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

Merge branch 'fix_sea_wyvern_head_offset' into 'master'

Browse Source 
fix sea wyvern head offset

See merge request veloren/veloren!4059
This commit is contained in:
Isse 2023-08-09 12:44:27 +00:00
commit 58b541490b
7 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assets/common/loot_tables/creature/bird_large/cloudwyvern.ron
View File

@ -1,7 +1,10 @@
[
(1.0, MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 3)),
(5.0, MultiDrop(Item("common.items.mineral.gem.amethyst"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6)),
(1, All([
MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 1),
MultiDrop(Item("common.items.mineral.gem.amethyst"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6),
],
)),
]

13
assets/common/loot_tables/creature/bird_large/flamewyvern.ron
View File

@ -1,7 +1,10 @@
[
(1.0, MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 3)),
(5.0, MultiDrop(Item("common.items.mineral.gem.ruby"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6)),
(1, All([
MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 1),
MultiDrop(Item("common.items.mineral.gem.ruby"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6),
],
)),
]

13
assets/common/loot_tables/creature/bird_large/frostwyvern.ron
View File

@ -1,7 +1,10 @@
[
(1.0, MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 3)),
(5.0, MultiDrop(Item("common.items.mineral.gem.diamond"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6)),
(1, All([
MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 1),
MultiDrop(Item("common.items.mineral.gem.diamond"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6),
],
)),
]

13
assets/common/loot_tables/creature/bird_large/seawyvern.ron
View File

@ -1,7 +1,10 @@
[
(1.0, MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 3)),
(5.0, MultiDrop(Item("common.items.mineral.gem.sapphire"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6)),
(1, All([
MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 1),
MultiDrop(Item("common.items.mineral.gem.sapphire"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6),
],
)),
]

13
assets/common/loot_tables/creature/bird_large/wealdwyvern.ron
View File

@ -1,7 +1,10 @@
[
(1.0, MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 3)),
(5.0, MultiDrop(Item("common.items.mineral.gem.emerald"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, 3)),
(1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 1, 3)),
(5.0, MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6)),
(1, All([
MultiDrop(Item("common.items.mineral.gem.topaz"), 1, 1),
MultiDrop(Item("common.items.mineral.gem.emerald"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 1, 3),
MultiDrop(Item("common.items.crafting_ing.hide.dragon_scale"), 2, 6),
],
)),
]

8
assets/voxygen/voxel/bird_large_central_manifest.ron
View File

@ -313,11 +313,11 @@
),
(SeaWyvern, Male): (
head: (
offset: (-3.5, 1.0, 3.0),
offset: (-3.5, -1.0, -1.0),
central: ("npc.wyvern_sea.male.head"),
),
beak: (
offset: (-3.5, 4.0, -4.0),
offset: (-3.5, 2.0, -6.0),
central: ("npc.wyvern_sea.male.beak"),
),
neck: (
@ -339,11 +339,11 @@
),
(SeaWyvern, Female): (
head: (
offset: (-3.5, 1.0, 3.0),
offset: (-3.5, -1.0, -1.0),
central: ("npc.wyvern_sea.male.head"),
),
beak: (
offset: (-3.5, 4.0, -4.0),
offset: (-3.5, 2.0, -6.0),
central: ("npc.wyvern_sea.male.beak"),
),
neck: (

2
voxygen/anim/src/bird_large/mod.rs
View File

@ -201,7 +201,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(FlameWyvern, _) => (10.0, -1.5),
(CloudWyvern, _) => (10.0, -1.5),
(FrostWyvern, _) => (10.0, -1.5),
(SeaWyvern, _) => (10.0, -1.5),
(SeaWyvern, _) => (10.0, 2.5),
(WealdWyvern, _) => (10.0, -1.5),
},
beak: match (body.species, body.body_type) {