woodengolem, chieftain, icedrake, blowgun

assets/common/entity/dungeon/tier-0/chieftain.ron

@@ -0,0 +1,13 @@
+EntityConfig (
+    name: Name("Gnarling Chieftain"),
+    body: RandomWith("gnarling"),
+    alignment: Alignment(Enemy),
+
+    loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
+
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.chieftain_staff")),
+
+    meta: [
+        LoadoutAsset("common.loadout.dungeon.tier-0.gnarling_chieftain"),
+    ],
+)

assets/common/entity/dungeon/tier-0/logger.ron

@@ -1,13 +1,13 @@
 EntityConfig (
-    name: Name("Gnarling Shaman"),
+    name: Name("Gnarling Logger"),
     body: RandomWith("gnarling"),
     alignment: Alignment(Enemy),
 
     loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
 
-    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.gnoll_staff")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.adlet_bow")),
 
     meta: [
-        LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+        LoadoutAsset("common.loadout.dungeon.tier-0.logger"),
     ],
 )

assets/common/entity/dungeon/tier-0/mugger.ron

@@ -8,6 +8,6 @@ EntityConfig (
     hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.wooden_spear")),
 
     meta: [
-        LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+        LoadoutAsset("common.loadout.dungeon.tier-0.mugger"),
     ],
 )

assets/common/entity/dungeon/tier-0/stalker.ron

@@ -5,9 +5,9 @@ EntityConfig (
 
     loot: LootTable("common.loot_tables.dungeon.tier-0.enemy"),
 
-    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.adlet_bow")),
+    hands: TwoHanded(Item("common.items.npc_weapons.biped_small.gnarling.blowgun")),
 
     meta: [
-        LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
+        LoadoutAsset("common.loadout.dungeon.tier-0.stalker"),
     ],
 )

