BL improvements, various fixes

assets/common/abilities/bowsimple/basic.ron

@@ -0,0 +1,15 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.5,
+    recover_duration: 0.3,
+    projectile: Arrow(
+        damage: 70.0,
+        knockback: 5.0,
+        energy_regen: 40,
+    ),
+    projectile_body: Object(Arrow),
+    projectile_light: None,
+    projectile_gravity: Some(Gravity(0.2)),
+    projectile_speed: 100.0,
+    can_continue: true,
+)

assets/common/abilities/hammer/singlestrike.ron

@@ -8,9 +8,9 @@ ComboMelee(
         knockback: 10.0,
         range: 4.5,
         angle: 50.0,
-        base_buildup_duration: 0.6,
-        base_swing_duration: 0.15,
-        base_recover_duration: 0.3,
+        base_buildup_duration: 0.5,
+        base_swing_duration: 0.1,
+        base_recover_duration: 0.2,
         forward_movement: 0.0,
     )],
     initial_energy_gain: 50,

assets/common/abilities/hammersimple/doublestrike.ron

@@ -0,0 +1,39 @@
+ComboMelee(
+    stage_data: [
+        (
+            stage: 1,
+            base_damage: 90,
+            damage_increase: 10,
+            base_poise_damage: 0,
+            poise_damage_increase: 0,
+            knockback: 8.0,
+            range: 3.5,
+            angle: 50.0,
+            base_buildup_duration: 0.6,
+            base_swing_duration: 0.08,
+            base_recover_duration: 0.6,
+            forward_movement: 2.5,
+        ),
+        (
+            stage: 2,
+            base_damage: 130,
+            damage_increase: 15,
+            base_poise_damage: 0,
+            poise_damage_increase: 0,
+            knockback: 12.0,
+            range: 3.5,
+            angle: 30.0,
+            base_buildup_duration: 0.5,
+            base_swing_duration: 0.1,
+            base_recover_duration: 0.5,
+            forward_movement: 2.0,
+        ),
+    ],
+    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,
+)

assets/common/abilities/spear/doublestrike.ron

@@ -9,9 +9,9 @@ ComboMelee(
             knockback: 8.0,
             range: 3.5,
             angle: 50.0,
-            base_buildup_duration: 350,
-            base_swing_duration: 75,
-            base_recover_duration: 400,
+            base_buildup_duration: 0.35,
+            base_swing_duration: 0.075,
+            base_recover_duration: 0.4,
             forward_movement: 2.5,
         ),
         (
@@ -23,9 +23,9 @@ ComboMelee(
             knockback: 12.0,
             range: 3.5,
             angle: 30.0,
-            base_buildup_duration: 500,
-            base_swing_duration: 100,
-            base_recover_duration: 500,
+            base_buildup_duration: 0.5,
+            base_swing_duration: 0.1,
+            base_recover_duration: 0.5,
             forward_movement: 2.0,
         ),
     ],

assets/common/abilities/staffsimple/firebomb.ron

@@ -0,0 +1,18 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.5,
+    recover_duration: 0.35,
+    projectile: Fireball(
+        damage: 100.0,
+        radius: 5.0,
+        energy_regen: 50,
+    ),
+    projectile_body: Object(BoltFire),
+    /*projectile_light: Some(LightEmitter {
+        col: (1.0, 0.75, 0.11).into(),
+        ..Default::default()
+    }),*/
+    projectile_gravity: Some(Gravity(0.3)),
+    projectile_speed: 60.0,
+    can_continue: true,
+)

assets/common/abilities/swordsimple/doublestrike.ron

@@ -0,0 +1,39 @@
+ComboMelee(
+    stage_data: [
+        (
+            stage: 1,
+            base_damage: 90,
+            damage_increase: 10,
+            base_poise_damage: 0,
+            poise_damage_increase: 0,
+            knockback: 8.0,
+            range: 3.5,
+            angle: 50.0,
+            base_buildup_duration: 0.4,
+            base_swing_duration: 0.1,
+            base_recover_duration: 0.5,
+            forward_movement: 2.5,
+        ),
+        (
+            stage: 2,
+            base_damage: 130,
+            damage_increase: 15,
+            base_poise_damage: 0,
+            poise_damage_increase: 0,
+            knockback: 12.0,
+            range: 3.5,
+            angle: 30.0,
+            base_buildup_duration: 0.5,
+            base_swing_duration: 0.1,
+            base_recover_duration: 0.5,
+            forward_movement: 2.0,
+        ),
+    ],
+    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,
+)

