Ajustments to new npcs

assets/common/abilities/custom/husk_brute/chargedmelee.ron

@@ -7,7 +7,7 @@ ChargedMelee(
     scaled_poise_damage: 150,
     initial_knockback: 0.0,
     scaled_knockback: 0.0,
-    range: 5.0,
+    range: 3.5,
     max_angle: 45.0,
     speed: 1.0,
     charge_duration: 1.5,

assets/common/abilities/custom/husk_brute/singlestrike.ron

@@ -7,7 +7,7 @@ ComboMelee(
             base_poise_damage: 12,
             poise_damage_increase: 0,
             knockback: 5.0,
-            range: 2.5,
+            range: 3.5,
             angle: 60.0,
             base_buildup_duration: 0.25,
             base_swing_duration: 0.07,

assets/common/entity/dungeon/tier-5/warlock.ron

@@ -4,7 +4,10 @@ EntityConfig (
 
     loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
 
-    main_tool: Some(Item("common.items.weapons.staff.bipedlarge-cultist_staff")),
+    main_tool: Some(Choice([
+        (1.5, Some(Item("common.items.weapons.staff.bipedlarge-cultist_staff"))),
+        (1.0, Some(Item("common.items.weapons.bow.bipedlarge-velorite"))),
+    ])),
     second_tool: None,
 
     loadout_asset: None,

assets/common/entity/dungeon/tier-5/warlord.ron

@@ -5,9 +5,8 @@ EntityConfig (
     loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
 
     main_tool: Some(Choice([
-        (2.0, Some(Item("common.items.weapons.sword.bipedlarge-cultist"))),
+        (1.5, Some(Item("common.items.weapons.sword.bipedlarge-cultist"))),
         (1.0, Some(Item("common.items.weapons.hammer.bipedlarge-cultist_purp_2h-0"))),
-        (1.0, Some(Item("common.items.weapons.bow.bipedlarge-velorite"))),
     ])),
     second_tool: None,
 

assets/common/items/weapons/bow/bipedlarge-velorite.ron

@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.4,
-            power: 2.0,
+            power: 1.6,
             poise_strength: 1.1,
-            speed: 1.0,
+            speed: 0.8,
             crit_chance: 0.140625,
         )),
     )),

assets/common/items/weapons/hammer/bipedlarge-cultist_purp_2h-0.ron

@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.5,
-            power: 2.0,
+            power: 1.6,
             poise_strength: 1.0,
-            speed: 1.0,
+            speed: 0.8,
             crit_chance: 0.140625,
         )),
     )),

assets/common/items/weapons/staff/bipedlarge-cultist_staff.ron

@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.3,
-            power: 2.0,
+            power: 1.6,
             poise_strength: 1.0,
-            speed: 1.0,
+            speed: 0.8,
             crit_chance: 0.140625,
         )),
     )),

assets/common/items/weapons/sword/bipedlarge-cultist.ron

@@ -6,9 +6,9 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_secs: 0.5,
-            power: 2.0,
+            power: 1.6,
             poise_strength: 1.0,
-            speed: 1.0,
+            speed: 0.8,
             crit_chance: 0.140625,
         )),
     )),

assets/voxygen/voxel/quadruped_medium_central_manifest.ron

