Rebase commit

CHANGELOG.md

@@ -90,6 +90,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Balance changes; Smoother entity progression consisting of larger variety in (effective) health pools, dps, entity flee_health alterations, and minor weight distribution changes for entity spawns.
 - Made power of weapon tiers scale non-linearly.
 - Sword Changes; Pommel Strike has been nerfed -> increased energy cost, increased _durations, and decreased poise damage. Heavy Sweep has been nerfed -> decreased poise damage and stun vulnerability damage. Pillar Thrust has been altered -> decreased maximum base damage with an increase in stun vulnerability damage.
+- Weapons block are based on poise
+- Wooden Shield recipe
 
 ### Removed
 - Medium and large potions from all loot tables

assets/common/abilities/ability_set_manifest.ron

@@ -351,8 +351,9 @@
         abilities: [],
     ),
     Tool(Shield): (
-        primary: Simple(None, "common.abilities.shield.tempbasic"),
+        guard: Some(Simple(None, "common.abilities.shield.basic_guard")),
-        secondary: Simple(None, "common.abilities.shield.block"),
+        primary: Simple(None, "common.abilities.shield.singlestrike"),
+        secondary: Simple(None, "common.abilities.shield.singlestrike"),
         abilities: [],
     ),
     Custom("Stone Golem"): (

assets/common/abilities/haniwa/soldier/guard.ron

@@ -2,7 +2,6 @@ BasicBlock(
     buildup_duration: 0.25,
     recover_duration: 0.25,
     max_angle: 90.0,
-    block_strength: 0.5,
     parry_window: (
         buildup: false,
         recover: false,

assets/common/abilities/shield/basic_guard.ron

@@ -1,14 +1,14 @@
 BasicBlock(
-    buildup_duration: 0.1,
+    buildup_duration: 0.45,
-    recover_duration: 0.1,
+    recover_duration: 0.2,
     max_angle: 90.0,
     block_strength: 0.8,
     parry_window: (
         buildup: true,
         recover: false,
     ),
-    energy_cost: 0.0,
+    energy_cost: 5.0,
-    energy_regen: 0.0,
+    energy_regen: 5.0,
     can_hold: true,
     blocked_attacks: (
         melee: true,

assets/common/abilities/shield/singlestrike.ron

@@ -0,0 +1,32 @@
+ComboMelee2(
+    strikes: [
+        (
+            melee_constructor: (
+                kind: Bash(
+                    damage: 6,
+                    poise: 5,
+                    knockback: 0,
+                    energy_regen: 5,
+                ),
+                range: 1.5,
+                angle: 45.0,
+                damage_effect: Some(BuffsVulnerable(0.5, Parried)),
+            ),
+            buildup_duration: 0.15,
+            swing_duration: 0.2,
+            hit_timing: 0.1,
+            recover_duration: 0.15,
+            ori_modifier: 0.1,
+            movement: (
+                buildup: Some(Forward(0.1)),
+                swing: None,
+                recover: None,
+            ),
+        ),
+    ],
+    energy_cost_per_strike: 0,
+    meta: (
+        // // The ability will parry all blockable attacks in the buildup portion
+        capabilities: ("PARRIES"),
+    ),
+)

assets/common/abilities/shield/tempbasic.ron

@@ -1,18 +0,0 @@
-BasicMelee(
-    energy_cost: 0,
-    buildup_duration: 0.1,
-    swing_duration: 0.1,
-    hit_timing: 0.0,
-    recover_duration: 0.3,
-    melee_constructor: (
-        kind: Bash(
-            damage: 4.0,
-            poise: 0.0,
-            knockback: 0.0,
-            energy_regen: 0.0,
-        ),
-        range: 3.0,
-        angle: 90.0,
-    ),
-    ori_modifier: 1.0,
-)

assets/common/abilities/sword/defensive_cascade.ron

@@ -22,6 +22,6 @@ ComboMelee2(
     energy_cost_per_strike: 5,
     meta: (
         // The ability will parry melee attacks in the buildup & swing portion
-        capabilities: ("PARRIES"),
+        capabilities: ("PARRIES_MELEE"),
     ),
 )

assets/common/abilities/sword/defensive_crescent_slash.ron

@@ -22,6 +22,6 @@ ComboMelee2(
     energy_cost_per_strike: 5,
     meta: (
         // The ability will parry melee attacks in the buildup & swing portion
-        capabilities: ("PARRIES"),
+        capabilities: ("PARRIES_MELEE"),
     ),
 )

assets/common/abilities/sword/defensive_cross_cut.ron

@@ -41,6 +41,6 @@ ComboMelee2(
     auto_progress: true,
     meta: (
         // The ability will parry melee attacks in the buildup & swing portion
-        capabilities: ("PARRIES"),
+        capabilities: ("PARRIES_MELEE"),
     ),
 )

assets/common/abilities/sword/defensive_deflect.ron

@@ -2,7 +2,6 @@ BasicBlock(
     buildup_duration: 0.4,
     recover_duration: 0.2,
     max_angle: 45.0,
-    block_strength: 0.75,
     parry_window: (
         buildup: true,
         recover: false,

assets/common/abilities/sword/defensive_dual_cross_cut.ron

@@ -23,6 +23,6 @@ ComboMelee2(
     energy_cost_per_strike: 5,
     meta: (
         // The ability will parry melee attacks in the buildup & swing portion
-        capabilities: ("PARRIES"),
+        capabilities: ("PARRIES_MELEE"),
     ),
 )

assets/common/abilities/sword/defensive_fell_strike.ron

@@ -22,6 +22,6 @@ ComboMelee2(
     energy_cost_per_strike: 5,
     meta: (
         // The ability will parry melee attacks in the buildup & swing portion
-        capabilities: ("PARRIES"),
+        capabilities: ("PARRIES_MELEE"),
     ),
 )

assets/common/abilities/sword/defensive_skewer.ron

@@ -27,6 +27,6 @@ ComboMelee2(
     energy_cost_per_strike: 5,
     meta: (
         // The ability will parry melee attacks in the buildup & swing portion
-        capabilities: ("PARRIES"),
+        capabilities: ("PARRIES_MELEE"),
     ),
 )

assets/common/item_i18n_manifest.ron

@@ -705,6 +705,9 @@
         Simple(
             "common.items.weapons.shield.shield_1",
         ): "weapon-shield-wood-0",
+        Simple(
+            "common.items.weapons.shield.starter_shield",
+        ): "weapon-shield-starter",
         Simple(
             "common.items.weapons.dagger.basic_0",
         ): "weapon-dagger-dagger_basic-0",

assets/common/items/debug/admin_stick.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Debug,

assets/common/items/debug/admin_sword.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 999.9
         ),
     )),
     quality: Debug,

assets/common/items/debug/velorite_bow_debug.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Debug,

assets/common/items/modular/weapon/primary/axe/axe.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.0,
                 buff_strength: 1.0,
+			    block_strength: 0.9,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/axe/battleaxe.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 1.2,
+                block_strength: 0.6,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/axe/greataxe.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.9,
                 energy_efficiency: 0.9,
                 buff_strength: 1.2,
+                block_strength: 1.2,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Greataxe"),

assets/common/items/modular/weapon/primary/axe/jagged.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 1.4,
+                block_strength: 0.8,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/axe/labrys.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.9,
                 buff_strength: 0.8,
+                block_strength: 1.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Labrys"),

assets/common/items/modular/weapon/primary/axe/ornate.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.1,
                 energy_efficiency: 1.3,
                 buff_strength: 1.0,
+			    block_strength: 0.7,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/axe/poleaxe.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.3,
                 energy_efficiency: 0.9,
                 buff_strength: 0.9,
+                block_strength: 1.1,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Poleaxe"),

assets/common/items/modular/weapon/primary/bow/bow.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.9,
                 energy_efficiency: 0.9,
                 buff_strength: 0.9,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Bow"),

assets/common/items/modular/weapon/primary/bow/composite.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 1.5,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Composite Bow"),

assets/common/items/modular/weapon/primary/bow/greatbow.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Greatbow"),

assets/common/items/modular/weapon/primary/bow/longbow.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.3,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Longbow"),

assets/common/items/modular/weapon/primary/bow/ornate.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.5,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Ornate Bow"),

assets/common/items/modular/weapon/primary/bow/shortbow.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Shortbow"),

assets/common/items/modular/weapon/primary/bow/warbow.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Warbow"),

assets/common/items/modular/weapon/primary/hammer/greathammer.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 1.3,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Greathammer"),

assets/common/items/modular/weapon/primary/hammer/greatmace.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 1.1,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Greatmace"),

assets/common/items/modular/weapon/primary/hammer/hammer.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.9,
                 energy_efficiency: 0.9,
                 buff_strength: 0.9,
+                block_strength: 1.0,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/hammer/maul.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.3,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 1.2,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Maul"),

assets/common/items/modular/weapon/primary/hammer/ornate.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.5,
                 buff_strength: 0.8,
+                block_strength: 0.8,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/hammer/spikedmace.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 1.5,
+                block_strength: 0.9,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/hammer/warhammer.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.7,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/sceptre/arbor.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.3,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Arbor"),

assets/common/items/modular/weapon/primary/sceptre/cane.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Cane"),

assets/common/items/modular/weapon/primary/sceptre/crook.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 1.5,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Crook"),

assets/common/items/modular/weapon/primary/sceptre/crozier.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Crozier"),

assets/common/items/modular/weapon/primary/sceptre/grandsceptre.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Grandsceptre"),

assets/common/items/modular/weapon/primary/sceptre/ornate.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.5,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Ornate Sceptre"),

assets/common/items/modular/weapon/primary/sceptre/sceptre.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.9,
                 energy_efficiency: 0.9,
                 buff_strength: 0.9,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Sceptre"),

assets/common/items/modular/weapon/primary/staff/brand.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Brand"),

assets/common/items/modular/weapon/primary/staff/grandstaff.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Grandstaff"),

assets/common/items/modular/weapon/primary/staff/longpole.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.3,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Longpole"),

assets/common/items/modular/weapon/primary/staff/ornate.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.5,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Ornate Staff"),

assets/common/items/modular/weapon/primary/staff/pole.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 1.5,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Pole"),

assets/common/items/modular/weapon/primary/staff/rod.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.8,
                 buff_strength: 0.8,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Rod"),

assets/common/items/modular/weapon/primary/staff/staff.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.9,
                 energy_efficiency: 0.9,
                 buff_strength: 0.9,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Staff"),

assets/common/items/modular/weapon/primary/sword/greatsword.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.7,
                 buff_strength: 1.0,
+			    block_strength: 1.3,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Greatsword"),

assets/common/items/modular/weapon/primary/sword/katana.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.3,
                 buff_strength: 0.9,
+                block_strength: 0.7,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/sword/longsword.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.0,
                 buff_strength: 1.0,
+			    block_strength: 1.0,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/sword/ornate.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.5,
                 buff_strength: 0.8,
+                block_strength: 0.8,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/sword/sabre.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.1,
                 buff_strength: 0.8,
+                block_strength: 1.1,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/sword/sawblade.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.9,
                 energy_efficiency: 0.8,
                 buff_strength: 1.4,
+                block_strength: 0.9,
             ),
             hand_restriction: None,
             weapon_name: HandednessDependent(

assets/common/items/modular/weapon/primary/sword/zweihander.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.3,
                 energy_efficiency: 0.9,
                 buff_strength: 0.8,
+                block_strength: 1.2,
             ),
             hand_restriction: Some(Two),
             weapon_name: Universal("Zweihander"),

assets/common/items/modular/weapon/secondary/axe/long.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.1,
                 energy_efficiency: 0.9,
                 buff_strength: 1.1,
+                block_strength: 1.2,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/axe/medium.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.9,
                 buff_strength: 1.0,
+			    block_strength: 1.0,
             ),
             hand_restriction: None,
         )

assets/common/items/modular/weapon/secondary/axe/short.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.9,
                 energy_efficiency: 1.1,
                 buff_strength: 0.9,
+                block_strength: 0.8,
             ),
             hand_restriction: Some(One),
         )

