diff --git a/data/json/items/melee/axes.json b/data/json/items/melee/axes.json index 5468ca63543d..ac16e6bc8175 100644 --- 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 index c65e7247448e..91a2423dd323 100644 --- 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 index 006460292119..c2bbd21a40fc 100644 --- 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,12 +524,11 @@ "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", @@ -536,15 +536,14 @@ "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", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 5e49d68452a8..52160ab91689 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -407,14 +407,15 @@ "copy-from": "cavalry_sabre", "name": { "str": "cavalry saber fake" }, "description": "This is a dull, cheap replica of a curved sword associated with cavalry, from the Early Modern period onwards.", - "weight": "600 g", "price": "97 USD", "price_postapoc": "50 cent", - "bashing": 9, - "cutting": 2, "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "qualities": [ ] + "qualities": [ ], + "repairs_like": "cavalry_sabre", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "kris", @@ -446,10 +447,12 @@ "price": "38 USD", "price_postapoc": "10 cent", "material": "aluminum", - "bashing": 2, - "cutting": 2, - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "qualities": [ ] + "qualities": [ ], + "repairs_like": "kris", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "kukri", @@ -500,9 +503,10 @@ "description": "This is an ancient Chinese doubled-edged straight sword. The sword is quite worn, and bent at an odd angle.", "price_postapoc": "750 cent", "material": "budget_steel", - "flags": [ "SHEATH_SWORD" ], - "bashing": 7, - "cutting": 24 + "repairs_like": "jian", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "jian_fake", @@ -513,10 +517,12 @@ "price": "100 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "400 g", - "cutting": 2, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "jian", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "scimitar", @@ -547,9 +553,10 @@ "description": "This is a curved sword associated with various Middle Eastern and Central Asian countries. This one seems oddly dull and worn.", "price_postapoc": "5 USD", "material": "budget_steel", - "flags": [ "SHEATH_SWORD" ], - "bashing": 5, - "cutting": 24 + "repairs_like": "scimitar", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "scimitar_fake", @@ -560,11 +567,12 @@ "price": "93 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "586 g", - "volume": "2 L", - "cutting": 2, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "scimitar", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "estoc", @@ -594,9 +602,10 @@ "description": "This is a thin, edgeless thrusting sword, a sort of predecessor to the rapier. It requires a larger baldric or scabbard, compared to smaller swords. It seems a bit too bendy.", "price_postapoc": "750 cent", "material": "budget_steel", - "flags": [ "STAB", "SHEATH_SWORD" ], - "bashing": 29, - "cutting": 10 + "repairs_like": "estoc", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "estoc_fake", @@ -607,11 +616,11 @@ "price": "135 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "STAB", "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "939 g", - "bashing": 13, - "cutting": 2, - "to_hit": 2 + "repairs_like": "estoc", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "longsword", @@ -642,9 +651,10 @@ "description": "This is a classic medieval sword, in between the lighter arming sword and later two-handed swords in size. You feel like the pommel could just snap off if you used it.", "price_postapoc": "750 cent", "material": "budget_steel", - "flags": [ "SHEATH_SWORD" ], - "bashing": 30, - "cutting": 9 + "repairs_like": "longsword", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "longsword_fake", @@ -655,12 +665,12 @@ "price": "130 USD", "price_postapoc": "1 USD", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "939 g", - "bashing": 15, - "cutting": 2, - "to_hit": 1, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "longsword", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "arming_sword", @@ -692,10 +702,10 @@ "description": "This is a classic medieval sword, just the right size to use one-handed. This one doesn't seem to have been made right.", "price_postapoc": "750 cent", "material": "budget_steel", - "flags": [ "SHEATH_SWORD" ], - "weight": "2721 g", - "bashing": 12, - "cutting": 25 + "repairs_like": "arming_sword", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "arming_sword_fake", @@ -707,11 +717,12 @@ "price": "100 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "704 g", - "cutting": 2, - "to_hit": 2, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "arming_sword", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "sword_xiphos", @@ -865,14 +876,14 @@ "type": "GENERIC", "copy-from": "tanto", "name": { "str": "tanto replica" }, - "description": "Long Japanese knives like this more-modern remake were the samurai's backup weapon, before the advent of the larger wakizashi. This one doesn't feel well-balanced", - "looks_like": "tanto", - "weight": "374 g", + "description": "Long Japanese knives like this more-modern remake were the samurai's backup weapon, before the advent of the larger wakizashi. This one doesn't feel well-balanced.", "price_postapoc": "25 cent", - "cutting": 12, "material": "budget_steel", - "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 7 ] ], - "flags": [ "STAB", "SHEATH_KNIFE" ] + "repairs_like": "tanto", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] }, + "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 7 ] ] }, { "id": "tanto_fake", @@ -881,14 +892,15 @@ "name": { "str": "tanto fake" }, "description": "This is a dull, cheaply made replica of a long Japanese knife, typically used as a samurai's backup weapon.", "looks_like": "tanto", - "weight": "374 g", "price": "18 USD", "price_postapoc": "10 cent", - "to_hit": 1, - "cutting": 7, "material": "aluminum", - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 5 ] ], - "flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ] + "qualities": [ ], + "repairs_like": "tanto", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "wakizashi", @@ -920,9 +932,10 @@ "price": "178 USD", "price_postapoc": "5 USD", "material": "budget_steel", - "flags": [ "SHEATH_SWORD" ], - "bashing": 17, - "cutting": 7 + "repairs_like": "wakizashi", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "wakizashi_fake", @@ -933,11 +946,12 @@ "price": "78 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "557 g", - "bashing": 8, - "cutting": 2, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "wakizashi", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "zweihander", @@ -968,9 +982,10 @@ "description": "This is a huge two-handed sword from Germany. You're not quite sure it's supposed to be that bendy.", "price_postapoc": "750 cent", "material": "budget_steel", - "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ], - "bashing": 38, - "cutting": 10 + "repairs_like": "zweihaender", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "zweihander_fake", @@ -981,11 +996,12 @@ "price": "80 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ], - "bashing": 19, - "cutting": 3, - "to_hit": 1, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "zweihander", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "kirpan", @@ -1018,9 +1034,12 @@ "looks_like": "kirpan", "price": "9 USD", "price_postapoc": "50 cent", - "cutting": 9, "material": "budget_steel", - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 4 ] ] + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 4 ] ], + "repairs_like": "kirpan", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "nodachi", @@ -1052,11 +1071,11 @@ "price": "150 USD", "price_postapoc": "5 USD", "material": "budget_steel", - "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ], - "techniques": [ "WBLOCK_1", "RAPID", "WIDE" ], - "weight": "1882 g", - "bashing": 30, - "cutting": 12 + "repairs_like": "nodachi", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] }, + "techniques": [ "WBLOCK_1", "RAPID", "WIDE" ] }, { "id": "nodachi_fake", @@ -1067,13 +1086,13 @@ "price": "150 USD", "price_postapoc": "250 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ], "techniques": [ "WBLOCK_1", "RAPID", "WIDE" ], - "weight": "1882 g", - "to_hit": 1, - "bashing": 15, - "cutting": 3, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "nodachi", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "fencing_foil", @@ -1308,9 +1327,10 @@ "description": "This is an early modern sword seeing use in the 16th, 17th, and 18th centuries. This sword appears to be made very poorly, but it should still stand up to a few swings.", "price_postapoc": "750 cent", "material": "budget_steel", - "flags": [ "SHEATH_SWORD" ], - "bashing": 7, - "cutting": 29 + "repairs_like": "broadsword", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "broadsword_fake", @@ -1321,11 +1341,11 @@ "price": "120 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "753 g", - "bashing": 10, - "cutting": 2, - "to_hit": 1 + "repairs_like": "broadsword", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "rapier", @@ -1396,11 +1416,11 @@ "price": "98 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "STAB", "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "660 g", - "bashing": 4, - "cutting": 2, - "to_hit": 1 + "repairs_like": "rapier", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "katana", @@ -1428,13 +1448,14 @@ "type": "GENERIC", "copy-from": "katana", "name": { "str": "katana replica" }, - "description": "This is a rare sword from Japan. While it's got the right edge and weight, the pommel just snaps off, and the blade seems pretty worn.", + "description": "This is a rare sword from Japan. While it's got the right edge and balance, the pommel just snaps off, and the blade seems pretty worn.", "price": "980 USD", "price_postapoc": "250 cent", "material": "budget_steel", - "flags": [ "SHEATH_SWORD" ], - "bashing": 22, - "cutting": 9 + "repairs_like": "katana", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "katana_fake", @@ -1445,12 +1466,12 @@ "price": "50 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "753 g", - "bashing": 11, - "cutting": 2, - "to_hit": 1, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "katana", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "butterfly_swords", @@ -1587,9 +1608,10 @@ "description": "This is a broad saber known for its use by sailors and pirates. This sword appears to be made very poorly, but it should still stand up to a few swings.", "price_postapoc": "750 cent", "material": "budget_steel", - "bashing": 23, - "cutting": 7, - "flags": [ "SHEATH_SWORD" ] + "repairs_like": "cutlass", + "proportional": { "weight": 1.2, "cutting": 0.85 }, + "relative": { "to_hit": -1 }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "id": "cutlass_fake", @@ -1600,12 +1622,12 @@ "price": "96 USD", "price_postapoc": "50 cent", "material": "aluminum", - "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ], - "weight": "634 g", - "bashing": 12, - "cutting": 1, - "to_hit": 1, - "qualities": [ ] + "qualities": [ ], + "repairs_like": "cutlass", + "proportional": { "weight": 0.6, "bashing": 0.75, "cutting": 0.1 }, + "relative": { "to_hit": -1 }, + "extend": { "flags": [ "FRAGILE_MELEE" ] }, + "delete": { "flags": [ "DURABLE_MELEE" ] } }, { "//": "Id retained to avoid breaking anything, same reason as with the makeshift glaive.", diff --git a/data/json/uncraft/weapon/melee.json b/data/json/uncraft/weapon/melee.json new file mode 100644 index 000000000000..03a16dcaf51e --- /dev/null +++ b/data/json/uncraft/weapon/melee.json @@ -0,0 +1,200 @@ +[ + { + "result": "battleaxe_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ], [ [ "splinter", 4 ] ] ] + }, + { + "result": "halberd_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 2 ] ], [ [ "splinter", 6 ] ] ] + }, + { + "result": "lucern_hammerfake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 2 ] ], [ [ "splinter", 6 ] ] ] + }, + { + "result": "mace_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ], [ [ "splinter", 2 ] ] ] + }, + { + "result": "morningstar_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ], [ [ "splinter", 2 ] ] ] + }, + { + "result": "naginata_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ], [ [ "splinter", 2 ] ] ] + }, + { + "result": "pike_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ], [ [ "splinter", 5 ] ] ] + }, + { + "result": "cavalry_sabre_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 2 ] ] ] + }, + { + "result": "kris_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ] ] + }, + { + "result": "jian_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ] ] + }, + { + "result": "scimitar_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 2 ] ] ] + }, + { + "result": "estoc_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 4 ] ] ] + }, + { + "result": "longsword_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 4 ] ] ] + }, + { + "result": "arming_sword_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 3 ] ] ] + }, + { + "result": "tanto_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ] ] + }, + { + "result": "wakizashi_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 1 ] ] ] + }, + { + "result": "zweihander_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 7 ] ] ] + }, + { + "result": "nodachi_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 6 ] ] ] + }, + { + "result": "broadsword_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 2 ] ] ] + }, + { + "result": "rapier_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 2 ] ] ] + }, + { + "result": "katana_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 2 ] ] ] + }, + { + "result": "cutlass_fake", + "type": "uncraft", + "skill_used": "fabrication", + "difficulty": 3, + "time": "10 m", + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "material_aluminium_ingot", 2 ] ] ] + } +]