From bda2f3da122eee7d4a85c84b1a28f91cf6d9474e Mon Sep 17 00:00:00 2001 From: Drew4484 <57647637+Drew4484@users.noreply.github.com> Date: Tue, 13 Sep 2022 11:37:42 -0700 Subject: [PATCH] Materials and nodachi fix --- data/json/items/melee/swords_and_blades.json | 64 ++++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index f03b824b5dd3c..448a05e6f25a6 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -502,7 +502,7 @@ "weight": "975 g", "cutting": 30, "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "neutral" }, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "techniques": [ "WBLOCK_2", "RAPID" ], "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 9 ] ], @@ -518,7 +518,7 @@ "weight": "975 g", "cutting": 30, "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "neutral" }, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "techniques": [ "WBLOCK_2", "RAPID" ], "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 10 ] ], @@ -660,7 +660,7 @@ "cutting": 32, "price": 100000, "price_postapoc": 4000, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -678,7 +678,7 @@ "cutting": 34, "price": 100000, "price_postapoc": 4000, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -803,7 +803,7 @@ "cutting": 33, "price": 93000, "price_postapoc": 3500, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -821,7 +821,7 @@ "cutting": 35, "price": 93000, "price_postapoc": 3500, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -947,7 +947,7 @@ "cutting": 41, "price": 135000, "price_postapoc": 5000, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "techniques": [ "WBLOCK_2", "PRECISE" ], "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], @@ -965,7 +965,7 @@ "cutting": 43, "price": 135000, "price_postapoc": 5000, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "techniques": [ "WBLOCK_2", "PRECISE" ], "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], @@ -1092,7 +1092,7 @@ "cutting": 39, "price": 130000, "price_postapoc": 6000, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2", "BRUTAL", "RAPID" ], @@ -1110,7 +1110,7 @@ "cutting": 41, "price": 130000, "price_postapoc": 6000, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2", "BRUTAL", "RAPID" ], @@ -1235,7 +1235,7 @@ "cutting": 33, "price": 100000, "price_postapoc": 4500, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -1253,7 +1253,7 @@ "cutting": 35, "price": 100000, "price_postapoc": 4500, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -1573,7 +1573,7 @@ "cutting": 35, "price": 17800, "price_postapoc": 2750, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "RAPID", "WBLOCK_2" ], @@ -1591,7 +1591,7 @@ "cutting": 36, "price": 17800, "price_postapoc": 2750, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "RAPID", "WBLOCK_2" ], @@ -1684,7 +1684,7 @@ "description": "This is a huge two-handed sword from Germany. It packs a real wallop. Features a blade of hardened steel and a non-conductive grip of kevlar reinforced with tough plastic resin to fit your hand better.", "weight": "3241 g", "cutting": 39, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND", "REACH_ATTACK", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], @@ -1700,7 +1700,7 @@ "description": "This is a huge two-handed sword from Germany. It packs a real wallop. Features a blade of hardened steel and a non-conductive grip of kevlar reinforced with tough plastic resin to fit your hand better.", "weight": "3241 g", "cutting": 41, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND", "REACH_ATTACK", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], @@ -1860,8 +1860,8 @@ "id": "hc_nodachi", "type": "TOOL", "copy-from": "lc_nodachi", - "name": { "str_sp": "medium steel nodachi" }, - "description": "This is a huge, curved, two-handed sword from Japan. It is surprisingly light for its size. Features a blade of hardened steel and a non-conductive grip of kevlar reinforced with tough plastic resin to fit your hand better.", + "name": { "str_sp": "high steel nodachi" }, + "description": "This is a huge, curved, two-handed sword from Japan. It is surprisingly light for its size. Features a blade of high carbon steel and a grip of leather wrapped in wire to fit your hand better.", "weight": "3002 g", "cutting": 48, "price": 150000, @@ -1884,7 +1884,7 @@ "cutting": 51, "price": 150000, "price_postapoc": 12000, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_1", "RAPID", "WIDE", "BRUTAL" ], @@ -1902,7 +1902,7 @@ "cutting": 53, "price": 150000, "price_postapoc": 12000, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_1", "RAPID", "WIDE", "BRUTAL" ], @@ -2233,7 +2233,7 @@ "price": 120000, "price_postapoc": 5000, "cutting": 31, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -2251,7 +2251,7 @@ "price": 120000, "price_postapoc": 5000, "cutting": 32, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -2388,7 +2388,7 @@ "cutting": 32, "price": 98000, "price_postapoc": 2500, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "RAPID", "WBLOCK_2", "PRECISE" ], @@ -2406,7 +2406,7 @@ "cutting": 34, "price": 98000, "price_postapoc": 2500, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "RAPID", "WBLOCK_2", "PRECISE" ], @@ -2507,7 +2507,7 @@ "cutting": 36, "price": 98000, "price_postapoc": 4500, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "RAPID", "WBLOCK_2" ], @@ -2525,7 +2525,7 @@ "cutting": 37, "price": 98000, "price_postapoc": 4500, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "RAPID", "WBLOCK_2" ], @@ -2786,7 +2786,7 @@ "price": 96000, "price_postapoc": 3500, "cutting": 30, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -2804,7 +2804,7 @@ "price": 96000, "price_postapoc": 3500, "cutting": 31, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2" ], @@ -2903,7 +2903,7 @@ "cutting": 38, "price": 100000, "price_postapoc": 4500, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2", "BRUTAL" ], @@ -2921,7 +2921,7 @@ "cutting": 40, "price": 100000, "price_postapoc": 4500, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_2", "BRUTAL" ], @@ -3020,7 +3020,7 @@ "cutting": 29, "price": 100000, "price_postapoc": 4500, - "material": [ "ch_steel", "kevlar", "epoxy" ], + "material": [ "ch_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "ch_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_1", "SWEEP" ], @@ -3038,7 +3038,7 @@ "cutting": 30, "price": 100000, "price_postapoc": 4500, - "material": [ "qt_steel", "kevlar", "epoxy" ], + "material": [ "qt_steel", "kevlar", "thermo_resin" ], "repairs_with": [ "qt_steel" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ], "techniques": [ "WBLOCK_1", "SWEEP" ],