assets/common/items/modular/weapon/secondary/bow/long.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.2,
                 energy_efficiency: 0.9,
                 buff_strength: 1.1,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/bow/medium.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.0,
                 buff_strength: 1.0,
+			    block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/bow/short.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.85,
                 energy_efficiency: 1.1,
                 buff_strength: 0.9,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/hammer/long.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.2,
                 energy_efficiency: 0.9,
                 buff_strength: 1.1,
+                block_strength: 1.2,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/hammer/medium.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 0.9,
                 buff_strength: 1.0,
+			    block_strength: 1.0,
             ),
             hand_restriction: None,
         )

assets/common/items/modular/weapon/secondary/hammer/short.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.85,
                 energy_efficiency: 1.1,
                 buff_strength: 0.9,
+                block_strength: 0.8,
             ),
             hand_restriction: Some(One),
         )

assets/common/items/modular/weapon/secondary/sceptre/heavy.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.2,
                 energy_efficiency: 0.9,
                 buff_strength: 1.1,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/sceptre/light.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.85,
                 energy_efficiency: 1.1,
                 buff_strength: 0.9,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/sceptre/medium.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.0,
                 buff_strength: 1.0,
+			    block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/staff/heavy.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.2,
                 energy_efficiency: 0.9,
                 buff_strength: 1.1,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/staff/light.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.85,
                 energy_efficiency: 1.1,
                 buff_strength: 0.9,