@@ -1809,7 +1809,7 @@
             central: ("npc.mammoth.male.neck"),
         ),
         jaw: (
-            offset: (-3.0, 0.0, -13.0),
+            offset: (-3.0, -5.0, -13.0),
             central: ("npc.mammoth.male.jaw"),
         ),
         torso_front: (
@@ -1839,7 +1839,7 @@
             central: ("npc.mammoth.male.neck"),
         ),
         jaw: (
-            offset: (-3.0, 0.0, -13.0),
+            offset: (-3.0, -5.0, -13.0),
             central: ("npc.mammoth.male.jaw"),
         ),
         torso_front: (
@@ -1869,7 +1869,7 @@
             central: ("npc.ngoubou.male.neck"),
         ),
         jaw: (
-            offset: (-2.5, 0.0, -3.0),
+            offset: (-2.5, -7.0, -3.0),
             central: ("npc.ngoubou.male.jaw"),
         ),
         torso_front: (

common/src/comp/body.rs

@@ -310,7 +310,7 @@ impl Body {
                 biped_large::Species::Werewolf => Vec3::new(4.0, 3.0, 3.5),
                 biped_large::Species::Harvester => Vec3::new(4.6, 3.0, 5.4),
                 biped_large::Species::Cultistwarlord => Vec3::new(3.0, 3.0, 4.5),
-                biped_large::Species::Cultistwarlock => Vec3::new(3.0, 3.0, 4.5),
+                biped_large::Species::Cultistwarlock => Vec3::new(3.0, 3.0, 3.5),
                 biped_large::Species::Huskbrute => Vec3::new(4.6, 3.0, 5.0),
                 _ => Vec3::new(4.6, 3.0, 6.0),
             },
@@ -469,7 +469,7 @@ impl Body {
                 quadruped_medium::Species::Bear => 900,
                 quadruped_medium::Species::Moose => 800,
                 quadruped_medium::Species::Dreadhorn => 1100,
-                quadruped_medium::Species::Mammoth => 1700,
+                quadruped_medium::Species::Mammoth => 1900,
                 quadruped_medium::Species::Ngoubou => 1500,
                 _ => 700,
             },
@@ -594,7 +594,7 @@ impl Body {
                 quadruped_medium::Species::Bear => 40,
                 quadruped_medium::Species::Moose => 30,
                 quadruped_medium::Species::Dreadhorn => 50,
-                quadruped_medium::Species::Mammoth => 70,
+                quadruped_medium::Species::Mammoth => 80,
                 quadruped_medium::Species::Ngoubou => 50,
                 _ => 20,
             },

common/src/comp/inventory/loadout_builder.rs

@@ -186,7 +186,9 @@ fn default_main_tool(body: &Body) -> Item {
             quadruped_medium::Species::Tuskram
             | quadruped_medium::Species::Roshwalr
             | quadruped_medium::Species::Moose
-            | quadruped_medium::Species::Dreadhorn => Some(Item::new_from_asset_expect(
+            | quadruped_medium::Species::Dreadhorn
+            | quadruped_medium::Species::Mammoth
+            | quadruped_medium::Species::Ngoubou => Some(Item::new_from_asset_expect(
                 "common.items.npc_weapons.unique.quadmedcharge",
             )),
             quadruped_medium::Species::Highland

common/src/states/utils.rs

@@ -79,6 +79,9 @@ impl Body {
                 biped_large::Species::Mightysaurok => 100.0,
                 biped_large::Species::Mindflayer => 90.0,
                 biped_large::Species::Minotaur => 60.0,
+                biped_large::Species::Huskbrute => 130.0,
+                biped_large::Species::Cultistwarlord => 110.0,
+                biped_large::Species::Cultistwarlock => 90.0,
                 _ => 80.0,
             },
             Body::BirdMedium(_) => 80.0,
@@ -138,7 +141,10 @@ impl Body {
         match self {
             Body::Humanoid(_) => 3.5,
             Body::QuadrupedSmall(_) => 3.0,
-            Body::QuadrupedMedium(_) => 2.8,
+            Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species {
+                quadruped_medium::Species::Mammoth => 2.2,
+                _ => 2.8,
+            },
             Body::BirdMedium(_) => 6.0,
             Body::FishMedium(_) => 6.0,
             Body::Dragon(_) => 1.0,

server/src/sys/agent.rs

@@ -1637,7 +1637,7 @@ impl<'a> AgentData<'a> {
                             },
                             "Quad Med Jump" => Tactic::QuadMedJump,
                             "Quad Med Charge" => Tactic::CircleCharge {
-                                radius: 12,
+                                radius: 6,
                                 circle_time: 1,
                             },
                             "Quad Med Basic" => Tactic::QuadMedBasic,
@@ -1645,7 +1645,7 @@ impl<'a> AgentData<'a> {
                             "Quad Low Breathe" | "Quad Low Beam" | "Basilisk" => {
                                 Tactic::QuadLowBeam
                             },
-                            "Quad Low Tail" => Tactic::TailSlap,
+                            "Quad Low Tail" | "Husk Brute" => Tactic::TailSlap,
                             "Quad Low Quick" => Tactic::QuadLowQuick,
                             "Quad Low Basic" => Tactic::QuadLowBasic,
                             "Theropod Basic" | "Theropod Bird" => Tactic::Theropod,

voxygen/anim/src/biped_large/idle.rs

@@ -90,7 +90,7 @@ impl Animation for IdleAnimation {
 
         match active_tool_kind {
             Some(ToolKind::Bow) => {
-                next.main.position = Vec3::new(-2.0, -5.0, -6.0);
+                next.main.position = Vec3::new(0.0, -6.0, 0.0);
                 next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
             },
             Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {

voxygen/anim/src/biped_large/mod.rs

@@ -421,7 +421,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Occultsaurok, _) => 1.0,
                 (Mightysaurok, _) => 1.0,
                 (Slysaurok, _) => 1.0,
-                (Mindflayer, _) => 1.5,
+                (Mindflayer, _) => 1.6,
                 (Minotaur, _) => 1.7,
                 (Tidalwarrior, _) => 1.7,
                 (Yeti, _) => 1.2,

voxygen/anim/src/biped_large/run.rs

@@ -295,7 +295,7 @@ impl Animation for RunAnimation {
 
             match active_tool_kind {
                 Some(ToolKind::Bow) => {
-                    next.main.position = Vec3::new(-2.0, -5.0, -6.0);
+                    next.main.position = Vec3::new(0.0, -6.0, 0.0);
                     next.main.orientation =
                         Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
                 },

voxygen/anim/src/biped_large/shoot.rs

@@ -156,7 +156,7 @@ impl Animation for ShootAnimation {
                 next.control.position = Vec3::new(
                     -1.0 + move1 * 2.0,
                     6.0 + s_a.grip.0 / 1.2 + move1 * 7.0,
-                    -5.0 + -s_a.grip.0 / 2.0 + move1 * s_a.height * 2.8,
+                    -5.0 + -s_a.grip.0 / 2.0 + move1 * s_a.height * 3.4,
                 );
 
                 next.control_l.orientation =

voxygen/anim/src/quadruped_medium/mod.rs

@@ -250,8 +250,8 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Moose, Male) => (10.0, -7.0),
                 (Moose, Female) => (6.0, -2.5),
                 (Snowleopard, _) => (3.0, -3.0),
-                (Mammoth, _) => (4.5, -3.0),
+                (Mammoth, _) => (9.5, -3.0),
-                (Ngoubou, _) => (4.5, -4.0),
+                (Ngoubou, _) => (8.5, -4.0),
                 (Llama, _) => (4.0, -1.0),
                 (Alpaca, _) => (3.0, -2.5),
             },