assets/common/abilities/weapon_ability_manifest.ron

@@ -35,6 +35,29 @@
         skills: [],
 
     ),
+    HammerSimple: (
+        primary: "common.abilities.hammersimple.doublestrike",
+        secondary: "common.abilities.hammersimple.doublestrike",
+        skills: [],
+
+    ),
+    SwordSimple: (
+        primary: "common.abilities.swordsimple.doublestrike",
+        secondary: "common.abilities.swordsimple.doublestrike",
+        skills: [
+        ],
+    ),
+    StaffSimple: (
+        primary: "common.abilities.staffsimple.firebomb",
+        secondary: "common.abilities.staffsimple.firebomb",
+        skills: [],
+    ),
+    BowSimple: (
+        primary: "common.abilities.bowsimple.basic",
+        secondary: "common.abilities.bowsimple.basic",
+        skills: [
+        ],
+    ),
     Staff: (
         primary: "common.abilities.staff.firebomb",
         secondary: "common.abilities.staff.flamethrower",

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

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Leather Plate Belt",
+    description: "Leather adorned with steel for better protection.",
+    kind: Armor((
+        kind: Belt("PlateLeather"),
+        stats: (
+            protection: Normal(4.0),
+            poise_resilience: Normal(8.0),
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Leather Plate Chest",
+    description: "Leather adorned with steel for better protection.",
+    kind: Armor((
+        kind: Chest("PlateLeather"),
+        stats: (
+            protection: Normal(25.0),
+            poise_resilience: Normal(40.0),
+        ),
+    )),
+    quality: High,
+)

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

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Leather Plate Boots",
+    description: "Leather adorned with steel for better protection.",
+    kind: Armor((
+        kind: Foot("PlateLeather"),
+        stats: (
+            protection: Normal(5.0),
+            poise_resilience: Normal(10.0),
+        ),
+    )),
+    quality: High,
+)

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

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Leather Plate Gloves",
+    description: "Leather adorned with steel for better protection.",
+    kind: Armor((
+        kind: Hand("PlateLeather"),
+        stats: (
+            protection: Normal(10.0),
+            poise_resilience: Normal(15.0),
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Leather Plate Chausses",
+    description: "Leather adorned with steel for better protection.",
+    kind: Armor((
+        kind: Pants("PlateLeather"),
+        stats: (
+            protection: Normal(20.0),
+            poise_resilience: Normal(26.0),
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,12 @@
+ItemDef(
+    name: "Leather Plate Shoulder Pad",
+    description: "Leather adorned with steel for better protection.",
+    kind: Armor((
+        kind: Shoulder("PlateLeather"),
+        stats: (
+            protection: Normal(15.0),
+            poise_resilience: Normal(20.0),
+        ),
+    )),
+    quality: Moderate,
+)

assets/common/items/npc_weapons/bow/saurok_bow.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Bow,
+            kind: BowSimple,
             hands: Two,
             stats: Direct((
                 equip_time_millis: 500,

assets/common/items/npc_weapons/hammer/cyclops_hammer.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Hammer,    
+            kind: HammerSimple,    
             hands: Two,
             stats: Direct((
                 equip_time_millis: 500,

assets/common/items/npc_weapons/hammer/ogre_hammer.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Hammer,    
+            kind: HammerSimple,    
             hands: Two,
             stats: Direct((
                 equip_time_millis: 500,

assets/common/items/npc_weapons/hammer/troll_hammer.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Hammer,    
+            kind: HammerSimple,    
             hands: Two,
             stats: Direct((
                 equip_time_millis: 500,

assets/common/items/npc_weapons/staff/mindflayer_staff.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Staff,
+            kind: StaffSimple,
             hands: Two,
             stats: Direct((
                 equip_time_millis: 300,

assets/common/items/npc_weapons/staff/ogre_staff.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Staff,    
+            kind: StaffSimple,    
             hands: Two,
             stats: Direct((
                 equip_time_millis: 500,

assets/common/items/npc_weapons/staff/saurok_staff.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placeholder",
     kind: Tool(
         (
-            kind: Staff,
+            kind: StaffSimple,
             hands: Two,
             stats: Direct((
                 equip_time_millis: 500,

assets/common/items/npc_weapons/sword/dullahan_sword.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placehoder",
     kind: Tool(
         (
-            kind: Sword,    
+            kind: SwordSimple,    
             hands: Two,
             stats: Direct((
                 equip_time_millis: 500,

assets/common/items/npc_weapons/sword/saurok_sword.ron

@@ -3,7 +3,7 @@ ItemDef(
     description: "Placehoder",
     kind: Tool(
         (
-            kind: Sword,    
+            kind: SwordSimple,    
             hands: Two,
             stats: Direct((
                 equip_time_millis: 500,

assets/voxygen/voxel/biped_large_central_manifest.ron

@@ -23,11 +23,8 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-5.0, -5.5, -4.0),
-            central: ("weapon.hammer.2hhammer_ogre"),
         )
+
     ),
     (Ogre, Female): (
         head: (
@@ -53,10 +50,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-2.5, -5.5, -4.0),
-            central: ("weapon.staff.firestaff_ogre"),
         )
     ),
     (Cyclops, Male): (
@@ -83,10 +76,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-5.0, -6.5, -4.0),
-            central: ("weapon.hammer.2hhammer_cyclops-0"),
         )
     ),
     (Cyclops, Female): (
@@ -113,10 +102,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-5.0, -6.5, -4.0),
-            central: ("weapon.hammer.2hhammer_cyclops-0"),
         )
     ),
     (Wendigo, Male): (
@@ -143,10 +128,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),
         )
     ),
     (Wendigo, Female): (
@@ -173,10 +154,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),
         )
     ),
     (Troll, Male): (
@@ -203,10 +180,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-4.0, -6.0, -4.0),
-            central: ("weapon.hammer.2hhammer_troll"),
         )
     ),
     (Troll, Female): (
@@ -233,10 +206,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-4.0, -6.0, -4.0),
-            central: ("weapon.hammer.2hhammer_troll"),
         )
     ),
     (Dullahan, Male): (
@@ -263,10 +232,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-1.5, -9.0, -4.0),
-            central: ("weapon.sword.greatsword_2h_dullahan"),
         )
     ),
     (Dullahan, Female): (
@@ -293,10 +258,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-1.5, -9.0, -4.0),
-            central: ("weapon.sword.greatsword_2h_dullahan"),
         )
     ),
     (Werewolf, Male): (
@@ -323,10 +284,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),
         )
     ),
     (Werewolf, Female): (
@@ -353,10 +310,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (0.0, 0.0, 0.0),
-            central: ("armor.empty"),
         )
     ),
     (Occultsaurok, Male): (
@@ -383,10 +336,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-3.0, -3.0, -4.0),
-            central: ("weapon.staff.firestaff_saurok"),
         )
     ),
     (Occultsaurok, Female): (
@@ -413,10 +362,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-3.0, -3.0, -4.0),
-            central: ("weapon.staff.firestaff_saurok"),
         )
     ),
     (Mightysaurok, Male): (
@@ -443,10 +388,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-1.5, -4.0, -4.0),
-            central: ("weapon.sword.long_2h_saurok"),
         )
     ),
     (Mightysaurok, Female): (
@@ -473,10 +414,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-1.5, -4.0, -4.0),
-            central: ("weapon.sword.long_2h_saurok"),
         )
     ),
     (Slysaurok, Male): (
@@ -503,10 +440,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-1.5, -4.0, -16.5),
-            central: ("weapon.bow.longbow_saurok"),
         )
     ),
     (Slysaurok, Female): (
@@ -533,10 +466,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-1.5, -4.0, -16.5),
-            central: ("weapon.bow.longbow_saurok"),
         )
     ),
     (Mindflayer, Male): (
@@ -563,10 +492,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-5.5, -3.5, -4.0),
-            central: ("weapon.staff.firestaff_mindflayer"),
         )
     ),
     (Mindflayer, Female): (
@@ -593,10 +518,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-5.5, -3.5, -4.0),
-            central: ("weapon.staff.firestaff_mindflayer"),
         )
     ),
     (Minotaur, Male): (
@@ -623,10 +544,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-5.5, -3.5, -4.0),
-            central: ("weapon.staff.firestaff_mindflayer"),
         )
     ),
     (Minotaur, Female): (
@@ -653,10 +570,6 @@
         second: (
             offset: (0.0, 0.0, 0.0),
             central: ("armor.empty"),
-        ),
-        main: (
-            offset: (-5.5, -3.5, -4.0),
-            central: ("weapon.staff.firestaff_mindflayer"),
         )
     ),
 })