+                block_strength: 0.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/staff/medium.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.0,
                 buff_strength: 1.0,
+			    block_strength: 1.0,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/sword/long.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.1,
                 energy_efficiency: 0.9,
                 buff_strength: 1.1,
+                block_strength: 1.2,
             ),
             hand_restriction: Some(Two),
         )

assets/common/items/modular/weapon/secondary/sword/medium.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 1.0,
                 energy_efficiency: 1.0,
                 buff_strength: 1.0,
+			    block_strength: 1.2,
             ),
             hand_restriction: None,
         )

assets/common/items/modular/weapon/secondary/sword/short.ron

@@ -12,6 +12,7 @@ ItemDef(
                 range: 0.9,
                 energy_efficiency: 1.1,
                 buff_strength: 0.9,
+                block_strength: 1.2,
             ),
             hand_restriction: Some(One),
         )

assets/common/items/npc_weapons/axe/gigas_frost_axe.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 1.0,
         ),
     )),
     quality: Legendary,

assets/common/items/npc_weapons/axe/minotaur_axe.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Legendary,

assets/common/items/npc_weapons/axe/oni_blue_axe.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 1.8,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/adlet/hunter.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 1.0,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/adlet/icepicker.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/adlet/tracker.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/boreal/bow.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Epic,

assets/common/items/npc_weapons/biped_small/boreal/hammer.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 1.0,
         ),
     )),
     quality: Epic,

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

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Low,

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

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Low,

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

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 1.0,
         ),
     )),
     quality: Low,

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

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.5,
         ),
     )),
     quality: Low,

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

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Low,

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

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Low,

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

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/haniwa/archer.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Moderate,

assets/common/items/npc_weapons/biped_small/haniwa/guard.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 1.0,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/haniwa/soldier.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 1.0,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/mandragora.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/myrmidon/hoplite.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 3.2,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/myrmidon/marksman.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Moderate,

assets/common/items/npc_weapons/biped_small/myrmidon/strategian.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 3.2,
         ),
     )),
     quality: Low,

assets/common/items/npc_weapons/biped_small/sahagin/sniper.ron

@@ -12,6 +12,7 @@ ItemDef(
             range: 1.0,
             energy_efficiency: 1.0,
             buff_strength: 1.0,
+			block_strength: 0.0,
         ),
     )),
     quality: Moderate,