diff --git a/CHANGELOG.md b/CHANGELOG.md index 43a0609889..e1cf9e0971 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Cliffs on steep slopes - Giant tree sites - Reset button for graphics settings +- Gave weapons critical strike {chance, multiplier} stats ### Changed diff --git a/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron b/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron index 72354697ca..6200893a42 100644 --- a/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron +++ b/assets/common/items/crafting_ing/modular/damage/sword/metal_blade.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.75, speed: 0.0, + crit_chance: 0.1, + crit_mult: 1.0 ), )), quality: Common, diff --git a/assets/common/items/debug/admin_stick.ron b/assets/common/items/debug/admin_stick.ron index b2b941c85f..00198771d0 100644 --- a/assets/common/items/debug/admin_stick.ron +++ b/assets/common/items/debug/admin_stick.ron @@ -9,7 +9,9 @@ ItemDef( equip_time_secs: 0.0, power: 1.00, poise_strength: 1.00, - speed: 1.0 + speed: 1.0, + crit_chance: 0.0, + crit_mult: 0.0, )), ) ), diff --git a/assets/common/items/debug/admin_sword.ron b/assets/common/items/debug/admin_sword.ron index dfe65e228f..26bb8050da 100644 --- a/assets/common/items/debug/admin_sword.ron +++ b/assets/common/items/debug/admin_sword.ron @@ -9,7 +9,9 @@ ItemDef( equip_time_secs: 0.0, power: 1000.0, poise_strength: 1000.0, - speed: 1.0 + speed: 1.0, + crit_chance: 0.5, + crit_mult: 2.0, )), ) ), diff --git a/assets/common/items/npc_weapons/axe/minotaur_axe.ron b/assets/common/items/npc_weapons/axe/minotaur_axe.ron index 77cbccee25..1d5e7958e3 100644 --- a/assets/common/items/npc_weapons/axe/minotaur_axe.ron +++ b/assets/common/items/npc_weapons/axe/minotaur_axe.ron @@ -1,18 +1,18 @@ ItemDef( name: "Minotaur Axe", description: "Placeholder", - kind: Tool( - ( - kind: AxeSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.8, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: AxeSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.8, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron index e2f537f4b0..9081f4ed4b 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron @@ -1,18 +1,18 @@ ItemDef( name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", - kind: Tool( - ( - kind: Bow, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 0.7, - poise_strength: 0.8, - speed: 0.3 - )), - ) - ), + description: "Strips of leather are wrapped around the handle.", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 0.7, + poise_strength: 0.8, + speed: 0.3, + crit_chance: 0.07, + crit_mult: 1.7, + )), + )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron index be0e40f4b9..338e0f940a 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron @@ -1,18 +1,18 @@ ItemDef( name: "Gnoll Staff", description: "eekum bokum", - kind: Tool( - ( - kind: StaffSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 0.7, - poise_strength: 0.8, - speed: 0.5 - )), - ) - ), + kind: Tool(( + kind: StaffSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 0.7, + poise_strength: 0.8, + speed: 0.5, + crit_chance: 0.07, + crit_mult: 1.7, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron index c78851f595..e98c715f88 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron @@ -1,18 +1,18 @@ ItemDef( name: "Wooden Spear", description: "Testing", - kind: Tool( - ( - kind: Spear, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 0.7, - poise_strength: 0.8, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: Spear, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 0.7, + poise_strength: 0.8, + speed: 1.0, + crit_chance: 0.07, + crit_mult: 1.7, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron index 3df2fb30dd..f2e5c26bc4 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron @@ -1,18 +1,18 @@ ItemDef( name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", - kind: Tool( - ( - kind: Bow, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 0.3, - poise_strength: 0.8, - speed: 0.7 - )), - ) - ), + description: "Strips of leather are wrapped around the handle.", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 0.3, + poise_strength: 0.8, + speed: 0.7, + crit_chance: 0.03, + crit_mult: 1.3, + )), + )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron index 08a3b00d26..e6c62734ec 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron @@ -1,18 +1,18 @@ ItemDef( name: "Gnoll Staff", description: "eekum bokum", - kind: Tool( - ( - kind: StaffSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 0.3, - poise_strength: 0.8, - speed: 0.8 - )), - ) - ), + kind: Tool(( + kind: StaffSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 0.3, + poise_strength: 0.8, + speed: 0.8, + crit_chance: 0.03, + crit_mult: 1.3, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron index 158f71e428..30323d8bb7 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron @@ -1,18 +1,18 @@ ItemDef( name: "Wooden Spear", description: "Testing", - kind: Tool( - ( - kind: Spear, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 0.3, - poise_strength: 0.8, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: Spear, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 0.3, + poise_strength: 0.8, + speed: 1.0, + crit_chance: 0.03, + crit_mult: 1.3, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron index 67754213a2..e8994becb3 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron @@ -1,16 +1,18 @@ ItemDef( name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", + description: "Strips of leather are wrapped around the handle.", kind: Tool(( - kind: Bow, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.6, - poise_strength: 0.8, - speed: 0.3 + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.6, + poise_strength: 0.8, + speed: 0.3, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron index df4b020848..1375df8ed8 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron @@ -2,15 +2,17 @@ ItemDef( name: "Gnoll Staff", description: "eekum bokum", kind: Tool(( - kind: StaffSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.8, - poise_strength: 0.8, - speed: 0.6 + kind: StaffSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.8, + poise_strength: 0.8, + speed: 0.6, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron index 73d2c47314..c445e43afb 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron @@ -2,15 +2,17 @@ ItemDef( name: "Wooden Spear", description: "Testing", kind: Tool(( - kind: Spear, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.4, - poise_strength: 0.8, - speed: 1.0 + kind: Spear, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.4, + poise_strength: 0.8, + speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron index fa41ece35a..b370bf9f2d 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron @@ -1,18 +1,18 @@ ItemDef( name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", - kind: Tool( - ( - kind: Bow, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.1, - poise_strength: 0.8, - speed: 0.5 - )), - ) - ), + description: "Strips of leather are wrapped around the handle.", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.1, + poise_strength: 0.8, + speed: 0.5, + crit_chance: 0.11, + crit_mult: 2.1, + )), + )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron index 68beef20b4..80feea3d29 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron @@ -1,18 +1,18 @@ ItemDef( name: "Gnoll Staff", description: "eekum bokum", - kind: Tool( - ( - kind: StaffSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.7, - poise_strength: 0.8, - speed: 0.7 - )), - ) - ), + kind: Tool(( + kind: StaffSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.7, + poise_strength: 0.8, + speed: 0.7, + crit_chance: 0.17, + crit_mult: 2.7, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron index 06463a5231..865938fe77 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron @@ -1,18 +1,18 @@ ItemDef( name: "Wooden Spear", description: "Testing", - kind: Tool( - ( - kind: Spear, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.7, - poise_strength: 0.8, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: Spear, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.7, + poise_strength: 0.8, + speed: 1.0, + crit_chance: 0.17, + crit_mult: 2.7, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron index 38ba184f05..5134bac2a8 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron @@ -1,18 +1,18 @@ ItemDef( name: "Adlet Bow", - description: "Strips of leather are wrapped around the handle.", - kind: Tool( - ( - kind: Bow, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.1, - poise_strength: 0.8, - speed: 0.3 - )), - ) - ), + description: "Strips of leather are wrapped around the handle.", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.1, + poise_strength: 0.8, + speed: 0.3, + crit_chance: 0.11, + crit_mult: 2.1, + )), + )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron index 766a9ee68f..c0a779960c 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron @@ -1,18 +1,18 @@ ItemDef( name: "Gnoll Staff", description: "eekum bokum", - kind: Tool( - ( - kind: StaffSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.1, - poise_strength: 0.8, - speed: 0.8 - )), - ) - ), + kind: Tool(( + kind: StaffSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.1, + poise_strength: 0.8, + speed: 0.8, + crit_chance: 0.11, + crit_mult: 2.1, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron index af201c4dba..55838e0cc1 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron @@ -1,18 +1,18 @@ ItemDef( name: "Wooden Spear", description: "Testing", - kind: Tool( - ( - kind: Spear, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 1.1, - poise_strength: 0.8, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: Spear, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 1.1, + poise_strength: 0.8, + speed: 1.0, + crit_chance: 0.11, + crit_mult: 2.1, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/bow/saurok_bow.ron b/assets/common/items/npc_weapons/bow/saurok_bow.ron index 77c81426bd..4d19f426e3 100644 --- a/assets/common/items/npc_weapons/bow/saurok_bow.ron +++ b/assets/common/items/npc_weapons/bow/saurok_bow.ron @@ -1,18 +1,18 @@ ItemDef( name: "Saurok bow", description: "Placeholder", - kind: Tool( - ( - kind: BowSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: BowSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron index 8ef9112c84..f69500807c 100644 --- a/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/cyclops_hammer.ron @@ -1,18 +1,18 @@ ItemDef( name: "Cyclops Hammer", description: "Placeholder", - kind: Tool( - ( - kind: HammerSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: HammerSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron index 8c90236706..0f5c66a4d2 100644 --- a/assets/common/items/npc_weapons/hammer/harvester_scythe.ron +++ b/assets/common/items/npc_weapons/hammer/harvester_scythe.ron @@ -1,18 +1,18 @@ ItemDef( name: "Harvester Sythe", description: "Placeholder", - kind: Tool( - ( - kind: HammerSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.001, - power: 1.6, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: HammerSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.001, + power: 1.6, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron index e868ef4be5..db88ec3cf6 100644 --- a/assets/common/items/npc_weapons/hammer/ogre_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/ogre_hammer.ron @@ -1,18 +1,18 @@ ItemDef( name: "Ogre Hammer", description: "Placeholder", - kind: Tool( - ( - kind: HammerSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: HammerSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/hammer/troll_hammer.ron b/assets/common/items/npc_weapons/hammer/troll_hammer.ron index 96c885dac1..b36fa78b58 100644 --- a/assets/common/items/npc_weapons/hammer/troll_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/troll_hammer.ron @@ -1,18 +1,18 @@ ItemDef( name: "Troll Hammer", description: "Placeholder", - kind: Tool( - ( - kind: HammerSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: HammerSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron index fce40ec088..29d99d0f0e 100644 --- a/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/wendigo_hammer.ron @@ -1,18 +1,18 @@ ItemDef( name: "Wendigo Hammer", description: "Placeholder", - kind: Tool( - ( - kind: Hammer, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: Hammer, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron index 4a877e41ba..22523a1245 100644 --- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron @@ -1,18 +1,18 @@ ItemDef( name: "Yeti Hammer", description: "Placeholder", - kind: Tool( - ( - kind: HammerSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.0, - power: 2.0, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: HammerSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.0, + power: 2.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron index 4ba9ac21f2..5c385e5dc2 100644 --- a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -1,18 +1,18 @@ ItemDef( name: "Mindflayer Staff", description: "Placeholder", - kind: Tool( - ( - kind: StaffSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.001, - power: 3.0, - poise_strength: 1.00, - speed: 1.5, - )), - ) - ), + kind: Tool(( + kind: StaffSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.001, + power: 3.0, + poise_strength: 1.0, + speed: 1.5, + crit_chance: 0.3, + crit_mult: 4.0, + )), + )), quality: Legendary, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/staff/ogre_staff.ron b/assets/common/items/npc_weapons/staff/ogre_staff.ron index 4c67432d3a..f446275517 100644 --- a/assets/common/items/npc_weapons/staff/ogre_staff.ron +++ b/assets/common/items/npc_weapons/staff/ogre_staff.ron @@ -1,18 +1,18 @@ ItemDef( name: "Ogre Staff", description: "Placeholder", - kind: Tool( - ( - kind: StaffSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: StaffSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/staff/saurok_staff.ron b/assets/common/items/npc_weapons/staff/saurok_staff.ron index 71550581e1..188ccb2d72 100644 --- a/assets/common/items/npc_weapons/staff/saurok_staff.ron +++ b/assets/common/items/npc_weapons/staff/saurok_staff.ron @@ -1,18 +1,18 @@ ItemDef( name: "Saurok Staff", description: "Placeholder", - kind: Tool( - ( - kind: StaffSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: StaffSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/sword/dullahan_sword.ron b/assets/common/items/npc_weapons/sword/dullahan_sword.ron index 68b6215c32..d35214ddae 100644 --- a/assets/common/items/npc_weapons/sword/dullahan_sword.ron +++ b/assets/common/items/npc_weapons/sword/dullahan_sword.ron @@ -1,18 +1,18 @@ ItemDef( name: "Dullahan Sword", description: "Placehoder", - kind: Tool( - ( - kind: SwordSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: SwordSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/sword/saurok_sword.ron b/assets/common/items/npc_weapons/sword/saurok_sword.ron index 66357e54ff..51fdf58dc6 100644 --- a/assets/common/items/npc_weapons/sword/saurok_sword.ron +++ b/assets/common/items/npc_weapons/sword/saurok_sword.ron @@ -1,18 +1,18 @@ ItemDef( name: "Saurok Sword", description: "Placehoder", - kind: Tool( - ( - kind: SwordSimple, - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: SwordSimple, + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/beast_claws.ron b/assets/common/items/npc_weapons/unique/beast_claws.ron index 4caf610525..f21a8f6dd9 100644 --- a/assets/common/items/npc_weapons/unique/beast_claws.ron +++ b/assets/common/items/npc_weapons/unique/beast_claws.ron @@ -1,18 +1,18 @@ ItemDef( name: "Beast Claws", description: "Was attached to a beast.", - kind: Tool( - ( - kind: Unique(BeastClaws), - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0, - )), - ) - ), + kind: Tool(( + kind: Unique(BeastClaws), + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadlowbasic.ron b/assets/common/items/npc_weapons/unique/quadlowbasic.ron index 768e0918bf..0a5d4bd361 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbasic.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Low Basic", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadLowBasic), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadLowBasic), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron index eadd6b0c51..3574a0cb75 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Small Beam", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadLowBeam), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadLowBeam), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron index e74df8d23e..b258a13ac2 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadlowbreathe.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Low Breathe", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadLowBreathe), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadLowBreathe), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadlowquick.ron b/assets/common/items/npc_weapons/unique/quadlowquick.ron index 7b53cfd239..fcb54637b3 100644 --- a/assets/common/items/npc_weapons/unique/quadlowquick.ron +++ b/assets/common/items/npc_weapons/unique/quadlowquick.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Low Quick", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadLowQuick), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadLowQuick), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/quadlowranged.ron index 5aeb436b71..bf5ee1c718 100644 --- a/assets/common/items/npc_weapons/unique/quadlowranged.ron +++ b/assets/common/items/npc_weapons/unique/quadlowranged.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Low Ranged", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadLowRanged), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadLowRanged), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadlowtail.ron b/assets/common/items/npc_weapons/unique/quadlowtail.ron index d15f0bc5cd..5fae64e560 100644 --- a/assets/common/items/npc_weapons/unique/quadlowtail.ron +++ b/assets/common/items/npc_weapons/unique/quadlowtail.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Low Tail", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadLowTail), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadLowTail), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadmedbasic.ron b/assets/common/items/npc_weapons/unique/quadmedbasic.ron index ab8e4a663c..46b5b1e69c 100644 --- a/assets/common/items/npc_weapons/unique/quadmedbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadmedbasic.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Med Basic", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadMedBasic), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadMedBasic), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadmedcharge.ron b/assets/common/items/npc_weapons/unique/quadmedcharge.ron index 924680916d..5a4595ec40 100644 --- a/assets/common/items/npc_weapons/unique/quadmedcharge.ron +++ b/assets/common/items/npc_weapons/unique/quadmedcharge.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Med Charge", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadMedCharge), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadMedCharge), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadmedhoof.ron index acabf52056..052c3e457a 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadmedhoof.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Med Hoof", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadMedHoof), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadMedHoof), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadmedjump.ron b/assets/common/items/npc_weapons/unique/quadmedjump.ron index e03942f132..9b006f3326 100644 --- a/assets/common/items/npc_weapons/unique/quadmedjump.ron +++ b/assets/common/items/npc_weapons/unique/quadmedjump.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Med Jump", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadMedJump), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.0, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadMedJump), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadmedquick.ron b/assets/common/items/npc_weapons/unique/quadmedquick.ron index b900cebbbd..0670ac21e7 100644 --- a/assets/common/items/npc_weapons/unique/quadmedquick.ron +++ b/assets/common/items/npc_weapons/unique/quadmedquick.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Med Quick", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadMedQuick), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.0, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadMedQuick), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index 180578c447..a9e0df0810 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -1,18 +1,18 @@ ItemDef( name: "Quad Small Basic", description: "testing123", - kind: Tool( - ( - kind: Unique(QuadSmallBasic), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(QuadSmallBasic), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron index bedb130b8b..6ce8afd553 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -1,18 +1,18 @@ ItemDef( name: "Stone Golem's Fist", description: "Was attached to a mighty stone golem.", - kind: Tool( - ( - kind: Unique(StoneGolemFist), - hands: Two, - stats: Direct(( - equip_time_secs: 0.001, - power: 1.00, - poise_strength: 1.00, - speed: 1.0 - )), - ) - ), + kind: Tool(( + kind: Unique(StoneGolemFist), + hands: Two, + stats: Direct(( + equip_time_secs: 0.001, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/theropodbasic.ron b/assets/common/items/npc_weapons/unique/theropodbasic.ron index 7dc980852a..dc48bf87d4 100644 --- a/assets/common/items/npc_weapons/unique/theropodbasic.ron +++ b/assets/common/items/npc_weapons/unique/theropodbasic.ron @@ -1,18 +1,18 @@ ItemDef( name: "Theropod Basic", description: "testing123", - kind: Tool( - ( - kind: Unique(TheropodBasic), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(TheropodBasic), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/theropodbird.ron b/assets/common/items/npc_weapons/unique/theropodbird.ron index f51fe4ac09..dd66342ca2 100644 --- a/assets/common/items/npc_weapons/unique/theropodbird.ron +++ b/assets/common/items/npc_weapons/unique/theropodbird.ron @@ -1,18 +1,18 @@ ItemDef( name: "Theropod Bird", description: "testing123", - kind: Tool( - ( - kind: Unique(TheropodBird), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(TheropodBird), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron index 08343ecaa9..542fe0bbfb 100644 --- a/assets/common/items/npc_weapons/unique/tidal_claws.ron +++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron @@ -1,18 +1,18 @@ ItemDef( name: "Tidal Claws", description: "Snip snap", - kind: Tool( - ( - kind: Unique(TidalClaws), - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0, - )), - ) - ), + kind: Tool(( + kind: Unique(TidalClaws), + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/turret.ron b/assets/common/items/npc_weapons/unique/turret.ron index 6e3ba66261..e7a58652b6 100644 --- a/assets/common/items/npc_weapons/unique/turret.ron +++ b/assets/common/items/npc_weapons/unique/turret.ron @@ -1,18 +1,18 @@ ItemDef( name: "Turret", description: "Turret weapon", - kind: Tool( - ( - kind: Unique(ObjectTurret), - hands: Two, - stats: Direct(( - equip_time_secs: 0.01, - power: 1.00, - poise_strength: 1.00, - speed: 1.00, - )), - ) - ), + kind: Tool(( + kind: Unique(ObjectTurret), + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron index e957eb5e5a..bf6293ea14 100644 --- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron +++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron @@ -1,18 +1,18 @@ ItemDef( name: "Wendigo Magic", description: "spook.", - kind: Tool( - ( - kind: Unique(WendigoMagic), - hands: Two, - stats: Direct(( - equip_time_secs: 0.5, - power: 1.00, - poise_strength: 1.00, - speed: 1.0, - )), - ) - ), + kind: Tool(( + kind: Unique(WendigoMagic), + hands: Two, + stats: Direct(( + equip_time_secs: 0.5, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, + )), + )), quality: Low, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron index d3b190e36b..a659d71c27 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-0.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron index 238cc66874..fa783e2453 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-1.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-1.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Executioner\'s Axe", + name: "Executioner's Axe", description: "Dark rituals call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe thirsts for future kills.", kind: Tool(( kind: Axe, @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.8, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index ca5e855ab6..1c6136a49d 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.8, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/bronze_axe-0.ron b/assets/common/items/weapons/axe/bronze_axe-0.ron index 71967f169c..b0e937ef83 100644 --- a/assets/common/items/weapons/axe/bronze_axe-0.ron +++ b/assets/common/items/weapons/axe/bronze_axe-0.ron @@ -9,8 +9,10 @@ ItemDef( power: 1.0, poise_strength: 0.9, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index de8bbd4ffd..b066651c20 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/assets/common/items/weapons/axe/bronze_axe-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron index 29668fee4b..24216f1cc5 100644 --- a/assets/common/items/weapons/axe/bronze_axe-2.ron +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/cobalt_axe-0.ron b/assets/common/items/weapons/axe/cobalt_axe-0.ron index 078ad75ea9..080756691c 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-0.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/cobalt_axe-1.ron b/assets/common/items/weapons/axe/cobalt_axe-1.ron index 400b24fbc5..d74eb8144f 100644 --- a/assets/common/items/weapons/axe/cobalt_axe-1.ron +++ b/assets/common/items/weapons/axe/cobalt_axe-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/axe/iron_axe-0.ron b/assets/common/items/weapons/axe/iron_axe-0.ron index 6f2b392951..0422251211 100644 --- a/assets/common/items/weapons/axe/iron_axe-0.ron +++ b/assets/common/items/weapons/axe/iron_axe-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.7, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-1.ron b/assets/common/items/weapons/axe/iron_axe-1.ron index 30a2a3e3ff..aa3c778ca0 100644 --- a/assets/common/items/weapons/axe/iron_axe-1.ron +++ b/assets/common/items/weapons/axe/iron_axe-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-2.ron b/assets/common/items/weapons/axe/iron_axe-2.ron index 1bada4e0d2..803958be07 100644 --- a/assets/common/items/weapons/axe/iron_axe-2.ron +++ b/assets/common/items/weapons/axe/iron_axe-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.1, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-3.ron b/assets/common/items/weapons/axe/iron_axe-3.ron index 058a44168f..beb03f1fe7 100644 --- a/assets/common/items/weapons/axe/iron_axe-3.ron +++ b/assets/common/items/weapons/axe/iron_axe-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.6, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-4.ron b/assets/common/items/weapons/axe/iron_axe-4.ron index 3047c53e7b..d20eceb135 100644 --- a/assets/common/items/weapons/axe/iron_axe-4.ron +++ b/assets/common/items/weapons/axe/iron_axe-4.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Butcher\'s Axe", + name: "Butcher's Axe", description: "This axe has a heavy iron head used to cleave nearly anything.", kind: Tool(( kind: Axe, @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-5.ron b/assets/common/items/weapons/axe/iron_axe-5.ron index c6ce58abc0..64fd5cf64c 100644 --- a/assets/common/items/weapons/axe/iron_axe-5.ron +++ b/assets/common/items/weapons/axe/iron_axe-5.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Barbarian\'s Axe", + name: "Barbarian's Axe", description: "While heavy, this iron forged axe is quite easy to swing, at least for those with the muscle backing it.", kind: Tool(( kind: Axe, @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.8, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-6.ron b/assets/common/items/weapons/axe/iron_axe-6.ron index 1b5d841ba8..9b6e22ea61 100644 --- a/assets/common/items/weapons/axe/iron_axe-6.ron +++ b/assets/common/items/weapons/axe/iron_axe-6.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.3, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-7.ron b/assets/common/items/weapons/axe/iron_axe-7.ron index 98647e199d..a0cc4877b7 100644 --- a/assets/common/items/weapons/axe/iron_axe-7.ron +++ b/assets/common/items/weapons/axe/iron_axe-7.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.6, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-8.ron b/assets/common/items/weapons/axe/iron_axe-8.ron index a27df5896e..67ba1a6b89 100644 --- a/assets/common/items/weapons/axe/iron_axe-8.ron +++ b/assets/common/items/weapons/axe/iron_axe-8.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.6, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/iron_axe-9.ron b/assets/common/items/weapons/axe/iron_axe-9.ron index d3557a3ccc..e264ab9c69 100644 --- a/assets/common/items/weapons/axe/iron_axe-9.ron +++ b/assets/common/items/weapons/axe/iron_axe-9.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.3, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/malachite_axe-0.ron b/assets/common/items/weapons/axe/malachite_axe-0.ron index 84d3d61484..44b5e2e110 100644 --- a/assets/common/items/weapons/axe/malachite_axe-0.ron +++ b/assets/common/items/weapons/axe/malachite_axe-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.1, speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/axe/orc_axe-0.ron b/assets/common/items/weapons/axe/orc_axe-0.ron index bfeb68447f..652d991614 100644 --- a/assets/common/items/weapons/axe/orc_axe-0.ron +++ b/assets/common/items/weapons/axe/orc_axe-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.6, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.06, + crit_mult: 1.6, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron index 1cf59e80ea..2617dc7995 100644 --- a/assets/common/items/weapons/axe/parashu.ron +++ b/assets/common/items/weapons/axe/parashu.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.5, poise_strength: 1.8, speed: 0.8, + crit_chance: 0.25, + crit_mult: 3.5, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/axe/starter_axe.ron b/assets/common/items/weapons/axe/starter_axe.ron index e4a4673db3..5fba0400c0 100644 --- a/assets/common/items/weapons/axe/starter_axe.ron +++ b/assets/common/items/weapons/axe/starter_axe.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 2.0, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/steel_axe-0.ron b/assets/common/items/weapons/axe/steel_axe-0.ron index 87344996cf..25556e8aaf 100644 --- a/assets/common/items/weapons/axe/steel_axe-0.ron +++ b/assets/common/items/weapons/axe/steel_axe-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.2, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-1.ron b/assets/common/items/weapons/axe/steel_axe-1.ron index 8f1cca27f9..0218a22ecd 100644 --- a/assets/common/items/weapons/axe/steel_axe-1.ron +++ b/assets/common/items/weapons/axe/steel_axe-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.2, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-2.ron b/assets/common/items/weapons/axe/steel_axe-2.ron index 0348a9e350..34e7c01f3b 100644 --- a/assets/common/items/weapons/axe/steel_axe-2.ron +++ b/assets/common/items/weapons/axe/steel_axe-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.2, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-3.ron b/assets/common/items/weapons/axe/steel_axe-3.ron index 7e8a341104..1d0a477590 100644 --- a/assets/common/items/weapons/axe/steel_axe-3.ron +++ b/assets/common/items/weapons/axe/steel_axe-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.1, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-4.ron b/assets/common/items/weapons/axe/steel_axe-4.ron index 3e5136d64a..d85d271adc 100644 --- a/assets/common/items/weapons/axe/steel_axe-4.ron +++ b/assets/common/items/weapons/axe/steel_axe-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.2, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-5.ron b/assets/common/items/weapons/axe/steel_axe-5.ron index 2d7566f456..dd0db1af56 100644 --- a/assets/common/items/weapons/axe/steel_axe-5.ron +++ b/assets/common/items/weapons/axe/steel_axe-5.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/steel_axe-6.ron b/assets/common/items/weapons/axe/steel_axe-6.ron index 34c0fc31bc..750e215cef 100644 --- a/assets/common/items/weapons/axe/steel_axe-6.ron +++ b/assets/common/items/weapons/axe/steel_axe-6.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-0.ron b/assets/common/items/weapons/axe/worn_iron_axe-0.ron index 9e027c662f..2df151ac96 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-0.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-0.ron @@ -1,6 +1,6 @@ ItemDef( name: "Worn Dwarven Axe", - description: "Rough cut axe of dwarven origin, it\'s very old, but still usable.", + description: "Rough cut axe of dwarven origin, it's very old, but still usable.", kind: Tool(( kind: Axe, hands: Two, @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-1.ron b/assets/common/items/weapons/axe/worn_iron_axe-1.ron index 17d519780c..a5071f82b4 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-1.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-2.ron b/assets/common/items/weapons/axe/worn_iron_axe-2.ron index 0e8e1144c3..07d5f2c09a 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-2.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-2.ron @@ -1,6 +1,6 @@ ItemDef( name: "Worn Human Axe", - description: "There\'s nothing too remarkable about this old axe.", + description: "There's nothing too remarkable about this old axe.", kind: Tool(( kind: Axe, hands: Two, @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 0.7, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-3.ron b/assets/common/items/weapons/axe/worn_iron_axe-3.ron index 43fb5038f8..f6ac022cdc 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-3.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 1.1, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe/worn_iron_axe-4.ron b/assets/common/items/weapons/axe/worn_iron_axe-4.ron index dfacdeb712..0ca7a7156a 100644 --- a/assets/common/items/weapons/axe/worn_iron_axe-4.ron +++ b/assets/common/items/weapons/axe/worn_iron_axe-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 0.5, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron index 70ff3a9b5d..4830dd8572 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 1.0, speed: 1.3, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron index b59fb0ffb0..3c64051f50 100644 --- a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/bronze-0.ron b/assets/common/items/weapons/axe_1h/bronze-0.ron index 06351719d2..edf585b5df 100644 --- a/assets/common/items/weapons/axe_1h/bronze-0.ron +++ b/assets/common/items/weapons/axe_1h/bronze-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/bronze-1.ron b/assets/common/items/weapons/axe_1h/bronze-1.ron index ce14319f19..aff9ac53b1 100644 --- a/assets/common/items/weapons/axe_1h/bronze-1.ron +++ b/assets/common/items/weapons/axe_1h/bronze-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.1, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.11, + crit_mult: 2.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/cobalt-0.ron b/assets/common/items/weapons/axe_1h/cobalt-0.ron index ce6689c37e..9bc94617bb 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-0.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/cobalt-1.ron b/assets/common/items/weapons/axe_1h/cobalt-1.ron index 3939e9cc8d..20f276924b 100644 --- a/assets/common/items/weapons/axe_1h/cobalt-1.ron +++ b/assets/common/items/weapons/axe_1h/cobalt-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.75, poise_strength: 1.0, speed: 0.85, + crit_chance: 0.17, + crit_mult: 2.75, )), )), quality: High, diff --git a/assets/common/items/weapons/axe_1h/iron-0.ron b/assets/common/items/weapons/axe_1h/iron-0.ron index a7258ea723..4b5649b754 100644 --- a/assets/common/items/weapons/axe_1h/iron-0.ron +++ b/assets/common/items/weapons/axe_1h/iron-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.1, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.11, + crit_mult: 2.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-1.ron b/assets/common/items/weapons/axe_1h/iron-1.ron index 4689926048..82cd5d61d8 100644 --- a/assets/common/items/weapons/axe_1h/iron-1.ron +++ b/assets/common/items/weapons/axe_1h/iron-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.3, poise_strength: 1.0, speed: 0.9, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-2.ron b/assets/common/items/weapons/axe_1h/iron-2.ron index 0499fb11b1..fcae2f8184 100644 --- a/assets/common/items/weapons/axe_1h/iron-2.ron +++ b/assets/common/items/weapons/axe_1h/iron-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.2, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/iron-3.ron b/assets/common/items/weapons/axe_1h/iron-3.ron index 96a4e172f0..01b0f424ce 100644 --- a/assets/common/items/weapons/axe_1h/iron-3.ron +++ b/assets/common/items/weapons/axe_1h/iron-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/orichalcum-0.ron b/assets/common/items/weapons/axe_1h/orichalcum-0.ron index 78fdfd1a00..6e2b3b2e9c 100644 --- a/assets/common/items/weapons/axe_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/axe_1h/orichalcum-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/axe_1h/steel-0.ron b/assets/common/items/weapons/axe_1h/steel-0.ron index aead5494d2..80074cae73 100644 --- a/assets/common/items/weapons/axe_1h/steel-0.ron +++ b/assets/common/items/weapons/axe_1h/steel-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 1.0, speed: 0.9, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/steel-1.ron b/assets/common/items/weapons/axe_1h/steel-1.ron index 5660bfd7a5..14ae0513cd 100644 --- a/assets/common/items/weapons/axe_1h/steel-1.ron +++ b/assets/common/items/weapons/axe_1h/steel-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/steel-2.ron b/assets/common/items/weapons/axe_1h/steel-2.ron index ae3fe6aee7..aebbe49327 100644 --- a/assets/common/items/weapons/axe_1h/steel-2.ron +++ b/assets/common/items/weapons/axe_1h/steel-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.3, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/axe_1h/stone-0.ron b/assets/common/items/weapons/axe_1h/stone-0.ron index 9ddc75c43b..9b18fc7853 100644 --- a/assets/common/items/weapons/axe_1h/stone-0.ron +++ b/assets/common/items/weapons/axe_1h/stone-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Common, diff --git a/assets/common/items/weapons/axe_1h/stone-1.ron b/assets/common/items/weapons/axe_1h/stone-1.ron index 188bbc5d8b..7fc8322a60 100644 --- a/assets/common/items/weapons/axe_1h/stone-1.ron +++ b/assets/common/items/weapons/axe_1h/stone-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.7, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.07, + crit_mult: 1.7, )), )), quality: Common, diff --git a/assets/common/items/weapons/axe_1h/wood-0.ron b/assets/common/items/weapons/axe_1h/wood-0.ron index 9027152dee..2b65dcaeb6 100644 --- a/assets/common/items/weapons/axe_1h/wood-0.ron +++ b/assets/common/items/weapons/axe_1h/wood-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/axe_1h/wood-1.ron b/assets/common/items/weapons/axe_1h/wood-1.ron index e4a368130a..5d8a1419d0 100644 --- a/assets/common/items/weapons/axe_1h/wood-1.ron +++ b/assets/common/items/weapons/axe_1h/wood-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/bone-0.ron b/assets/common/items/weapons/bow/bone-0.ron index df7cb62bf0..b3ca9c7fc5 100644 --- a/assets/common/items/weapons/bow/bone-0.ron +++ b/assets/common/items/weapons/bow/bone-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.9, poise_strength: 0.8, speed: 1.1, + crit_chance: 0.09, + crit_mult: 1.9, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-1.ron b/assets/common/items/weapons/bow/bone-1.ron index 62a89315fb..3bbc7e77ed 100644 --- a/assets/common/items/weapons/bow/bone-1.ron +++ b/assets/common/items/weapons/bow/bone-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.8, speed: 0.8, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-2.ron b/assets/common/items/weapons/bow/bone-2.ron index 6d93079bb1..fe9ef993e6 100644 --- a/assets/common/items/weapons/bow/bone-2.ron +++ b/assets/common/items/weapons/bow/bone-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/bone-3.ron b/assets/common/items/weapons/bow/bone-3.ron index aa2d2a5144..bd11406653 100644 --- a/assets/common/items/weapons/bow/bone-3.ron +++ b/assets/common/items/weapons/bow/bone-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.1, poise_strength: 0.8, speed: 0.9, + crit_chance: 0.11, + crit_mult: 2.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/eldwood-0.ron b/assets/common/items/weapons/bow/eldwood-0.ron index a13aade1e3..196c40f955 100644 --- a/assets/common/items/weapons/bow/eldwood-0.ron +++ b/assets/common/items/weapons/bow/eldwood-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/eldwood-1.ron b/assets/common/items/weapons/bow/eldwood-1.ron index 4a8e7953f2..224f7146d9 100644 --- a/assets/common/items/weapons/bow/eldwood-1.ron +++ b/assets/common/items/weapons/bow/eldwood-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 0.8, speed: 1.2, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/eldwood-2.ron b/assets/common/items/weapons/bow/eldwood-2.ron index de2ff7677e..ce14cf173f 100644 --- a/assets/common/items/weapons/bow/eldwood-2.ron +++ b/assets/common/items/weapons/bow/eldwood-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 0.8, speed: 0.8, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-0.ron b/assets/common/items/weapons/bow/frostwood-0.ron index a1d997137f..d090aca7ff 100644 --- a/assets/common/items/weapons/bow/frostwood-0.ron +++ b/assets/common/items/weapons/bow/frostwood-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 0.8, speed: 1.2, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-1.ron b/assets/common/items/weapons/bow/frostwood-1.ron index 0cc1eb609b..9fcbd53c3b 100644 --- a/assets/common/items/weapons/bow/frostwood-1.ron +++ b/assets/common/items/weapons/bow/frostwood-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/frostwood-2.ron b/assets/common/items/weapons/bow/frostwood-2.ron index 4dd74f9966..0ed994256c 100644 --- a/assets/common/items/weapons/bow/frostwood-2.ron +++ b/assets/common/items/weapons/bow/frostwood-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.7, poise_strength: 0.8, speed: 0.9, + crit_chance: 0.17, + crit_mult: 2.7, )), )), quality: High, diff --git a/assets/common/items/weapons/bow/hardwood-0.ron b/assets/common/items/weapons/bow/hardwood-0.ron index 14a40af6ef..2997fcceb3 100644 --- a/assets/common/items/weapons/bow/hardwood-0.ron +++ b/assets/common/items/weapons/bow/hardwood-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-1.ron b/assets/common/items/weapons/bow/hardwood-1.ron index ebe5d42ce8..d3fe14d1ad 100644 --- a/assets/common/items/weapons/bow/hardwood-1.ron +++ b/assets/common/items/weapons/bow/hardwood-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 0.8, speed: 0.8, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-2.ron b/assets/common/items/weapons/bow/hardwood-2.ron index 5835ad1c44..f9c0831a49 100644 --- a/assets/common/items/weapons/bow/hardwood-2.ron +++ b/assets/common/items/weapons/bow/hardwood-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.1, poise_strength: 0.8, speed: 1.1, + crit_chance: 0.11, + crit_mult: 2.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-3.ron b/assets/common/items/weapons/bow/hardwood-3.ron index e0f0487fe4..e5f2d92676 100644 --- a/assets/common/items/weapons/bow/hardwood-3.ron +++ b/assets/common/items/weapons/bow/hardwood-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.9, poise_strength: 0.8, speed: 1.3, + crit_chance: 0.09, + crit_mult: 1.9, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-4.ron b/assets/common/items/weapons/bow/hardwood-4.ron index 27c029e941..b60b28fff4 100644 --- a/assets/common/items/weapons/bow/hardwood-4.ron +++ b/assets/common/items/weapons/bow/hardwood-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.8, speed: 1.2, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-5.ron b/assets/common/items/weapons/bow/hardwood-5.ron index 860b179983..3428236eaf 100644 --- a/assets/common/items/weapons/bow/hardwood-5.ron +++ b/assets/common/items/weapons/bow/hardwood-5.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.3, poise_strength: 0.8, speed: 0.9, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-0.ron b/assets/common/items/weapons/bow/metal-0.ron index 5c607e3e2e..d0924d464b 100644 --- a/assets/common/items/weapons/bow/metal-0.ron +++ b/assets/common/items/weapons/bow/metal-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-1.ron b/assets/common/items/weapons/bow/metal-1.ron index a85a4b20f6..9f44bf4875 100644 --- a/assets/common/items/weapons/bow/metal-1.ron +++ b/assets/common/items/weapons/bow/metal-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.8, speed: 1.2, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-2.ron b/assets/common/items/weapons/bow/metal-2.ron index 7d6bffb67c..db107711e5 100644 --- a/assets/common/items/weapons/bow/metal-2.ron +++ b/assets/common/items/weapons/bow/metal-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.3, poise_strength: 0.8, speed: 1.1, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-3.ron b/assets/common/items/weapons/bow/metal-3.ron index 4f09dd7d61..961972a671 100644 --- a/assets/common/items/weapons/bow/metal-3.ron +++ b/assets/common/items/weapons/bow/metal-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 0.8, speed: 0.9, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/metal-4.ron b/assets/common/items/weapons/bow/metal-4.ron index 7c9a30a1f6..a249f15ed2 100644 --- a/assets/common/items/weapons/bow/metal-4.ron +++ b/assets/common/items/weapons/bow/metal-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 0.8, speed: 0.8, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/rawwood-0.ron b/assets/common/items/weapons/bow/rawwood-0.ron index f7f610e953..414693e475 100644 --- a/assets/common/items/weapons/bow/rawwood-0.ron +++ b/assets/common/items/weapons/bow/rawwood-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.7, poise_strength: 0.8, speed: 0.9, + crit_chance: 0.07, + crit_mult: 1.7, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/rawwood-1.ron b/assets/common/items/weapons/bow/rawwood-1.ron index 515a0ddc68..07260a8bc3 100644 --- a/assets/common/items/weapons/bow/rawwood-1.ron +++ b/assets/common/items/weapons/bow/rawwood-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.6, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.06, + crit_mult: 1.6, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron index 3ad0f8e0ed..527b7f375f 100644 --- a/assets/common/items/weapons/bow/sagitta.ron +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.5, poise_strength: 0.8, speed: 0.8, + crit_chance: 0.25, + crit_mult: 3.5, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/bow/starter.ron b/assets/common/items/weapons/bow/starter.ron index d46f8276a2..a33aa3c22f 100644 --- a/assets/common/items/weapons/bow/starter.ron +++ b/assets/common/items/weapons/bow/starter.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 0.3, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/velorite.ron b/assets/common/items/weapons/bow/velorite.ron index 5a69837f7e..c4d6f43d95 100644 --- a/assets/common/items/weapons/bow/velorite.ron +++ b/assets/common/items/weapons/bow/velorite.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.1, speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/bow/wood-0.ron b/assets/common/items/weapons/bow/wood-0.ron index 75435263ef..42e3153e29 100644 --- a/assets/common/items/weapons/bow/wood-0.ron +++ b/assets/common/items/weapons/bow/wood-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.9, poise_strength: 0.8, speed: 0.9, + crit_chance: 0.09, + crit_mult: 1.9, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-1.ron b/assets/common/items/weapons/bow/wood-1.ron index f356d0e402..c8552abfa0 100644 --- a/assets/common/items/weapons/bow/wood-1.ron +++ b/assets/common/items/weapons/bow/wood-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.7, poise_strength: 0.8, speed: 1.1, + crit_chance: 0.07, + crit_mult: 1.7, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-2.ron b/assets/common/items/weapons/bow/wood-2.ron index 10c65a3a40..60f06889a1 100644 --- a/assets/common/items/weapons/bow/wood-2.ron +++ b/assets/common/items/weapons/bow/wood-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-3.ron b/assets/common/items/weapons/bow/wood-3.ron index 85a000bbef..9118749788 100644 --- a/assets/common/items/weapons/bow/wood-3.ron +++ b/assets/common/items/weapons/bow/wood-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.8, speed: 0.8, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/bow/wood-4.ron b/assets/common/items/weapons/bow/wood-4.ron index fc026b0b31..e4db326f15 100644 --- a/assets/common/items/weapons/bow/wood-4.ron +++ b/assets/common/items/weapons/bow/wood-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.6, poise_strength: 0.8, speed: 1.2, + crit_chance: 0.06, + crit_mult: 1.6, )), )), quality: Low, diff --git a/assets/common/items/weapons/dagger/basic_0.ron b/assets/common/items/weapons/dagger/basic_0.ron index 04b28e71bb..99eaac8cfb 100644 --- a/assets/common/items/weapons/dagger/basic_0.ron +++ b/assets/common/items/weapons/dagger/basic_0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 2.0, speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/dagger/cultist_0.ron b/assets/common/items/weapons/dagger/cultist_0.ron index e7f72999a1..903bce5a81 100644 --- a/assets/common/items/weapons/dagger/cultist_0.ron +++ b/assets/common/items/weapons/dagger/cultist_0.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/dagger/starter_dagger.ron b/assets/common/items/weapons/dagger/starter_dagger.ron index 8e96415a3c..13be2f69ea 100644 --- a/assets/common/items/weapons/dagger/starter_dagger.ron +++ b/assets/common/items/weapons/dagger/starter_dagger.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.5, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/empty/empty.ron b/assets/common/items/weapons/empty/empty.ron index 5a2e6c9c07..cfe1863590 100644 --- a/assets/common/items/weapons/empty/empty.ron +++ b/assets/common/items/weapons/empty/empty.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-0.ron b/assets/common/items/weapons/hammer/bronze_hammer-0.ron index d409ebb89a..cf3b21b146 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-0.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.9, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/bronze_hammer-1.ron b/assets/common/items/weapons/hammer/bronze_hammer-1.ron index 12bb129388..b2f276aa28 100644 --- a/assets/common/items/weapons/hammer/bronze_hammer-1.ron +++ b/assets/common/items/weapons/hammer/bronze_hammer-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron index 585b3b4a27..6aeef04f2d 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-0.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron index 33942bf553..f1f2ec4d09 100644 --- a/assets/common/items/weapons/hammer/cobalt_hammer-1.ron +++ b/assets/common/items/weapons/hammer/cobalt_hammer-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron index b6ab771652..1cbebadfab 100644 --- a/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron +++ b/assets/common/items/weapons/hammer/cultist_purp_2h-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/hammer/flimsy_hammer.ron b/assets/common/items/weapons/hammer/flimsy_hammer.ron index ceb02aad51..84ce7287fd 100644 --- a/assets/common/items/weapons/hammer/flimsy_hammer.ron +++ b/assets/common/items/weapons/hammer/flimsy_hammer.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/hammer_1.ron b/assets/common/items/weapons/hammer/hammer_1.ron index 283ef91e14..7a2ffad502 100644 --- a/assets/common/items/weapons/hammer/hammer_1.ron +++ b/assets/common/items/weapons/hammer/hammer_1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/iron_hammer-0.ron b/assets/common/items/weapons/hammer/iron_hammer-0.ron index 0899c43251..dc594fa0d7 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-1.ron b/assets/common/items/weapons/hammer/iron_hammer-1.ron index 77e7a05685..d465d432dc 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.9, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-2.ron b/assets/common/items/weapons/hammer/iron_hammer-2.ron index d7ea0770d6..f338c953a6 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-3.ron b/assets/common/items/weapons/hammer/iron_hammer-3.ron index a1ed65f483..1ac2b00a33 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-4.ron b/assets/common/items/weapons/hammer/iron_hammer-4.ron index bec365f66c..30b1146c33 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-4.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-5.ron b/assets/common/items/weapons/hammer/iron_hammer-5.ron index e2fbd4521c..04dd822974 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-5.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-5.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-6.ron b/assets/common/items/weapons/hammer/iron_hammer-6.ron index 3e98b77ad5..9ef95a18a0 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-6.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-6.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-7.ron b/assets/common/items/weapons/hammer/iron_hammer-7.ron index 8112bbc51f..99b1c00c65 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-7.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-7.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Giant\'s Fist", + name: "Giant's Fist", description: "This iron forged hammer is roughly shaped into the shape of a fist holding the hammer head.", kind: Tool(( kind: Hammer, @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.1, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/iron_hammer-8.ron b/assets/common/items/weapons/hammer/iron_hammer-8.ron index de68d17fe3..1ad5feeffe 100644 --- a/assets/common/items/weapons/hammer/iron_hammer-8.ron +++ b/assets/common/items/weapons/hammer/iron_hammer-8.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/mjolnir.ron b/assets/common/items/weapons/hammer/mjolnir.ron index 09ba718eb9..e514011e4f 100644 --- a/assets/common/items/weapons/hammer/mjolnir.ron +++ b/assets/common/items/weapons/hammer/mjolnir.ron @@ -1,6 +1,6 @@ ItemDef( name: "Mjolnir", - description: "It\'s crackling with lightning.", + description: "It's crackling with lightning.", kind: Tool(( kind: Hammer, hands: Two, @@ -9,8 +9,10 @@ ItemDef( power: 4.0, poise_strength: 2.0, speed: 0.5, + crit_chance: 0.4, + crit_mult: 5.0, )), )), quality: Legendary, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer/ramshead_hammer.ron b/assets/common/items/weapons/hammer/ramshead_hammer.ron index d0a4230b4c..62c097b8d2 100644 --- a/assets/common/items/weapons/hammer/ramshead_hammer.ron +++ b/assets/common/items/weapons/hammer/ramshead_hammer.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Ram\'s Head Mace", + name: "Ram's Head Mace", description: "You feel an evil presence in the hammer.", kind: Tool(( kind: Hammer, @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 1.7, speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer/runic_hammer.ron b/assets/common/items/weapons/hammer/runic_hammer.ron index ee33512ade..49aca12ed4 100644 --- a/assets/common/items/weapons/hammer/runic_hammer.ron +++ b/assets/common/items/weapons/hammer/runic_hammer.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 1.8, speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer/starter_hammer.ron b/assets/common/items/weapons/hammer/starter_hammer.ron index 2321b7fb5f..103959549e 100644 --- a/assets/common/items/weapons/hammer/starter_hammer.ron +++ b/assets/common/items/weapons/hammer/starter_hammer.ron @@ -1,6 +1,6 @@ ItemDef( name: "Sturdy Old Hammer", - description: "\'Property of...\' The rest is missing.", + description: "'Property of...' The rest is missing.", kind: Tool(( kind: Hammer, hands: Two, @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 0.9, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/steel_hammer-0.ron b/assets/common/items/weapons/hammer/steel_hammer-0.ron index a3a14b0815..e06428ff8b 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-0.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-1.ron b/assets/common/items/weapons/hammer/steel_hammer-1.ron index 5bab87a4ab..21875a01b5 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-1.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.3, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-2.ron b/assets/common/items/weapons/hammer/steel_hammer-2.ron index 9d3a3f1e56..0b2092278d 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-2.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-3.ron b/assets/common/items/weapons/hammer/steel_hammer-3.ron index 9d99a52cd3..d07f23bbff 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-3.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.7, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-4.ron b/assets/common/items/weapons/hammer/steel_hammer-4.ron index bb72a635a9..6bf68011c3 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-4.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-4.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Brute\'s Hammer", + name: "Brute's Hammer", description: "This destructive hammer was likely wielded by a vicious killer.", kind: Tool(( kind: Hammer, @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/steel_hammer-5.ron b/assets/common/items/weapons/hammer/steel_hammer-5.ron index 2b9fb74138..7a87675fd5 100644 --- a/assets/common/items/weapons/hammer/steel_hammer-5.ron +++ b/assets/common/items/weapons/hammer/steel_hammer-5.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.3, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer/stone_hammer-0.ron b/assets/common/items/weapons/hammer/stone_hammer-0.ron index 4a2ba70f0d..cf876a68b9 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-0.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.7, poise_strength: 1.7, speed: 1.0, + crit_chance: 0.07, + crit_mult: 1.7, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-1.ron b/assets/common/items/weapons/hammer/stone_hammer-1.ron index d9a804116a..ca60503612 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-1.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.7, poise_strength: 1.8, speed: 1.0, + crit_chance: 0.07, + crit_mult: 1.7, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-2.ron b/assets/common/items/weapons/hammer/stone_hammer-2.ron index d875268bf1..939428bdf6 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-2.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.7, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.07, + crit_mult: 1.7, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/stone_hammer-3.ron b/assets/common/items/weapons/hammer/stone_hammer-3.ron index 64833684b4..8dda36b9d6 100644 --- a/assets/common/items/weapons/hammer/stone_hammer-3.ron +++ b/assets/common/items/weapons/hammer/stone_hammer-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.7, poise_strength: 1.8, speed: 1.0, + crit_chance: 0.07, + crit_mult: 1.7, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/wood_hammer-0.ron b/assets/common/items/weapons/hammer/wood_hammer-0.ron index efd328c442..4c4d9ade4a 100644 --- a/assets/common/items/weapons/hammer/wood_hammer-0.ron +++ b/assets/common/items/weapons/hammer/wood_hammer-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.6, poise_strength: 0.8, speed: 1.0, + crit_chance: 0.06, + crit_mult: 1.6, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron index df1a583494..5cffb8166f 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.85, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.09, + crit_mult: 1.85, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron index 53fbc285c2..0c0add9d40 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.85, poise_strength: 0.6, speed: 1.0, + crit_chance: 0.09, + crit_mult: 1.85, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron index 56ff8638b4..e0605634e8 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.85, poise_strength: 0.7, speed: 1.0, + crit_chance: 0.09, + crit_mult: 1.85, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron index fe5c028cca..ea90cd0585 100644 --- a/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron +++ b/assets/common/items/weapons/hammer/worn_iron_hammer-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.85, poise_strength: 1.1, speed: 1.0, + crit_chance: 0.09, + crit_mult: 1.85, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron index 7f8680d76e..1e07389080 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.0, speed: 1.2, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron index c808bc95b8..8984dd362d 100644 --- a/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/hammer_1h/bloodsteel-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/bronze-0.ron b/assets/common/items/weapons/hammer_1h/bronze-0.ron index 2fc8168206..3519460708 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-0.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/bronze-1.ron b/assets/common/items/weapons/hammer_1h/bronze-1.ron index c3c153b010..0350b2319a 100644 --- a/assets/common/items/weapons/hammer_1h/bronze-1.ron +++ b/assets/common/items/weapons/hammer_1h/bronze-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-0.ron b/assets/common/items/weapons/hammer_1h/cobalt-0.ron index 5788e12ee5..2bf08a7c25 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-0.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/cobalt-1.ron b/assets/common/items/weapons/hammer_1h/cobalt-1.ron index e80beaa8e8..626c62582a 100644 --- a/assets/common/items/weapons/hammer_1h/cobalt-1.ron +++ b/assets/common/items/weapons/hammer_1h/cobalt-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: High, diff --git a/assets/common/items/weapons/hammer_1h/iron-0.ron b/assets/common/items/weapons/hammer_1h/iron-0.ron index 0e489cd140..cafc1e0832 100644 --- a/assets/common/items/weapons/hammer_1h/iron-0.ron +++ b/assets/common/items/weapons/hammer_1h/iron-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/iron-1.ron b/assets/common/items/weapons/hammer_1h/iron-1.ron index 01750186e7..6a65c0f659 100644 --- a/assets/common/items/weapons/hammer_1h/iron-1.ron +++ b/assets/common/items/weapons/hammer_1h/iron-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.3, poise_strength: 1.0, speed: 0.9, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/iron-2.ron b/assets/common/items/weapons/hammer_1h/iron-2.ron index a75e847444..6baf066932 100644 --- a/assets/common/items/weapons/hammer_1h/iron-2.ron +++ b/assets/common/items/weapons/hammer_1h/iron-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.1, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.11, + crit_mult: 2.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron index 0c6f76a8a1..721fa173cd 100644 --- a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/hammer_1h/steel-0.ron b/assets/common/items/weapons/hammer_1h/steel-0.ron index 77b063c698..2ba55239ce 100644 --- a/assets/common/items/weapons/hammer_1h/steel-0.ron +++ b/assets/common/items/weapons/hammer_1h/steel-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 1.0, speed: 0.9, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/steel-1.ron b/assets/common/items/weapons/hammer_1h/steel-1.ron index fa03dbdeff..2acad3f557 100644 --- a/assets/common/items/weapons/hammer_1h/steel-1.ron +++ b/assets/common/items/weapons/hammer_1h/steel-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/steel-2.ron b/assets/common/items/weapons/hammer_1h/steel-2.ron index 97e6a61a7f..327802db46 100644 --- a/assets/common/items/weapons/hammer_1h/steel-2.ron +++ b/assets/common/items/weapons/hammer_1h/steel-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.0, speed: 1.2, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/hammer_1h/stone-0.ron b/assets/common/items/weapons/hammer_1h/stone-0.ron index 2a980b9951..c35a3399f6 100644 --- a/assets/common/items/weapons/hammer_1h/stone-0.ron +++ b/assets/common/items/weapons/hammer_1h/stone-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.7, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.07, + crit_mult: 1.7, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer_1h/stone-1.ron b/assets/common/items/weapons/hammer_1h/stone-1.ron index 8169b32872..547384e5c2 100644 --- a/assets/common/items/weapons/hammer_1h/stone-1.ron +++ b/assets/common/items/weapons/hammer_1h/stone-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/hammer_1h/wood-0.ron b/assets/common/items/weapons/hammer_1h/wood-0.ron index e850ddeb33..ed745eafef 100644 --- a/assets/common/items/weapons/hammer_1h/wood-0.ron +++ b/assets/common/items/weapons/hammer_1h/wood-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/hammer_1h/wood-1.ron b/assets/common/items/weapons/hammer_1h/wood-1.ron index f8c8f44eed..29c9141382 100644 --- a/assets/common/items/weapons/hammer_1h/wood-1.ron +++ b/assets/common/items/weapons/hammer_1h/wood-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/fork0.ron b/assets/common/items/weapons/sceptre/fork0.ron index 5d709b19a1..921f80f000 100644 --- a/assets/common/items/weapons/sceptre/fork0.ron +++ b/assets/common/items/weapons/sceptre/fork0.ron @@ -9,8 +9,10 @@ ItemDef( power: 2.0, poise_strength: 1.5, speed: 0.8, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: High, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/loops0.ron b/assets/common/items/weapons/sceptre/loops0.ron index 0199f08c80..aa1f09134a 100644 --- a/assets/common/items/weapons/sceptre/loops0.ron +++ b/assets/common/items/weapons/sceptre/loops0.ron @@ -9,8 +9,10 @@ ItemDef( power: 1.2, poise_strength: 1.5, speed: 1.5, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: High, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/moon0.ron b/assets/common/items/weapons/sceptre/moon0.ron index f051a251e7..11c0786ab0 100644 --- a/assets/common/items/weapons/sceptre/moon0.ron +++ b/assets/common/items/weapons/sceptre/moon0.ron @@ -9,8 +9,10 @@ ItemDef( power: 1.6, poise_strength: 1.5, speed: 0.5, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: Common, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/root_evil.ron b/assets/common/items/weapons/sceptre/root_evil.ron index 0e7f3cc38a..2fd8b7357a 100644 --- a/assets/common/items/weapons/sceptre/root_evil.ron +++ b/assets/common/items/weapons/sceptre/root_evil.ron @@ -1,6 +1,6 @@ ItemDef( name: "The Root of Evil", - description: "\'Everything comes at a price...\'", + description: "'Everything comes at a price...'", kind: Tool(( kind: Sceptre, hands: Two, @@ -9,8 +9,10 @@ ItemDef( power: 4.0, poise_strength: 1.5, speed: 0.5, + crit_chance: 0.4, + crit_mult: 5.0, )), )), quality: Legendary, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/root_green0.ron b/assets/common/items/weapons/sceptre/root_green0.ron index e55b68e017..d612c3313a 100644 --- a/assets/common/items/weapons/sceptre/root_green0.ron +++ b/assets/common/items/weapons/sceptre/root_green0.ron @@ -9,8 +9,10 @@ ItemDef( power: 3.5, poise_strength: 1.5, speed: 0.4, + crit_chance: 0.35, + crit_mult: 4.5, )), )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron index c1717c9d73..e4eded7522 100644 --- a/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron +++ b/assets/common/items/weapons/sceptre/sceptre_velorite_0.ron @@ -9,8 +9,10 @@ ItemDef( power: 1.2, poise_strength: 1.5, speed: 1.6, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Epic, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/staff_nature.ron b/assets/common/items/weapons/sceptre/staff_nature.ron index a15600f3d7..908348f3d7 100644 --- a/assets/common/items/weapons/sceptre/staff_nature.ron +++ b/assets/common/items/weapons/sceptre/staff_nature.ron @@ -9,8 +9,10 @@ ItemDef( power: 0.91, poise_strength: 0.5, speed: 1.1, + crit_chance: 0.09, + crit_mult: 1.91, )), )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index bf94d16927..af37d82be8 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 0.1, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/sceptre/totem_green.ron b/assets/common/items/weapons/sceptre/totem_green.ron index c5a2fd15fd..329918e518 100644 --- a/assets/common/items/weapons/sceptre/totem_green.ron +++ b/assets/common/items/weapons/sceptre/totem_green.ron @@ -9,8 +9,10 @@ ItemDef( power: 1.0, poise_strength: 1.5, speed: 1.2, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, tags: [], -) +) \ No newline at end of file diff --git a/assets/common/items/weapons/shield/shield_1.ron b/assets/common/items/weapons/shield/shield_1.ron index 1a896f6877..f2c4ef98bf 100644 --- a/assets/common/items/weapons/shield/shield_1.ron +++ b/assets/common/items/weapons/shield/shield_1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/staff/amethyst_staff.ron b/assets/common/items/weapons/staff/amethyst_staff.ron index bbe428fc0e..95834536d1 100644 --- a/assets/common/items/weapons/staff/amethyst_staff.ron +++ b/assets/common/items/weapons/staff/amethyst_staff.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 1.4, speed: 1.0, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/staff/bone_staff.ron b/assets/common/items/weapons/staff/bone_staff.ron index 359f6c865b..390aae3692 100644 --- a/assets/common/items/weapons/staff/bone_staff.ron +++ b/assets/common/items/weapons/staff/bone_staff.ron @@ -1,6 +1,6 @@ ItemDef( name: "Bone Staff", - description: "There\'s a red gem suspended in the bones.", + description: "There's a red gem suspended in the bones.", kind: Tool(( kind: Staff, hands: Two, @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/staff/cultist_staff.ron b/assets/common/items/weapons/staff/cultist_staff.ron index 3e35706f60..e2002945e5 100644 --- a/assets/common/items/weapons/staff/cultist_staff.ron +++ b/assets/common/items/weapons/staff/cultist_staff.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/staff/staff_1.ron b/assets/common/items/weapons/staff/staff_1.ron index c26f6dc265..3ce6f8a2ac 100644 --- a/assets/common/items/weapons/staff/staff_1.ron +++ b/assets/common/items/weapons/staff/staff_1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/staff/starter_staff.ron b/assets/common/items/weapons/staff/starter_staff.ron index cd21db9db4..28d59d4f6b 100644 --- a/assets/common/items/weapons/staff/starter_staff.ron +++ b/assets/common/items/weapons/staff/starter_staff.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/bloodsteel-0.ron b/assets/common/items/weapons/sword/bloodsteel-0.ron index 32b0ee20d7..19c28078bf 100644 --- a/assets/common/items/weapons/sword/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword/bloodsteel-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bloodsteel-1.ron b/assets/common/items/weapons/sword/bloodsteel-1.ron index b63554b64b..d55bb3e9c7 100644 --- a/assets/common/items/weapons/sword/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword/bloodsteel-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 0.4, speed: 1.2, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bloodsteel-2.ron b/assets/common/items/weapons/sword/bloodsteel-2.ron index c9d4254652..8d8289adaf 100644 --- a/assets/common/items/weapons/sword/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword/bloodsteel-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 0.4, speed: 0.8, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/bronze-0.ron b/assets/common/items/weapons/sword/bronze-0.ron index 07cb6e9a53..7ffca233dd 100644 --- a/assets/common/items/weapons/sword/bronze-0.ron +++ b/assets/common/items/weapons/sword/bronze-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.1, poise_strength: 0.4, speed: 0.9, + crit_chance: 0.11, + crit_mult: 2.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/bronze-1.ron b/assets/common/items/weapons/sword/bronze-1.ron index e3fa20d076..d8a74dbe36 100644 --- a/assets/common/items/weapons/sword/bronze-1.ron +++ b/assets/common/items/weapons/sword/bronze-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.9, poise_strength: 0.4, speed: 1.1, + crit_chance: 0.09, + crit_mult: 1.9, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/bronze-2.ron b/assets/common/items/weapons/sword/bronze-2.ron index e70a7b10ad..ebf4736786 100644 --- a/assets/common/items/weapons/sword/bronze-2.ron +++ b/assets/common/items/weapons/sword/bronze-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index be2e3edc54..a8f84f6906 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.5, poise_strength: 0.4, speed: 0.8, + crit_chance: 0.25, + crit_mult: 3.5, )), )), quality: Legendary, diff --git a/assets/common/items/weapons/sword/cobalt-0.ron b/assets/common/items/weapons/sword/cobalt-0.ron index a30b3a8720..03a9c6e989 100644 --- a/assets/common/items/weapons/sword/cobalt-0.ron +++ b/assets/common/items/weapons/sword/cobalt-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 0.4, speed: 1.1, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-1.ron b/assets/common/items/weapons/sword/cobalt-1.ron index ba08a15ef5..f59e29381a 100644 --- a/assets/common/items/weapons/sword/cobalt-1.ron +++ b/assets/common/items/weapons/sword/cobalt-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.8, poise_strength: 0.4, speed: 0.8, + crit_chance: 0.18, + crit_mult: 2.8, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-2.ron b/assets/common/items/weapons/sword/cobalt-2.ron index 0f21a06154..0ef2b9155b 100644 --- a/assets/common/items/weapons/sword/cobalt-2.ron +++ b/assets/common/items/weapons/sword/cobalt-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cobalt-3.ron b/assets/common/items/weapons/sword/cobalt-3.ron index 56b08b8191..6b960e5ec5 100644 --- a/assets/common/items/weapons/sword/cobalt-3.ron +++ b/assets/common/items/weapons/sword/cobalt-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.7, poise_strength: 0.4, speed: 0.9, + crit_chance: 0.17, + crit_mult: 2.7, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/cultist.ron b/assets/common/items/weapons/sword/cultist.ron index 77febbe9d7..483e7e14d1 100644 --- a/assets/common/items/weapons/sword/cultist.ron +++ b/assets/common/items/weapons/sword/cultist.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/frost-0.ron b/assets/common/items/weapons/sword/frost-0.ron index 127fb8ec10..a32657b709 100644 --- a/assets/common/items/weapons/sword/frost-0.ron +++ b/assets/common/items/weapons/sword/frost-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.7, poise_strength: 2.0, speed: 1.0, + crit_chance: 0.17, + crit_mult: 2.7, )), )), quality: High, diff --git a/assets/common/items/weapons/sword/frost-1.ron b/assets/common/items/weapons/sword/frost-1.ron index 36c2b2a877..5644b03965 100644 --- a/assets/common/items/weapons/sword/frost-1.ron +++ b/assets/common/items/weapons/sword/frost-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.95, poise_strength: 1.7, speed: 1.0, + crit_chance: 0.2, + crit_mult: 2.95, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword/iron-0.ron b/assets/common/items/weapons/sword/iron-0.ron index 2f3ce8bb85..b3f83b8bc0 100644 --- a/assets/common/items/weapons/sword/iron-0.ron +++ b/assets/common/items/weapons/sword/iron-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.25, poise_strength: 0.4, speed: 0.95, + crit_chance: 0.12, + crit_mult: 2.25, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-1.ron b/assets/common/items/weapons/sword/iron-1.ron index 3b27d45527..652ceaa2eb 100644 --- a/assets/common/items/weapons/sword/iron-1.ron +++ b/assets/common/items/weapons/sword/iron-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.45, poise_strength: 0.4, speed: 0.75, + crit_chance: 0.15, + crit_mult: 2.45, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-10.ron b/assets/common/items/weapons/sword/iron-10.ron index 1d64973648..fd4ba29d45 100644 --- a/assets/common/items/weapons/sword/iron-10.ron +++ b/assets/common/items/weapons/sword/iron-10.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.35, poise_strength: 0.4, speed: 0.85, + crit_chance: 0.14, + crit_mult: 2.35, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-2.ron b/assets/common/items/weapons/sword/iron-2.ron index 6701c53eb9..84765a7126 100644 --- a/assets/common/items/weapons/sword/iron-2.ron +++ b/assets/common/items/weapons/sword/iron-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.1, poise_strength: 0.4, speed: 1.1, + crit_chance: 0.11, + crit_mult: 2.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-3.ron b/assets/common/items/weapons/sword/iron-3.ron index f6bbd9bb18..9ccf5558b7 100644 --- a/assets/common/items/weapons/sword/iron-3.ron +++ b/assets/common/items/weapons/sword/iron-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.15, poise_strength: 0.4, speed: 1.05, + crit_chance: 0.12, + crit_mult: 2.15, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-4.ron b/assets/common/items/weapons/sword/iron-4.ron index efe18b2897..71344a782f 100644 --- a/assets/common/items/weapons/sword/iron-4.ron +++ b/assets/common/items/weapons/sword/iron-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.3, poise_strength: 0.4, speed: 0.9, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-5.ron b/assets/common/items/weapons/sword/iron-5.ron index a0c5d806a0..1685fa5545 100644 --- a/assets/common/items/weapons/sword/iron-5.ron +++ b/assets/common/items/weapons/sword/iron-5.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.05, poise_strength: 0.4, speed: 1.15, + crit_chance: 0.1, + crit_mult: 2.05, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-6.ron b/assets/common/items/weapons/sword/iron-6.ron index 6b66bb48d8..a92bb0954b 100644 --- a/assets/common/items/weapons/sword/iron-6.ron +++ b/assets/common/items/weapons/sword/iron-6.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-7.ron b/assets/common/items/weapons/sword/iron-7.ron index a2fa0d307c..fdfe23f731 100644 --- a/assets/common/items/weapons/sword/iron-7.ron +++ b/assets/common/items/weapons/sword/iron-7.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 0.4, speed: 0.8, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-8.ron b/assets/common/items/weapons/sword/iron-8.ron index f4ce93492a..0fb4b2306b 100644 --- a/assets/common/items/weapons/sword/iron-8.ron +++ b/assets/common/items/weapons/sword/iron-8.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.4, speed: 1.2, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/iron-9.ron b/assets/common/items/weapons/sword/iron-9.ron index 8560c8042c..5161ac6cf0 100644 --- a/assets/common/items/weapons/sword/iron-9.ron +++ b/assets/common/items/weapons/sword/iron-9.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.95, poise_strength: 0.4, speed: 1.25, + crit_chance: 0.09, + crit_mult: 1.95, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/starter.ron b/assets/common/items/weapons/sword/starter.ron index a2a93b74ef..fee6405732 100644 --- a/assets/common/items/weapons/sword/starter.ron +++ b/assets/common/items/weapons/sword/starter.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/steel-0.ron b/assets/common/items/weapons/sword/steel-0.ron index ad91eb5b3b..aee17953ba 100644 --- a/assets/common/items/weapons/sword/steel-0.ron +++ b/assets/common/items/weapons/sword/steel-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-1.ron b/assets/common/items/weapons/sword/steel-1.ron index a06595be06..e34d4ebc3a 100644 --- a/assets/common/items/weapons/sword/steel-1.ron +++ b/assets/common/items/weapons/sword/steel-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.45, poise_strength: 0.4, speed: 0.95, + crit_chance: 0.15, + crit_mult: 2.45, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-2.ron b/assets/common/items/weapons/sword/steel-2.ron index 6dde404fc0..26ae210ce6 100644 --- a/assets/common/items/weapons/sword/steel-2.ron +++ b/assets/common/items/weapons/sword/steel-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.25, poise_strength: 0.4, speed: 1.15, + crit_chance: 0.12, + crit_mult: 2.25, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-3.ron b/assets/common/items/weapons/sword/steel-3.ron index d0e7887d59..25bd51c851 100644 --- a/assets/common/items/weapons/sword/steel-3.ron +++ b/assets/common/items/weapons/sword/steel-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 0.4, speed: 0.9, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-4.ron b/assets/common/items/weapons/sword/steel-4.ron index 662bf2a863..3d5f776545 100644 --- a/assets/common/items/weapons/sword/steel-4.ron +++ b/assets/common/items/weapons/sword/steel-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.55, poise_strength: 0.4, speed: 0.85, + crit_chance: 0.16, + crit_mult: 2.55, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-5.ron b/assets/common/items/weapons/sword/steel-5.ron index 6559479d09..b8f21f36cd 100644 --- a/assets/common/items/weapons/sword/steel-5.ron +++ b/assets/common/items/weapons/sword/steel-5.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 0.4, speed: 1.2, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-6.ron b/assets/common/items/weapons/sword/steel-6.ron index c134123b51..3c27639755 100644 --- a/assets/common/items/weapons/sword/steel-6.ron +++ b/assets/common/items/weapons/sword/steel-6.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.3, poise_strength: 0.4, speed: 1.1, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-7.ron b/assets/common/items/weapons/sword/steel-7.ron index 3044bb2f1e..55e9a84da6 100644 --- a/assets/common/items/weapons/sword/steel-7.ron +++ b/assets/common/items/weapons/sword/steel-7.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 0.4, speed: 0.8, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/steel-8.ron b/assets/common/items/weapons/sword/steel-8.ron index 6a25595c56..2151e9c284 100644 --- a/assets/common/items/weapons/sword/steel-8.ron +++ b/assets/common/items/weapons/sword/steel-8.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.35, poise_strength: 0.4, speed: 1.05, + crit_chance: 0.14, + crit_mult: 2.35, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword/stone-0.ron b/assets/common/items/weapons/sword/stone-0.ron index 7acceea5c5..9b59b12987 100644 --- a/assets/common/items/weapons/sword/stone-0.ron +++ b/assets/common/items/weapons/sword/stone-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 0.4, speed: 0.8, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/stone-1.ron b/assets/common/items/weapons/sword/stone-1.ron index 238db6f571..2111677042 100644 --- a/assets/common/items/weapons/sword/stone-1.ron +++ b/assets/common/items/weapons/sword/stone-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/stone-2.ron b/assets/common/items/weapons/sword/stone-2.ron index 6651ac3936..50d7dc97ba 100644 --- a/assets/common/items/weapons/sword/stone-2.ron +++ b/assets/common/items/weapons/sword/stone-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.9, poise_strength: 0.4, speed: 0.9, + crit_chance: 0.09, + crit_mult: 1.9, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-0.ron b/assets/common/items/weapons/sword/wood-0.ron index 2cd0c30425..4a8af1a335 100644 --- a/assets/common/items/weapons/sword/wood-0.ron +++ b/assets/common/items/weapons/sword/wood-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.6, poise_strength: 0.4, speed: 1.0, + crit_chance: 0.06, + crit_mult: 1.6, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-1.ron b/assets/common/items/weapons/sword/wood-1.ron index 74eb98a5a6..2a20ea3e6f 100644 --- a/assets/common/items/weapons/sword/wood-1.ron +++ b/assets/common/items/weapons/sword/wood-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 0.4, speed: 0.8, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword/wood-2.ron b/assets/common/items/weapons/sword/wood-2.ron index e229ed4967..9dcfc90140 100644 --- a/assets/common/items/weapons/sword/wood-2.ron +++ b/assets/common/items/weapons/sword/wood-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.5, poise_strength: 0.5, speed: 1.1, + crit_chance: 0.05, + crit_mult: 1.5, )), )), quality: Low, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron index 3636ea64ed..908881ff10 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.45, poise_strength: 1.0, speed: 1.3, + crit_chance: 0.15, + crit_mult: 2.45, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron index e5de808957..52ad540f23 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.0, poise_strength: 1.0, speed: 0.75, + crit_chance: 0.2, + crit_mult: 3.0, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron index 5028cc1266..2a3d4659c0 100644 --- a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron +++ b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.75, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.17, + crit_mult: 2.75, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/bronze-0.ron b/assets/common/items/weapons/sword_1h/bronze-0.ron index d0b7c17a88..7afd1a1b83 100644 --- a/assets/common/items/weapons/sword_1h/bronze-0.ron +++ b/assets/common/items/weapons/sword_1h/bronze-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.65, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.06, + crit_mult: 1.65, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/bronze-1.ron b/assets/common/items/weapons/sword_1h/bronze-1.ron index 849d5a362f..7a47465b09 100644 --- a/assets/common/items/weapons/sword_1h/bronze-1.ron +++ b/assets/common/items/weapons/sword_1h/bronze-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.75, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.08, + crit_mult: 1.75, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/bronze-2.ron b/assets/common/items/weapons/sword_1h/bronze-2.ron index 253691f2c8..58a9680379 100644 --- a/assets/common/items/weapons/sword_1h/bronze-2.ron +++ b/assets/common/items/weapons/sword_1h/bronze-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.85, poise_strength: 1.0, speed: 0.9, + crit_chance: 0.09, + crit_mult: 1.85, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/cobalt-0.ron b/assets/common/items/weapons/sword_1h/cobalt-0.ron index bc8e28409d..258291dd35 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-0.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.3, poise_strength: 1.0, speed: 1.2, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-1.ron b/assets/common/items/weapons/sword_1h/cobalt-1.ron index 8299250ce1..f49886afea 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-1.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.7, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.17, + crit_mult: 2.7, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-2.ron b/assets/common/items/weapons/sword_1h/cobalt-2.ron index 4808840343..b34924452a 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-2.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.4, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.14, + crit_mult: 2.4, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/cobalt-3.ron b/assets/common/items/weapons/sword_1h/cobalt-3.ron index d5af18aaeb..6edc7dda45 100644 --- a/assets/common/items/weapons/sword_1h/cobalt-3.ron +++ b/assets/common/items/weapons/sword_1h/cobalt-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.6, poise_strength: 1.0, speed: 0.9, + crit_chance: 0.16, + crit_mult: 2.6, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/iron-0.ron b/assets/common/items/weapons/sword_1h/iron-0.ron index 5a40b752d4..909f199178 100644 --- a/assets/common/items/weapons/sword_1h/iron-0.ron +++ b/assets/common/items/weapons/sword_1h/iron-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-1.ron b/assets/common/items/weapons/sword_1h/iron-1.ron index 1848b367a2..50ee5b917d 100644 --- a/assets/common/items/weapons/sword_1h/iron-1.ron +++ b/assets/common/items/weapons/sword_1h/iron-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.9, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.09, + crit_mult: 1.9, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-2.ron b/assets/common/items/weapons/sword_1h/iron-2.ron index d414a968e1..c9127a51d1 100644 --- a/assets/common/items/weapons/sword_1h/iron-2.ron +++ b/assets/common/items/weapons/sword_1h/iron-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-3.ron b/assets/common/items/weapons/sword_1h/iron-3.ron index e687bc0510..51299abdd4 100644 --- a/assets/common/items/weapons/sword_1h/iron-3.ron +++ b/assets/common/items/weapons/sword_1h/iron-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 0.8, poise_strength: 1.0, speed: 1.2, + crit_chance: 0.08, + crit_mult: 1.8, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/iron-4.ron b/assets/common/items/weapons/sword_1h/iron-4.ron index d2f6f046b7..e53d0d4cc7 100644 --- a/assets/common/items/weapons/sword_1h/iron-4.ron +++ b/assets/common/items/weapons/sword_1h/iron-4.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.1, poise_strength: 1.0, speed: 0.9, + crit_chance: 0.11, + crit_mult: 2.1, )), )), quality: Common, diff --git a/assets/common/items/weapons/sword_1h/obsidian-0.ron b/assets/common/items/weapons/sword_1h/obsidian-0.ron index 37af1e1280..745295a98c 100644 --- a/assets/common/items/weapons/sword_1h/obsidian-0.ron +++ b/assets/common/items/weapons/sword_1h/obsidian-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.95, poise_strength: 1.0, speed: 0.8, + crit_chance: 0.2, + crit_mult: 2.95, )), )), quality: High, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-0.ron b/assets/common/items/weapons/sword_1h/orichalcum-0.ron index 5d0716958f..586c310d88 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-0.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 2.1, poise_strength: 1.0, speed: 0.9, + crit_chance: 0.21, + crit_mult: 3.1, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword_1h/orichalcum-1.ron b/assets/common/items/weapons/sword_1h/orichalcum-1.ron index 7566f7bedc..6a16c895af 100644 --- a/assets/common/items/weapons/sword_1h/orichalcum-1.ron +++ b/assets/common/items/weapons/sword_1h/orichalcum-1.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.9, poise_strength: 1.0, speed: 1.1, + crit_chance: 0.19, + crit_mult: 2.9, )), )), quality: Epic, diff --git a/assets/common/items/weapons/sword_1h/steel-0.ron b/assets/common/items/weapons/sword_1h/steel-0.ron index 8c3990bc3a..2c6eb1af00 100644 --- a/assets/common/items/weapons/sword_1h/steel-0.ron +++ b/assets/common/items/weapons/sword_1h/steel-0.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.5, poise_strength: 1.0, speed: 0.75, + crit_chance: 0.15, + crit_mult: 2.5, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-1.ron b/assets/common/items/weapons/sword_1h/steel-1.ron index c6aad22cbc..6797dc93d0 100644 --- a/assets/common/items/weapons/sword_1h/steel-1.ron +++ b/assets/common/items/weapons/sword_1h/steel-1.ron @@ -8,7 +8,9 @@ ItemDef( equip_time_secs: 0.4, power: 1.3, poise_strength: 1.0, - speed: .95, + speed: 0.95, + crit_chance: 0.13, + crit_mult: 2.3, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-2.ron b/assets/common/items/weapons/sword_1h/steel-2.ron index d4f4dc2a56..3ce47b10eb 100644 --- a/assets/common/items/weapons/sword_1h/steel-2.ron +++ b/assets/common/items/weapons/sword_1h/steel-2.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.05, poise_strength: 1.0, speed: 1.2, + crit_chance: 0.1, + crit_mult: 2.05, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/sword_1h/steel-3.ron b/assets/common/items/weapons/sword_1h/steel-3.ron index 31dedfe598..ce10a72b44 100644 --- a/assets/common/items/weapons/sword_1h/steel-3.ron +++ b/assets/common/items/weapons/sword_1h/steel-3.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.2, poise_strength: 1.0, speed: 1.05, + crit_chance: 0.12, + crit_mult: 2.2, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/tool/broom.ron b/assets/common/items/weapons/tool/broom.ron index 8740dd82b0..4f92b3a4b7 100644 --- a/assets/common/items/weapons/tool/broom.ron +++ b/assets/common/items/weapons/tool/broom.ron @@ -1,6 +1,6 @@ ItemDef( name: "Broom", - description: "It\'s beginning to fall apart.", + description: "It's beginning to fall apart.", kind: Tool(( kind: Farming, hands: Two, @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/fishing_rod.ron b/assets/common/items/weapons/tool/fishing_rod.ron index 4e82e5b915..f99d7e514b 100644 --- a/assets/common/items/weapons/tool/fishing_rod.ron +++ b/assets/common/items/weapons/tool/fishing_rod.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/hoe.ron b/assets/common/items/weapons/tool/hoe.ron index 4b81521996..f7955a79b1 100644 --- a/assets/common/items/weapons/tool/hoe.ron +++ b/assets/common/items/weapons/tool/hoe.ron @@ -1,6 +1,6 @@ ItemDef( name: "Hoe", - description: "It\'s stained with dirt.", + description: "It's stained with dirt.", kind: Tool(( kind: Farming, hands: Two, @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.5, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/pickaxe.ron b/assets/common/items/weapons/tool/pickaxe.ron index 9e873b39f7..1c85af7df8 100644 --- a/assets/common/items/weapons/tool/pickaxe.ron +++ b/assets/common/items/weapons/tool/pickaxe.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/pitchfork.ron b/assets/common/items/weapons/tool/pitchfork.ron index 7741143d54..1f2a1bd9c3 100644 --- a/assets/common/items/weapons/tool/pitchfork.ron +++ b/assets/common/items/weapons/tool/pitchfork.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 4.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/rake.ron b/assets/common/items/weapons/tool/rake.ron index c44b545464..6defaf4f7b 100644 --- a/assets/common/items/weapons/tool/rake.ron +++ b/assets/common/items/weapons/tool/rake.ron @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/shovel-0.ron b/assets/common/items/weapons/tool/shovel-0.ron index 94d7c0a355..ca6f5b76eb 100644 --- a/assets/common/items/weapons/tool/shovel-0.ron +++ b/assets/common/items/weapons/tool/shovel-0.ron @@ -1,6 +1,6 @@ ItemDef( name: "Shovel", - description: "It\'s covered in manure.", + description: "It's covered in manure.", kind: Tool(( kind: Farming, hands: Two, @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 2.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/items/weapons/tool/shovel-1.ron b/assets/common/items/weapons/tool/shovel-1.ron index 555f87d653..8a1dfd9611 100644 --- a/assets/common/items/weapons/tool/shovel-1.ron +++ b/assets/common/items/weapons/tool/shovel-1.ron @@ -1,6 +1,6 @@ ItemDef( name: "Shovel", - description: "It\'s been recently cleaned.", + description: "It's been recently cleaned.", kind: Tool(( kind: Farming, hands: Two, @@ -9,6 +9,8 @@ ItemDef( power: 1.0, poise_strength: 2.0, speed: 1.0, + crit_chance: 0.1, + crit_mult: 2.0, )), )), quality: Common, diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index 9f7ffecd88..9fc450422e 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -5,41 +5,55 @@ power: 1.75, poise_strength: 1.75, speed: 1.75, + crit_chance: 1.75, + crit_mult: 1.75, ), "common.items.crafting_ing.bronze_ingot": ( equip_time_secs: 1.0, power: 0.75, poise_strength: 0.75, speed: 0.75, + crit_chance: 0.75, + crit_mult: 0.75, ), "common.items.crafting_ing.cobalt_ingot": ( equip_time_secs: 1.0, power: 1.5, poise_strength: 1.5, speed: 1.5, + crit_chance: 1.5, + crit_mult: 1.5, ), "common.items.crafting_ing.copper_ingot": ( equip_time_secs: 1.0, power: 0.4, poise_strength: 0.4, speed: 0.4, + crit_chance: 0.4, + crit_mult: 0.4, ), "common.items.crafting_ing.iron_ingot": ( equip_time_secs: 1.0, power: 1.0, poise_strength: 1.0, speed: 1.0, + crit_chance: 1.0, + crit_mult: 1.0, ), "common.items.crafting_ing.steel_ingot": ( equip_time_secs: 1.0, power: 1.25, poise_strength: 1.25, speed: 1.25, + crit_chance: 1.25, + crit_mult: 1.25, ), "common.items.crafting_ing.tin_ingot": ( equip_time_secs: 1.0, power: 0.25, poise_strength: 0.25, speed: 0.25, + crit_chance: 0.25, + crit_mult: 0.25, ), }) diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 232e828758..b5b2224707 100644 --- a/common/src/bin/csv_export/main.rs +++ b/common/src/bin/csv_export/main.rs @@ -76,21 +76,30 @@ fn weapon_stats() -> Result<(), Box> { "Power", "Poise Strength", "Speed", - "Equip Time (ms)", + "Crit Chance", + "Crit Mult", + "Equip Time (s)", "Description", ])?; let msm = MaterialStatManifest::default(); - for item in comp::item::Item::new_from_asset_glob("common.items.weapons.*") - .expect("Failed to iterate over item folders!") - { + let mut items: Vec = comp::Item::new_from_asset_glob("common.items.weapons.*") + .expect("Failed to iterate over item folders!"); + items.extend( + comp::Item::new_from_asset_glob("common.items.npc_weapons.*") + .expect("Failed to iterate over npc weapons!"), + ); + + for item in items.iter() { match item.kind() { comp::item::ItemKind::Tool(tool) => { let power = tool.base_power(&msm, &[]).to_string(); let poise_strength = tool.base_poise_strength(&msm, &[]).to_string(); let speed = tool.base_speed(&msm, &[]).to_string(); - let equip_time = tool.equip_time(&msm, &[]).subsec_millis().to_string(); + let crit_chance = tool.base_crit_chance(&msm, &[]).to_string(); + let crit_mult = tool.base_crit_mult(&msm, &[]).to_string(); + let equip_time = tool.equip_time(&msm, &[]).as_secs_f32().to_string(); let kind = get_tool_kind(&tool.kind); let hands = get_tool_hands(&tool); @@ -103,6 +112,8 @@ fn weapon_stats() -> Result<(), Box> { &power, &poise_strength, &speed, + &crit_chance, + &crit_mult, &equip_time, item.description(), ])?; diff --git a/common/src/bin/csv_import/main.rs b/common/src/bin/csv_import/main.rs index 46cbd2b62d..011fd86b8b 100644 --- a/common/src/bin/csv_import/main.rs +++ b/common/src/bin/csv_import/main.rs @@ -1,5 +1,6 @@ #![deny(clippy::clone_on_ref_ptr)] +use hashbrown::HashMap; use ron::ser::{to_string_pretty, PrettyConfig}; use serde::Serialize; use std::{error::Error, fs::File, io::Write}; @@ -7,7 +8,7 @@ use structopt::StructOpt; use comp::item::{ armor::{ArmorKind, Protection}, - ItemKind, Quality, + ItemDesc, ItemKind, ItemTag, Quality, }; use veloren_common::{assets::ASSETS_PATH, comp}; @@ -23,15 +24,23 @@ struct FakeItemDef { description: String, kind: ItemKind, quality: Quality, + tags: Vec, } impl FakeItemDef { - fn new(name: String, description: String, kind: ItemKind, quality: Quality) -> Self { + fn new( + name: String, + description: String, + kind: ItemKind, + quality: Quality, + tags: Vec, + ) -> Self { Self { name, description, kind, quality, + tags, } } } @@ -39,6 +48,14 @@ impl FakeItemDef { fn armor_stats() -> Result<(), Box> { let mut rdr = csv::Reader::from_path("armorstats.csv")?; + let headers: HashMap = rdr + .headers() + .expect("Failed to read CSV headers") + .iter() + .enumerate() + .map(|(i, x)| (x.to_string(), i)) + .collect(); + for record in rdr.records() { for item in comp::item::Item::new_from_asset_glob("common.items.armor.*") .expect("Failed to iterate over item folders!") @@ -53,24 +70,27 @@ fn armor_stats() -> Result<(), Box> { } if let Ok(ref record) = record { - if item.item_definition_id() == record.get(0).expect("No file path in csv?") + if item.item_definition_id() + == record.get(headers["Path"]).expect("No file path in csv?") { - let protection = if let Some(protection_raw) = record.get(4) { - if protection_raw == "Invincible" { - Protection::Invincible + let protection = + if let Some(protection_raw) = record.get(headers["Protection"]) { + if protection_raw == "Invincible" { + Protection::Invincible + } else { + let value: f32 = protection_raw.parse().unwrap(); + Protection::Normal(value) + } } else { - let value: f32 = protection_raw.parse().unwrap(); - Protection::Normal(value) - } - } else { - eprintln!( - "Could not unwrap protection value for {:?}", - item.item_definition_id() - ); - Protection::Normal(0.0) - }; + eprintln!( + "Could not unwrap protection value for {:?}", + item.item_definition_id() + ); + Protection::Normal(0.0) + }; - let poise_resilience = if let Some(poise_resilience_raw) = record.get(5) + let poise_resilience = if let Some(poise_resilience_raw) = + record.get(headers["Poise Resilience"]) { if poise_resilience_raw == "Invincible" { Protection::Invincible @@ -89,7 +109,8 @@ fn armor_stats() -> Result<(), Box> { let kind = armor.kind.clone(); let armor = comp::item::armor::Armor::new(kind, protection, poise_resilience); - let quality = if let Some(quality_raw) = record.get(3) { + let quality = if let Some(quality_raw) = record.get(headers["Quality"]) + { match quality_raw { "Low" => comp::item::Quality::Low, "Common" => comp::item::Quality::Common, @@ -115,16 +136,20 @@ fn armor_stats() -> Result<(), Box> { comp::item::Quality::Debug }; - let description = record.get(6).expect(&format!( - "Error unwrapping description for {:?}", - item.item_definition_id() - )); + let description = record + .get(headers["Description"]) + .expect(&format!( + "Error unwrapping description for {:?}", + item.item_definition_id() + )) + .replace("\\'", "'"); let fake_item = FakeItemDef::new( item.name().to_string(), description.to_string(), ItemKind::Armor(armor), quality, + item.tags().to_vec(), ); let pretty_config = PrettyConfig::new() @@ -144,7 +169,7 @@ fn armor_stats() -> Result<(), Box> { write!( writer, "ItemDef{}", - to_string_pretty(&fake_item, pretty_config)? + to_string_pretty(&fake_item, pretty_config)?.replace("\\'", "'") )?; } } @@ -160,18 +185,31 @@ fn armor_stats() -> Result<(), Box> { fn weapon_stats() -> Result<(), Box> { let mut rdr = csv::Reader::from_path("weaponstats.csv")?; + let headers: HashMap = rdr + .headers() + .expect("Failed to read CSV headers") + .iter() + .enumerate() + .map(|(i, x)| (x.to_string(), i)) + .collect(); + for record in rdr.records() { - for item in comp::item::Item::new_from_asset_glob("common.items.weapons.*") - .expect("Failed to iterate over item folders!") - { + let mut items: Vec = comp::Item::new_from_asset_glob("common.items.weapons.*") + .expect("Failed to iterate over item folders!"); + items.extend( + comp::Item::new_from_asset_glob("common.items.npc_weapons.*") + .expect("Failed to iterate over npc weapons!"), + ); + for item in items.iter() { match item.kind() { comp::item::ItemKind::Tool(tool) => { if let Ok(ref record) = record { - if item.item_definition_id() == record.get(0).expect("No file path in csv?") + if item.item_definition_id() + == record.get(headers["Path"]).expect("No file path in csv?") { let kind = tool.kind; let equip_time_secs: f32 = record - .get(8) + .get(headers["Equip Time (s)"]) .expect(&format!( "Error unwrapping equip time for {:?}", item.item_definition_id() @@ -179,7 +217,7 @@ fn weapon_stats() -> Result<(), Box> { .parse() .expect(&format!("Not a u32? {:?}", item.item_definition_id())); let power: f32 = record - .get(5) + .get(headers["Power"]) .expect(&format!( "Error unwrapping power for {:?}", item.item_definition_id() @@ -187,7 +225,7 @@ fn weapon_stats() -> Result<(), Box> { .parse() .expect(&format!("Not a f32? {:?}", item.item_definition_id())); let poise_strength: f32 = record - .get(6) + .get(headers["Poise Strength"]) .expect(&format!( "Error unwrapping poise power for {:?}", item.item_definition_id() @@ -196,7 +234,7 @@ fn weapon_stats() -> Result<(), Box> { .expect(&format!("Not a f32? {:?}", item.item_definition_id())); let speed: f32 = record - .get(7) + .get(headers["Speed"]) .expect(&format!( "Error unwrapping speed for {:?}", item.item_definition_id() @@ -204,7 +242,7 @@ fn weapon_stats() -> Result<(), Box> { .parse() .expect(&format!("Not a f32? {:?}", item.item_definition_id())); - let hands = if let Some(hands_raw) = record.get(3) { + let hands = if let Some(hands_raw) = record.get(headers["Hands"]) { match hands_raw { "One" | "1" | "1h" => comp::item::tool::Hands::One, "Two" | "2" | "2h" => comp::item::tool::Hands::Two, @@ -224,6 +262,24 @@ fn weapon_stats() -> Result<(), Box> { comp::item::tool::Hands::Two }; + let crit_chance: f32 = record + .get(headers["Crit Chance"]) + .expect(&format!( + "Error unwrapping crit_chance for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + + let crit_mult: f32 = record + .get(headers["Crit Mult"]) + .expect(&format!( + "Error unwrapping crit_mult for {:?}", + item.item_definition_id() + )) + .parse() + .expect(&format!("Not a f32? {:?}", item.item_definition_id())); + let tool = comp::item::tool::Tool::new( kind, hands, @@ -231,9 +287,12 @@ fn weapon_stats() -> Result<(), Box> { power, poise_strength, speed, + crit_chance, + crit_mult, ); - let quality = if let Some(quality_raw) = record.get(4) { + let quality = if let Some(quality_raw) = record.get(headers["Quality"]) + { match quality_raw { "Low" => comp::item::Quality::Low, "Common" => comp::item::Quality::Common, @@ -259,7 +318,7 @@ fn weapon_stats() -> Result<(), Box> { comp::item::Quality::Debug }; - let description = record.get(9).expect(&format!( + let description = record.get(headers["Description"]).expect(&format!( "Error unwrapping description for {:?}", item.item_definition_id() )); @@ -269,6 +328,7 @@ fn weapon_stats() -> Result<(), Box> { description.to_string(), ItemKind::Tool(tool), quality, + item.tags().to_vec(), ); let pretty_config = PrettyConfig::new() @@ -288,7 +348,7 @@ fn weapon_stats() -> Result<(), Box> { write!( writer, "ItemDef{}", - to_string_pretty(&fake_item, pretty_config)? + to_string_pretty(&fake_item, pretty_config)?.replace("\\'", "'") )?; } } diff --git a/common/src/combat.rs b/common/src/combat.rs index 5687b237b2..474fc06e8c 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -473,13 +473,15 @@ impl Damage { damage_modifier: f32, ) -> HealthChange { let mut damage = self.value * damage_modifier; + // Critical hit damage (to be applied post-armor for melee, and pre-armor for + // other damage kinds + let critdamage = if is_crit { + damage * (crit_mult - 1.0) + } else { + 0.0 + }; match self.source { DamageSource::Melee => { - // Critical hit - let mut critdamage = 0.0; - if is_crit { - critdamage = damage * (crit_mult - 1.0); - } // Armor damage *= 1.0 - damage_reduction; @@ -498,9 +500,7 @@ impl Damage { }, DamageSource::Projectile => { // Critical hit - if is_crit { - damage *= crit_mult; - } + damage += critdamage; // Armor damage *= 1.0 - damage_reduction; @@ -513,6 +513,8 @@ impl Damage { } }, DamageSource::Explosion => { + // Critical hit + damage += critdamage; // Armor damage *= 1.0 - damage_reduction; @@ -525,6 +527,8 @@ impl Damage { } }, DamageSource::Shockwave => { + // Critical hit + damage += critdamage; // Armor damage *= 1.0 - damage_reduction; @@ -537,6 +541,8 @@ impl Damage { } }, DamageSource::Energy => { + // Critical hit + damage += critdamage; // Armor damage *= 1.0 - damage_reduction; diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs index 4a17daaf6e..b2928e0317 100644 --- a/common/src/comp/inventory/item/modular.rs +++ b/common/src/comp/inventory/item/modular.rs @@ -182,6 +182,16 @@ fn make_component_def( } else { 0.0 }, + crit_chance: if matches!(modkind, ModularComponentKind::Held) { + AVERAGE_STAT_VALUE[tier] * 0.1 + } else { + 0.0 + }, + crit_mult: if matches!(modkind, ModularComponentKind::Damage) { + 1.0 + AVERAGE_STAT_VALUE[tier] + } else { + 0.0 + }, }, }; let kind = ItemKind::ModularComponent(mc); diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index bdbadd77d5..6b1aeec171 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -73,6 +73,8 @@ pub struct Stats { pub power: f32, pub poise_strength: f32, pub speed: f32, + pub crit_chance: f32, + pub crit_mult: f32, } impl Stats { @@ -82,6 +84,8 @@ impl Stats { power: 0.0, poise_strength: 0.0, speed: 0.0, + crit_chance: 0.0, + crit_mult: 0.0, } } @@ -105,6 +109,8 @@ impl AddAssign for Stats { self.power += other.power; self.poise_strength += other.poise_strength; self.speed += other.speed; + self.crit_chance += other.crit_chance; + self.crit_mult += other.crit_mult; } } impl MulAssign for Stats { @@ -113,6 +119,8 @@ impl MulAssign for Stats { self.power *= other.power; self.poise_strength *= other.poise_strength; self.speed *= other.speed; + self.crit_chance *= other.crit_chance; + self.crit_mult *= other.crit_mult; } } impl DivAssign for Stats { @@ -124,6 +132,8 @@ impl DivAssign for Stats { self.power /= scalar as f32; self.poise_strength /= scalar as f32; self.speed /= scalar as f32; + self.crit_chance /= scalar as f32; + self.crit_mult /= scalar as f32; } } @@ -200,6 +210,8 @@ impl From<(&MaterialStatManifest, &[Item], &Tool)> for Stats { power: raw_stats.power * power, poise_strength: raw_stats.poise_strength, speed: raw_stats.speed * speed, + crit_chance: raw_stats.crit_chance, + crit_mult: raw_stats.crit_mult, } } } @@ -215,6 +227,7 @@ pub struct Tool { impl Tool { // DO NOT USE UNLESS YOU KNOW WHAT YOU ARE DOING // Added for CSV import of stats + #[allow(clippy::too_many_arguments)] pub fn new( kind: ToolKind, hands: Hands, @@ -222,6 +235,8 @@ impl Tool { power: f32, poise_strength: f32, speed: f32, + crit_chance: f32, + crit_mult: f32, ) -> Self { Self { kind, @@ -231,6 +246,8 @@ impl Tool { power, poise_strength, speed, + crit_chance, + crit_mult, }), } } @@ -244,6 +261,8 @@ impl Tool { power: 1.00, poise_strength: 1.00, speed: 1.00, + crit_chance: 0.1, + crit_mult: 2.0, }), } } @@ -264,6 +283,14 @@ impl Tool { .speed } + pub fn base_crit_chance(&self, msm: &MaterialStatManifest, components: &[Item]) -> f32 { + self.stats.resolve_stats(msm, components).crit_chance + } + + pub fn base_crit_mult(&self, msm: &MaterialStatManifest, components: &[Item]) -> f32 { + self.stats.resolve_stats(msm, components).crit_mult + } + pub fn equip_time(&self, msm: &MaterialStatManifest, components: &[Item]) -> Duration { Duration::from_secs_f32(self.stats.resolve_stats(msm, components).equip_time_secs) } diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs index 2a4964b239..f370f87419 100644 --- a/common/src/comp/projectile.rs +++ b/common/src/comp/projectile.rs @@ -67,7 +67,12 @@ pub enum ProjectileConstructor { } impl ProjectileConstructor { - pub fn create_projectile(self, owner: Option) -> Projectile { + pub fn create_projectile( + self, + owner: Option, + crit_chance: f32, + crit_mult: f32, + ) -> Projectile { use ProjectileConstructor::*; match self { Arrow { @@ -96,7 +101,7 @@ impl ProjectileConstructor { .with_effect(buff); let attack = Attack::default() .with_damage(damage) - .with_crit(0.5, 1.2) + .with_crit(crit_chance, crit_mult) .with_effect(energy) .with_effect(knockback); @@ -122,7 +127,10 @@ impl ProjectileConstructor { }, Some(GroupTarget::OutOfGroup), ); - let attack = Attack::default().with_damage(damage).with_effect(energy); + let attack = Attack::default() + .with_damage(damage) + .with_crit(crit_chance, crit_mult) + .with_effect(energy); let explosion = Explosion { effects: vec![ RadiusEffect::Attack(attack), @@ -147,7 +155,9 @@ impl ProjectileConstructor { }, Some(GroupTarget::OutOfGroup), ); - let attack = Attack::default().with_damage(damage); + let attack = Attack::default() + .with_damage(damage) + .with_crit(crit_chance, crit_mult); let explosion = Explosion { effects: vec![RadiusEffect::Attack(attack)], radius, @@ -174,7 +184,10 @@ impl ProjectileConstructor { }, Some(GroupTarget::OutOfGroup), ); - let attack = Attack::default().with_damage(damage).with_effect(energy); + let attack = Attack::default() + .with_damage(damage) + .with_crit(crit_chance, crit_mult) + .with_effect(energy); Projectile { hit_solid: vec![Effect::Vanish], @@ -197,7 +210,10 @@ impl ProjectileConstructor { Some(GroupTarget::OutOfGroup), ); let heal = AttackEffect::new(Some(GroupTarget::InGroup), CombatEffect::Heal(heal)); - let attack = Attack::default().with_damage(damage).with_effect(heal); + let attack = Attack::default() + .with_damage(damage) + .with_crit(crit_chance, crit_mult) + .with_effect(heal); let explosion = Explosion { effects: vec![RadiusEffect::Attack(attack)], radius, @@ -283,7 +299,7 @@ impl ProjectileConstructor { if let ProjectileConstructor::Fireball { damage, energy_regen, - .. + radius: _, } = self { ProjectileConstructor::Firebolt { diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs index 844d6b9d11..6479c730bb 100644 --- a/common/src/states/basic_beam.rs +++ b/common/src/states/basic_beam.rs @@ -149,8 +149,11 @@ impl CharacterBehavior for Data { .with_requirement(CombatRequirement::SufficientEnergy( self.static_data.energy_cost, )); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) + .with_crit(crit_chance, crit_mult) .with_effect(energy) .with_effect(heal); diff --git a/common/src/states/basic_melee.rs b/common/src/states/basic_melee.rs index f9fbfeae1a..5e32889794 100644 --- a/common/src/states/basic_melee.rs +++ b/common/src/states/basic_melee.rs @@ -114,9 +114,11 @@ impl CharacterBehavior for Data { Some(GroupTarget::OutOfGroup), ) .with_effect(buff); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) - .with_crit(0.5, 1.3) + .with_crit(crit_chance, crit_mult) .with_effect(energy) .with_effect(poise) .with_effect(knockback); diff --git a/common/src/states/basic_ranged.rs b/common/src/states/basic_ranged.rs index c3d2726c2f..cb0142e939 100644 --- a/common/src/states/basic_ranged.rs +++ b/common/src/states/basic_ranged.rs @@ -83,10 +83,13 @@ impl CharacterBehavior for Data { StageSection::Recover => { if !self.exhausted { // Fire - let projectile = self - .static_data - .projectile - .create_projectile(Some(*data.uid)); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); + let projectile = self.static_data.projectile.create_projectile( + Some(*data.uid), + crit_chance, + crit_mult, + ); update.server_events.push_front(ServerEvent::Shoot { entity: data.entity, dir: data.inputs.look_dir, diff --git a/common/src/states/charged_melee.rs b/common/src/states/charged_melee.rs index 9fb63b9f33..5ec42d92f6 100644 --- a/common/src/states/charged_melee.rs +++ b/common/src/states/charged_melee.rs @@ -180,9 +180,11 @@ impl CharacterBehavior for Data { Some(GroupTarget::OutOfGroup), ) .with_effect(buff); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) - .with_crit(0.5, 1.3) + .with_crit(crit_chance, crit_mult) .with_effect(poise) .with_effect(knockback); diff --git a/common/src/states/charged_ranged.rs b/common/src/states/charged_ranged.rs index 7981e3f998..4d65df8feb 100644 --- a/common/src/states/charged_ranged.rs +++ b/common/src/states/charged_ranged.rs @@ -124,9 +124,11 @@ impl CharacterBehavior for Data { Some(GroupTarget::OutOfGroup), ) .with_effect(buff); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) - .with_crit(0.5, 1.2) + .with_crit(crit_chance, crit_mult) .with_effect(knockback); // Fire diff --git a/common/src/states/combo_melee.rs b/common/src/states/combo_melee.rs index 476673e5e0..da269675ba 100644 --- a/common/src/states/combo_melee.rs +++ b/common/src/states/combo_melee.rs @@ -208,9 +208,11 @@ impl CharacterBehavior for Data { Some(GroupTarget::OutOfGroup), ) .with_effect(buff); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) - .with_crit(0.5, 1.3) + .with_crit(crit_chance, crit_mult) .with_effect(energy) .with_effect(poise) .with_effect(knockback) diff --git a/common/src/states/dash_melee.rs b/common/src/states/dash_melee.rs index e7e19b464e..26d2abfc40 100644 --- a/common/src/states/dash_melee.rs +++ b/common/src/states/dash_melee.rs @@ -160,9 +160,11 @@ impl CharacterBehavior for Data { Some(GroupTarget::OutOfGroup), ) .with_effect(buff); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) - .with_crit(0.5, 1.3) + .with_crit(crit_chance, crit_mult) .with_effect(poise) .with_effect(knockback); diff --git a/common/src/states/leap_melee.rs b/common/src/states/leap_melee.rs index 2bd2002e8b..c9be3dc4c3 100644 --- a/common/src/states/leap_melee.rs +++ b/common/src/states/leap_melee.rs @@ -170,9 +170,11 @@ impl CharacterBehavior for Data { Some(GroupTarget::OutOfGroup), ) .with_effect(buff); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) - .with_crit(0.5, 1.3) + .with_crit(crit_chance, crit_mult) .with_effect(poise) .with_effect(knockback); diff --git a/common/src/states/repeater_ranged.rs b/common/src/states/repeater_ranged.rs index 89fa6aca8a..a9904efc12 100644 --- a/common/src/states/repeater_ranged.rs +++ b/common/src/states/repeater_ranged.rs @@ -135,10 +135,13 @@ impl CharacterBehavior for Data { } if self.reps_remaining > 0 { // Fire - let projectile = self - .static_data - .projectile - .create_projectile(Some(*data.uid)); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); + let projectile = self.static_data.projectile.create_projectile( + Some(*data.uid), + crit_chance, + crit_mult, + ); update.server_events.push_front(ServerEvent::Shoot { entity: data.entity, // Provides slight variation to projectile direction diff --git a/common/src/states/shockwave.rs b/common/src/states/shockwave.rs index 8cf88ef4e6..bb233d8606 100644 --- a/common/src/states/shockwave.rs +++ b/common/src/states/shockwave.rs @@ -100,8 +100,11 @@ impl CharacterBehavior for Data { }, Some(GroupTarget::OutOfGroup), ); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) + .with_crit(crit_chance, crit_mult) .with_effect(poise) .with_effect(knockback); let properties = shockwave::Properties { diff --git a/common/src/states/spin_melee.rs b/common/src/states/spin_melee.rs index 418007e000..f91306d1d7 100644 --- a/common/src/states/spin_melee.rs +++ b/common/src/states/spin_melee.rs @@ -135,9 +135,11 @@ impl CharacterBehavior for Data { Some(GroupTarget::OutOfGroup), ) .with_effect(buff); + let (crit_chance, crit_mult) = + get_crit_data(data, self.static_data.ability_info); let attack = Attack::default() .with_damage(damage) - .with_crit(0.5, 1.3) + .with_crit(crit_chance, crit_mult) .with_effect(poise) .with_effect(knockback); diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index e2913acbe7..fef074dd46 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -575,6 +575,24 @@ pub fn unwrap_tool_data<'a>(data: &'a JoinData, equip_slot: EquipSlot) -> Option } } +pub fn get_crit_data(data: &JoinData, ai: AbilityInfo) -> (f32, f32) { + const DEFAULT_CRIT_DATA: (f32, f32) = (0.5, 1.3); + use HandInfo::*; + let slot = match ai.hand { + Some(TwoHanded) | Some(MainHand) => EquipSlot::Mainhand, + Some(OffHand) => EquipSlot::Offhand, + None => return DEFAULT_CRIT_DATA, + }; + if let Some(item) = data.inventory.equipped(slot) { + if let ItemKind::Tool(tool) = item.kind() { + let crit_chance = tool.base_crit_chance(data.msm, item.components()); + let crit_mult = tool.base_crit_mult(data.msm, item.components()); + return (crit_chance, crit_mult); + } + } + DEFAULT_CRIT_DATA +} + pub fn handle_interrupt(data: &JoinData, update: &mut StateUpdate, attacks_interrupt: bool) { if attacks_interrupt { handle_ability1_input(data, update); diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index e7740815f8..7f195b9aa7 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -263,7 +263,11 @@ fn statblock_desc(stats: &Stats) -> String { stats.speed * stats.power * 10.0, // Damage per second stats.power * 10.0, //stats.poise_strength * 10.0, - stats.speed + stats.speed, + ) + &format!( + "Critical chance: {:0.1}%\n\nCritical multiplier: {:0.1}x\n\n", + stats.crit_chance * 100.0, + stats.crit_mult, ) } @@ -321,6 +325,8 @@ mod tests { power: 3.0, poise_strength: 5.0, speed: 7.0, + crit_chance: 0.5, + crit_mult: 2.0, }, ); @@ -330,7 +336,7 @@ mod tests { ); assert_eq!( "Crafting Ingredient\n\nA bronze ingot.\n\nStat multipliers:\nDPS: 210.0\n\nPower: \ - 30.0\n\nSpeed: 7.0\n\n", + 30.0\n\nSpeed: 7.0\n\nCritical chance: 50.0%\n\nCritical multiplier: 2.0x\n\n", ingredient_desc( "A bronze ingot.", "common.items.crafting_ing.bronze_ingot",