From 64d73abdec0c11c5484a13db922e446113ba402b Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sun, 18 Oct 2020 02:37:12 -0400
Subject: [PATCH] roshwalr fix

---
 ...loot_table_frostfang.ron => loot_table_animal_ice.ron} | 0
 .../voxygen/voxel/quadruped_medium_lateral_manifest.ron   | 8 ++++----
 common/src/comp/body.rs                                   | 2 +-
 server/src/events/entity_manipulation.rs                  | 5 +++--
 voxygen/src/anim/src/quadruped_medium/mod.rs              | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename assets/common/loot_tables/{loot_table_frostfang.ron => loot_table_animal_ice.ron} (100%)

diff --git a/assets/common/loot_tables/loot_table_frostfang.ron b/assets/common/loot_tables/loot_table_animal_ice.ron
similarity index 100%
rename from assets/common/loot_tables/loot_table_frostfang.ron
rename to assets/common/loot_tables/loot_table_animal_ice.ron
diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
index 9474b7772f..429aa3fbd5 100644
--- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
+++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron
@@ -893,11 +893,11 @@
             lateral: ("npc.roshwalr.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -1.0, -2.5),
+            offset: (-2.0, -4.0, -2.5),
             lateral: ("npc.roshwalr.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -1.0, -2.5),
+            offset: (-2.0, -4.0, -2.5),
             lateral: ("npc.roshwalr.male.leg_br"),
         ),
         foot_fl: (
@@ -927,11 +927,11 @@
             lateral: ("npc.roshwalr.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -1.0, -2.5),
+            offset: (-2.0, -4.0, -2.5),
             lateral: ("npc.roshwalr.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -1.0, -2.5),
+            offset: (-2.0, -4.0, -2.5),
             lateral: ("npc.roshwalr.male.leg_br"),
         ),
         foot_fl: (
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index fea03442ca..b1348e4b42 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -320,7 +320,7 @@ impl Body {
                 quadruped_medium::Species::Bonerattler => 30,
                 quadruped_medium::Species::Deer => 30,
                 quadruped_medium::Species::Hirdrasil => 30,
-                quadruped_medium::Species::Roshwalr => 30,
+                quadruped_medium::Species::Roshwalr => 40,
                 _ => 20,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs
index 9bda994e77..d4daa1b3bc 100644
--- a/server/src/events/entity_manipulation.rs
+++ b/server/src/events/entity_manipulation.rs
@@ -330,8 +330,9 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
                 },
                 Some(common::comp::Body::QuadrupedMedium(quadruped_medium)) => {
                     match quadruped_medium.species {
-                        quadruped_medium::Species::Frostfang => {
-                            "common.loot_tables.loot_table_frostfang"
+                        quadruped_medium::Species::Frostfang
+                        | quadruped_medium::Species::Roshwalr => {
+                            "common.loot_tables.loot_table_animal_ice"
                         },
                         _ => match rng.gen_range(0, 4) {
                             0 => "common.loot_tables.loot_table_food",
diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs
index bb59992ea7..5c3175a2db 100644
--- a/voxygen/src/anim/src/quadruped_medium/mod.rs
+++ b/voxygen/src/anim/src/quadruped_medium/mod.rs
@@ -294,7 +294,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (-0.5, -3.0, -2.5),
                 (Deer, _) => (-0.5, -0.5, -2.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) {
                 (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),
                 (Deer, _) => (-1.0, -0.5, -2.0),
                 (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) {
                 (Grolgar, _) => (1.3),