feat(balance): standardize how replica and fake weapons are statted o…

…ut, and uncrafts to fake weapons (#5350)
cataclysmbnteam · Sep 14, 2024 · 8bce77d · 8bce77d
1 parent 0cf652b
commit 8bce77d
Show file tree

Hide file tree

Showing 5 changed files with 413 additions and 189 deletions.
diff --git a/data/json/items/melee/axes.json b/data/json/items/melee/axes.json
@@ -28,10 +28,10 @@
     "description": "This is a huge axe designed for warfare.  You notice that the axe heads aren't seated properly at all.",
     "price_postapoc": "20 USD",
     "material": [ "budget_steel", "wood" ],
-    "bashing": 42,
-    "cutting": 10,
-    "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ],
-    "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -20 ] ]
+    "repairs_like": "battleaxe",
+    "proportional": { "weight": 1.2, "cutting": 0.85 },
+    "relative": { "to_hit": -1 },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "battleaxe_fake",
@@ -43,11 +43,11 @@
     "price_postapoc": "5 USD",
     "material": [ "aluminum", "wood" ],
     "qualities": [  ],
-    "flags": [ "NONCONDUCTIVE", "SHEATH_AXE", "FRAGILE_MELEE" ],
-    "weight": "2068 g",
-    "volume": "3250 ml",
-    "bashing": 21,
-    "cutting": 3
+    "repairs_like": "battleaxe",
+    "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 },
+    "relative": { "to_hit": -1 },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "halberd",
@@ -77,14 +77,14 @@
     "description": "This is a dull, cheaply made replica of a polearm with an axe blade, a spike, and other fun things attached to a long stick.",
     "price": "50 USD",
     "material": [ "wood", "aluminum" ],
-    "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ],
     "techniques": [ "WBLOCK_1", "SWEEP" ],
-    "weight": "1644 g",
-    "bashing": 22,
-    "cutting": 4,
-    "to_hit": 1,
     "price_postapoc": "5 USD",
-    "qualities": [  ]
+    "qualities": [  ],
+    "repairs_like": "halberd",
+    "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 },
+    "relative": { "to_hit": -1 },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "bowling_axe",

diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
@@ -182,27 +182,28 @@
     "id": "bokken_inferior",
     "type": "GENERIC",
     "copy-from": "bokken",
-    "looks_like": "bokken",
     "name": { "str": "bokken replica" },
     "description": "This is a solid wood 'training' katana, but it looks to be mass-produced, and not quite as effective as the real deal.",
     "price": "125 USD",
     "price_postapoc": "750 cent",
-    "flags": [ "SHEATH_SWORD" ],
-    "to_hit": 1
+    "repairs_like": "bokken",
+    "proportional": { "weight": 0.8, "bashing": 0.85 },
+    "relative": { "to_hit": -1 },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "bokken_fake",
     "type": "GENERIC",
     "copy-from": "bokken",
-    "looks_like": "bokken",
     "name": { "str": "bokken fake" },
     "description": "This is a solid wood 'training' katana, but feels far too light to make an effective weapon.",
     "price": "125 USD",
     "price_postapoc": "5 USD",
-    "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
-    "weight": "680 g",
-    "bashing": 13,
-    "to_hit": 1
+    "repairs_like": "bokken",
+    "proportional": { "weight": 0.6, "bashing": 0.5 },
+    "relative": { "to_hit": -1 },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "bowling_pin",
@@ -484,17 +485,17 @@
     "type": "GENERIC",
     "copy-from": "lucern_hammer",
     "name": { "str": "lucerne hammer fake" },
-    "description": "This is a cheap piece of crap imitation of a versatile polearm with a spiked hammer head, probably used for LARPing",
+    "description": "This is a cheap piece of crap imitation of a versatile polearm with a spiked hammer head, probably used for LARPing.",
     "price": "40 USD",
     "price_postapoc": "5 USD",
     "material": [ "wood", "aluminum" ],
-    "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE", "STAB" ],
     "techniques": [ "WBLOCK_1", "SWEEP" ],
-    "weight": "2700 g",
-    "volume": "3750 ml",
-    "bashing": 48,
-    "cutting": 8,
-    "qualities": [ [ "HAMMER", 1 ], [ "COOK", 1 ] ]
+    "qualities": [  ],
+    "repairs_like": "lucern_hammer",
+    "proportional": { "weight": 0.6, "bashing": 0.5 },
+    "relative": { "to_hit": -1 },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "mace",
@@ -523,12 +524,12 @@
     "copy-from": "mace",
     "name": { "str": "mace replica" },
     "description": "A medieval weapon consisting of a wood handle with a heavy iron end.  That iron end feels a bit loose.",
-    "weight": "1000 g",
     "looks_like": "mace",
     "material": [ "budget_steel", "wood" ],
-    "flags": [ "NONCONDUCTIVE" ],
-    "volume": "1250 ml",
-    "bashing": 22,
+    "repairs_like": "mace",
+    "proportional": { "weight": 0.8, "bashing": 0.85 },
+    "relative": { "to_hit": -1 },
+    "delete": { "flags": [ "DURABLE_MELEE" ] },
     "price": "100 USD",
     "price_postapoc": "10 USD"
   },