assets/voxygen/voxel/biped_large_lateral_manifest.ron

@@ -1,19 +1,19 @@
 ({
     (Ogre, Male): (
         shoulder_l: (
-            offset: (-6.0, -3.5, -4.0),
+            offset: (-6.0, -3.5, -6.5),
             lateral: ("npc.ogre.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-6.0, -4.5, -4.0),
+            offset: (-6.0, -4.5, -6.5),
             lateral: ("npc.ogre.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-5.5, -3.5, -15.0),
+            offset: (-5.5, -3.5, -13.0),
             lateral: ("npc.ogre.male.hand_l"),
         ),
         hand_r: (
-            offset: (-5.5, -3.5, -15.0),
+            offset: (-5.5, -3.5, -13.0),
             lateral: ("npc.ogre.male.hand_r"),
         ),
         leg_l: (
@@ -35,11 +35,11 @@
     ),
     (Ogre, Female): (
         shoulder_l: (
-            offset: (-3.0, -3.0, -3.5),
+            offset: (-3.0, -3.0, -5.5),
             lateral: ("npc.ogre.female.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.0, -3.0, -3.5),
+            offset: (-3.0, -3.0, -5.5),
             lateral: ("npc.ogre.female.shoulder_r"),
         ),
         hand_l: (
@@ -69,19 +69,19 @@
     ),
     (Cyclops, Male): (
         shoulder_l: (
-            offset: (-3.0, -4.0, -5.0),
+            offset: (-3.0, -4.0, -7.0),
             lateral: ("npc.cyclops.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.0, -4.0, -5.0),
+            offset: (-3.0, -4.0, -7.0),
             lateral: ("npc.cyclops.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-3.5, -3.5, -14.0),
+            offset: (-3.5, -3.5, -12.0),
             lateral: ("npc.cyclops.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.5, -3.5, -14.0),
+            offset: (-3.5, -3.5, -12.0),
             lateral: ("npc.cyclops.male.hand_r"),
         ),
         leg_l: (
@@ -103,19 +103,19 @@
     ),
     (Cyclops, Female): (
         shoulder_l: (
-            offset: (-3.0, -4.0, -5.0),
+            offset: (-3.0, -4.0, -7.0),
             lateral: ("npc.cyclops.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.0, -4.0, -5.0),
+            offset: (-3.0, -4.0, -7.0),
             lateral: ("npc.cyclops.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-3.5, -3.5, -14.0),
+            offset: (-3.5, -3.5, -12.0),
             lateral: ("npc.cyclops.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.5, -3.5, -14.0),
+            offset: (-3.5, -3.5, -12.0),
             lateral: ("npc.cyclops.male.hand_r"),
         ),
         leg_l: (
@@ -137,19 +137,19 @@
     ),
     (Wendigo, Male): (
         shoulder_l: (
-            offset: (-3.0, -4.0, -5.0),
+            offset: (-3.0, -4.0, -8.5),
             lateral: ("npc.wendigo.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.0, -4.0, -5.0),
+            offset: (-3.0, -4.0, -8.5),
             lateral: ("npc.wendigo.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-4.0, -3.5, -18.0),
+            offset: (-4.0, -3.5, -15.0),
             lateral: ("npc.wendigo.male.hand_l"),
         ),
         hand_r: (
-            offset: (-4.0, -3.5, -18.0),
+            offset: (-4.0, -3.5, -15.0),
             lateral: ("npc.wendigo.male.hand_r"),
         ),
         leg_l: (
@@ -171,19 +171,19 @@
     ),
     (Wendigo, Female): (
         shoulder_l: (
-            offset: (-3.0, -4.0, -5.0),
+            offset: (-3.0, -4.0, -8.5),
             lateral: ("npc.wendigo.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.0, -4.0, -5.0),
+            offset: (-3.0, -4.0, -8.5),
             lateral: ("npc.wendigo.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-4.0, -3.5, -18.0),
+            offset: (-4.0, -3.5, -15.0),
             lateral: ("npc.wendigo.male.hand_l"),
         ),
         hand_r: (
-            offset: (-4.0, -3.5, -18.0),
+            offset: (-4.0, -3.5, -15.0),
             lateral: ("npc.wendigo.male.hand_r"),
         ),
         leg_l: (
@@ -205,19 +205,19 @@
     ),
     (Troll, Male): (
         shoulder_l: (
-            offset: (-5.0, -4.5, -7.0),
+            offset: (-5.0, -4.5, -11.0),
             lateral: ("npc.troll.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-5.0, -4.5, -7.0),
+            offset: (-5.0, -4.5, -11.0),
             lateral: ("npc.troll.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-3.5, -4.0, -15.0),
+            offset: (-3.5, -4.0, -12.0),
             lateral: ("npc.troll.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.5, -4.0, -15.0),
+            offset: (-3.5, -4.0, -12.0),
             lateral: ("npc.troll.male.hand_r"),
         ),
         leg_l: (
@@ -239,19 +239,19 @@
     ),
     (Troll, Female): (
         shoulder_l: (
-            offset: (-5.0, -4.5, -7.0),
+            offset: (-5.0, -4.5, -11.0),
             lateral: ("npc.troll.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-5.0, -4.5, -7.0),
+            offset: (-5.0, -4.5, -11.0),
             lateral: ("npc.troll.male.shoulder_r"),
         ),
         hand_l: (
-            offset: (-3.5, -4.0, -15.0),
+            offset: (-3.5, -4.0, -12.0),
             lateral: ("npc.troll.male.hand_l"),
         ),
         hand_r: (
-            offset: (-3.5, -4.0, -15.0),
+            offset: (-3.5, -4.0, -12.0),
             lateral: ("npc.troll.male.hand_r"),
         ),
         leg_l: (
@@ -409,11 +409,11 @@
     ),
     (Occultsaurok, Male): (
         shoulder_l: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_occult.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_occult.male.shoulder_r"),
         ),
         hand_l: (
@@ -425,29 +425,29 @@
             lateral: ("npc.saurok_occult.male.hand_r"),
         ),
         leg_l: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_occult.male.leg_l"),
         ),
         leg_r: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_occult.male.leg_r"),
         ),
         foot_l: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_occult.male.foot_l"),
         ),
         foot_r: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_occult.male.foot_r"),
         ),
     ),
     (Occultsaurok, Female): (
         shoulder_l: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_occult.female.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_occult.female.shoulder_r"),
         ),
         hand_l: (
@@ -459,29 +459,29 @@
             lateral: ("npc.saurok_occult.female.hand_r"),
         ),
         leg_l: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_occult.female.leg_l"),
         ),
         leg_r: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_occult.female.leg_r"),
         ),
         foot_l: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_occult.female.foot_l"),
         ),
         foot_r: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_occult.female.foot_r"),
         ),
     ),
     (Mightysaurok, Male): (
         shoulder_l: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_mighty.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_mighty.male.shoulder_r"),
         ),
         hand_l: (
@@ -493,29 +493,29 @@
             lateral: ("npc.saurok_mighty.male.hand_r"),
         ),
         leg_l: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_mighty.male.leg_l"),
         ),
         leg_r: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_mighty.male.leg_r"),
         ),
         foot_l: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_mighty.male.foot_l"),
         ),
         foot_r: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_mighty.male.foot_r"),
         ),
     ),
     (Mightysaurok, Female): (
         shoulder_l: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_mighty.female.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_mighty.female.shoulder_r"),
         ),
         hand_l: (
@@ -527,29 +527,29 @@
             lateral: ("npc.saurok_mighty.female.hand_r"),
         ),
         leg_l: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_mighty.female.leg_l"),
         ),
         leg_r: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_mighty.female.leg_r"),
         ),
         foot_l: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_mighty.female.foot_l"),
         ),
         foot_r: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_mighty.female.foot_r"),
         ),
     ),
     (Slysaurok, Male): (
         shoulder_l: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_sly.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_sly.male.shoulder_r"),
         ),
         hand_l: (
@@ -561,29 +561,29 @@
             lateral: ("npc.saurok_sly.male.hand_r"),
         ),
         leg_l: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_sly.male.leg_l"),
         ),
         leg_r: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_sly.male.leg_r"),
         ),
         foot_l: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_sly.male.foot_l"),
         ),
         foot_r: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_sly.male.foot_r"),
         ),
     ),
     (Slysaurok, Female): (
         shoulder_l: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_sly.female.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -6.5),
             lateral: ("npc.saurok_sly.female.shoulder_r"),
         ),
         hand_l: (
@@ -595,19 +595,19 @@
             lateral: ("npc.saurok_sly.female.hand_r"),
         ),
         leg_l: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_sly.female.leg_l"),
         ),
         leg_r: (
-            offset: (-2.0, -3.0, -3.5),
+            offset: (-2.0, -1.5, -6.5),
             lateral: ("npc.saurok_sly.female.leg_r"),
         ),
         foot_l: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_sly.female.foot_l"),
         ),
         foot_r: (
-            offset: (-2.5, -4.5, -5.0),
+            offset: (-2.5, -5.5, -9.0),
             lateral: ("npc.saurok_sly.female.foot_r"),
         ),
     ),
