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 'various_small_fixes' into 'master'

Browse Source 
various_small_fixes

See merge request veloren/veloren!4229
This commit is contained in:
flo 2023-12-27 07:30:23 +00:00
commit afb1e04e5f
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/common/loot_tables/creature/crustacean/crab.ron
View File

@ -1,4 +1,5 @@
[ [
(2.0, Nothing),
(1.0, Item("common.items.crafting_ing.animal_misc.viscous_ooze")), (1.0, Item("common.items.crafting_ing.animal_misc.viscous_ooze")),
(2.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2)), (1.0, Item("common.items.crafting_ing.animal_misc.strong_pincer")),
] ]

2
assets/common/loot_tables/creature/quad_medium/mammoth.ron
View File

@ -1,6 +1,6 @@
[ [
(1, All([ (1, All([
MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 3), MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 1),
MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2), MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2),
], ],
)), )),

2
assets/common/loot_tables/creature/quad_medium/ngoubou.ron
View File

@ -1,6 +1,6 @@
[ [
(1, All([ (1, All([
MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 3), MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 1),
MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2), MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2),
MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2), MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2),
], ],

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

@ -512,7 +512,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Highland, _) => (5.5, -2.5, 0.0), (Highland, _) => (5.5, -2.5, 0.0),
(Yak, _) => (4.5, -2.0, -1.5), (Yak, _) => (4.5, -2.0, -1.5),
(Panda, _) => (7.5, -5.5, -2.0), (Panda, _) => (7.5, -5.5, -2.0),
(Bear, _) => (3.5, -4.5, -3.5), (Bear, _) => (5.5, -4.5, -3.5),
(Dreadhorn, _) => (8.5, -7.0, -0.5), (Dreadhorn, _) => (8.5, -7.0, -0.5),
(Moose, _) => (5.5, -4.0, 1.0), (Moose, _) => (5.5, -4.0, 1.0),
(Snowleopard, _) => (6.5, -4.0, -2.5), (Snowleopard, _) => (6.5, -4.0, -2.5),