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

updated mortar and pestle, fixed GR and cheese rotation, fixed offsets of Pfau's turbans

Browse Source
This commit is contained in:
DoctorKompot 2021-12-10 23:31:27 +02:00
parent 1cc69bbca1
commit 44f6e3888b
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/voxygen/item_image_manifest.ron
View File

@ -2481,7 +2481,7 @@
),
Consumable("common.items.food.cheese"): VoxTrans(
"voxel.object.cheese",
(0.0, 0.0, 0.0), (-60.0, -10.0, 0.0), 0.8,
(0.0, 0.0, 0.0), (-50.0, 40.0, 27.0), 0.7,
),
Consumable("common.items.food.blue_cheese"): VoxTrans(
"voxel.object.blue_cheese",
@ -2501,7 +2501,7 @@
),
Consumable("common.items.food.apple_mushroom_curry"): VoxTrans(
"voxel.object.mushroom_curry",
(-0.3, 2.0, 0.0), (-50.0, 20.0, 17.0), 1.0,
(0.0, 0.0, 0.0), (-50.0, 20.0, 17.0), 0.9,
),
Consumable("common.items.food.spore_corruption"): VoxTrans(
"voxel.sprite.spore.corruption_spore",
@ -2663,7 +2663,7 @@
),
Ingredient("FlayerBagDamaged"): VoxTrans(
"voxel.object.glowing_remains",
(0.0, 0.0, 0.0), (10.0, -20.0, 30.0), 1.0,
(0.0, 0.0, 0.0), (-20.0, 20.0, .0), 0.9,
),
Ingredient("RaptorFeather"): VoxTrans(
"voxel.object.raptor_feather",
@ -2883,7 +2883,7 @@
),
Ingredient("MortarPestle"): VoxTrans(
"voxel.object.mortar_pestle",
(0.0, 0.0, 0.0), (10.0, -20.0, 30.0), 1.0,
(0.0, 0.0, 0.0), (-40.0, 15.0, 17.0), 0.8,
),
Ingredient("EmptyVial"): VoxTrans(
"voxel.object.potion_empty",

BIN
assets/voxygen/voxel/armor/merchant/turban_human.vox (Stored with Git LFS)
View File

Binary file not shown.

24
assets/voxygen/voxel/humanoid_armor_head_manifest.ron
View File

@ -864,51 +864,51 @@
),
// Merchant Turban
(Human, Male, "Merchant"): (
vox_spec: ("armor.merchant.turban_human", (-2.0, -3.0, 2.0)),
vox_spec: ("armor.merchant.turban_human", (-4.0, -7.0, 2.0)),
color: None
),
(Human, Female, "Merchant"): (
vox_spec: ("armor.merchant.turban_human", (-2.0, -2.0, 2.0)),
vox_spec: ("armor.merchant.turban_human", (-4.0, -6.0, 2.0)),
color: None
),
(Elf, Male, "Merchant"): (
vox_spec: ("armor.merchant.turban_human", (-1.0, -3.0, 2.0)),
vox_spec: ("armor.merchant.turban_human", (-3.0, -7.0, 2.0)),
color: None
),
(Elf, Female, "Merchant"): (
vox_spec: ("armor.merchant.turban_human", (-1.0, -3.0, 2.0)),
vox_spec: ("armor.merchant.turban_human", (-3.0, -7.0, 2.0)),
color: None
),
(Dwarf, Male, "Merchant"): (
vox_spec: ("armor.merchant.turban_dwarf", (-3.0, -2.0, 2.0)),
vox_spec: ("armor.merchant.turban_dwarf", (-5.0, -6.0, 2.0)),
color: None
),
(Dwarf, Female, "Merchant"): (
vox_spec: ("armor.merchant.turban_dwarf", (-3.0, -2.0, 2.0)),
vox_spec: ("armor.merchant.turban_dwarf", (-5.0, -6.0, 2.0)),
color: None
),
(Danari, Male, "Merchant"): (
vox_spec: ("armor.merchant.turban_human", (0.0, -4.0, 4.0)),
vox_spec: ("armor.merchant.turban_human", (-2.0, -7.0, 4.0)),
color: None
),
(Danari, Female, "Merchant"): (
vox_spec: ("armor.merchant.turban_human", (0.0, -4.0, 4.0)),
vox_spec: ("armor.merchant.turban_human", (-2.0, -7.0, 4.0)),
color: None
),
(Undead, Male, "Merchant"): (
vox_spec: ("armor.merchant.turban_undead", (-4.0, -3.0, 4.0)),
vox_spec: ("armor.merchant.turban_undead", (-6.0, -7.0, 4.0)),
color: None
),
(Undead, Female, "Merchant"): (
vox_spec: ("armor.merchant.turban_undead", (-4.0, -3.0, 3.0)),
vox_spec: ("armor.merchant.turban_undead", (-6.0, -7.0, 3.0)),
color: None
),
(Orc, Male, "Merchant"): (
vox_spec: ("armor.merchant.turban_orc", (-1.0, -2.0, 4.0)),
vox_spec: ("armor.merchant.turban_orc", (-3.0, -5.0, 4.0)),
color: None
),
(Orc, Female, "Merchant"): (
vox_spec: ("armor.merchant.turban_orc", (-1.0, -4.0, 2.0)),
vox_spec: ("armor.merchant.turban_orc", (-3.0, -8.0, 2.0)),
color: None
),
//Winged Coronet -1, 5

BIN
assets/voxygen/voxel/object/mortar_pestle.vox (Stored with Git LFS)
View File

Binary file not shown.