diff --git a/assets/common/abilities/custom/roshwalr/doublehusk.ron b/assets/common/abilities/custom/roshwalr/doublehusk.ron index 8184536ac6..ee99724eea 100644 --- a/assets/common/abilities/custom/roshwalr/doublehusk.ron +++ b/assets/common/abilities/custom/roshwalr/doublehusk.ron @@ -4,7 +4,7 @@ ComboMelee( stage: 1, base_damage: 28.0, damage_increase: 0, - base_poise_damage: 15, + base_poise_damage: 7.5, poise_damage_increase: 0, knockback: 3.0, range: 2.2, @@ -14,13 +14,13 @@ ComboMelee( hit_timing: 0.5, base_recover_duration: 0.3, forward_movement: 0.5, - damage_kind: Crushing, + damage_kind: Piercing, ), ( stage: 2, base_damage: 28.0, damage_increase: 0, - base_poise_damage: 18, + base_poise_damage: 7.5, poise_damage_increase: 0, knockback: 3.0, range: 2.2, @@ -30,7 +30,7 @@ ComboMelee( hit_timing: 0.5, base_recover_duration: 0.6, forward_movement: 0.5, - damage_kind: Crushing, + damage_kind: Piercing, ), ], initial_energy_gain: 0, diff --git a/assets/common/abilities/custom/roshwalr/freezeshockwave.ron b/assets/common/abilities/custom/roshwalr/freezeshockwave.ron index e504dadc12..240a21e621 100644 --- a/assets/common/abilities/custom/roshwalr/freezeshockwave.ron +++ b/assets/common/abilities/custom/roshwalr/freezeshockwave.ron @@ -5,7 +5,7 @@ Shockwave( recover_duration: 2.0, damage: 15.0, poise_damage: 10, - knockback: (strength: 18.0, direction: Up), + knockback: (strength: 3.0, direction: Up), shockwave_angle: 75.0, shockwave_vertical_angle: 15.0, shockwave_speed: 20.0, diff --git a/assets/common/items/npc_armor/quadruped_medium/roshwalr.ron b/assets/common/items/npc_armor/quadruped_medium/roshwalr.ron new file mode 100644 index 0000000000..b6c692d940 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_medium/roshwalr.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Roshwalr's Thick Skin", + description: "testing123", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(100.0)), + poise_resilience: Some(Normal(2.0)), + )), + )), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/world/wildlife/spawn/tundra/snow.ron b/assets/world/wildlife/spawn/tundra/snow.ron index bc14011061..186ee00e1b 100644 --- a/assets/world/wildlife/spawn/tundra/snow.ron +++ b/assets/world/wildlife/spawn/tundra/snow.ron @@ -8,7 +8,7 @@ SpawnEntry ( (1, (1, 1, "common.entity.wild.aggressive.akhlut")), (1, (1, 1, "common.entity.wild.aggressive.icedrake")), (1, (1, 3, "common.entity.wild.aggressive.snow_raptor")), - (1, (1, 3, "common.entity.wild.aggressive.roshwalr")), + (1, (1, 1, "common.entity.wild.aggressive.roshwalr")), (5, (5, 20, "common.entity.wild.peaceful.penguin")), ], spawn_mode: Land, diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs index 06abb8b304..c5cca5fd04 100644 --- a/common/src/comp/agent.rs +++ b/common/src/comp/agent.rs @@ -283,7 +283,7 @@ impl<'a> From<&'a Body> for Psyche { quadruped_medium::Species::Dreadhorn => 0.2, quadruped_medium::Species::Bonerattler => 0.0, quadruped_medium::Species::Tiger => 0.1, - quadruped_medium::Species::Roshwalr => 0.1, + quadruped_medium::Species::Roshwalr => 0.0, _ => 0.3, }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 361f3fd487..d2711df6f0 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -691,7 +691,7 @@ impl Body { quadruped_medium::Species::Bonerattler => 50, quadruped_medium::Species::Deer => 50, quadruped_medium::Species::Hirdrasil => 70, - quadruped_medium::Species::Roshwalr => 280, + quadruped_medium::Species::Roshwalr => 350, quadruped_medium::Species::Donkey => 55, quadruped_medium::Species::Zebra => 55, quadruped_medium::Species::Antelope => 45, diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index bb18365a1d..637b493770 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -923,6 +923,12 @@ impl LoadoutBuilder { }, _ => None, }, + Body::QuadrupedMedium(body) => match body.species { + quadruped_medium::Species::Roshwalr => { + Some("common.items.npc_armor.quadruped_medium.roshwalr") + }, + _ => None, + }, Body::Theropod(body) => match body.species { theropod::Species::Archaeos | theropod::Species::Yale