Merge branch 'snowram/new-npcs-batch' into 'master'

Snowram/new npcs batch

See merge request veloren/veloren!2495

assets/common/abilities/ability_set_manifest.ron

@@ -34,11 +34,15 @@
         secondary: "common.abilities.custom.husk.triplestrike",
         abilities: [],
     ),
+    Custom("Husk Brute"): (
+        primary: "common.abilities.custom.husk_brute.singlestrike",
+        secondary: "common.abilities.custom.husk_brute.chargedmelee",
+        abilities: [],
+    ),
     Tool(Spear): (
         primary: "common.abilities.spear.doublestrike",
         secondary: "common.abilities.spear.dash",
         abilities: [],
-
     ),
     Custom("Hammer Simple"): (
         primary: "common.abilities.hammersimple.doublestrike",
@@ -53,8 +57,7 @@
     Custom("Sword Simple"): (
         primary: "common.abilities.swordsimple.doublestrike",
         secondary: "common.abilities.swordsimple.dash",
-        abilities: [
+        abilities: [],
-        ],
     ),
     Custom("Staff Simple"): (
         primary: "common.abilities.staffsimple.firebomb",

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

@@ -0,0 +1,18 @@
+ChargedMelee(
+    energy_cost: 0,
+    energy_drain: 0,
+    initial_damage: 50,
+    scaled_damage: 450,
+    initial_poise_damage: 50,
+    scaled_poise_damage: 150,
+    initial_knockback: 0.0,
+    scaled_knockback: 0.0,
+    range: 3.5,
+    max_angle: 45.0,
+    speed: 1.0,
+    charge_duration: 1.5,
+    swing_duration: 0.1,
+    hit_timing: 0.8,
+    recover_duration: 0.5,
+    damage_kind: Crushing,
+)

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

@@ -0,0 +1,28 @@
+ComboMelee(
+    stage_data: [
+        (
+            stage: 1,
+            base_damage: 160,
+            damage_increase: 0,
+            base_poise_damage: 12,
+            poise_damage_increase: 0,
+            knockback: 5.0,
+            range: 3.5,
+            angle: 60.0,
+            base_buildup_duration: 0.25,
+            base_swing_duration: 0.07,
+            hit_timing: 0.5,
+            base_recover_duration: 0.25,
+            forward_movement: 0.5,
+            damage_kind: Crushing,
+        ),
+    ],
+    initial_energy_gain: 0,
+    max_energy_gain: 0,
+    energy_increase: 0,
+    speed_increase: 0.0,
+    max_speed_increase: 0.0,
+    scales_from_combo: 0,
+    is_interruptible: false,
+    ori_modifier: 0.6,
+)

assets/common/abilities/custom/minotaur/cleave.ron

@@ -1,8 +1,8 @@
 ChargedMelee(
     energy_cost: 0,
     energy_drain: 0,
-    initial_damage: 0,
+    initial_damage: 50,
-    scaled_damage: 500,
+    scaled_damage: 450,
     initial_poise_damage: 50,
     scaled_poise_damage: 150,
     initial_knockback: 0.0,

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

@@ -0,0 +1,18 @@
+EntityConfig (
+    name: Some("Cultist"),
+    body: Some(RandomWith("humanoid")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
+
+    main_tool: Some(Choice([
+        (1.0, Some(Item("common.items.weapons.axe_1h.orichalcum-0"))),
+        (2.0, Some(Item("common.items.weapons.sword.cultist"))),
+        (1.0, Some(Item("common.items.weapons.hammer.cultist_purp_2h-0"))),
+        (1.0, Some(Item("common.items.weapons.hammer_1h.orichalcum-0"))),
+        (1.0, Some(Item("common.items.weapons.bow.velorite"))),
+    ])),
+    second_tool: None,
+
+    loadout_asset: Some("common.loadout.dungeon.tier-5.cultist"),
+    skillset_asset: Some("common.skillset.dungeon.tier-5.enemy"),
+)

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

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Husk Brute"),
+    body: Some(RandomWith("husk_brute")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-5.miniboss")),
+
+    main_tool: None,
+    second_tool: None,
+
+    loadout_asset: None,
+    skillset_asset: None,
+)

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

@@ -1,12 +1,15 @@
 EntityConfig (
     name: Some("Cultist Warlock"),
-    body: Some(RandomWith("humanoid")),
+    body: Some(RandomWith("cultist_warlock")),
 
     loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
 
-    main_tool: Some(Item("common.items.weapons.staff.cultist_staff")),
+    main_tool: Some(Choice([
+        (1.5, Some(Item("common.items.npc_weapons.staff.bipedlarge-cultist"))),
+        (1.0, Some(Item("common.items.npc_weapons.bow.bipedlarge-velorite"))),
+    ])),
     second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-5.warlock"),
+    loadout_asset: None,
-    skillset_asset: Some("common.skillset.dungeon.tier-5.enemy"),
+    skillset_asset: None,
 )

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

@@ -1,18 +1,15 @@
 EntityConfig (
     name: Some("Cultist Warlord"),
-    body: Some(RandomWith("humanoid")),
+    body: Some(RandomWith("cultist_warlord")),
 
     loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")),
 
     main_tool: Some(Choice([
-        (1.0, Some(Item("common.items.weapons.axe_1h.orichalcum-0"))),
+        (1.5, Some(Item("common.items.npc_weapons.sword.bipedlarge-cultist"))),
-        (2.0, Some(Item("common.items.weapons.sword.cultist"))),
+        (1.0, Some(Item("common.items.npc_weapons.hammer.bipedlarge-cultist"))),
-        (1.0, Some(Item("common.items.weapons.hammer.cultist_purp_2h-0"))),
-        (1.0, Some(Item("common.items.weapons.hammer_1h.orichalcum-0"))),
-        (1.0, Some(Item("common.items.weapons.bow.velorite"))),
     ])),
     second_tool: None,
 
-    loadout_asset: Some("common.loadout.dungeon.tier-5.warlord"),
+    loadout_asset: None,
-    skillset_asset: Some("common.skillset.dungeon.tier-5.enemy"),
+    skillset_asset: None,
 )

assets/common/items/armor/warlock/back.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlock cape",
-    description: "Belong to a mighty warlock.",
-    kind: Armor((
-        kind: Back("Warlock"),
-        stats: (
-            protection: Normal(4.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlock/belt.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlock Belt",
-    description: "Belong to a mighty warlock.",
-    kind: Armor((
-        kind: Belt("Warlock"),
-        stats: (
-            protection: Normal(8.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlock/chest.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlock Vest",
-    description: "Belong to a mighty warlock.",
-    kind: Armor((
-        kind: Chest("Warlock"),
-        stats: (
-            protection: Normal(40.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlock/foot.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlock Slippers",
-    description: "Belong to a mighty warlock.",
-    kind: Armor((
-        kind: Foot("Warlock"),
-        stats: (
-            protection: Normal(8.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlock/hand.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlock Gloves",
-    description: "Belong to a mighty warlock.",
-    kind: Armor((
-        kind: Hand("Warlock"),
-        stats: (
-            protection: Normal(15.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/warlock/head.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlock",
-    description: "Belong to a mighty warlock.",
-    kind: Armor((
-        kind: Head("Warlock"),
-        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/warlock/pants.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlock Kilt",
-    description: "Belong to a mighty warlock.",
-    kind: Armor((
-        kind: Pants("Warlock"),
-        stats: (
-            protection: Normal(30.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlock/shoulder.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlock Shoulders",
-    description: "Belong to a mighty warlock.",
-    kind: Armor((
-        kind: Shoulder("Warlock"),
-        stats: (
-            protection: Normal(22.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/warlord/back.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlord cape",
-    description: "Belong to a mighty warlord.",
-    kind: Armor((
-        kind: Back("Warlord"),
-        stats: (
-            protection: Normal(4.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlord/belt.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlord Belt",
-    description: "Belong to a mighty warlord.",
-    kind: Armor((
-        kind: Belt("Warlord"),
-        stats: (
-            protection: Normal(8.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlord/chest.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlord Cuirass",
-    description: "Belong to a mighty warlord.",
-    kind: Armor((
-        kind: Chest("Warlord"),
-        stats: (
-            protection: Normal(40.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlord/foot.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlord Feet",
-    description: "Belong to a mighty warlord.",
-    kind: Armor((
-        kind: Foot("Warlord"),
-        stats: (
-            protection: Normal(8.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlord/hand.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlord Handguards",
-    description: "Belong to a mighty warlord.",
-    kind: Armor((
-        kind: Hand("Warlord"),
-        stats: (
-            protection: Normal(15.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/warlord/head.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlord Helmet",
-    description: "Belong to a mighty warlord.",
-    kind: Armor((
-        kind: Head("Warlord"),
-        stats: (
-            protection: Normal(10.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/armor/warlord/pants.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlord Legguards",
-    description: "Belong to a mighty warlord.",
-    kind: Armor((
-        kind: Pants("Warlord"),
-        stats: (
-            protection: Normal(30.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/armor/warlord/shoulder.ron

@@ -1,17 +0,0 @@
-ItemDef(
-    name: "Warlord Shoulderguards",
-    description: "Belong to a mighty warlord.",
-    kind: Armor((
-        kind: Shoulder("Warlord"),
-        stats: (
-            protection: Normal(22.0),
-            poise_resilience: Normal(0.0),
-            energy_max: 0,
-            energy_reward: 0.0,
-            crit_power: 0.0,
-            stealth: 0.0,
-        ),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/crafting_ing/hide/rugged_hide.ron

@@ -4,7 +4,7 @@ ItemDef(
     kind: Ingredient(
         kind: "RuggedHide",
     ),
-    quality: Common,
+    quality: Epic,
     tags: [
         Material(Leather)
     ],

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Giant Velorite Bow",
+    description: "Infused with Velorite power.",
+    kind: Tool((
+        kind: Bow,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.4,
+            power: 1.6,
+            poise_strength: 1.1,
+            speed: 0.8,
+            crit_chance: 0.140625,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Bow Simple")),
+)

assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Giant Cultist Warhammer",
+    description: "This belonged to an evil Cult Leader.",
+    kind: Tool((
+        kind: Hammer,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.5,
+            power: 1.6,
+            poise_strength: 1.0,
+            speed: 0.8,
+            crit_chance: 0.140625,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Hammer Simple")),
+)

assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Giant Cultist Staff",
+    description: "The fire gives off no heat.",
+    kind: Tool((
+        kind: Staff,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.3,
+            power: 1.6,
+            poise_strength: 1.0,
+            speed: 0.8,
+            crit_chance: 0.140625,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Staff Simple")),
+)

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

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Giant Cultist Greatsword",
+    description: "This belonged to an evil Cult Leader.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.5,
+            power: 1.6,
+            poise_strength: 1.0,
+            speed: 0.8,
+            crit_chance: 0.140625,
+        )),
+    )),
+    quality: Epic,
+    tags: [],
+    ability_spec: Some(Custom("Sword Simple")),
+)

assets/common/items/npc_weapons/unique/husk_brute.ron

@@ -0,0 +1,18 @@
+ItemDef(
+    name: "Husk Brute",
+    description: "testing123",
+    kind: Tool((
+        kind: Natural,
+        hands: Two,
+        stats: Direct((
+            equip_time_secs: 0.0,
+            power: 1.0,
+            poise_strength: 1.0,
+            speed: 1.0,
+            crit_chance: 0.0625,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+    ability_spec: Some(Custom("Husk Brute")),
+)

assets/common/loadout/dungeon/tier-5/cultist.ron

@@ -0,0 +1,17 @@
+({
+    Armor(Shoulders): Item("common.items.armor.cultist.shoulder"),
+    Armor(Chest): Item("common.items.armor.cultist.chest"),
+    Armor(Belt): Item("common.items.armor.cultist.belt"),
+    Armor(Hands): Item("common.items.armor.cultist.hand"),
+    Armor(Legs): Item("common.items.armor.cultist.pants"),
+    Armor(Feet): Item("common.items.armor.cultist.foot"),
+
+    Armor(Back): Item("common.items.armor.misc.back.dungeon_purple"),
+
+    Lantern: Choice([
+        (1.0, Some(Item("common.items.lantern.black_0"))),
+        (2.0, None),
+    ]),
+
+    Glider: Item("common.items.glider.glider_purp"),
+})

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

@@ -1,17 +0,0 @@
-({
-    Armor(Shoulders): Item("common.items.armor.warlock.shoulder"),
-    Armor(Chest): Item("common.items.armor.warlock.chest"),
-    Armor(Belt): Item("common.items.armor.warlock.belt"),
-    Armor(Hands): Item("common.items.armor.warlock.hand"),
-    Armor(Legs): Item("common.items.armor.warlock.pants"),
-    Armor(Feet): Item("common.items.armor.warlock.foot"),
-
-    Armor(Back): Item("common.items.armor.warlock.back"),
-
-    Lantern: Choice([
-        (1.0, Some(Item("common.items.lantern.black_0"))),
-        (2.0, None),
-    ]),
-
-    Glider: Item("common.items.glider.glider_purp"),
-})

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

@@ -1,17 +0,0 @@
-({
-    Armor(Shoulders): Item("common.items.armor.warlord.shoulder"),
-    Armor(Chest): Item("common.items.armor.warlord.chest"),
-    Armor(Belt): Item("common.items.armor.warlord.belt"),
-    Armor(Hands): Item("common.items.armor.warlord.hand"),
-    Armor(Legs): Item("common.items.armor.warlord.pants"),
-    Armor(Feet): Item("common.items.armor.warlord.foot"),
-
-    Armor(Back): Item("common.items.armor.warlord.back"),
-
-    Lantern: Choice([
-        (1.0, Some(Item("common.items.lantern.black_0"))),
-        (2.0, None),
-    ]),
-
-    Glider: Item("common.items.glider.glider_purp"),
-})

assets/common/loot_tables/creature/quad_low/salamander.ron

@@ -0,0 +1,4 @@
+[
+    (1.0, Item("common.items.crafting_ing.hide.tough_hide")),
+    (3.0, Item("common.items.crafting_ing.hide.scales")),
+]

assets/common/loot_tables/creature/quad_medium/dreadhorn.ron

@@ -2,5 +2,5 @@
     (1.5, Item("common.items.food.meat.beast_small_raw")),
     (0.5, Item("common.items.food.meat.beast_large_raw")),
     (2.0, Item("common.items.crafting_ing.animal_misc.large_horn")),
-    (3.0, Item("common.items.crafting_ing.hide.carapace")),
+    (3.0, Item("common.items.crafting_ing.hide.rugged_hide")),
 ]

assets/common/loot_tables/creature/quad_medium/horned.ron

@@ -0,0 +1,4 @@
+[
+    (1.0, Item("common.items.crafting_ing.hide.rugged_hide")),
+    (1.0, Item("common.items.crafting_ing.animal_misc.large_horn")),
+]

assets/common/loot_tables/creature/quad_medium/mammoth.ron

@@ -0,0 +1,4 @@
+[
+    (1.0, ItemQuantity("common.items.crafting_ing.hide.rugged_hide", 1, 2)),
+    (1.0, ItemQuantity("common.items.crafting_ing.animal_misc.large_horn", 2, 3)),
+]

assets/common/loot_tables/creature/quad_medium/wool.ron

@@ -0,0 +1,6 @@
+[
+    (1.5, Item("common.items.food.meat.beast_small_raw")),
+    (0.5, Item("common.items.food.meat.beast_large_raw")),
+    (1.0, Item("common.items.crafting_ing.hide.animal_hide")),
+    (5.0, ItemQuantity("common.items.crafting_ing.cloth.wool", 2, 5)),
+]

assets/common/loot_tables/creature/theropod/generic.ron

@@ -1,3 +1,3 @@
 [
-    (1.0, Item("common.items.crafting_ing.hide.plate")),
+    (1.0, Item("common.items.crafting_ing.hide.rugged_hide")),
 ]

assets/common/loot_tables/creature/theropod/raptor.ron

@@ -1,5 +1,5 @@
 [
     (0.5, Item("common.items.food.meat.beast_large_raw")),
-    (1.0, Item("common.items.crafting_ing.hide.tough_hide")),
+    (1.0, Item("common.items.crafting_ing.hide.scales")),
     (1.0, Item("common.items.crafting_ing.animal_misc.raptor_feather")),
 ]

assets/common/npc_names.ron

@@ -546,7 +546,23 @@
             snowleopard: (
                 keyword: "snowleopard",
                 generic: "Snow Leopard"
-            )
+            ),
+            mammoth: (
+                keyword: "mammoth",
+                generic: "Mammoth"
+            ),
+            ngoubou: (
+                keyword: "ngoubou",
+                generic: "Ngoubou"
+            ),
+            llama: (
+                keyword: "llama",
+                generic: "Llama"
+            ),
+            alpaca: (
+                keyword: "alpaca",
+                generic: "Alpaca"
+            ),
         )
     ),
     quadruped_small: (
@@ -886,6 +902,18 @@
                 keyword: "oni_red",
                 generic: "Red Oni"
             ),
+            cultist_warlord: (
+                keyword: "cultist_warlord",
+                generic: "Cultist Warlord"
+            ),
+            cultist_warlock: (
+                keyword: "cultist_warlock",
+                generic: "Cultist Warlock"
+            ),
+            husk_brute: (
+                keyword: "husk_brute",
+                generic: "Husk Brute"
+            ),
         )
     ),
     golem: (

assets/common/recipe_book.ron

@@ -275,7 +275,7 @@
         output: ("common.items.mineral.ingot.bloodsteel", 2),
         inputs: [
             (Item("common.items.mineral.ore.bloodstone"), 1),
-            (Item("common.items.mineral.ore.iron"), 1),
+            (Item("common.items.mineral.ingot.iron"), 1),
             (Item("common.items.mineral.ore.coal"), 1),
       ],
         craft_sprite: Some(Forge),
@@ -283,7 +283,7 @@
     "steel ingot": (
         output: ("common.items.mineral.ingot.steel", 1),
         inputs: [
-            (Item("common.items.mineral.ore.iron"), 1),
+            (Item("common.items.mineral.ingot.iron"), 1),
             (Item("common.items.mineral.ore.coal"), 1),
       ],
         craft_sprite: Some(Forge),
@@ -917,8 +917,8 @@
     "woolen belt": (
         output: ("common.items.armor.cloth.woolen.belt", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 2),
+            (Item("common.items.crafting_ing.cloth.wool"), 1),
-            (Item("common.items.crafting_ing.cloth.cotton"), 2),
+            (Item("common.items.crafting_ing.cloth.cotton"), 1),
             (Item("common.items.crafting_ing.animal_misc.fur"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
         ],
@@ -927,7 +927,7 @@
     "woolen chest": (
         output: ("common.items.armor.cloth.woolen.chest", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 10),
+            (Item("common.items.crafting_ing.cloth.wool"), 8),
             (Item("common.items.crafting_ing.cloth.cotton"), 2),
             (Item("common.items.crafting_ing.animal_misc.fur"), 2),
             (Item("common.items.crafting_tools.sewing_set"), 0),
@@ -937,7 +937,7 @@
     "woolen feet": (
         output: ("common.items.armor.cloth.woolen.foot", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 3),
+            (Item("common.items.crafting_ing.cloth.wool"), 2),
             (Item("common.items.crafting_ing.cloth.cotton"), 1),
             (Item("common.items.crafting_ing.animal_misc.fur"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
@@ -947,7 +947,7 @@
     "woolen hands": (
         output: ("common.items.armor.cloth.woolen.hand", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 3),
+            (Item("common.items.crafting_ing.cloth.wool"), 2),
             (Item("common.items.crafting_ing.cloth.cotton"), 1),
             (Item("common.items.crafting_ing.animal_misc.fur"), 1),
             (Item("common.items.crafting_tools.sewing_set"), 0),
@@ -957,7 +957,7 @@
     "woolen pants": (
         output: ("common.items.armor.cloth.woolen.pants", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 8),
+            (Item("common.items.crafting_ing.cloth.wool"), 6),
             (Item("common.items.crafting_ing.cloth.cotton"), 2),
             (Item("common.items.crafting_ing.animal_misc.fur"), 2),
             (Item("common.items.crafting_tools.sewing_set"), 0),
@@ -967,7 +967,7 @@
     "woolen shoulder": (
         output: ("common.items.armor.cloth.woolen.shoulder", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.wool"), 8),
+            (Item("common.items.crafting_ing.cloth.wool"), 6),
             (Item("common.items.crafting_ing.cloth.cotton"), 2),
             (Item("common.items.crafting_ing.animal_misc.fur"), 2),
             (Item("common.items.crafting_tools.sewing_set"), 0),

assets/voxygen/item_image_manifest.ron

@@ -1548,56 +1548,6 @@
         "voxel.armor.bonerattler.shoulder",
         (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
     ),
-    //Warlord Set
-    Armor(Chest("Warlord")): VoxTrans(
-        "voxel.armor.warlord.chest",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Pants("Warlord")): VoxTrans(
-        "voxel.armor.warlord.pants",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Belt("Warlord")): VoxTrans(
-        "voxel.armor.warlord.belt",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
-    ),
-    Armor(Foot("Warlord")): VoxTrans(
-        "voxel.armor.warlord.foot",
-        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
-    ),
-    Armor(Hand("Warlord")): VoxTrans(
-        "voxel.armor.warlord.hand",
-        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
-    ),
-    Armor(Shoulder("Warlord")): VoxTrans(
-        "voxel.armor.warlord.shoulder",
-        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
-    ),
-    //Warlock Set
-    Armor(Chest("Warlock")): VoxTrans(
-        "voxel.armor.warlock.chest",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Pants("Warlock")): VoxTrans(
-        "voxel.armor.warlock.pants",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
-    ),
-    Armor(Belt("Warlock")): VoxTrans(
-        "voxel.armor.warlock.belt",
-        (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
-    ),
-    Armor(Foot("Warlock")): VoxTrans(
-        "voxel.armor.warlock.foot",
-        (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
-    ),
-    Armor(Hand("Warlock")): VoxTrans(
-        "voxel.armor.warlock.hand",
-        (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
-    ),
-    Armor(Shoulder("Warlock")): VoxTrans(
-        "voxel.armor.warlock.shoulder",
-        (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
-    ),
     //Rawhide Set
     Armor(Chest("Rawhide")): VoxTrans(
         "voxel.armor.hide.rawhide.chest",
@@ -2183,14 +2133,6 @@
         "voxel.armor.misc.back.backpack",
         (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
     ),
-    Armor(Back("Warlord")): VoxTrans(
-        "voxel.armor.warlord.back",
-        (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
-    ),
-    Armor(Back("Warlock")): VoxTrans(
-        "voxel.armor.warlock.back",
-        (0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
-    ),
     // Rings
     Armor(Ring("Scratched")): VoxTrans(
         "voxel.armor.misc.ring.scratched",

assets/voxygen/voxel/biped_large_central_manifest.ron

@@ -936,4 +936,160 @@
             central: ("armor.empty"),
         )
     ),
+    (Cultistwarlord, Male): (
+        head: (
+            offset: (-10.0, -6.0, -9.0),
+            central: ("npc.cultist_warlord.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -6.0, -6.0),
+            central: ("npc.cultist_warlord.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-7.0, -5.0, -9.0),
+            central: ("npc.cultist_warlord.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Cultistwarlord, Female): (
+        head: (
+            offset: (-10.0, -6.0, -9.0),
+            central: ("npc.cultist_warlord.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -6.0, -6.0),
+            central: ("npc.cultist_warlord.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-7.0, -5.0, -9.0),
+            central: ("npc.cultist_warlord.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Cultistwarlock, Male): (
+        head: (
+            offset: (-6.0, -5.5, -6.5),
+            central: ("npc.cultist_warlock.male.head"),
+        ),
+        torso_upper: (
+            offset: (-7.0, -5.5, -5.5),
+            central: ("npc.cultist_warlock.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -4.5, -10.0),
+            central: ("npc.cultist_warlock.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Cultistwarlock, Female): (
+        head: (
+            offset: (-6.0, -5.5, -6.5),
+            central: ("npc.cultist_warlock.male.head"),
+        ),
+        torso_upper: (
+            offset: (-7.0, -5.5, -5.5),
+            central: ("npc.cultist_warlock.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-6.0, -4.5, -10.0),
+            central: ("npc.cultist_warlock.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Huskbrute, Male): (
+        head: (
+            offset: (-6.0, -6.0, -6.5),
+            central: ("npc.husk_brute.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -8.0, -8.0),
+            central: ("npc.husk_brute.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-7.0, -6.5, -9.0),
+            central: ("npc.husk_brute.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
+    (Huskbrute, Female): (
+        head: (
+            offset: (-6.0, -6.0, -6.5),
+            central: ("npc.husk_brute.male.head"),
+        ),
+        torso_upper: (
+            offset: (-8.0, -8.0, -8.0),
+            central: ("npc.husk_brute.male.torso_upper"),
+        ),
+        torso_lower: (
+            offset: (-7.0, -6.5, -9.0),
+            central: ("npc.husk_brute.male.torso_lower"),
+        ),
+        jaw: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        second: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        )
+    ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -1223,4 +1223,208 @@
             lateral: ("npc.oni_red.male.foot_r"),
         )
     ),
+    (Cultistwarlord, Male): (
+        shoulder_l: (
+            offset: (-6.0, -5.5, -6.0),
+            lateral: ("npc.cultist_warlord.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-6.0, -5.5, -6.0),
+            lateral: ("npc.cultist_warlord.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.5, -3.5, -10.0),
+            lateral: ("npc.cultist_warlord.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.5, -3.5, -10.0),
+            lateral: ("npc.cultist_warlord.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-1.5, -2.0, -2.5),
+            lateral: ("npc.cultist_warlord.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-1.5, -2.0, -2.5),
+            lateral: ("npc.cultist_warlord.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.0, -4.0),
+            lateral: ("npc.cultist_warlord.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.0, -4.0),
+            lateral: ("npc.cultist_warlord.male.foot_r"),
+        )
+    ),
+    (Cultistwarlord, Female): (
+        shoulder_l: (
+            offset: (-6.0, -5.5, -6.0),
+            lateral: ("npc.cultist_warlord.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-6.0, -5.5, -6.0),
+            lateral: ("npc.cultist_warlord.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.5, -3.5, -10.0),
+            lateral: ("npc.cultist_warlord.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.5, -3.5, -10.0),
+            lateral: ("npc.cultist_warlord.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-1.5, -2.0, -2.5),
+            lateral: ("npc.cultist_warlord.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-1.5, -2.0, -2.5),
+            lateral: ("npc.cultist_warlord.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.0, -4.0),
+            lateral: ("npc.cultist_warlord.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.0, -4.0),
+            lateral: ("npc.cultist_warlord.male.foot_r"),
+        )
+    ),
+    (Cultistwarlock, Male): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -3.0),
+            lateral: ("npc.cultist_warlock.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -3.0),
+            lateral: ("npc.cultist_warlock.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.5, -3.5, -10.0),
+            lateral: ("npc.cultist_warlock.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.5, -3.5, -10.0),
+            lateral: ("npc.cultist_warlock.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-1.5, -2.0, -2.5),
+            lateral: ("npc.cultist_warlock.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-1.5, -2.0, -2.5),
+            lateral: ("npc.cultist_warlock.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.0, -4.0),
+            lateral: ("npc.cultist_warlock.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.0, -4.0),
+            lateral: ("npc.cultist_warlock.male.foot_r"),
+        )
+    ),
+    (Cultistwarlock, Female): (
+        shoulder_l: (
+            offset: (-3.5, -3.5, -3.0),
+            lateral: ("npc.cultist_warlock.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-3.5, -3.5, -3.0),
+            lateral: ("npc.cultist_warlock.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-3.5, -3.5, -10.0),
+            lateral: ("npc.cultist_warlock.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-3.5, -3.5, -10.0),
+            lateral: ("npc.cultist_warlock.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-1.5, -2.0, -2.5),
+            lateral: ("npc.cultist_warlock.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-1.5, -2.0, -2.5),
+            lateral: ("npc.cultist_warlock.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -4.0, -4.0),
+            lateral: ("npc.cultist_warlock.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -4.0, -4.0),
+            lateral: ("npc.cultist_warlock.male.foot_r"),
+        )
+    ),
+    (Huskbrute, Male): (
+        shoulder_l: (
+            offset: (-4.0, -4.5, -4.0),
+            lateral: ("npc.husk_brute.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.0, -4.5, -4.0),
+            lateral: ("npc.husk_brute.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.0, -3.5, -17.0),
+            lateral: ("npc.husk_brute.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.0, -3.5, -17.0),
+            lateral: ("npc.husk_brute.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -2.5, -3.5),
+            lateral: ("npc.husk_brute.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -2.5, -3.5),
+            lateral: ("npc.husk_brute.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -3.5, -3.5),
+            lateral: ("npc.husk_brute.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -3.5, -3.5),
+            lateral: ("npc.husk_brute.male.foot_r"),
+        )
+    ),
+    (Huskbrute, Female): (
+        shoulder_l: (
+            offset: (-4.0, -4.5, -4.0),
+            lateral: ("npc.husk_brute.male.shoulder_l"),
+        ),
+        shoulder_r: (
+            offset: (-4.0, -4.5, -4.0),
+            lateral: ("npc.husk_brute.male.shoulder_r"),
+        ),
+        hand_l: (
+            offset: (-4.0, -3.5, -17.0),
+            lateral: ("npc.husk_brute.male.hand_l"),
+        ),
+        hand_r: (
+            offset: (-4.0, -3.5, -17.0),
+            lateral: ("npc.husk_brute.male.hand_r"),
+        ),
+        leg_l: (
+            offset: (-2.0, -2.5, -3.5),
+            lateral: ("npc.husk_brute.male.leg_l"),
+        ),
+        leg_r: (
+            offset: (-2.0, -2.5, -3.5),
+            lateral: ("npc.husk_brute.male.leg_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, -3.5, -3.5),
+            lateral: ("npc.husk_brute.male.foot_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, -3.5, -3.5),
+            lateral: ("npc.husk_brute.male.foot_r"),
+        )
+    ),
 })

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -1050,6 +1050,10 @@
         vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
         color: None
     ),
+    "common.items.npc_weapons.unique.husk_brute": (
+        vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
+        color: None
+    ),
     "common.items.npc_weapons.axe.minotaur_axe": (
         vox_spec: ("weapon.axe.2haxe_minotaur", (-2.5, -9.0, -8.0)),
         color: None
@@ -1070,6 +1074,22 @@
         vox_spec: ("weapon.hammer.2hhammer_oni_red", (-3.0, -4.5, -12.0)),
         color: None
     ),
+    "common.items.npc_weapons.sword.bipedlarge-cultist": (
+        vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.hammer.bipedlarge-cultist": (
+        vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.bow.bipedlarge-velorite": (
+        vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)),
+        color: None
+    ),
+        "common.items.npc_weapons.staff.bipedlarge-cultist": (
+        vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)),
+        color: None
+    ),
     //BIPEDSMALL
     "common.items.npc_weapons.biped_small.adlet.adlet_bow": (
         vox_spec: ("weapon.biped_small.bow.adlet", (-1.5, -3.0, -5.0)),

assets/voxygen/voxel/bird_medium_central_manifest.ron

@@ -1,30 +1,30 @@
 ({
     (Duck, Male): (
         head: (
-            offset: (-1.5, -2.0, -1.5),
+            offset: (-2.0, -1.5, -2.5),
             central: ("npc.duck.male.head"),
         ),
         torso: (
-            offset: (-2.5, -3.0, -2.0),
+            offset: (-3.0, -4.5, -3.0),
             central: ("npc.duck.male.torso"),
         ),
         tail: (
-            offset: (-1.5, -0.5, -2.5),
+            offset: (-2.0, -1.5, -3.0),
             central: ("npc.duck.male.tail"),
         )
     ),
     (Duck, Female): (
         head: (
-            offset: (-1.5, -2.0, -1.5),
+            offset: (-2.0, -1.5, -2.5),
-            central: ("npc.duck.female.head"),
+            central: ("npc.duck.male.head"),
         ),
         torso: (
-            offset: (-2.5, -3.0, -2.0),
+            offset: (-3.0, -4.5, -3.0),
-            central: ("npc.duck.female.torso"),
+            central: ("npc.duck.male.torso"),
         ),
         tail: (
-            offset: (-1.5, -0.5, -2.5),
+            offset: (-2.0, -1.5, -3.0),
-            central: ("npc.duck.female.tail"),
+            central: ("npc.duck.male.tail"),
         )
     ),
     (Chicken, Male): (

assets/voxygen/voxel/bird_medium_lateral_manifest.ron

@@ -1,37 +1,37 @@
 ({
     (Duck, Male): (
         wing_l: (
-            offset: (-0.5, -2.5, -3.0),
+            offset: (-0.5, -4.0, -4.0),
             lateral: ("npc.duck.male.wing"),
         ),
         wing_r: (
-            offset: (-0.5, -2.5, -3.0),
+            offset: (-0.5, -4.0, -4.0),
             lateral: ("npc.duck.male.wing"),
         ),
         foot_l: (
-            offset: (-1.0, 0.0, -4.0),
+            offset: (-1.5, -1.5, -4.0),
             lateral: ("npc.duck.male.leg_r"),
         ),
         foot_r: (
-            offset: (-1.0, 0.0, -4.0),
+            offset: (-1.5, -1.5, -4.0),
             lateral: ("npc.duck.male.leg_r"),
         )
     ),
     (Duck, Female): (
         wing_l: (
-            offset: (-0.5, -2.5, -3.0),
+            offset: (-0.5, -4.0, -4.0),
             lateral: ("npc.duck.female.wing"),
         ),
         wing_r: (
-            offset: (-0.5, -2.5, -3.0),
+            offset: (-0.5, -4.0, -4.0),
             lateral: ("npc.duck.female.wing"),
         ),
         foot_l: (
-            offset: (-1.0, 0.0, -4.0),
+            offset: (-1.5, -1.5, -4.0),
             lateral: ("npc.duck.female.leg_r"),
         ),
         foot_r: (
-            offset: (-1.0, 0.0, -4.0),
+            offset: (-1.5, -1.5, -4.0),
             lateral: ("npc.duck.female.leg_r"),
         )
     ),

assets/voxygen/voxel/humanoid_armor_back_manifest.ron

@@ -40,14 +40,6 @@
             vox_spec: ("armor.leather_blue.back", (-5.0, -1.0, -11.0)),
             color: None
         ),
-        "Warlord": (
-            vox_spec: ("armor.warlord.back", (-5.0, -1.0, -14.0)),
-            color: None
-        ),
-        "Warlock": (
-            vox_spec: ("armor.warlock.back", (-5.0, -1.5, -15.5)),
-            color: None
-        ),
         "Rawhide": (
             vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.0, -6.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_belt_manifest.ron

@@ -72,14 +72,6 @@
           vox_spec: ("armor.velorite_battlemage.belt", (-5.0, -3.5, 2.0)),
           color: None
         ),
-        "Warlord":(
-            vox_spec: ("armor.warlord.belt", (-4.0, -3.5, 1.0)),
-            color: None
-        ),
-        "Warlock":(
-            vox_spec: ("armor.warlock.belt", (-4.0, -3.0, 2.0)),
-            color: None
-        ),
         "Rawhide": (
             vox_spec: ("armor.hide.rawhide.belt", (-4.0, -3.5, 2.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_chest_manifest.ron

@@ -142,14 +142,6 @@
           vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
           color: None
         ),
-        "Warlord": (
-          vox_spec: ("armor.warlord.chest", (-7.0, -3.5, -0.5)),
-          color: None
-        ),
-        "Warlock": (
-          vox_spec: ("armor.warlock.chest", (-7.0, -3.5, 0.5)),
-          color: None
-        ),
         "Rawhide": (
             vox_spec: ("armor.hide.rawhide.chest", (-7.0, -3.5, 2.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_foot_manifest.ron

@@ -72,14 +72,6 @@
           vox_spec: ("armor.velorite_battlemage.foot", (-2.5, -3.5, -2.0)),
           color: None
         ),
-        "Warlord": (
-          vox_spec: ("armor.warlord.foot", (-2.5, -3.5, -2.0)),
-          color: None
-        ),
-        "Warlock": (
-          vox_spec: ("armor.warlock.foot", (-2.5, -3.5, -2.0)),
-          color: None
-        ),
         "Rawhide": (
             vox_spec: ("armor.hide.rawhide.foot", (-2.5, -3.5, -2.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_hand_manifest.ron

@@ -150,26 +150,6 @@
                 color: None
             )
         ),
-        "Warlord": (
-            left: (
-                vox_spec: ("armor.warlord.hand", (-3.0, -2.0, -5.0)),
-                color: None
-            ),
-            right: (
-                vox_spec: ("armor.warlord.hand", (-2.0, -2.0, -5.0)),
-                color: None
-            )
-        ),
-        "Warlock": (
-            left: (
-                vox_spec: ("armor.warlock.hand", (-4.5, -3.5, -5.0)),
-                color: None
-            ),
-            right: (
-                vox_spec: ("armor.warlock.hand", (-2.5, -3.5, -5.0)),
-                color: None
-            )
-        ),
         "Rawhide": (
             left: (
                 vox_spec: ("armor.hide.rawhide.hand", (-1.5, -1.5, -2.5)),

assets/voxygen/voxel/humanoid_armor_pants_manifest.ron

@@ -100,14 +100,6 @@
             vox_spec: ("armor.leather_blue.pants", (-5.0, -3.5, 1.0)),
             color: None
         ),
-        "Warlord": (
-            vox_spec: ("armor.warlord.pants", (-6.0, -4.5, -2.0)),
-            color: None
-        ),
-        "Warlock": (
-            vox_spec: ("armor.warlock.pants", (-5.0, -4.0, -2.0)),
-            color: None
-        ),
         "Rawhide": (
             vox_spec: ("armor.hide.rawhide.pants", (-5.0, -3.5, 1.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron

@@ -231,26 +231,6 @@
                 color: None
             )
         ),
-        "Warlord": (
-            left: (
-                vox_spec: ("armor.warlord.shoulder", (-8.0, -3.5 , -2.5)),
-                color: None
-            ),
-            right: (
-                vox_spec: ("armor.warlord.shoulder", (-1.0, -3.5 , -2.5)),
-                color: None
-            )
-        ),
-        "Warlock": (
-            left: (
-                vox_spec: ("armor.warlock.shoulder", (-6.0, -4.0 , -2.0)),
-                color: None
-            ),
-            right: (
-                vox_spec: ("armor.warlock.shoulder", (0.0, -4.0, -2.0)),
-                color: None
-            )
-        ),
         "Rawhide": (
             left: (
                 vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.2, -0.5)),