Merge pull request #77838 from Karol1223/moretohit

Pruning the old ``to-hit`` syntax - Part 11
CleverRaven · Nov 15, 2024 · 4f476ed · 4f476ed
2 parents 67ed1bc + b89da8e
commit 4f476ed
Show file tree

Hide file tree

Showing 16 changed files with 120 additions and 318 deletions.
diff --git a/data/json/items/book/abstract.json b/data/json/items/book/abstract.json
@@ -428,7 +428,6 @@
     "volume": "250 ml",
     "price": "1 kUSD",
     "price_postapoc": "7 USD 50 cent",
-    "to_hit": -1,
     "material": [ "paper" ],
     "skill": "electronics",
     "required_level": 7,
@@ -451,7 +450,6 @@
     "flags": [ "PAPER_SHAPED" ],
     "price": "10 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
     "material": [ "paper" ],
     "symbol": ";",
     "color": "light_gray"

diff --git a/data/json/items/containers/generic.json b/data/json/items/containers/generic.json
@@ -172,7 +172,6 @@
     "longest_side": "150 cm",
     "price": 0,
     "price_postapoc": 0,
-    "to_hit": -3,
     "use_action": [ "CHANGE_OUTFIT" ],
     "material": [ "plastic" ],
     "pocket_data": [

diff --git a/data/json/items/corpses/dead_exodii.json b/data/json/items/corpses/dead_exodii.json
@@ -11,9 +11,7 @@
     "material": [ "steel" ],
     "volume": "119 L",
     "weight": "221 kg",
-    "to_hit": -3,
-    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
-    "melee_damage": { "bash": 20, "cut": 15 }
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
   },
   {
     "type": "GENERIC",
@@ -27,9 +25,7 @@
     "material": [ "steel" ],
     "volume": "410 L",
     "weight": "498 kg",
-    "to_hit": -3,
-    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
-    "melee_damage": { "bash": 20, "cut": 15 }
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
   },
   {
     "type": "GENERIC",
@@ -43,9 +39,7 @@
     "material": [ "steel" ],
     "weight": "206 kg",
     "volume": "105 L",
-    "to_hit": -3,
-    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
-    "melee_damage": { "bash": 20, "cut": 15 }
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
   },
   {
     "type": "GENERIC",
@@ -59,8 +53,6 @@
     "material": [ "steel" ],
     "volume": "70 L",
     "weight": "150 kg",
-    "to_hit": -3,
-    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
-    "melee_damage": { "bash": 20, "cut": 15 }
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
   }
 ]
diff --git a/data/json/items/corpses/dead_yrax.json b/data/json/items/corpses/dead_yrax.json
@@ -11,9 +11,7 @@
     "material": [ "steel", "yrax_quartz" ],
     "volume": "119 L",
     "weight": "221 kg",
-    "to_hit": -3,
-    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
-    "melee_damage": { "bash": 20, "cut": 15 }
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
   },
   {
     "type": "GENERIC",
@@ -27,9 +25,7 @@
     "material": [ "steel", "yrax_quartz" ],
     "volume": "119 L",
     "weight": "221 kg",
-    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
-    "flags": [ "TRADER_AVOID", "NO_REPAIR" ],
-    "melee_damage": { "bash": 20, "cut": 15 }
+    "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
   },
   {
     "id": "broken_golden_monolith",
@@ -42,7 +38,6 @@
     "weight": "8282 kg",
     "price": "50 USD",
     "price_postapoc": "50 USD",
-    "melee_damage": { "bash": 1000 },
     "material": [ "yrax_quartz", "gold" ],
     "color": "yellow",
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
@@ -79,7 +74,6 @@
     "longest_side": "400 cm",
     "price": "50 USD",
     "price_postapoc": "50 USD",
-    "melee_damage": { "bash": 100 },
     "material": [ "yrax_quartz", "gold" ],
     "color": "yellow",
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
@@ -96,7 +90,6 @@
     "longest_side": "400 cm",
     "price": "50 USD",
     "price_postapoc": "50 USD",
-    "melee_damage": { "bash": 100 },
     "material": [ "yrax_quartz", "gold" ],
     "color": "yellow",
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ]