Merge pull request #74600 from anothersimulacrum/dps-for-weapons

Check DPS for all weapons, make bows, bionics, and clothes worse weapons
CleverRaven · Jun 19, 2024 · bc964cb · bc964cb
2 parents d2ce2d5 + a76e405
commit bc964cb
Show file tree

Hide file tree

Showing 25 changed files with 691 additions and 166 deletions.
diff --git a/data/json/items/armor/bespoke_armor/custom_headgear.json b/data/json/items/armor/bespoke_armor/custom_headgear.json
@@ -85,7 +85,7 @@
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ],
     "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ],
-    "melee_damage": { "bash": 10 }
+    "melee_damage": { "bash": 4 }
   },
   {
     "id": "hood_wsurvivor",
@@ -107,7 +107,7 @@
     "environmental_protection": 5,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ],
     "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ],
-    "melee_damage": { "bash": 10 }
+    "melee_damage": { "bash": 4 }
   },
   {
     "id": "xl_hood_wsurvivor",
@@ -161,7 +161,7 @@
     "environmental_protection": 3,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ],
     "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ],
-    "melee_damage": { "bash": 10 }
+    "melee_damage": { "bash": 4 }
   },
   {
     "id": "xl_hood_lsurvivor",
@@ -241,7 +241,7 @@
         "covers": [ "head" ]
       }
     ],
-    "melee_damage": { "bash": 10 },
+    "melee_damage": { "bash": 4 },
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
@@ -320,7 +320,7 @@
         "covers": [ "head" ]
       }
     ],
-    "melee_damage": { "bash": 10 },
+    "melee_damage": { "bash": 4 },
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
@@ -398,7 +398,7 @@
         "covers": [ "head" ]
       }
     ],
-    "melee_damage": { "bash": 10 },
+    "melee_damage": { "bash": 4 },
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",

diff --git a/data/json/items/armor/bespoke_armor/cuttingroom.json b/data/json/items/armor/bespoke_armor/cuttingroom.json
@@ -233,7 +233,7 @@
     "environmental_protection": 10,
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ],
     "armor": [ { "encumbrance": 30, "coverage": 100, "covers": [ "head" ] } ],
-    "melee_damage": { "bash": 10 }
+    "melee_damage": { "bash": 4 }
   },
   {
     "id": "xl_hood_fsurvivor",

diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -1277,7 +1277,7 @@
         "coverage": 100
       }
     ],
