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

roshwalr fix

Browse Source
This commit is contained in:
jshipsey 2020-10-18 02:37:12 -04:00 committed by Robin Gilh
parent caa048b1d5
commit 64d73abdec
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/common/loot_tables/loot_table_frostfang.ron → assets/common/loot_tables/loot_table_animal_ice.ron
View File

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

@ -893,11 +893,11 @@
lateral: ("npc.roshwalr.male.leg_fr"), lateral: ("npc.roshwalr.male.leg_fr"),
), ),
leg_bl: ( leg_bl: (
offset: (-2.0, -1.0, -2.5), offset: (-2.0, -4.0, -2.5),
lateral: ("npc.roshwalr.male.leg_bl"), lateral: ("npc.roshwalr.male.leg_bl"),
), ),
leg_br: ( leg_br: (
offset: (-2.0, -1.0, -2.5), offset: (-2.0, -4.0, -2.5),
lateral: ("npc.roshwalr.male.leg_br"), lateral: ("npc.roshwalr.male.leg_br"),
), ),
foot_fl: ( foot_fl: (
@ -927,11 +927,11 @@
lateral: ("npc.roshwalr.male.leg_fr"), lateral: ("npc.roshwalr.male.leg_fr"),
), ),
leg_bl: ( leg_bl: (
offset: (-2.0, -1.0, -2.5), offset: (-2.0, -4.0, -2.5),
lateral: ("npc.roshwalr.male.leg_bl"), lateral: ("npc.roshwalr.male.leg_bl"),
), ),
leg_br: ( leg_br: (
offset: (-2.0, -1.0, -2.5), offset: (-2.0, -4.0, -2.5),
lateral: ("npc.roshwalr.male.leg_br"), lateral: ("npc.roshwalr.male.leg_br"),
), ),
foot_fl: ( foot_fl: (

2
common/src/comp/body.rs
View File

@ -320,7 +320,7 @@ impl Body {
quadruped_medium::Species::Bonerattler => 30, quadruped_medium::Species::Bonerattler => 30,
quadruped_medium::Species::Deer => 30, quadruped_medium::Species::Deer => 30,
quadruped_medium::Species::Hirdrasil => 30, quadruped_medium::Species::Hirdrasil => 30,
quadruped_medium::Species::Roshwalr => 30, quadruped_medium::Species::Roshwalr => 40,
_ => 20, _ => 20,
}, },
Body::BirdMedium(bird_medium) => match bird_medium.species { Body::BirdMedium(bird_medium) => match bird_medium.species {

5
server/src/events/entity_manipulation.rs
View File

@ -330,8 +330,9 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
}, },
Some(common::comp::Body::QuadrupedMedium(quadruped_medium)) => { Some(common::comp::Body::QuadrupedMedium(quadruped_medium)) => {
match quadruped_medium.species { match quadruped_medium.species {
quadruped_medium::Species::Frostfang => { quadruped_medium::Species::Frostfang
"common.loot_tables.loot_table_frostfang" | quadruped_medium::Species::Roshwalr => {
"common.loot_tables.loot_table_animal_ice"
}, },
_ => match rng.gen_range(0, 4) { _ => match rng.gen_range(0, 4) {
0 => "common.loot_tables.loot_table_food", 0 => "common.loot_tables.loot_table_food",

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

@ -294,7 +294,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Bonerattler, _) => (-0.5, -3.0, -2.5), (Bonerattler, _) => (-0.5, -3.0, -2.5),
(Deer, _) => (-0.5, -0.5, -2.5), (Deer, _) => (-0.5, -0.5, -2.5),
(Hirdrasil, _) => (-0.5, -3.0, -3.5), (Hirdrasil, _) => (-0.5, -3.0, -3.5),
(Roshwalr, _) => (0.5, -0.5, -3.0), (Roshwalr, _) => (0.5, 0.0, -3.0),
}, },
feet_b: match (body.species, body.body_type) { feet_b: match (body.species, body.body_type) {
(Grolgar, _) => (0.5, -1.5, -3.0), (Grolgar, _) => (0.5, -1.5, -3.0),
@ -310,7 +310,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
(Bonerattler, _) => (0.0, 3.0, -2.5), (Bonerattler, _) => (0.0, 3.0, -2.5),
(Deer, _) => (-1.0, -0.5, -2.0), (Deer, _) => (-1.0, -0.5, -2.0),
(Hirdrasil, _) => (-1.0, -2.0, -4.5), (Hirdrasil, _) => (-1.0, -2.0, -4.5),
(Roshwalr, _) => (0.5, 1.0, -3.5), (Roshwalr, _) => (0.5, -1.0, -3.5),
}, },
scaler: match (body.species, body.body_type) { scaler: match (body.species, body.body_type) {
(Grolgar, _) => (1.3), (Grolgar, _) => (1.3),