Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

sceptre positioning [ci_skip]

Browse Source
This commit is contained in:
brunt 2022-05-02 22:51:52 -05:00 committed by Sam
parent 6ccc0b82f0
commit 5ab9c0f1ad
3 changed files with 88 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/item_image_manifest.ron
View File

@ -1404,7 +1404,7 @@
(0.0, 0.0, 0.0), (-130.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.wood", Two)): VoxTrans(
"voxel.weapon.sceptre.sceptre.wood",
"voxel.weapon.sceptre.ornate.wood",
(0.0, 0.0, 0.0), (-130.0, 90.0, 0.0), 1.0,
),
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.wood", Two)): VoxTrans(

84
assets/voxygen/voxel/biped_weapon_manifest.ron
View File

@ -1331,171 +1331,171 @@
),
// Sceptres
Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.wood", Two)): (
vox_spec: ("weapon.sceptre.arbor.wood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.arbor.wood", (-1.5, -5.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.wood", Two)): (
vox_spec: ("weapon.sceptre.cane.wood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.cane.wood", (-1.5, -3.0, -6.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.wood", Two)): (
vox_spec: ("weapon.sceptre.crook.wood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crook.wood", (-0.5, -4.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.wood", Two)): (
vox_spec: ("weapon.sceptre.crozier.wood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crozier.wood", (-1.5, -5.0, -6.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.wood", Two)): (
vox_spec: ("weapon.sceptre.grandsceptre.wood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.grandsceptre.wood", (-0.5, -5.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.wood", Two)): (
vox_spec: ("weapon.sceptre.sceptre.wood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.ornate.wood", (-1.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.wood", Two)): (
vox_spec: ("weapon.sceptre.sceptre.wood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.sceptre.wood", (-0.5, -5.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.bamboo", Two)): (
vox_spec: ("weapon.sceptre.arbor.bamboo", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.arbor.bamboo", (-2.5, -3.0, -4.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.bamboo", Two)): (
vox_spec: ("weapon.sceptre.cane.bamboo", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.cane.bamboo", (-1.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.bamboo", Two)): (
vox_spec: ("weapon.sceptre.crook.bamboo", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crook.bamboo", (-1.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.bamboo", Two)): (
vox_spec: ("weapon.sceptre.crozier.bamboo", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crozier.bamboo", (-1.5, -3.0, -4.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.bamboo", Two)): (
vox_spec: ("weapon.sceptre.grandsceptre.bamboo", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.grandsceptre.bamboo", (-2.5, -3.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.bamboo", Two)): (
vox_spec: ("weapon.sceptre.ornate.bamboo", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.ornate.bamboo", (-0.5, -3.0, -4.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.bamboo", Two)): (
vox_spec: ("weapon.sceptre.sceptre.bamboo", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.sceptre.bamboo", (-2.5, -3.0, -4.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.hardwood", Two)): (
vox_spec: ("weapon.sceptre.arbor.hardwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.arbor.hardwood", (-1.5, -5.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.hardwood", Two)): (
vox_spec: ("weapon.sceptre.cane.hardwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.cane.hardwood", (-1.5, -5.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.hardwood", Two)): (
vox_spec: ("weapon.sceptre.crook.hardwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crook.hardwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.hardwood", Two)): (
vox_spec: ("weapon.sceptre.crozier.hardwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crozier.hardwood", (-6.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.hardwood", Two)): (
vox_spec: ("weapon.sceptre.grandsceptre.hardwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.grandsceptre.hardwood", (-4.5, -6.0, -4.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.hardwood", Two)): (
vox_spec: ("weapon.sceptre.ornate.hardwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.ornate.hardwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.hardwood", Two)): (
vox_spec: ("weapon.sceptre.sceptre.hardwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.sceptre.hardwood", (-1.5, -6.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.ironwood", Two)): (
vox_spec: ("weapon.sceptre.arbor.ironwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.arbor.ironwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.ironwood", Two)): (
vox_spec: ("weapon.sceptre.cane.ironwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.cane.ironwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.ironwood", Two)): (
vox_spec: ("weapon.sceptre.crook.ironwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crook.ironwood", (-0.5, -5.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.ironwood", Two)): (
vox_spec: ("weapon.sceptre.crozier.ironwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crozier.ironwood", (-4.5, -3.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.ironwood", Two)): (
vox_spec: ("weapon.sceptre.grandsceptre.ironwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.grandsceptre.ironwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.ironwood", Two)): (
vox_spec: ("weapon.sceptre.ornate.ironwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.ornate.ironwood", (-4.5, -3.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.ironwood", Two)): (
vox_spec: ("weapon.sceptre.sceptre.ironwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.sceptre.ironwood", (-5.5, -6.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.frostwood", Two)): (
vox_spec: ("weapon.sceptre.arbor.frostwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.arbor.frostwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.frostwood", Two)): (
vox_spec: ("weapon.sceptre.cane.frostwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.cane.frostwood", (-3.5, -3.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.frostwood", Two)): (
vox_spec: ("weapon.sceptre.crook.frostwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crook.frostwood", (-1.5, -3.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.frostwood", Two)): (
vox_spec: ("weapon.sceptre.crozier.frostwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crozier.frostwood", (-4.5, -2.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.frostwood", Two)): (
vox_spec: ("weapon.sceptre.grandsceptre.frostwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.grandsceptre.frostwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.frostwood", Two)): (
vox_spec: ("weapon.sceptre.ornate.frostwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.ornate.frostwood", (-3.5, -3.0, -5.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.frostwood", Two)): (
vox_spec: ("weapon.sceptre.sceptre.frostwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.sceptre.frostwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.eldwood", Two)): (
vox_spec: ("weapon.sceptre.arbor.eldwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.arbor.eldwood", (-6.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.eldwood", Two)): (
vox_spec: ("weapon.sceptre.cane.eldwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.cane.eldwood", (-4.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.eldwood", Two)): (
vox_spec: ("weapon.sceptre.crook.eldwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crook.eldwood", (-1.5, -4.0, -6.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.eldwood", Two)): (
vox_spec: ("weapon.sceptre.crozier.eldwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.crozier.eldwood", (-6.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.eldwood", Two)): (
vox_spec: ("weapon.sceptre.grandsceptre.eldwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.grandsceptre.eldwood", (-2.5, -3.0, -3.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.eldwood", Two)): (
vox_spec: ("weapon.sceptre.ornate.eldwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.ornate.eldwood", (-5.5, -4.0, -7.0)),
color: None
),
Modular(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.eldwood", Two)): (
vox_spec: ("weapon.sceptre.sceptre.eldwood", (0.0, 0.0, 0.0)),
vox_spec: ("weapon.sceptre.sceptre.eldwood", (-4.5, -3.0, -3.0)),
color: None
),
Tool("common.items.weapons.sceptre.starter_sceptre"): (

45
assets/voxygen/voxel/item_drop_manifest.ron
View File

@ -302,6 +302,51 @@
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.ornate", "common.items.mineral.ingot.orichalcum", One)):"voxel.weapon.hammer.ornate.orichalcum-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.spikedmace", "common.items.mineral.ingot.orichalcum", One)):"voxel.weapon.hammer.spikedmace.orichalcum-1h",
ModularWeapon(("common.items.crafting_ing.modular.primary.hammer.warhammer", "common.items.mineral.ingot.orichalcum", One)):"voxel.weapon.hammer.warhammer.orichalcum-1h",
// Sceptres
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.wood", Two)): "voxel.weapon.sceptre.arbor.wood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.wood", Two)): "voxel.weapon.sceptre.cane.wood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.wood", Two)): "voxel.weapon.sceptre.crook.wood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.wood", Two)): "voxel.weapon.sceptre.crozier.wood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.wood", Two)): "voxel.weapon.sceptre.ornate.wood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.wood", Two)): "voxel.weapon.sceptre.grandsceptre.wood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.wood", Two)): "voxel.weapon.sceptre.sceptre.wood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.bamboo", Two)): "voxel.weapon.sceptre.arbor.bamboo",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.bamboo", Two)): "voxel.weapon.sceptre.cane.bamboo",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.bamboo", Two)): "voxel.weapon.sceptre.crook.bamboo",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.bamboo", Two)): "voxel.weapon.sceptre.crozier.bamboo",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.bamboo", Two)): "voxel.weapon.sceptre.ornate.bamboo",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.bamboo", Two)): "voxel.weapon.sceptre.grandsceptre.bamboo",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.bamboo", Two)): "voxel.weapon.sceptre.sceptre.bamboo",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.hardwood", Two)): "voxel.weapon.sceptre.arbor.hardwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.hardwood", Two)): "voxel.weapon.sceptre.cane.hardwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.hardwood", Two)): "voxel.weapon.sceptre.crook.hardwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.hardwood", Two)): "voxel.weapon.sceptre.crozier.hardwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.hardwood", Two)): "voxel.weapon.sceptre.ornate.hardwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.hardwood", Two)): "voxel.weapon.sceptre.grandsceptre.hardwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.hardwood", Two)): "voxel.weapon.sceptre.sceptre.hardwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.ironwood", Two)): "voxel.weapon.sceptre.arbor.ironwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.ironwood", Two)): "voxel.weapon.sceptre.cane.ironwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.ironwood", Two)): "voxel.weapon.sceptre.crook.ironwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.ironwood", Two)): "voxel.weapon.sceptre.crozier.ironwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.ironwood", Two)): "voxel.weapon.sceptre.ornate.ironwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.ironwood", Two)): "voxel.weapon.sceptre.grandsceptre.ironwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.ironwood", Two)): "voxel.weapon.sceptre.sceptre.ironwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.frostwood", Two)): "voxel.weapon.sceptre.arbor.frostwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.frostwood", Two)): "voxel.weapon.sceptre.cane.frostwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.frostwood", Two)): "voxel.weapon.sceptre.crook.frostwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.frostwood", Two)): "voxel.weapon.sceptre.crozier.frostwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.frostwood", Two)): "voxel.weapon.sceptre.ornate.frostwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.frostwood", Two)): "voxel.weapon.sceptre.grandsceptre.frostwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.frostwood", Two)): "voxel.weapon.sceptre.sceptre.frostwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.arbor.eldwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.cane.eldwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.crook.eldwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.crozier.eldwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.ornate.eldwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.grandsceptre.eldwood",
ModularWeapon(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.eldwood", Two)): "voxel.weapon.sceptre.sceptre.eldwood",
Tool("common.items.weapons.bow.sagitta"): "voxel.weapon.bow.sagitta",
Tool("common.items.weapons.bow.starter"): "voxel.weapon.bow.starter",
Tool("common.items.weapons.bow.velorite"): "voxel.weapon.bow.velorite",