@@ -538,14 +539,15 @@
     "copy-from": "mace",
     "name": { "str": "mace fake" },
     "description": "A light, cheaply made replica of a medieval weapon that would normally consist of a wood handle with a heavy iron end.",
-    "weight": "750 g",
-    "looks_like": "mace",
     "material": [ "aluminum", "wood" ],
-    "flags": [ "NONCONDUCTIVE", "FRAGILE_MELEE" ],
-    "bashing": 15,
     "price": "100 USD",
     "price_postapoc": "5 USD",
-    "qualities": [  ]
+    "qualities": [  ],
+    "repairs_like": "mace",
+    "proportional": { "weight": 0.6, "bashing": 0.5 },
+    "relative": { "to_hit": -1 },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "makeshift_sap",
@@ -612,12 +614,11 @@
     "copy-from": "morningstar",
     "name": { "str": "morningstar replica" },
     "description": "A medieval weapon consisting of a wood handle with a heavy, spiked iron ball on the end.  That end feels lighter than it should.",
-    "weight": "1000 g",
-    "looks_like": "morningstar",
     "material": [ "budget_steel", "wood" ],
-    "bashing": 26,
-    "cutting": 1,
-    "flags": [ "STAB", "NONCONDUCTIVE" ],
+    "repairs_like": "morningstar",
+    "proportional": { "weight": 0.8, "bashing": 0.85 },
+    "relative": { "to_hit": -1 },
+    "delete": { "flags": [ "DURABLE_MELEE" ] },
     "price": "120 USD",
     "price_postapoc": "10 USD"
   },
@@ -839,9 +840,11 @@
     "description": "A fake shillelagh massproduced as a souvenir for tourists.  This knotty stick has not been cured in a chimney like a traditional shillelagh but has had fake black soot painted on.",
     "price": "25 USD",
     "price_postapoc": "50 cent",
-    "flags": [ "FRAGILE_MELEE" ],
-    "weight": "850 g",
-    "to_hit": 1
+    "repairs_like": "shillelagh",
+    "proportional": { "weight": 0.6, "bashing": 0.5 },
+    "relative": { "to_hit": -1 },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "tonfa",

diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
@@ -380,9 +380,10 @@
     "name": { "str": "naginata replica" },
     "description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades.  This one has a bit of wiggle to its blade and feels a bit shoddily made.",
     "material": [ "budget_steel", "wood" ],
-    "bashing": 29,
-    "cutting": 11,
-    "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "SPEAR" ],
+    "repairs_like": "naginata",
+    "proportional": { "weight": 1.2, "cutting": 0.85 },
+    "relative": { "to_hit": -1 },
+    "delete": { "flags": [ "DURABLE_MELEE" ] },
     "price_postapoc": "15 USD"
   },
   {
@@ -391,15 +392,15 @@
     "copy-from": "naginata",
     "name": { "str": "naginata fake" },
     "description": "This is a dull, slightly floppy replica of a Japanese polearm with a curved blade.  With a little difficulty, you could use it administer a solid slap from a distance.",
-    "weight": "1000 g",
     "material": [ "aluminum", "wood" ],
-    "bashing": 12,
-    "cutting": 2,
-    "to_hit": 1,
-    "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "FRAGILE_MELEE", "SPEAR" ],
     "price": "80 USD",
     "price_postapoc": "5 USD",
-    "qualities": [  ]
+    "qualities": [  ],
+    "repairs_like": "naginata",
+    "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 },
+    "relative": { "to_hit": -1 },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "spear_survivor",
@@ -523,28 +524,26 @@
     "name": { "ctxt": "weapon", "str": "pike replica" },
     "description": "This is a medieval weapon consisting of a wood shaft tipped with an iron spearhead.  The head seems to be pretty dull, and the whole thing feels poorly made.",
     "price_postapoc": "1250 cent",
-    "to_hit": -1,
-    "bashing": 25,
-    "cutting": 8,
     "material": [ "budget_steel", "wood" ],
-    "looks_like": "pike",
-    "flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND", "STAB" ]
+    "repairs_like": "pike",
+    "proportional": { "weight": 1.2, "cutting": 0.85 },
+    "relative": { "to_hit": -1 },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "pike_fake",
     "type": "GENERIC",
     "copy-from": "pike",
     "name": { "ctxt": "weapon", "str": "pike fake" },
     "description": "This is a dull, cheaply made replica of a medieval weapon consisting of a wood shaft tipped with an iron spearhead.",
-    "weight": "2000 g",
     "price": "40 USD",
     "price_postapoc": "5 USD",
-    "to_hit": 1,
-    "bashing": 13,
-    "cutting": 2,
     "material": [ "aluminum", "wood" ],
-    "looks_like": "pike",
-    "flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND", "FRAGILE_MELEE", "STAB" ]
+    "repairs_like": "pike",
+    "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 },
+    "relative": { "to_hit": -1 },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "delete": { "flags": [ "DURABLE_MELEE" ] }
   },
   {
     "id": "spear_dory",