@@ -681,11 +681,11 @@
     ),
     (Minotaur, Male): (
         shoulder_l: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -7.5),
             lateral: ("npc.minotaur.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -7.5),
             lateral: ("npc.minotaur.male.shoulder_r"),
         ),
         hand_l: (
@@ -715,11 +715,11 @@
     ),
     (Minotaur, Female): (
         shoulder_l: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -7.5),
             lateral: ("npc.minotaur.male.shoulder_l"),
         ),
         shoulder_r: (
-            offset: (-3.5, -3.5, -4.5),
+            offset: (-3.5, -3.5, -7.5),
             lateral: ("npc.minotaur.male.shoulder_r"),
         ),
         hand_l: (

assets/voxygen/voxel/biped_large_weapon_manifest.ron

@@ -0,0 +1,42 @@
+({
+    "common.items.npc_weapons.hammer.ogre_hammer": (
+        vox_spec: ("weapon.hammer.2hhammer_ogre", (-5.0, -5.5, -7.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.staff.ogre_staff": (
+        vox_spec: ("weapon.staff.firestaff_ogre", (-2.5, -5.5, -6.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.hammer.cyclops_hammer": (
+        vox_spec: ("weapon.hammer.2hhammer_cyclops-0", (-5.0, -6.5, -7.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.hammer.troll_hammer": (
+        vox_spec: ("weapon.hammer.2hhammer_troll", (-4.0, -6.0, -7.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.sword.dullahan_sword": (
+        vox_spec: ("weapon.sword.greatsword_2h_dullahan", (-1.5, -9.0, -10.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.staff.saurok_staff": (
+        vox_spec: ("weapon.staff.firestaff_saurok", (-3.0, -3.0, -6.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.sword.saurok_sword": (
+        vox_spec: ("weapon.sword.long_2h_saurok", (-1.5, -4.0, -5.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.bow.saurok_bow": (
+        vox_spec: ("weapon.bow.longbow_saurok", (-1.5, -4.0, -16.5)),
+        color: None
+    ),
+    "common.items.npc_weapons.staff.mindflayer_staff": (
+        vox_spec: ("weapon.staff.firestaff_mindflayer", (-5.5, -3.5, -8.0)),
+        color: None
+    ),
+    "common.items.npc_weapons.unique.beast_claws": (
+        vox_spec: ("armor.empty", (0.0, 0.0, 0.0)),
+        color: None
+    ),
+})

assets/voxygen/voxel/bird_medium_lateral_manifest.ron

@@ -10,7 +10,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -4.0),
-            lateral: ("npc.duck.male.leg_l"),
+            lateral: ("npc.duck.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -4.0),
@@ -28,7 +28,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -4.0),
-            lateral: ("npc.duck.female.leg_l"),
+            lateral: ("npc.duck.female.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -4.0),
@@ -46,7 +46,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -4.0),
-            lateral: ("npc.chicken.male.leg_l"),
+            lateral: ("npc.chicken.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -4.0),
@@ -64,7 +64,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -4.0),
-            lateral: ("npc.chicken.female.leg_l"),
+            lateral: ("npc.chicken.female.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -4.0),
@@ -82,7 +82,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.goose.male.leg_l"),
+            lateral: ("npc.goose.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -6.5),
@@ -100,7 +100,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.goose.male.leg_l"),
+            lateral: ("npc.goose.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -6.5),
@@ -110,7 +110,7 @@
     (Peacock, Male): (
         wing_l: (
             offset: (-1.0, -3.5, -5.0),
-            lateral: ("npc.peacock.male.wing_l"),
+            lateral: ("npc.peacock.male.wing_r"),
         ),
         wing_r: (
             offset: (-1.0, -3.5, -5.0),
@@ -118,7 +118,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -8.0),
-            lateral: ("npc.peacock.male.leg_l"),
+            lateral: ("npc.peacock.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -8.0),
@@ -128,7 +128,7 @@
     (Peacock, Female): (
         wing_l: (
             offset: (-1.0, -3.5, -5.0),
-            lateral: ("npc.peacock.female.wing_l"),
+            lateral: ("npc.peacock.female.wing_r"),
         ),
         wing_r: (
             offset: (-1.0, -3.5, -5.0),
@@ -136,7 +136,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -8.0),
-            lateral: ("npc.peacock.female.leg_l"),
+            lateral: ("npc.peacock.female.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -8.0),
@@ -146,7 +146,7 @@
     (Eagle, Male): (
         wing_l: (
             offset: (-1.0, -3.5, -12.0),
-            lateral: ("npc.eagle.male.wing_l"),
+            lateral: ("npc.eagle.male.wing_r"),
         ),
         wing_r: (
             offset: (-1.0, -3.5, -12.0),
@@ -154,7 +154,7 @@
         ),
         foot_l: (
             offset: (-1.5, 0.0, -8.0),
-            lateral: ("npc.eagle.male.leg_l"),
+            lateral: ("npc.eagle.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.5, 0.0, -8.0),
@@ -164,7 +164,7 @@
     (Eagle, Female): (
         wing_l: (
             offset: (-1.0, -3.5, -12.0),
-            lateral: ("npc.eagle.male.wing_l"),
+            lateral: ("npc.eagle.male.wing_r"),
         ),
         wing_r: (
             offset: (-1.0, -3.5, -12.0),
@@ -172,7 +172,7 @@
         ),
         foot_l: (
             offset: (-1.5, 0.0, -8.0),
-            lateral: ("npc.eagle.male.leg_l"),
+            lateral: ("npc.eagle.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.5, 0.0, -8.0),
@@ -182,7 +182,7 @@
     (Owl, Male): (
         wing_l: (
             offset: (-1.0, -2.5, -8.0),
-            lateral: ("npc.owl.male.wing_l"),
+            lateral: ("npc.owl.male.wing_r"),
         ),
         wing_r: (
             offset: (-1.0, -2.5, -8.0),
@@ -190,7 +190,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.owl.male.leg_l"),
+            lateral: ("npc.owl.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -6.5),
@@ -200,7 +200,7 @@
     (Owl, Female): (
         wing_l: (
             offset: (-1.0, -2.5, -8.0),
-            lateral: ("npc.owl.female.wing_l"),
+            lateral: ("npc.owl.female.wing_r"),
         ),
         wing_r: (
             offset: (-1.0, -2.5, -8.0),
@@ -208,7 +208,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -6.5),
-            lateral: ("npc.owl.female.leg_l"),
+            lateral: ("npc.owl.female.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -6.5),
@@ -226,7 +226,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -3.0),
-            lateral: ("npc.parrot.male.leg_l"),
+            lateral: ("npc.parrot.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -3.0),
@@ -244,7 +244,7 @@
         ),
         foot_l: (
             offset: (-1.0, 0.0, -3.0),
-            lateral: ("npc.parrot.male.leg_l"),
+            lateral: ("npc.parrot.male.leg_r"),
         ),
         foot_r: (
             offset: (-1.0, 0.0, -3.0),
@@ -254,7 +254,7 @@
     (Cockatrice, Male): (
         wing_l: (
             offset: (-2.0, -3.0, -9.0),
-            lateral: ("npc.cockatrice.male.wing_l"),
+            lateral: ("npc.cockatrice.male.wing_r"),
         ),
         wing_r: (
             offset: (-2.0, -3.0, -9.0),
@@ -262,7 +262,7 @@
         ),
         foot_l: (
             offset: (-2.5, 0.0, -12.0),
-            lateral: ("npc.cockatrice.male.leg_l"),
+            lateral: ("npc.cockatrice.male.leg_r"),
         ),
         foot_r: (
             offset: (-2.5, 0.0, -12.0),
@@ -272,7 +272,7 @@
     (Cockatrice, Female): (
         wing_l: (
             offset: (-2.0, -3.0, -9.0),
-            lateral: ("npc.cockatrice.male.wing_l"),
+            lateral: ("npc.cockatrice.male.wing_r"),
         ),
         wing_r: (
             offset: (-2.0, -3.0, -9.0),
@@ -280,7 +280,7 @@
         ),
         foot_l: (
             offset: (-2.5, 0.0, -12.0),
-            lateral: ("npc.cockatrice.male.leg_l"),
+            lateral: ("npc.cockatrice.male.leg_r"),
         ),
         foot_r: (
             offset: (-2.5, 0.0, -12.0),

assets/voxygen/voxel/fish_medium_lateral_manifest.ron

@@ -2,7 +2,7 @@
     (Marlin, Male): (
         fin_l: (
             offset: (-3.0, -5.0, -4.0),
-            lateral: ("npc.marlin.male.fin_l"),
+            lateral: ("npc.marlin.male.fin_r"),
         ),
         fin_r: (
             offset: (0.0, -5.0, -4.0),
@@ -12,7 +12,7 @@
     (Marlin, Female): (
         fin_l: (
             offset: (-3.0, -5.0, -4.0),
-            lateral: ("npc.marlin.male.fin_l"),
+            lateral: ("npc.marlin.male.fin_r"),
         ),
         fin_r: (
             offset: (0.0, -5.0, -4.0),

assets/voxygen/voxel/fish_small_lateral_manifest.ron

@@ -2,7 +2,7 @@
     (Clownfish, Male): (
         fin_l: (
             offset: (-0.5, -3.0, -4.0),
-            lateral: ("npc.clownfish.male.fin_l"),
+            lateral: ("npc.clownfish.male.fin_r"),
         ),
         fin_r: (
             offset: (-0.5, -3.0, -4.0),
@@ -12,7 +12,7 @@
     (Clownfish, Female): (
         fin_l: (
             offset: (-0.5, -3.0, -4.0),
-            lateral: ("npc.clownfish.male.fin_l"),
+            lateral: ("npc.clownfish.male.fin_r"),
         ),
         fin_r: (
             offset: (-0.5, -3.0, -4.0),

assets/voxygen/voxel/humanoid_armor_belt_manifest.ron

@@ -60,6 +60,10 @@
             vox_spec: ("armor.belt.steel-0", (-5.0, -4.5, 2.0)),
             color: None
         ),
+        "PlateLeather": (
+            vox_spec: ("armor.belt.plate_leather-0", (-4.0, -4.5, 2.0)),
+            color: None
+        ),
         "Druid": (
             vox_spec: ("armor.belt.druid", (-4.0, -3.5, -1.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_chest_manifest.ron

@@ -135,7 +135,11 @@
             color: Some((57, 81, 132))
         ),
         "Steel0": (
-            vox_spec: ("armor.chest.steel-0", (-8.0, -4.5, 2.0)),
+            vox_spec: ("armor.chest.steel-0", (-5.0, -4.5, 2.0)),
+            color: None
+        ),
+        "PlateLeather": (
+            vox_spec: ("armor.chest.plate_leather", (-8.0, -5.5, 2.0)),
             color: None
         ),
         "Leather2": (

assets/voxygen/voxel/humanoid_armor_foot_manifest.ron

@@ -48,6 +48,10 @@
             vox_spec: ("armor.foot.steel-0", (-2.5, -3.5, -2.0)),
             color: None
         ),
+        "PlateLeather": (
+            vox_spec: ("armor.foot.plate_leather", (-2.5, -3.5, -2.0)),
+            color: None
+        ),
         "Leather2": (
             vox_spec: ("armor.foot.leather-2", (-2.5, -3.5, -2.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_hand_manifest.ron

@@ -110,6 +110,16 @@
                 color: None
             )
         ),
+        "PlateLeather": (
+            left: (
+                vox_spec: ("armor.hand.plate_leather_left-0", (-1.5, -1.5, -2.5)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.hand.plate_leather_right-0", (-1.5, -1.5, -2.5)),
+                color: None
+            )
+        ),
         "Leather2": (
             left: (
                 vox_spec: ("armor.hand.leather_left-2", (-1.5, -1.5, -2.5)),

assets/voxygen/voxel/humanoid_armor_pants_manifest.ron

@@ -72,6 +72,10 @@
             vox_spec: ("armor.pants.steel-0", (-6.0, -4.5, 1.0)),
             color: None
         ),
+        "PlateLeather": (
+            vox_spec: ("armor.pants.plate_leather-0", (-5.0, -4.5, 1.0)),
+            color: None
+        ),
         "Leather2": (
             vox_spec: ("armor.pants.leather-2", (-5.0, -3.5, 1.0)),
             color: None

assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron

@@ -131,6 +131,16 @@
                 color: None
             )
         ),
+        "PlateLeather": (
+            left: (
+                vox_spec: ("armor.shoulder.plate_leather_left-0", (-4.0, -4.5 , 0.0)),
+                color: None
+            ),
+            right: (
+                vox_spec: ("armor.shoulder.plate_leather_right-0", (-0.9, -4.5, 0.0)),
+                color: None
+            )
+        ),
         "Leather2": (
             left: (
                 vox_spec: ("armor.shoulder.leather_left-2", (-5.0, -3.8, -0.9)),