-    "melee_damage": { "bash": 14 }
+    "melee_damage": { "bash": 10 }
   },
   {
     "id": "dance_shoes",

diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json
@@ -11,10 +11,9 @@
     "color": "yellow",
     "price_postapoc": "10 USD",
     "use_action": [ "install_bionic" ],
-    "flags": [ "CBM" ],
+    "flags": [ "CBM", "FRAGILE_MELEE" ],
     "is_upgrade": false,
-    "faults": [ "fault_bionic_salvaged" ],
-    "melee_damage": { "bash": 8 }
+    "faults": [ "fault_bionic_salvaged" ]
   },
   {
     "abstract": "bionic_general_npc_usable",

diff --git a/data/json/items/gunmod/stock.json b/data/json/items/gunmod/stock.json
@@ -401,7 +401,7 @@
     "mod_targets": [ "m26_mass_standalone" ],
     "handling_modifier": 4,
     "min_skills": [ [ "shotgun", 2 ] ],
-    "melee_damage": { "bash": 6 }
+    "melee_damage": { "bash": 4 }
   },
   {
     "id": "scout_stock",
@@ -421,7 +421,7 @@
     "color": "dark_gray",
     "location": "stock",
     "mod_targets": [ "steyr_scout" ],
-    "melee_damage": { "bash": 6 },
+    "melee_damage": { "bash": 3 },
     "pocket_mods": [
       {
         "pocket_type": "CONTAINER",

diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json
@@ -339,6 +339,7 @@
     "//": "52in Elm Shortbow at 24in draw with 26in, 0.077 lb aspen arrow: 45J, 50 lbs draw, 0.35 slugs with 30g arrow.",
     "material": [ "wood" ],
     "flags": [
+      "FRAGILE_MELEE",
       "FIRE_TWOHAND",
       "RELOAD_AND_SHOOT",
       "PRIMITIVE_RANGED_WEAPON",
@@ -378,7 +379,7 @@
     "valid_mod_locations": [ [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 6 }
+    "melee_damage": { "bash": 3 }
   },
   {
     "id": "compbow",
@@ -391,7 +392,15 @@
     "price": "550 USD",
     "//": "60 lb draw weight 24in draw, 100J, 0.55 slugs of momentum with a 30g arrow.",
     "material": [ "steel", "plastic" ],
-    "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "SHEATH_BOW", "WATERPROOF_GUN", "NEVER_JAMS" ],
+    "flags": [
+      "FIRE_TWOHAND",
+      "RELOAD_AND_SHOOT",
+      "FRAGILE_MELEE",
+      "PRIMITIVE_RANGED_WEAPON",
+      "SHEATH_BOW",
+      "WATERPROOF_GUN",
+      "NEVER_JAMS"
+    ],
     "ammo_effects": [ "NEVER_MISFIRES" ],
     "skill": "archery",
     "min_strength": 9,
@@ -420,7 +429,7 @@
     },
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 8 }
+    "melee_damage": { "bash": 4 }
   },
   {
     "id": "compbow_high",
@@ -477,6 +486,7 @@
       "WATER_FRIENDLY",
       "SHEATH_BOW",
       "WATERPROOF_GUN",
+      "FRAGILE_MELEE",
       "NEVER_JAMS"
     ],
     "ammo_effects": [ "NEVER_MISFIRES" ],
@@ -512,7 +522,7 @@
     "valid_mod_locations": [ [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 8 }
+    "melee_damage": { "bash": 4 }
   },
   {
     "id": "reflexbow",
@@ -530,6 +540,7 @@
       "RELOAD_AND_SHOOT",
       "PRIMITIVE_RANGED_WEAPON",
       "BELTED",
+      "FRAGILE_MELEE",
       "WATER_FRIENDLY",
       "SHEATH_BOW",
       "WATERPROOF_GUN",
@@ -565,7 +576,7 @@
     "valid_mod_locations": [ [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 12 }
+    "melee_damage": { "bash": 6 }
   },
   {
     "id": "recurbow",
@@ -581,6 +592,7 @@
     "flags": [
       "FIRE_TWOHAND",
       "RELOAD_AND_SHOOT",
+      "FRAGILE_MELEE",
       "PRIMITIVE_RANGED_WEAPON",
       "BELTED",
       "WATER_FRIENDLY",
@@ -621,7 +633,7 @@
     "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 12 }
+    "melee_damage": { "bash": 6 }
   },
   {
     "id": "takedown_recurbow",
@@ -636,6 +648,7 @@
     "material": [ "steel", "fiberglass" ],
     "flags": [
       "FIRE_TWOHAND",
+      "FRAGILE_MELEE",
       "RELOAD_AND_SHOOT",
       "PRIMITIVE_RANGED_WEAPON",
       "BELTED",
@@ -687,7 +700,7 @@
       "ammo_scale": 0,
       "moves": 1500
     },
-    "melee_damage": { "bash": 12 }
+    "melee_damage": { "bash": 6 }
   },
   {
     "id": "takedown_recurbow_folded",
@@ -706,7 +719,7 @@
     "longest_side": "60 cm",
     "//2": "When taken down.",
     "price_postapoc": "22 USD",
-    "flags": [ "NO_TURRET" ],
+    "flags": [ "FRAGILE_MELEE", "NO_TURRET" ],
     "modes": [ [ "DEFAULT", "disassembled", 0, [ "MELEE" ] ] ],
     "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
@@ -718,7 +731,7 @@
       "msg": "You assemble your bow.",
       "moves": 1500
     },
-    "melee_damage": { "bash": 12 }
+    "melee_damage": { "bash": 6 }
   },
   {
     "id": "longbow",
@@ -738,6 +751,7 @@
       "WATER_FRIENDLY",
       "SHEATH_BOW",
       "WATERPROOF_GUN",
+      "FRAGILE_MELEE",
       "NEVER_JAMS"
     ],
     "ammo_effects": [ "NEVER_MISFIRES" ],
@@ -770,7 +784,7 @@
     "valid_mod_locations": [ [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 10 }
+    "melee_damage": { "bash": 5 }
   },
   {
     "id": "woodgreatbow",
@@ -846,7 +860,15 @@
     "price": "1 kUSD 600 USD",
     "//": "120 lb draw weight, very efficient, 0.5 slugs of momentum with a 30g arrow.",
     "material": [ "steel", "plastic" ],
-    "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "SHEATH_BOW", "WATERPROOF_GUN", "NEVER_JAMS" ],
+    "flags": [
+      "FIRE_TWOHAND",
+      "FRAGILE_MELEE",
+      "RELOAD_AND_SHOOT",
+      "PRIMITIVE_RANGED_WEAPON",
+      "SHEATH_BOW",
+      "WATERPROOF_GUN",
+      "NEVER_JAMS"
+    ],
     "ammo_effects": [ "NEVER_MISFIRES" ],
     "skill": "archery",
     "min_strength": 15,
@@ -866,7 +888,7 @@
     "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "stabilizer", 1 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 14 }
+    "melee_damage": { "bash": 7 }
   },
   {
     "id": "reflexrecurvebow",
@@ -884,6 +906,7 @@
       "RELOAD_AND_SHOOT",
       "PRIMITIVE_RANGED_WEAPON",
       "BELTED",
+      "FRAGILE_MELEE",
       "WATER_FRIENDLY",
       "SHEATH_BOW",
       "WATERPROOF_GUN",
@@ -919,6 +942,6 @@
     "valid_mod_locations": [ [ "sights", 1 ], [ "dampening", 1 ], [ "arrow rest", 1 ] ],
     "reload": 50,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 }, "open_container": true } ],
-    "melee_damage": { "bash": 12 }
+    "melee_damage": { "bash": 6 }
   }
 ]