assets/common/items/npc_armor/biped_small/gnarling/chest/chieftain.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling Chieftain",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Chest("GnarlingChieftain"),
+        stats: (
+            protection: Some(Normal(2.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(2.7),
+            energy_reward: Some(0.027),
+            crit_power: Some(0.025),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/chest/logger.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Gnarling",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Chest("Gnarling"),
+        kind: Chest("GnarlingLogger"),
         stats: (
             protection: Some(Normal(2.0)),
             poise_resilience: Some(Normal(1.0)),

assets/common/items/npc_armor/biped_small/gnarling/chest/mugger.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Chest("GnarlingMugger"),
+        stats: (
+            protection: Some(Normal(2.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(2.7),
+            energy_reward: Some(0.027),
+            crit_power: Some(0.025),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/chest/stalker.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Chest("GnarlingStalker"),
+        stats: (
+            protection: Some(Normal(2.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(2.7),
+            energy_reward: Some(0.027),
+            crit_power: Some(0.025),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/foot/chieftain.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling Chieftain",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Foot("GnarlingChieftain"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.9),
+            energy_reward: Some(0.009),
+            crit_power: Some(0.008),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/foot/logger.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Gnarling",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Foot("Gnarling"),
+        kind: Foot("GnarlingLogger"),
         stats: (
             protection: Some(Normal(1.0)),
             poise_resilience: Some(Normal(1.0)),

assets/common/items/npc_armor/biped_small/gnarling/foot/mugger.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Foot("GnarlingMugger"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.9),
+            energy_reward: Some(0.009),
+            crit_power: Some(0.008),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/foot/stalker.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Foot("GnarlingStalker"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.9),
+            energy_reward: Some(0.009),
+            crit_power: Some(0.008),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/hand/chieftain.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling Chieftain",
+    description: "Ceremonial attire used by members..",
+    kind: Armor((
+        kind: Hand("GnarlingChieftain"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.9),
+            energy_reward: Some(0.009),
+            crit_power: Some(0.008),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/hand/logger.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Gnarling",
     description: "Ceremonial attire used by members..",
     kind: Armor((
-        kind: Hand("Gnarling"),
+        kind: Hand("GnarlingLogger"),
         stats: (
             protection: Some(Normal(1.0)),
             poise_resilience: Some(Normal(1.0)),

assets/common/items/npc_armor/biped_small/gnarling/hand/mugger.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members..",
+    kind: Armor((
+        kind: Hand("GnarlingMugger"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.9),
+            energy_reward: Some(0.009),
+            crit_power: Some(0.008),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/hand/stalker.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members..",
+    kind: Armor((
+        kind: Hand("GnarlingStalker"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.9),
+            energy_reward: Some(0.009),
+            crit_power: Some(0.008),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/head/chieftain.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling Chieftain",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Head("GnarlingChieftain"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.02),
+            crit_power: Some(0.016),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/head/logger.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Gnarling",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Head("Gnarling"),
+        kind: Head("GnarlingLogger"),
         stats: (
             protection: Some(Normal(1.0)),
             poise_resilience: Some(Normal(1.0)),

assets/common/items/npc_armor/biped_small/gnarling/head/mugger.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Head("GnarlingMugger"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.02),
+            crit_power: Some(0.016),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/head/stalker.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Head("GnarlingStalker"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.02),
+            crit_power: Some(0.016),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/pants/chieftain.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling Chieftain",
+    description: "Ceremonial attire used by members..",
+    kind: Armor((
+        kind: Pants("GnarlingChieftain"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.02),
+            crit_power: Some(0.016),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/pants/logger.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Gnarling",
     description: "Ceremonial attire used by members..",
     kind: Armor((
-        kind: Pants("Gnarling"),
+        kind: Pants("GnarlingLogger"),
         stats: (
             protection: Some(Normal(1.0)),
             poise_resilience: Some(Normal(1.0)),

assets/common/items/npc_armor/biped_small/gnarling/pants/mugger.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members..",
+    kind: Armor((
+        kind: Pants("GnarlingMugger"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.02),
+            crit_power: Some(0.016),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/pants/stalker.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members..",
+    kind: Armor((
+        kind: Pants("GnarlingStalker"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(1.8),
+            energy_reward: Some(0.02),
+            crit_power: Some(0.016),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/tail/chieftain.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling Chieftain",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Belt("GnarlingChieftain"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.4),
+            energy_reward: Some(0.005),
+            crit_power: Some(0.004),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/tail/logger.ron

@@ -2,7 +2,7 @@ ItemDef(
     name: "Gnarling",
     description: "Ceremonial attire used by members.",
     kind: Armor((
-        kind: Belt("Gnarling"),
+        kind: Belt("GnarlingLogger"),
         stats: (
             protection: Some(Normal(1.0)),
             poise_resilience: Some(Normal(1.0)),

assets/common/items/npc_armor/biped_small/gnarling/tail/mugger.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Belt("GnarlingMugger"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.4),
+            energy_reward: Some(0.005),
+            crit_power: Some(0.004),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_armor/biped_small/gnarling/tail/stalker.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Gnarling",
+    description: "Ceremonial attire used by members.",
+    kind: Armor((
+        kind: Belt("GnarlingStalker"),
+        stats: (
+            protection: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(1.0)),
+            energy_max: Some(0.4),
+            energy_reward: Some(0.005),
+            crit_power: Some(0.004),
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/npc_weapons/biped_small/gnarling/blowgun.ron

@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Gnarling Blowgun",
+    description: "testing123",
+    kind: Tool((
+        kind: Blowgun,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.0,
+            power: 0.3,
+            effect_power: 0.8,
+            speed: 0.6,
+            crit_chance: 0.26764706,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: None,
+)

assets/common/items/npc_weapons/biped_small/gnarling/chieftain_staff.ron

@@ -0,0 +1,21 @@
+ItemDef(
+    name: "Chieftain Staff",
+    description: "eekum bokum",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.0,
+            power: 0.3,
+            effect_power: 0.8,
+            speed: 0.6,
+            crit_chance: 0.26764706,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Staff Simple")),
+)

assets/common/loadout/dungeon/tier-0/gnarling_chieftain.ron

@@ -0,0 +1,8 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.chieftain"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.chieftain"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.chieftain"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.chieftain"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.chieftain"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.chieftain"),
+})

assets/common/loadout/dungeon/tier-0/logger.ron

@@ -1,8 +1,8 @@
 ({
-    Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.gnarling"),
+    Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.logger"),
-    Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.gnarling"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.logger"),
-    Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.gnarling"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.logger"),
-    Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.gnarling"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.logger"),
-    Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.gnarling"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.logger"),
-    Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.gnarling"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.logger"),
 })

assets/common/loadout/dungeon/tier-0/mugger.ron

@@ -0,0 +1,8 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.mugger"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.mugger"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.mugger"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.mugger"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.mugger"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.mugger"),
+})

assets/common/loadout/dungeon/tier-0/stalker.ron

@@ -0,0 +1,8 @@
+({
+    Armor(Head): Item("common.items.npc_armor.biped_small.gnarling.head.stalker"),
+    Armor(Feet): Item("common.items.npc_armor.biped_small.gnarling.foot.stalker"),
+    Armor(Hands): Item("common.items.npc_armor.biped_small.gnarling.hand.stalker"),
+    Armor(Chest): Item("common.items.npc_armor.biped_small.gnarling.chest.stalker"),
+    Armor(Legs): Item("common.items.npc_armor.biped_small.gnarling.pants.stalker"),
+    Armor(Belt): Item("common.items.npc_armor.biped_small.gnarling.tail.stalker"),
+})

assets/common/npc_names.ron

@@ -932,6 +932,10 @@
                 keyword: "treant",
                 generic: "Treant"
             ),
+            woodgolem: (
+                keyword: "woodgolem",
+                generic: "Wooden Golem"
+            ),
             claygolem: (
                 keyword: "claygolem",
                 generic: "ClayGolem"
@@ -1182,6 +1186,10 @@
                 keyword: "lavadrake",
                 generic: "Lava Drake"
             ),
+            icedrake: (
+                keyword: "icedrake",
+                generic: "Ice Drake"
+            ),
             basilisk: (
                 keyword: "basilisk",
                 generic: "Basilisk"

assets/voxygen/voxel/biped_small_armor_chest_manifest.ron

@@ -15,8 +15,17 @@
         "AdletBow": (
             vox_spec: ("npc.adlet.male.bow.chest", (-5.0, -3.5, -2.0)),
         ),
-        "Gnarling": (
+        "GnarlingMugger": (
-            vox_spec: ("npc.gnarling.male.chest", (-4.5, -3.5, -2.5)),
+            vox_spec: ("npc.gnarling.mugger.chest", (-4.5, -3.5, -2.5)),
+        ),
+        "GnarlingStalker": (
+            vox_spec: ("npc.gnarling.stalker.chest", (-4.5, -3.5, -2.5)),
+        ),
+        "GnarlingLogger": (
+            vox_spec: ("npc.gnarling.logger.chest", (-4.5, -3.5, -2.5)),
+        ),
+        "GnarlingChieftain": (
+            vox_spec: ("npc.gnarling.chieftain.chest", (-4.5, -3.5, -1.0)),
         ),
         "Mandragora": (
             vox_spec: ("npc.mandragora.male.chest", (-11.0, -11.0, -6.5)),

assets/voxygen/voxel/biped_small_armor_foot_manifest.ron

@@ -32,12 +32,36 @@
                 vox_spec: ("npc.adlet.male.foot_r", (-1.5, -3.0, -7.0)),
             )
         ),
-        "Gnarling": (
+        "GnarlingMugger": (
             left: (
-                vox_spec: ("npc.gnarling.male.foot_r", (-1.0, -2.0, -5.0)),
+                vox_spec: ("npc.gnarling.mugger.foot_r", (-1.0, -2.0, -5.0)),
             ),
             right: (
-                vox_spec: ("npc.gnarling.male.foot_r", (-1.0, -2.0, -5.0)),
+                vox_spec: ("npc.gnarling.mugger.foot_r", (-1.0, -2.0, -5.0)),
+            )
+        ),
+        "GnarlingStalker": (
+            left: (
+                vox_spec: ("npc.gnarling.stalker.foot_r", (-1.0, -2.0, -5.0)),
+            ),
+            right: (
+                vox_spec: ("npc.gnarling.stalker.foot_r", (-1.0, -2.0, -5.0)),
+            )
+        ),
+        "GnarlingLogger": (
+            left: (
+                vox_spec: ("npc.gnarling.logger.foot_r", (-1.0, -2.0, -5.0)),
+            ),
+            right: (
+                vox_spec: ("npc.gnarling.logger.foot_r", (-1.0, -2.0, -5.0)),
+            )
+        ),
+        "GnarlingChieftain": (
+            left: (
+                vox_spec: ("npc.gnarling.chieftain.foot_r", (-1.0, -2.0, -5.0)),
+            ),
+            right: (
+                vox_spec: ("npc.gnarling.chieftain.foot_r", (-1.0, -2.0, -5.0)),
             )
         ),
         "Mandragora": (

assets/voxygen/voxel/biped_small_armor_hand_manifest.ron

@@ -40,12 +40,36 @@
                 vox_spec: ("npc.adlet.male.bow.hand_r", (0.0, -2.0, -7.0)),
             )
         ),
-        "Gnarling": (
+        "GnarlingMugger": (
             left: (
-                vox_spec: ("npc.gnarling.male.hand_r", (-3.0, -1.5, -7.0)),
+                vox_spec: ("npc.gnarling.mugger.hand_r", (-3.0, -1.5, -7.0)),
             ),
             right: (
-                vox_spec: ("npc.gnarling.male.hand_r", (0.0, -1.5, -7.0)),
+                vox_spec: ("npc.gnarling.mugger.hand_r", (0.0, -1.5, -7.0)),
+            )
+        ),
+        "GnarlingStalker": (
+            left: (
+                vox_spec: ("npc.gnarling.stalker.hand_r", (-3.0, -1.5, -7.0)),
+            ),
+            right: (
+                vox_spec: ("npc.gnarling.stalker.hand_r", (0.0, -1.5, -7.0)),
+            )
+        ),
+        "GnarlingLogger": (
+            left: (
+                vox_spec: ("npc.gnarling.logger.hand_r", (-3.0, -1.5, -7.0)),
+            ),
+            right: (
+                vox_spec: ("npc.gnarling.logger.hand_r", (0.0, -1.5, -7.0)),
+            )
+        ),
+        "GnarlingChieftain": (
+            left: (
+                vox_spec: ("npc.gnarling.chieftain.hand_r", (-3.5, -0.5, -8.0)),
+            ),
+            right: (
+                vox_spec: ("npc.gnarling.chieftain.hand_r", (-0.5, -0.5, -8.0)),
             )
         ),
         "Mandragora": (

assets/voxygen/voxel/biped_small_armor_head_manifest.ron

@@ -15,8 +15,17 @@
         "AdletBow": (
             vox_spec: ("npc.adlet.male.bow.head", (-7.0, -4.5, -6.0)),
         ),
-        "Gnarling": (
+        "GnarlingMugger": (
-            vox_spec: ("npc.gnarling.male.head", (-6.5, -5.5, -4.5)),
+            vox_spec: ("npc.gnarling.mugger.head", (-6.5, -5.5, -4.5)),
+        ),
+        "GnarlingStalker": (
+            vox_spec: ("npc.gnarling.stalker.head", (-6.5, -5.5, -4.5)),
+        ),
+        "GnarlingLogger": (
+            vox_spec: ("npc.gnarling.logger.head", (-6.5, -5.5, -4.5)),
+        ),
+        "GnarlingChieftain": (
+            vox_spec: ("npc.gnarling.chieftain.head", (-6.5, -5.5, -4.5)),
         ),
         "Mandragora": (
             vox_spec: ("npc.mandragora.male.head", (0.0, 0.0, 0.0)),

assets/voxygen/voxel/biped_small_armor_pants_manifest.ron

@@ -15,8 +15,17 @@
         "AdletBow": (
             vox_spec: ("npc.adlet.male.bow.pants", (-5.0, -4.5, -3.0)),
         ),
-        "Gnarling": (
+        "GnarlingMugger": (
-            vox_spec: ("npc.gnarling.male.pants", (-3.5, -3.0, -2.5)),
+            vox_spec: ("npc.gnarling.mugger.pants", (-3.5, -3.0, -2.5)),
+        ),
+        "GnarlingStalker": (
+            vox_spec: ("npc.gnarling.stalker.pants", (-3.5, -3.0, -2.5)),
+        ),
+        "GnarlingLogger": (
+            vox_spec: ("npc.gnarling.logger.pants", (-3.5, -3.0, -2.5)),
+        ),
+        "GnarlingChieftain": (
+            vox_spec: ("npc.gnarling.chieftain.pants", (-3.5, -3.0, -3.5)),
         ),
         "Mandragora": (
             vox_spec: ("npc.mandragora.male.pants", (-3.0, -3.0, -1.0)),

assets/voxygen/voxel/biped_small_armor_tail_manifest.ron

@@ -9,8 +9,17 @@
         "Adlet": (
             vox_spec: ("npc.adlet.male.tail", (-1.0, -5.0, -1.0)),
         ),
-        "Gnarling": (
+        "GnarlingMugger": (
-            vox_spec: ("npc.gnarling.male.tail", (-1.5, -13.0, -3.0)),
+            vox_spec: ("npc.gnarling.mugger.tail", (-1.5, -13.0, -3.0)),
+        ),
+        "GnarlingStalker": (
+            vox_spec: ("npc.gnarling.stalker.tail", (-1.5, -13.0, -3.0)),
+        ),
+        "GnarlingLogger": (
+            vox_spec: ("npc.gnarling.logger.tail", (-1.5, -13.0, -3.0)),
+        ),
+        "GnarlingChieftain": (
+            vox_spec: ("npc.gnarling.chieftain.tail", (-1.5, -14.0, -3.0)),
         ),
         "Kappa": (
             vox_spec: ("npc.kappa.male.tail", (-2.5, -10.0, -5.0)),

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -1107,6 +1107,14 @@
         vox_spec: ("weapon.biped_small.bow.adlet", (-2.5, -3.0, -5.0)),
         color: None
     ),
+    "common.items.npc_weapons.biped_small.gnarling.chieftain_staff": (
+        vox_spec: ("weapon.biped_small.staff.chieftain_staff", (-0.5, -4.0, -4.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.biped_small.gnarling.blowgun": (
+        vox_spec: ("weapon.biped_small.blowgun", (-2.5, -2.5, -4.0)),
+        color: None
+    ),
     "common.items.npc_weapons.biped_small.adlet.gnoll_staff": (
         vox_spec: ("weapon.biped_small.staff.sahagin", (-0.5, -4.0, -4.0)),
         color: None

assets/voxygen/voxel/golem_central_manifest.ron

@@ -107,4 +107,40 @@
             central: ("npc.claygolem.male.chest_lower"),
         ),
     ),
+    (WoodGolem, Male): (
+        head: (
+            offset: (-6.5, -4.5, -3.0),
+            central: ("npc.woodgolem.male.head"),
+        ),
+        jaw: (
+            offset: (-9.5, 0.0, -3.0),
+            central: ("armor.empty"),
+        ),
+        torso_upper: (
+            offset: (-6.5, -7.0, -4.5),
+            central: ("npc.woodgolem.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-2.5, -3.5, -7.0),
+            central: ("npc.woodgolem.male.chest_lower"),
+        ),
+    ),
+    (WoodGolem, Female): (
+        head: (
+            offset: (-6.5, -4.5, -3.0),
+            central: ("npc.woodgolem.male.head"),
+        ),
+        jaw: (
+            offset: (-9.5, 0.0, -3.0),
+            central: ("armor.empty"),
+        ),
+        torso_upper: (
+            offset: (-6.5, -7.0, -4.5),
+            central: ("npc.woodgolem.male.chest_upper"),
+        ),
+        torso_lower: (
+            offset: (-2.5, -3.5, -7.0),
+            central: ("npc.woodgolem.male.chest_lower"),
+        ),
+    ),
 })

assets/voxygen/voxel/golem_lateral_manifest.ron

@@ -203,4 +203,72 @@
             lateral: ("npc.claygolem.male.foot_r"),
         )
     ),
+    (WoodGolem, Male): (
+        shoulder_l: (
+            offset: (-9.0, -5.5, -5.5),
+            lateral: ("npc.woodgolem.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (0.0, -5.5, -5.5),
+            lateral: ("npc.woodgolem.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.0, -6.5, -14.0),
+            lateral: ("npc.woodgolem.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.0, -6.5, -14.0),
+            lateral: ("npc.woodgolem.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-4.0, -3.5, -4.5),
+            lateral: ("npc.woodgolem.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -3.5, -4.5),
+            lateral: ("npc.woodgolem.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -4.0, -8.0),
+            lateral: ("npc.woodgolem.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.5, -4.0, -8.0),
+            lateral: ("npc.woodgolem.male.foot_r"),
+        )
+    ),
+    (WoodGolem, Female): (
+        shoulder_l: (
+            offset: (-9.0, -5.5, -5.5),
+            lateral: ("npc.woodgolem.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (0.0, -5.5, -5.5),
+            lateral: ("npc.woodgolem.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.0, -6.5, -14.0),
+            lateral: ("npc.woodgolem.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.0, -6.5, -14.0),
+            lateral: ("npc.woodgolem.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-4.0, -3.5, -4.5),
+            lateral: ("npc.woodgolem.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (0.0, -3.5, -4.5),
+            lateral: ("npc.woodgolem.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-3.5, -4.0, -8.0),
+            lateral: ("npc.woodgolem.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-3.5, -4.0, -8.0),
+            lateral: ("npc.woodgolem.male.foot_r"),
+        )
+    ),
 })

assets/voxygen/voxel/quadruped_low_central_manifest.ron

@@ -624,6 +624,58 @@
             central: ("npc.lavadrake.male.tail_front"),
         ),
     ),
+    (Icedrake, Male): (
+        upper: (
+            offset: (-3.5, -2.0, -6.0),
+            central: ("npc.icedrake.male.head_upper"),
+        ),
+        lower: (
+            offset: (-3.5, -1.0, -5.0),
+            central: ("npc.icedrake.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-4.5, 0.0, -5.0),
+            central: ("npc.icedrake.male.jaw"),
+        ),
+        chest: (
+            offset: (-7.5, -11.0, -14.0),
+            central: ("npc.icedrake.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-2.5, -20.0, -7.5),
+            central: ("npc.icedrake.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-3.5, -12.0, -6.5),
+            central: ("npc.icedrake.male.tail_front"),
+        ),
+    ),
+    (Icedrake, Female): (
+        upper: (
+            offset: (-3.5, -2.0, -6.0),
+            central: ("npc.icedrake.male.head_upper"),
+        ),
+        lower: (
+            offset: (-3.5, -1.0, -5.0),
+            central: ("npc.icedrake.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-4.5, 0.0, -5.0),
+            central: ("npc.icedrake.male.jaw"),
+        ),
+        chest: (
+            offset: (-7.5, -11.0, -14.0),
+            central: ("npc.icedrake.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-2.5, -20.0, -7.5),
+            central: ("npc.icedrake.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-3.5, -12.0, -6.5),
+            central: ("npc.icedrake.male.tail_front"),
+        ),
+    ),
     (Basilisk, Male): (
         upper: (
             offset: (-5.5, 0.0, -5.0),

assets/voxygen/voxel/quadruped_low_lateral_manifest.ron

@@ -431,6 +431,42 @@
             lateral: ("npc.lavadrake.male.foot_br", false),
         ),
     ),
+    (Icedrake, Male): (
+        front_left: (
+            offset: (-14.0, -4.0, -10.0),
+            lateral: ("npc.icedrake.male.foot_fr", false),
+        ),
+        front_right: (
+            offset: (0.0, -4.0, -10.0),
+            lateral: ("npc.icedrake.male.foot_fr", false),
+        ),
+        back_left: (
+            offset: (-14.0, -7.5, -10.0),
+            lateral: ("npc.icedrake.male.foot_br", false),
+        ),
+        back_right: (
+            offset: (0.0, -7.5, -10.0),
+            lateral: ("npc.icedrake.male.foot_br", false),
+        ),
+    ),
+    (Icedrake, Female): (
+        front_left: (
+            offset: (-14.0, -4.0, -10.0),
+            lateral: ("npc.icedrake.male.foot_fr", false),
+        ),
+        front_right: (
+            offset: (0.0, -4.0, -10.0),
+            lateral: ("npc.icedrake.male.foot_fr", false),
+        ),
+        back_left: (
+            offset: (-14.0, -7.5, -10.0),
+            lateral: ("npc.icedrake.male.foot_br", false),
+        ),
+        back_right: (
+            offset: (0.0, -7.5, -10.0),
+            lateral: ("npc.icedrake.male.foot_br", false),
+        ),
+    ),
     (Basilisk, Male): (
         front_left: (
             offset: (-13.0, 0.0, -13.0),

common/src/bin/csv_export/main.rs

@@ -164,6 +164,7 @@ fn get_tool_kind(kind: &ToolKind) -> String {
         ToolKind::Sceptre => "Sceptre".to_string(),
         ToolKind::Shield => "Shield".to_string(),
         ToolKind::Spear => "Spear".to_string(),
+        ToolKind::Blowgun => "Blowgun".to_string(),
         ToolKind::Debug => "Debug".to_string(),
         ToolKind::Farming => "Farming".to_string(),
         ToolKind::Pick => "Pick".to_string(),

common/src/comp/body/golem.rs

@@ -37,6 +37,7 @@ make_case_elim!(
         StoneGolem = 0,
         Treant = 1,
         ClayGolem = 2,
+        WoodGolem = 3,
     }
 );
 
@@ -48,6 +49,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub stonegolem: SpeciesMeta,
     pub treant: SpeciesMeta,
     pub claygolem: SpeciesMeta,
+    pub woodgolem: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -59,11 +61,17 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::StoneGolem => &self.stonegolem,
             Species::Treant => &self.treant,
             Species::ClayGolem => &self.claygolem,
+            Species::WoodGolem => &self.woodgolem,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 3] = [Species::StoneGolem, Species::Treant, Species::ClayGolem];
+pub const ALL_SPECIES: [Species; 4] = [
+    Species::StoneGolem,
+    Species::Treant,
+    Species::ClayGolem,
+    Species::WoodGolem,
+];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
     type IntoIter = std::iter::Copied<std::slice::Iter<'static, Self::Item>>;

common/src/comp/body/quadruped_low.rs

@@ -53,6 +53,7 @@ make_case_elim!(
         Lavadrake = 11,
         Basilisk = 12,
         Deadwood = 13,
+        Icedrake = 14,
     }
 );
 
@@ -75,6 +76,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub lavadrake: SpeciesMeta,
     pub basilisk: SpeciesMeta,
     pub deadwood: SpeciesMeta,
+    pub icedrake: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -97,11 +99,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Lavadrake => &self.lavadrake,
             Species::Basilisk => &self.basilisk,
             Species::Deadwood => &self.deadwood,
+            Species::Icedrake => &self.icedrake,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 14] = [
+pub const ALL_SPECIES: [Species; 15] = [
     Species::Crocodile,
     Species::Alligator,
     Species::Salamander,
@@ -116,6 +119,7 @@ pub const ALL_SPECIES: [Species; 14] = [
     Species::Lavadrake,
     Species::Basilisk,
     Species::Deadwood,
+    Species::Icedrake,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

common/src/comp/inventory/item/modular.rs

@@ -45,6 +45,7 @@ impl TagExampleInfo for ModularComponentTag {
                 ToolKind::Sceptre => "sceptre head",
                 // TODO: naming
                 ToolKind::Spear => "spear damage component",
+                ToolKind::Blowgun => "blowgun damage component",
                 ToolKind::Shield => "shield damage component",
                 ToolKind::Debug => "debug damage component",
                 ToolKind::Farming => "farming damage component",
@@ -62,6 +63,7 @@ impl TagExampleInfo for ModularComponentTag {
                 ToolKind::Sceptre => "sceptre shaft",
                 // TODO: naming
                 ToolKind::Spear => "spear held component",
+                ToolKind::Blowgun => "blowgun held component",
                 ToolKind::Shield => "shield held component",
                 ToolKind::Natural => "natural held component",
                 ToolKind::Debug => "debug held component",
@@ -84,6 +86,7 @@ impl TagExampleInfo for ModularComponentTag {
                 ToolKind::Sceptre => "common.items.tag_examples.modular.damage.sceptre",
                 ToolKind::Shield => "common.items.tag_examples.modular.damage.shield",
                 ToolKind::Spear => "common.items.tag_examples.modular.damage.spear",
+                ToolKind::Blowgun => "common.items.tag_examples.modular.damage.blowgun",
                 ToolKind::Natural => "common.items.tag_examples.modular.damage.natural",
                 ToolKind::Debug => "common.items.tag_examples.modular.damage.debug",
                 ToolKind::Farming => "common.items.tag_examples.modular.damage.farming",
@@ -100,6 +103,7 @@ impl TagExampleInfo for ModularComponentTag {
                 ToolKind::Sceptre => "common.items.tag_examples.modular.held.sceptre",
                 ToolKind::Shield => "common.items.tag_examples.modular.held.shield",
                 ToolKind::Spear => "common.items.tag_examples.modular.held.spear",
+                ToolKind::Blowgun => "common.items.tag_examples.modular.held.blowgun",
                 ToolKind::Natural => "common.items.tag_examples.modular.held.natural",
                 ToolKind::Debug => "common.items.tag_examples.modular.held.debug",
                 ToolKind::Farming => "common.items.tag_examples.modular.held.farming",

common/src/comp/inventory/item/tool.rs

@@ -25,6 +25,7 @@ pub enum ToolKind {
     Dagger,
     Shield,
     Spear,
+    Blowgun,
     // tools
     Debug,
     Farming,
@@ -47,6 +48,7 @@ impl ToolKind {
             ToolKind::Dagger => "dagger",
             ToolKind::Staff => "staff",
             ToolKind::Spear => "spear",
+            ToolKind::Blowgun => "blowgun",
             ToolKind::Sceptre => "sceptre",
             ToolKind::Shield => "shield",
             ToolKind::Natural => "natural",
@@ -67,6 +69,7 @@ impl ToolKind {
                 | ToolKind::Dagger
                 | ToolKind::Staff
                 | ToolKind::Spear
+                | ToolKind::Blowgun
                 | ToolKind::Sceptre
                 | ToolKind::Shield
         )

common/src/states/utils.rs

@@ -123,6 +123,7 @@ impl Body {
                 quadruped_low::Species::Sandshark => 160.0,
                 quadruped_low::Species::Hakulaq => 140.0,
                 quadruped_low::Species::Lavadrake => 100.0,
+                quadruped_low::Species::Icedrake => 100.0,
                 quadruped_low::Species::Basilisk => 90.0,
                 quadruped_low::Species::Deadwood => 140.0,
             },
@@ -179,6 +180,7 @@ impl Body {
                 quadruped_low::Species::Tortoise => 1.5,
                 quadruped_low::Species::Rocksnapper => 1.8,
                 quadruped_low::Species::Lavadrake => 1.7,
+                quadruped_low::Species::Icedrake => 1.7,
                 _ => 2.0,
             },
             Body::Ship(ship) if ship.has_water_thrust() => 0.1,