From df3bb7762d82705ae23935a9f8ae6661521e65d1 Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Tue, 7 Apr 2020 19:26:31 +0200 Subject: [PATCH 1/4] Melee weapon prices --- data/json/items/melee/bludgeons.json | 83 +++++++++++++---- data/json/items/melee/knives_kitchen.json | 8 ++ data/json/items/melee/misc.json | 3 + .../json/items/melee/spears_and_polearms.json | 41 ++++++-- data/json/items/melee/swords_and_blades.json | 93 ++++++++++++++++--- data/json/items/melee/unarmed_weapons.json | 7 ++ 6 files changed, 195 insertions(+), 40 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 43c85eaf11697..203a697b8f000 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -8,6 +8,7 @@ "weight": "4550 g", "volume": "3750 ml", "price": 25000, + "price_postapoc": 3000, "bashing": 40, "material": [ "wood", "steel" ], "symbol": "\\", @@ -24,6 +25,7 @@ "weight": "1700 g", "volume": "3750 ml", "price": 4000, + "price_postapoc": 1000, "bashing": 19, "material": [ "wood" ], "symbol": "\\", @@ -38,6 +40,7 @@ "description": "A sturdy wood bat. Makes a great melee weapon.", "weight": "1133 g", "to_hit": 3, + "price_postapoc": 750, "color": "brown", "symbol": "/", "material": [ "wood" ], @@ -56,6 +59,7 @@ "to_hit": 3, "color": "light_gray", "symbol": "/", + "price_postapoc": 1250, "material": [ "aluminum" ], "techniques": [ "WBLOCK_1" ], "qualities": [ [ "HAMMER", 1 ] ], @@ -73,6 +77,7 @@ "weight": "725 g", "to_hit": 2, "color": "dark_gray", + "price_postapoc": 750, "symbol": "/", "material": [ "aluminum" ], "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], @@ -89,6 +94,7 @@ "description": "A telescoping baton that collapses for easy storage. Makes an excellent melee weapon. Activate to collapse.", "weight": "725 g", "to_hit": 2, + "price_postapoc": 750, "color": "dark_gray", "symbol": "/", "material": [ "aluminum" ], @@ -108,6 +114,7 @@ "weight": "2002 g", "volume": "2500 ml", "price": 40000, + "price_postapoc": 12000, "to_hit": 1, "bashing": 20, "cutting": 30, @@ -126,7 +133,7 @@ "name": { "str": "battle axe" }, "description": "This is a dull, cheaply made replica of a massive axe designed for warfare.", "price": 1050, - "price_postapoc": 300, + "price_postapoc": 500, "material": [ "aluminum", "wood" ], "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], @@ -145,6 +152,7 @@ "name": { "str": "battle axe" }, "description": "This is a huge axe designed for warfare. You notice that the axe heads aren't seated properly at all.", "price": 40000, + "price_postapoc": 2000, "material": [ "budget_steel", "wood" ], "weight": "2002 g", "volume": "2500 ml", @@ -164,6 +172,7 @@ "name": { "str": "blackjack" }, "description": "This is a short, easily concealed bludgeoning weapon consisting of a weight embedded at the end of a short leather shaft. Formerly used by law enforcement, this weapon is meant to stun or knock out the subject, although head strikes have a high risk of causing a permanent, disabling brain injury or being fatal.", "price": 17500, + "price_postapoc": 500, "material": [ "leather", "lead" ], "techniques": [ "PRECISE", "RAPID" ], "flags": [ "BELT_CLIP", "NONCONDUCTIVE" ], @@ -181,6 +190,7 @@ "name": { "str": "bokken" }, "description": "This is a solid wood 'training' katana, exactingly crafted to mimic the weight and balance of the real thing. Despite its lack of a sharp metal edge, it's still quite capable of inflicting deadly wounds.", "price": 55000, + "price_postapoc": 2500, "material": "wood", "techniques": [ "RAPID", "WBLOCK_2", "SWEEP" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ], @@ -201,6 +211,7 @@ "name": { "str": "bokken" }, "description": "This is a solid wood 'training' katana, but feels far too light to make an effective weapon.", "price": 12500, + "price_postapoc": 500, "material": "wood", "techniques": [ "RAPID", "WBLOCK_2", "SWEEP" ], "flags": [ "SHEATH_SWORD" ], @@ -220,6 +231,7 @@ "name": { "str": "bokken" }, "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": 12500, + "price_postapoc": 750, "material": "wood", "techniques": [ "RAPID", "WBLOCK_2", "SWEEP" ], "flags": [ "SHEATH_SWORD" ], @@ -237,6 +249,8 @@ "description": "An improvised weapon, made from two spikes attached to a bowling pin in the shape of a 'T'.", "weight": "2433 g", "to_hit": -1, + "price": 18000, + "price_postapoc": 50, "color": "brown", "symbol": "/", "material": [ "wood", "steel" ], @@ -244,9 +258,7 @@ "volume": "1750 ml", "bashing": 11, "cutting": 8, - "flags": [ "STAB", "NONCONDUCTIVE" ], - "price": 18000, - "price_postapoc": 0 + "flags": [ "STAB", "NONCONDUCTIVE" ] }, { "type": "GENERIC", @@ -255,6 +267,7 @@ "description": "A blunt bowling pin. Makes a decent melee weapon, if somewhat short.", "weight": "1530 g", "to_hit": -1, + "price_postapoc": 50, "color": "brown", "symbol": "/", "material": [ "wood" ], @@ -271,6 +284,7 @@ "description": "A baseball bat wrapped with barbed wire. A brutal melee weapon.", "weight": "1420 g", "to_hit": 3, + "price_postapoc": 1250, "color": "brown", "symbol": "/", "material": [ "wood", "steel" ], @@ -305,6 +319,7 @@ "description": "A slender long rod of wood, while traditionally intended as a training tool for many dueling moves, it still makes a good melee weapon in a pinch.", "weight": "875 g", "to_hit": 2, + "price_postapoc": 50, "color": "brown", "symbol": "/", "material": [ "wood" ], @@ -322,6 +337,7 @@ "description": "A flat wooden club with sharpened pieces of stone sticking to both of its sides.", "weight": "955 g", "to_hit": 1, + "price_postapoc": 250, "color": "dark_gray", "symbol": "/", "material": [ "wood", "stone" ], @@ -329,8 +345,7 @@ "volume": "2250 ml", "bashing": 7, "cutting": 14, - "price": 5900, - "price_postapoc": 2000 + "price": 5900 }, { "type": "GENERIC", @@ -341,6 +356,7 @@ "description": "A glass shard with wrapping at one end so it can be safely wielded.", "material": [ "glass", "cotton" ], "weight": "115 g", + "price_postapoc": 10, "volume": "30 ml", "cutting": 6, "flags": [ "SHEATH_KNIFE", "CONDUCTIVE", "FRAGILE_MELEE" ], @@ -354,7 +370,7 @@ "name": { "str": "golf club" }, "description": "A long handle with a big metal head, flat on one side, for driving golf balls. Fore!", "price": 13000, - "price_postapoc": 2200, + "price_postapoc": 50, "material": "aluminum", "weight": "300 g", "volume": "1 L", @@ -376,6 +392,7 @@ "volume": "1250 ml", "bashing": 40, "price": 12000, + "price_postapoc": 500, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -394,6 +411,7 @@ "bashing": 35, "to_hit": -1, "price": 12000, + "price_postapoc": 250, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -411,6 +429,7 @@ "bashing": 25, "to_hit": -1, "price": 6000, + "price_postapoc": 250, "qualities": [ [ "HAMMER", 2 ] ] }, { @@ -429,6 +448,7 @@ "bashing": 80, "to_hit": -4, "price": 24000, + "price_postapoc": 750, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -439,7 +459,7 @@ "name": { "str": "hockey stick" }, "description": "A curved wooden stick with a wide and flat end. Commonly used by hockey players.", "price": 11000, - "price_postapoc": 2000, + "price_postapoc": 50, "material": [ "wood", "plastic" ], "techniques": [ "WBLOCK_1" ], "weight": "420 g", @@ -464,7 +484,8 @@ "cutting": 2, "qualities": [ [ "HAMMER", 1 ] ], "flags": [ "STAB", "NONCONDUCTIVE" ], - "price": 8000 + "price": 8000, + "price_postapoc": 50 }, { "type": "GENERIC", @@ -474,6 +495,7 @@ "name": { "str": "ironshod quarterstaff", "str_pl": "ironshod quarterstaves" }, "description": "A smooth and sturdy staff with a leather-wrapped grip, which has been reinforced with metal bands and caps. Durable and well-balanced, it is surprisingly easy to handle.", "price": 6000, + "price_postapoc": 1500, "material": [ "wood", "iron" ], "techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ], "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ], @@ -493,6 +515,7 @@ "weight": "1000 g", "volume": "3 L", "price": 5000, + "price_postapoc": 3000, "to_hit": 3, "bashing": 18, "material": [ "superalloy", "steel" ], @@ -547,6 +570,7 @@ "bashing": 30, "cutting": 22, "to_hit": 2, + "price_postapoc": 10000, "qualities": [ [ "COOK", 1 ] ] }, { @@ -557,7 +581,7 @@ "name": { "str": "lucerne hammer" }, "description": "This is a cheap piece of crap imitation of a versatile polearm with a spiked hammer head, probably used for LARPing", "price": 4000, - "price_postapoc": 0, + "price_postapoc": 500, "material": [ "wood", "aluminum" ], "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_1", "SWEEP" ], @@ -584,6 +608,7 @@ "//": "Same total damage and slightly higher weight than a morningstar - exchanged.", "bashing": 37, "price": 100000, + "price_postapoc": 6000, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -601,7 +626,8 @@ "flags": [ "NONCONDUCTIVE" ], "volume": "1250 ml", "bashing": 8, - "price": 10000 + "price": 10000, + "price_postapoc": 500 }, { "type": "GENERIC", @@ -619,6 +645,7 @@ "volume": "1250 ml", "bashing": 22, "price": 10000, + "price_postapoc": 1000, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -636,6 +663,7 @@ "volume": "350 ml", "bashing": 9, "to_hit": 1, + "price_postapoc": 50, "category": "weapons" }, { @@ -652,6 +680,7 @@ "volume": "2500 ml", "bashing": 9999, "price": 12000, + "price_postapoc": 50000, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -670,6 +699,7 @@ "cutting": 4, "flags": [ "DURABLE_MELEE", "SPEAR", "NONCONDUCTIVE" ], "price": 120000, + "price_postapoc": 8000, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -688,7 +718,8 @@ "bashing": 8, "cutting": 1, "flags": [ "SPEAR", "NONCONDUCTIVE" ], - "price": 12000 + "price": 12000, + "price_postapoc": 500 }, { "type": "GENERIC", @@ -707,6 +738,7 @@ "cutting": 1, "flags": [ "SPEAR", "NONCONDUCTIVE" ], "price": 12000, + "price_postapoc": 1000, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -724,7 +756,8 @@ "bashing": 20, "cutting": 4, "flags": [ "STAB" ], - "price": 16000 + "price": 16000, + "price_postapoc": 1750 }, { "type": "GENERIC", @@ -742,7 +775,7 @@ "cutting": 3, "flags": [ "STAB" ], "price": 8000, - "price_postapoc": 1000 + "price_postapoc": 50 }, { "type": "GENERIC", @@ -758,7 +791,7 @@ "volume": "2 L", "bashing": 10, "price": 8000, - "price_postapoc": 500 + "price_postapoc": 50 }, { "type": "GENERIC", @@ -776,7 +809,8 @@ "use_action": { "menu_text": "Retract", "type": "transform", "target": "PR24-retracted", "msg": "You collapse your PR-24 baton." }, "volume": "2 L", "bashing": 13, - "price": 30000 + "price": 30000, + "price_postapoc": 750 }, { "type": "GENERIC", @@ -794,7 +828,8 @@ "use_action": { "menu_text": "Extend", "type": "transform", "target": "PR24-extended", "msg": "You snap open your PR-24 baton." }, "volume": "1 L", "bashing": 5, - "price": 30000 + "price": 30000, + "price_postapoc": 750 }, { "type": "GENERIC", @@ -811,7 +846,8 @@ "volume": "3 L", "bashing": 19, "category": "weapons", - "to_hit": 3 + "to_hit": 3, + "price_postapoc": 1000 }, { "type": "GENERIC", @@ -821,7 +857,7 @@ "name": { "str": "rock in a sock", "str_pl": "rocks in socks" }, "description": "A pair of nested socks filled with a stone. A true weapon of despair.", "price": 1000, - "price_postapoc": 300, + "price_postapoc": 10, "material": [ "cotton", "stone" ], "weight": "1007 g", "volume": "500 ml", @@ -843,6 +879,7 @@ "volume": "250 ml", "bashing": 2, "cutting": 1, + "price_postapoc": 10, "flags": [ "STAB", "SHEATH_KNIFE", "CONDUCTIVE" ] }, { @@ -860,6 +897,7 @@ "volume": "1500 ml", "bashing": 22, "to_hit": 2, + "price_postapoc": 1250, "category": "weapons" }, { @@ -877,6 +915,7 @@ "volume": "1500 ml", "bashing": 27, "to_hit": 2, + "price_postapoc": 1750, "category": "weapons" }, { @@ -893,6 +932,7 @@ "volume": "1500 ml", "bashing": 10, "to_hit": 2, + "price_postapoc": 50, "category": "weapons" }, { @@ -905,6 +945,7 @@ "volume": "3250 ml", "price": 8000, "to_hit": 3, + "price_postapoc": 4500, "bashing": 25, "material": [ "wood", "iron" ], "symbol": "/", @@ -933,6 +974,7 @@ "volume": "2250 ml", "price": 17000, "to_hit": 2, + "price_postapoc": 2500, "bashing": 14, "material": [ "plastic", "steel" ], "symbol": "/", @@ -969,6 +1011,7 @@ "description": "A hard plastic truncheon commonly employed by police. Originally an Okinawan weapon, it consists of a stick with a perpendicular handle attached a third of the way down its length.", "weight": "575 g", "to_hit": 2, + "price_postapoc": 750, "color": "dark_gray", "symbol": "/", "material": "plastic", @@ -985,6 +1028,7 @@ "description": "A stout wooden truncheon of the sort commonly employed by police. Originally an Okinawan weapon, it consists of a stick with a perpendicular handle attached a third of the way down its length.", "weight": "921 g", "to_hit": 2, + "price_postapoc": 750, "color": "brown", "symbol": "/", "material": [ "wood" ], @@ -1001,6 +1045,7 @@ "description": "A medieval hammer made for battle. Its odd shape and balance make it an excellent weapon, but an ineffective tool.", "weight": "1337 g", "to_hit": 1, + "price_postapoc": 6000, "color": "brown", "symbol": "/", "//": "Craftable from steel, shouldn't be silver. A warhammer is essentially one end of a pickaxe with balancing weight on the other and crushes/pierces the armor.", diff --git a/data/json/items/melee/knives_kitchen.json b/data/json/items/melee/knives_kitchen.json index 3dec4454457ff..ec099bac0a162 100644 --- a/data/json/items/melee/knives_kitchen.json +++ b/data/json/items/melee/knives_kitchen.json @@ -18,6 +18,7 @@ "weight": "380 g", "volume": "300 ml", "price": 3000, + "price_postapoc": 50, "bashing": 2, "cutting": 10, "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 25 ] ], @@ -33,6 +34,7 @@ "weight": "112 g", "volume": "100 ml", "price": 250, + "price_postapoc": 50, "to_hit": -1, "bashing": 2, "cutting": 7, @@ -50,6 +52,7 @@ "weight": "50 g", "volume": "30 ml", "price": 250, + "price_postapoc": 50, "to_hit": -1, "bashing": 1, "cutting": 6, @@ -67,6 +70,7 @@ "weight": "280 g", "volume": "200 ml", "price": 1500, + "price_postapoc": 100, "bashing": 1, "cutting": 10, "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 10 ] ], @@ -83,6 +87,7 @@ "weight": "280 g", "volume": "200 ml", "price": 1500, + "price_postapoc": 50, "bashing": 1, "cutting": 8, "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 22 ] ], @@ -99,6 +104,7 @@ "weight": "280 g", "volume": "200 ml", "price": 500, + "price_postapoc": 50, "bashing": 4, "cutting": 6, "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 8 ] ], @@ -115,6 +121,7 @@ "weight": "250 g", "volume": "250 ml", "price": 2500, + "price_postapoc": 50, "bashing": 2, "cutting": 10, "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ], @@ -131,6 +138,7 @@ "weight": "350 g", "volume": "300 ml", "price": 3500, + "price_postapoc": 50, "bashing": 2, "cutting": 12, "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 25 ] ], diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index 8133721293ff7..c0677b12c4cc0 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -9,6 +9,7 @@ "weight": "3460 g", "volume": "2 L", "price": 3500, + "price_postapoc": 500, "material": [ "leather" ], "flags": [ "REACH_ATTACK", "REACH3", "WHIP" ], "cutting": 3, @@ -22,6 +23,7 @@ "weight": "2722 g", "volume": "1750 ml", "price": 25000, + "price_postapoc": 1250, "to_hit": -3, "bashing": 13, "cutting": 26, @@ -41,6 +43,7 @@ "weight": "151 g", "volume": "250 ml", "price": 14000, + "price_postapoc": 1500, "to_hit": -1, "bashing": 6, "//": "Yes, this is smaller than it's magazine well. Go with it.", diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json index c2849db1ffc36..2d5b62658802d 100644 --- a/data/json/items/melee/spears_and_polearms.json +++ b/data/json/items/melee/spears_and_polearms.json @@ -16,7 +16,8 @@ "cutting": 18, "qualities": [ [ "COOK", 1 ] ], "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ], - "price": 2000 + "price": 2000, + "price_postapoc": 500 }, { "type": "GENERIC", @@ -31,6 +32,7 @@ "bashing": 4, "cutting": 8, "to_hit": 1, + "price_postapoc": 10, "flags": [ "SPEAR" ], "techniques": [ "WBLOCK_1" ], "qualities": [ [ "COOK", 1 ] ] @@ -42,6 +44,7 @@ "description": "A stout pole with an improvised grip and a fire-hardened point.", "weight": "898 g", "to_hit": 1, + "price_postapoc": 50, "color": "brown", "symbol": "/", "material": [ "wood" ], @@ -62,6 +65,7 @@ "weight": "3013 g", "volume": "3250 ml", "price": 16000, + "price_postapoc": 50, "bashing": 2, "cutting": 16, "material": [ "steel", "wood" ], @@ -80,6 +84,7 @@ "weight": "1487 g", "volume": "1250 ml", "price": 400, + "price_postapoc": 50, "to_hit": 1, "bashing": 4, "cutting": 13, @@ -99,6 +104,7 @@ "weight": "1487 g", "volume": "1250 ml", "price": 700, + "price_postapoc": 150, "to_hit": 1, "bashing": 4, "cutting": 15, @@ -118,6 +124,7 @@ "weight": "1487 g", "volume": "1250 ml", "price": 12000, + "price_postapoc": 500, "to_hit": 1, "bashing": 4, "cutting": 17, @@ -137,6 +144,7 @@ "weight": "1814 g", "volume": "1500 ml", "price": 1400, + "price_postapoc": 750, "to_hit": 1, "bashing": 2, "cutting": 19, @@ -154,6 +162,7 @@ "weight": "1650 g", "//": "Block 2 until we re-implement defensive-disarm, I'm afraid.", "to_hit": 1, + "price_postapoc": 750, "color": "brown", "symbol": "/", "material": [ "wood", "steel" ], @@ -172,6 +181,7 @@ "description": "A stout wooden pole with a spearhead worked from copper.", "weight": "1450 g", "to_hit": 1, + "price_postapoc": 1250, "color": "light_red", "symbol": "/", "material": [ "copper", "wood" ], @@ -190,6 +200,7 @@ "description": "A stout wooden pole with a hand-forged steel spearhead.", "weight": "1498 g", "to_hit": 2, + "price_postapoc": 5500, "color": "light_gray", "symbol": "/", "material": [ "steel", "wood" ], @@ -209,6 +220,7 @@ "description": "A stout metal pole with a sharp point.", "weight": "1398 g", "to_hit": 1, + "price_postapoc": 50, "color": "light_gray", "symbol": "/", "material": [ "steel" ], @@ -228,7 +240,7 @@ "name": { "str": "sharpened rebar" }, "description": "A somewhat sharpened piece of rebar, it is still better at bashing than stabbing but the added flexibility is nice.", "price": 500, - "price_postapoc": 2000, + "price_postapoc": 50, "material": "iron", "weight": "908 g", "volume": "1500 ml", @@ -245,6 +257,7 @@ "description": "An ancient Chinese spear, typically with a tassel just below the spearhead. One of the four major weapons in folklore, alongside the dao sabre, jian sword, and gun staff.", "weight": "1398 g", "to_hit": 2, + "price_postapoc": 3500, "color": "light_gray", "symbol": "/", "material": [ "steel", "wood" ], @@ -272,6 +285,7 @@ "bashing": 16, "cutting": 36, "to_hit": 2, + "price_postapoc": 10000, "qualities": [ [ "COOK", 1 ], [ "BUTCHER", -70 ] ] }, { @@ -290,6 +304,7 @@ "bashing": 15, "cutting": 2, "to_hit": 2, + "price_postapoc": 500, "category": "weapons" }, { @@ -308,7 +323,8 @@ "volume": "2500 ml", "bashing": 8, "cutting": 30, - "to_hit": 2 + "to_hit": 2, + "price_postapoc": 8000 }, { "type": "GENERIC", @@ -326,7 +342,8 @@ "cutting": 37, "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -24 ] ], "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ], - "price": 80000 + "price": 80000, + "price_postapoc": 9500 }, { "type": "GENERIC", @@ -344,7 +361,8 @@ "to_hit": 2, "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -24 ] ], "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ], - "price": 8000 + "price": 8000, + "price_postapoc": 1500 }, { "type": "GENERIC", @@ -361,7 +379,8 @@ "cutting": 1, "to_hit": -1, "flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ], - "price": 8000 + "price": 8000, + "price_postapoc": 500 }, { "type": "GENERIC", @@ -380,6 +399,7 @@ "flags": [ "STAB", "REACH_ATTACK", "SHEATH_SPEAR" ], "//": "Description says it can slash. STAB currently doesn't slash, but at least it doesn't give the spear bonus", "price": 8000, + "price_postapoc": 4500, "qualities": [ [ "COOK", 1 ], [ "CUT", 1 ], [ "BUTCHER", -24 ] ] }, { @@ -399,6 +419,7 @@ "thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 11 } ], "flags": [ "SPEAR", "SHEATH_SPEAR", "JAVELIN" ], "price": 4000, + "price_postapoc": 250, "qualities": [ [ "COOK", 1 ] ] }, { @@ -418,6 +439,7 @@ "thrown_damage": [ { "damage_type": "bash", "amount": 5 }, { "damage_type": "stab", "amount": 17 } ], "flags": [ "SPEAR", "NONCONDUCTIVE", "SHEATH_SPEAR", "JAVELIN" ], "price": 9000, + "price_postapoc": 500, "qualities": [ [ "COOK", 1 ] ] }, { @@ -429,6 +451,7 @@ "weight": "2500 g", "volume": "3500 ml", "price": 40000, + "price_postapoc": 5000, "to_hit": -2, "bashing": 8, "cutting": 25, @@ -448,6 +471,7 @@ "weight": "2000 g", "volume": "3500 ml", "price": 4000, + "price_postapoc": 500, "to_hit": -2, "bashing": 6, "cutting": 15, @@ -468,6 +492,7 @@ "weight": "2500 g", "volume": "3500 ml", "price": 40000, + "price_postapoc": 1250, "to_hit": -2, "bashing": 8, "cutting": 25, @@ -487,6 +512,7 @@ "weight": "3013 g", "volume": "3250 ml", "price": 16000, + "price_postapoc": 2500, "to_hit": 1, "bashing": 2, "cutting": 26, @@ -505,6 +531,7 @@ "weight": "1598 g", "volume": "3500 ml", "price": 10000, + "price_postapoc": 3500, "to_hit": 2, "bashing": 5, "cutting": 27, @@ -524,6 +551,7 @@ "weight": "3175 g", "volume": "3750 ml", "price": 50000, + "price_postapoc": 3500, "to_hit": 2, "bashing": 16, "cutting": 20, @@ -541,6 +569,7 @@ "weight": "1098 g", "volume": "1250 ml", "price": 1300, + "price_postapoc": 50, "to_hit": 1, "bashing": 5, "cutting": 14, diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 2ea8c5a7a11a5..a3345573f1b46 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -12,6 +12,7 @@ "bashing": 12, "cutting": 1, "to_hit": 1, + "price_postapoc": 50, "flags": [ "SHEATH_SWORD" ], "techniques": [ "WBLOCK_1" ] }, @@ -27,6 +28,7 @@ "weight": "648 g", "bashing": 12, "cutting": 4, + "price_postapoc": 100, "techniques": [ "WBLOCK_1" ] }, { @@ -42,6 +44,7 @@ "bashing": 6, "cutting": 14, "to_hit": -1, + "price_postapoc": 250, "flags": [ "SHEATH_SWORD" ], "qualities": [ [ "BUTCHER", -50 ] ], "techniques": [ "WBLOCK_1" ] @@ -55,6 +58,7 @@ "weight": "100 g", "volume": "50 ml", "price": 2000, + "price_postapoc": 50, "to_hit": -2, "cutting": 16, "material": [ "steel", "plastic" ], @@ -72,6 +76,7 @@ "weight": "80 g", "volume": "40 ml", "price": 1500, + "price_postapoc": 50, "bashing": 1, "cutting": 12, "material": [ "steel", "plastic" ], @@ -89,6 +94,7 @@ "weight": "558 g", "volume": "500 ml", "price": 10000, + "price_postapoc": 1250, "to_hit": 1, "bashing": 2, "cutting": 18, @@ -129,6 +135,7 @@ "weight": "390 g", "volume": "250 ml", "price": 4000, + "price_postapoc": 750, "cutting": 16, "material": [ "steel", "leather" ], "symbol": "/", @@ -146,6 +153,7 @@ "weight": "612 g", "volume": "1 L", "price": 2000, + "price_postapoc": 500, "bashing": 4, "cutting": 15, "material": [ "steel", "plastic" ], @@ -164,6 +172,7 @@ "weight": "188 g", "volume": "750 ml", "price": 45000, + "price_postapoc": 4000, "to_hit": 2, "bashing": 2, "cutting": 20, @@ -190,6 +199,7 @@ "weight": "120 g", "volume": "60 ml", "price": 3000, + "price_postapoc": 500, "to_hit": -2, "cutting": 6, "material": [ "steel", "plastic" ], @@ -207,6 +217,7 @@ "weight": "608 g", "volume": "500 ml", "price": 11000, + "price_postapoc": 1250, "to_hit": 1, "bashing": 6, "cutting": 14, @@ -225,6 +236,7 @@ "weight": "550 g", "volume": "251 ml", "price": 0, + "price_postapoc": 50, "to_hit": -1, "bashing": 2, "cutting": 10, @@ -243,6 +255,7 @@ "weight": "581 g", "volume": "2 L", "price": 1000, + "price_postapoc": 250, "to_hit": 1, "bashing": 4, "cutting": 14, @@ -262,6 +275,7 @@ "weight": "538 g", "volume": "1 L", "price": 2800, + "price_postapoc": 1500, "to_hit": 2, "bashing": 6, "cutting": 20, @@ -281,6 +295,7 @@ "weight": "910 g", "volume": "1250 ml", "price": 97000, + "price_postapoc": 4000, "to_hit": 2, "bashing": 2, "cutting": 26, @@ -300,6 +315,7 @@ "weight": "558 g", "volume": "750 ml", "price": 9000, + "price_postapoc": 500, "to_hit": 1, "bashing": 1, "cutting": 14, @@ -319,6 +335,7 @@ "weight": "450 g", "volume": "750 ml", "price": 8000, + "price_postapoc": 1250, "to_hit": 1, "bashing": 2, "cutting": 20, @@ -337,6 +354,7 @@ "name": { "str": "jian", "str_pl": "jian" }, "description": "This is an ancient Chinese doubled-edged straight sword, with an ornate guard and a tassel attached to the pommel. One of the four major weapons in folklore, alongside the dao sabre, qiang spear, and gun staff.", "price": 100000, + "price_postapoc": 4000, "material": "steel", "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -356,6 +374,7 @@ "name": { "str": "jian", "str_pl": "jian" }, "description": "This is an ancient Chinese doubled-edged straight sword. The sword is quite worn, and bent at an odd angle.", "price": 100000, + "price_postapoc": 750, "material": "budget_steel", "flags": [ "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -375,6 +394,7 @@ "name": { "str": "jian", "str_pl": "jian" }, "description": "This is a dull, cheaply made replica of an ancient Chinese doubled-edged straight sword, with an ornate guard.", "price": 10000, + "price_postapoc": 500, "price_postapoc": 0, "material": "aluminum", "flags": [ "SHEATH_SWORD" ], @@ -394,6 +414,7 @@ "name": { "str": "scimitar" }, "description": "This is a curved sword associated with various Middle Eastern and Central Asian countries. Designed for slashing, and quite deadly against unarmored targets.", "price": 93000, + "price_postapoc": 3500, "material": "iron", "techniques": [ "WBLOCK_2" ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ], @@ -413,6 +434,7 @@ "name": { "str": "scimitar" }, "description": "This is a curved sword associated with various Middle Eastern and Central Asian countries. This one seems oddly dull and worn.", "price": 93000, + "price_postapoc": 500, "material": "budget_steel", "techniques": [ "WBLOCK_2" ], "flags": [ "SHEATH_SWORD" ], @@ -432,6 +454,7 @@ "name": { "str": "scimitar" }, "description": "This is a dull, cheaply made replica of a curved sword, associated with various Middle Eastern and Central Asian countries.", "price": 9300, + "price_postapoc": 50, "price_postapoc": 0, "material": "aluminum", "techniques": [ "WBLOCK_2" ], @@ -451,6 +474,7 @@ "name": { "str": "estoc" }, "description": "This is a thin thrusting sword, a sort of predecessor to the rapier. It requires a larger baldric or scabbard, compared to smaller swords.", "price": 135000, + "price_postapoc": 5000, "material": "steel", "techniques": [ "WBLOCK_2", "PRECISE" ], "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_SWORD" ], @@ -470,6 +494,7 @@ "name": { "str": "estoc" }, "description": "This is a thin 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": 13500, + "price_postapoc": 750, "price_postapoc": 0, "material": "budget_steel", "techniques": [ "WBLOCK_2", "PRECISE" ], @@ -489,6 +514,7 @@ "name": { "str": "estoc" }, "description": "This is a dull, cheaply-made replica of a thin thrusting sword predating the rapier. It requires a larger baldric or scabbard, compared to smaller swords.", "price": 13500, + "price_postapoc": 50, "price_postapoc": 0, "material": "aluminum", "techniques": [ "WBLOCK_2", "PRECISE" ], @@ -508,6 +534,7 @@ "name": { "str": "longsword" }, "description": "This is a classic medieval sword, in between the lighter arming sword and later two-handed swords in size. It requires a larger baldric or scabbard, compared to smaller swords.", "price": 130000, + "price_postapoc": 6000, "material": "steel", "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -527,6 +554,7 @@ "name": { "str": "longsword" }, "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": 130000, + "price_postapoc": 750, "material": "budget_steel", "flags": [ "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -546,7 +574,7 @@ "name": { "str": "longsword" }, "description": "This is a dull, cheaply-made replica of the classic medieval longsword. It requires a larger baldric or scabbard, compared to smaller swords.", "price": 13000, - "price_postapoc": 0, + "price_postapoc": 100, "material": "aluminum", "flags": [ "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -565,6 +593,7 @@ "name": { "str": "arming sword" }, "description": "This is a classic medieval sword, just the right size to use one-handed.", "price": 100000, + "price_postapoc": 4500, "material": "steel", "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -585,7 +614,7 @@ "name": { "str": "arming sword" }, "description": "This is a dull, cheaply made replica of a classic medieval sword, just the right size to use one-handed.", "price": 10000, - "price_postapoc": 0, + "price_postapoc": 50, "material": "aluminum", "flags": [ "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -605,6 +634,7 @@ "name": { "str": "arming sword" }, "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": 100000, + "price_postapoc": 250, "material": "budget_steel", "flags": [ "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -625,6 +655,7 @@ "weight": "800 g", "volume": "2 L", "price": 12000, + "price_postapoc": 2500, "to_hit": 2, "bashing": 8, "cutting": 20, @@ -644,6 +675,7 @@ "weight": "750 g", "volume": "1750 ml", "price": 12000, + "price_postapoc": 3000, "to_hit": 1, "bashing": 7, "cutting": 19, @@ -663,6 +695,7 @@ "weight": "850 g", "volume": "1750 ml", "price": 12500, + "price_postapoc": 3500, "to_hit": 2, "bashing": 6, "cutting": 18, @@ -682,6 +715,7 @@ "weight": "565 g", "volume": "1 L", "price": 2800, + "price_postapoc": 2500, "to_hit": 2, "bashing": 6, "cutting": 20, @@ -701,6 +735,7 @@ "weight": "923 g", "volume": "1750 ml", "price": 25000, + "price_postapoc": 4000, "to_hit": 1, "bashing": 8, "cutting": 25, @@ -734,6 +769,7 @@ "weight": "558 g", "volume": "500 ml", "price": 18000, + "price_postapoc": 1500, "to_hit": 2, "bashing": 1, "cutting": 16, @@ -753,6 +789,7 @@ "weight": "835 g", "volume": "1500 ml", "price": 17800, + "price_postapoc": 2750, "to_hit": 1, "bashing": 3, "cutting": 24, @@ -772,6 +809,7 @@ "weight": "3176 g", "volume": "3250 ml", "price": 160000, + "price_postapoc": 9500, "to_hit": 1, "bashing": 17, "cutting": 40, @@ -792,6 +830,7 @@ "volume": "500 ml", "price": 1800, "to_hit": 1, + "price_postapoc": 250, "bashing": 1, "cutting": 18, "material": "steel", @@ -810,6 +849,7 @@ "weight": "374 g", "volume": "500 ml", "price": 900, + "price_postapoc": 50, "bashing": 1, "cutting": 9, "material": "budget_steel", @@ -828,6 +868,7 @@ "weight": "374 g", "volume": "500 ml", "price": 1800, + "price_postapoc": 10, "to_hit": 1, "bashing": 1, "cutting": 7, @@ -848,6 +889,7 @@ "weight": "3 g", "volume": "500 ml", "price": 18000, + "price_postapoc": 25, "to_hit": 2, "bashing": 1, "cutting": 12, @@ -868,6 +910,7 @@ "weight": "2822 g", "volume": "3250 ml", "price": 150000, + "price_postapoc": 12000, "to_hit": 1, "bashing": 5, "cutting": 50, @@ -886,7 +929,7 @@ "name": { "str": "nodachi", "str_pl": "nodachi" }, "description": "This is a dull, cheaply made replica of a huge, curved, two-handed sword from Japan. It is surprisingly light for its size.", "price": 15000, - "price_postapoc": 0, + "price_postapoc": 250, "material": "aluminum", "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_1", "RAPID", "WIDE" ], @@ -905,7 +948,7 @@ "name": { "str": "nodachi", "str_pl": "nodachi" }, "description": "This is a huge, curved, two-handed sword from Japan. It is surprisingly light for its size, but also much bendier than a sword should be.", "price": 15000, - "price_postapoc": 0, + "price_postapoc": 500, "material": "budget_steel", "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_1", "RAPID", "WIDE" ], @@ -924,6 +967,7 @@ "name": { "str": "fencing foil" }, "description": "A weapon used for fencing, the most noble of all sports. Unfortunately, a fencing foil is rather useless as a weapon, due to its flexible shaft and dull tip.", "price": 2000, + "price_postapoc": 10, "price_postapoc": 0, "material": "steel", "weight": "450 g", @@ -942,7 +986,7 @@ "name": { "str": "fencing épée" }, "description": "A weapon used for fencing, the most noble of all sports. The épée is the heaviest and stiffest of the fencing weapons, and therefore perhaps the most useful.", "price": 2000, - "price_postapoc": 1000, + "price_postapoc": 10, "material": "steel", "weight": "650 g", "volume": "1250 ml", @@ -960,7 +1004,7 @@ "name": { "str": "fencing saber" }, "description": "A weapon used for fencing, the most noble of all sports. The fencing saber is marginally shorter than the foil and épée, but no less effective.", "price": 2000, - "price_postapoc": 0, + "price_postapoc": 10, "material": "steel", "weight": "400 g", "volume": "1250 ml", @@ -1005,6 +1049,7 @@ "description": "The modifications made to this fencing foil may not be sporting, but they might give you an edge in this final competition. Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired through the electronic scoring circuit to the tip. Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.", "ammo": "battery", "charges_per_use": 100, + "price_postapoc": 1250, "use_action": "TAZER", "extend": { "flags": [ "NONCONDUCTIVE" ] }, "relative": { "volume": "250 ml", "weight": "151 g" }, @@ -1024,6 +1069,7 @@ "name": { "str": "electrified épée" }, "description": "The modifications made to this fencing épée may not be sporting, but they might give you an edge in this final competition. Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired through the electronic scoring circuit to the tip. Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.", "ammo": "battery", + "price_postapoc": 1250, "charges_per_use": 100, "use_action": "TAZER", "extend": { "flags": [ "NONCONDUCTIVE" ] }, @@ -1044,6 +1090,7 @@ "name": { "str": "electrified saber" }, "description": "The modifications made to this fencing saber may not be sporting, but they might give you an edge in this final competition. Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired to the tip along the saber's groove. Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.", "ammo": "battery", + "price_postapoc": 1250, "charges_per_use": 100, "use_action": "TAZER", "extend": { "flags": [ "NONCONDUCTIVE" ] }, @@ -1064,7 +1111,7 @@ "name": { "str": "hollow cane" }, "description": "A cane designed to conceal blade. This was a popular fashion accessory for the wealthy during the 18th and 19th centuries.", "price": 2000, - "price_postapoc": 1000, + "price_postapoc": 750, "material": [ "wood" ], "weight": "200 g", "volume": "1531 ml", @@ -1089,7 +1136,7 @@ "name": { "str": "sword cane" }, "description": "A sword with a thin blade designed to be hidden inside a hollow cane.", "price": 2000, - "price_postapoc": 1000, + "price_postapoc": 3000, "material": [ "steel" ], "weight": "650 g", "volume": "1200 ml", @@ -1108,6 +1155,7 @@ "weight": "1133 g", "volume": "1750 ml", "price": 120000, + "price_postapoc": 5000, "to_hit": 2, "bashing": 8, "cutting": 35, @@ -1126,6 +1174,7 @@ "name": { "str": "broadsword" }, "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": 120000, + "price_postapoc": 750, "material": "budget_steel", "flags": [ "SHEATH_SWORD" ], "techniques": "WBLOCK_2", @@ -1145,6 +1194,7 @@ "name": { "str": "cutlass", "str_pl": "cutlasses" }, "description": "This is a dull, cheaply made replica of a broad saber known for its use by sailors and pirates.", "price": 9600, + "price_postapoc": 50, "price_postapoc": 0, "material": "aluminum", "techniques": "WBLOCK_2", @@ -1164,6 +1214,7 @@ "name": { "str": "cutlass", "str_pl": "cutlasses" }, "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": 96000, + "price_postapoc": 500, "material": "budget_steel", "techniques": "WBLOCK_2", "weight": "955 g", @@ -1184,6 +1235,7 @@ "weight": "1000 g", "volume": "1500 ml", "price": 98000, + "price_postapoc": 2500, "to_hit": 2, "bashing": 2, "cutting": 29, @@ -1203,6 +1255,7 @@ "weight": "1133 g", "volume": "2 L", "price": 98000, + "price_postapoc": 4500, "to_hit": 1, "bashing": 4, "cutting": 31, @@ -1221,7 +1274,7 @@ "name": { "str": "katana" }, "description": "This is a dull, cheaply made replica of a rare sword from Japan.", "price": 5000, - "price_postapoc": 0, + "price_postapoc": 50, "material": "aluminum", "techniques": [ "RAPID", "WBLOCK_2" ], "flags": [ "SHEATH_SWORD" ], @@ -1240,6 +1293,7 @@ "name": { "str": "katana" }, "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.", "price": 98000, + "price_postapoc": 250, "material": "budget_steel", "techniques": [ "RAPID", "WBLOCK_2" ], "flags": [ "SHEATH_SWORD" ], @@ -1259,7 +1313,7 @@ "name": { "str": "zweihänder" }, "description": "This is a dull, cheaply made replica of a huge two-handed sword from Germany. It still packs a wallop.", "price": 8000, - "price_postapoc": 1000, + "price_postapoc": 50, "material": "aluminum", "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], @@ -1278,6 +1332,7 @@ "name": { "str": "zweihänder" }, "description": "This is a huge two-handed sword from Germany. You're not quite sure it's supposed to be that bendy.", "price": 160000, + "price_postapoc": 750, "material": "budget_steel", "flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], @@ -1297,6 +1352,7 @@ "name": { "str": "broadsword" }, "description": "This is a dull, cheaply made replica of an early modern sword seeing use in the 16th, 17th, and 18th centuries. Called 'broad' to contrast with the slimmer rapiers.", "price": 12000, + "price_postapoc": 50, "price_postapoc": 500, "material": "aluminum", "flags": [ "SHEATH_SWORD" ], @@ -1317,7 +1373,7 @@ "weight": "600 g", "volume": "1250 ml", "price": 9700, - "price_postapoc": 0, + "price_postapoc": 50, "to_hit": 2, "bashing": 4, "cutting": 2, @@ -1335,7 +1391,7 @@ "name": { "str": "rapier" }, "description": "This is a blunted, cheap replica of a thin sword with an ornate hand guard. It looks like the preferred weapon of gentlemen and swashbucklers. Light and quick, it makes any battle a stylish battle.", "price": 9800, - "price_postapoc": 0, + "price_postapoc": 50, "material": "aluminum", "techniques": [ "RAPID", "WBLOCK_2", "PRECISE" ], "flags": [ "SHEATH_SWORD" ], @@ -1354,7 +1410,7 @@ "name": { "str": "wakizashi", "str_pl": "wakizashi" }, "description": "This is a dull, cheap replica of the more common wakizashi. Smaller and lighter than a katana, but still effective in combat.", "price": 7800, - "price_postapoc": 0, + "price_postapoc": 50, "material": "aluminum", "techniques": [ "RAPID", "WBLOCK_2" ], "flags": [ "SHEATH_SWORD" ], @@ -1373,6 +1429,7 @@ "name": { "str": "wakizashi", "str_pl": "wakizashi" }, "description": "This is a comparatively-common Japanese short sword. There's something not quite right about this sword.", "price": 17800, + "price_postapoc": 500, "material": "budget_steel", "techniques": [ "RAPID", "WBLOCK_2" ], "flags": [ "SHEATH_SWORD" ], @@ -1392,7 +1449,7 @@ "name": { "str": "kris", "str_pl": "krises" }, "description": "This is a dull, cheap replica of a wavy bladed dagger that comes from Southeast Asia.", "price": 3800, - "price_postapoc": 0, + "price_postapoc": 10, "material": "aluminum", "techniques": [ "WBLOCK_1", "RAPID" ], "weight": "558 g", @@ -1412,7 +1469,7 @@ "description": "This is a matched pair of traditional Shaolin butterfly swords. They are about the size of machetes but have hand guards and wider blades.", "//": "basically 2x the weight, 1.3x the damage, 2.5x the resources of a single machete to cover the fact that it's two weapons, each with a hand guard", "price": 50000, - "price_postapoc": 80000, + "price_postapoc": 6000, "material": "steel", "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ], "techniques": [ "WBLOCK_2" ], @@ -1433,6 +1490,7 @@ "weight": "14254 g", "volume": "7500 ml", "price": 40000, + "price_postapoc": 2000, "to_hit": -5, "bashing": 20, "material": [ "plastic", "steel" ], @@ -1468,6 +1526,7 @@ "weight": "14254 g", "volume": "7500 ml", "price": 40000, + "price_postapoc": 2000, "to_hit": -5, "bashing": 20, "material": [ "plastic", "steel" ], @@ -1507,6 +1566,7 @@ "weight": "955 g", "volume": "1250 ml", "price": 96000, + "price_postapoc": 3500, "to_hit": 2, "bashing": 7, "cutting": 27, @@ -1525,6 +1585,7 @@ "name": { "str": "lajatang" }, "description": "An exotic weapon comprised of a long pole of wood with curved blades on each end. It can be deadly in skilled hands.", "price": 12000, + "price_postapoc": 1250, "material": [ "wood", "iron" ], "techniques": [ "WBLOCK_1", "SPIN" ], "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], @@ -1544,6 +1605,7 @@ "weight": "5122 g", "volume": "2250 ml", "price": 25000, + "price_postapoc": 3000, "to_hit": -3, "bashing": 8, "material": [ "steel", "aluminum" ], @@ -1580,6 +1642,7 @@ "weight": "5122 g", "volume": "2250 ml", "price": 25000, + "price_postapoc": 3000, "to_hit": -3, "bashing": 8, "material": [ "steel", "aluminum" ], diff --git a/data/json/items/melee/unarmed_weapons.json b/data/json/items/melee/unarmed_weapons.json index d8795b59984b3..374a9e2268d75 100644 --- a/data/json/items/melee/unarmed_weapons.json +++ b/data/json/items/melee/unarmed_weapons.json @@ -13,6 +13,7 @@ "cutting": 6, "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ], "price": 20000, + "price_postapoc": 250, "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 14 ] ] }, { @@ -26,6 +27,7 @@ "volume": "100 ml", "weight": "300 g", "bashing": 2, + "price_postapoc": 250, "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "NONCONDUCTIVE" ] }, { @@ -39,6 +41,7 @@ "material": "brass", "weight": "320 g", "bashing": 6, + "price_postapoc": 250, "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ] }, { @@ -53,6 +56,7 @@ "weight": "1150 g", "cutting": 16, "to_hit": 2, + "price_postapoc": 500, "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ], "flags": [ "UNARMED_WEAPON" ], "techniques": [ "WBLOCK_1" ] @@ -69,6 +73,7 @@ "weight": "430 g", "bashing": 4, "cutting": 6, + "price_postapoc": 50, "flags": [ "UNARMED_WEAPON" ] }, { @@ -82,6 +87,7 @@ "volume": "250 ml", "weight": "430 g", "bashing": 8, + "price_postapoc": 50, "qualities": [ [ "HAMMER", 1 ] ], "flags": [ "UNARMED_WEAPON" ] }, @@ -92,6 +98,7 @@ "description": "A short and sharp double-edged dagger made to be gripped in the palm, with the blade protruding between the fingers.", "weight": "168 g", "to_hit": 2, + "price_postapoc": 50, "color": "dark_gray", "symbol": "{", "material": [ "steel" ], From 781bb683ad4b02ef21b30e4ca7c9c2e03941517c Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Wed, 8 Apr 2020 00:48:40 +0200 Subject: [PATCH 2/4] Remove duplicate prices --- data/json/items/melee/swords_and_blades.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index a3345573f1b46..e9f0c90bfa1b6 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -394,8 +394,7 @@ "name": { "str": "jian", "str_pl": "jian" }, "description": "This is a dull, cheaply made replica of an ancient Chinese doubled-edged straight sword, with an ornate guard.", "price": 10000, - "price_postapoc": 500, - "price_postapoc": 0, + "price_postapoc": 50, "material": "aluminum", "flags": [ "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], @@ -455,7 +454,6 @@ "description": "This is a dull, cheaply made replica of a curved sword, associated with various Middle Eastern and Central Asian countries.", "price": 9300, "price_postapoc": 50, - "price_postapoc": 0, "material": "aluminum", "techniques": [ "WBLOCK_2" ], "flags": [ "SHEATH_SWORD" ], @@ -495,7 +493,6 @@ "description": "This is a thin 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": 13500, "price_postapoc": 750, - "price_postapoc": 0, "material": "budget_steel", "techniques": [ "WBLOCK_2", "PRECISE" ], "flags": [ "SHEATH_SWORD" ], @@ -515,7 +512,6 @@ "description": "This is a dull, cheaply-made replica of a thin thrusting sword predating the rapier. It requires a larger baldric or scabbard, compared to smaller swords.", "price": 13500, "price_postapoc": 50, - "price_postapoc": 0, "material": "aluminum", "techniques": [ "WBLOCK_2", "PRECISE" ], "flags": [ "SHEATH_SWORD" ], @@ -968,7 +964,6 @@ "description": "A weapon used for fencing, the most noble of all sports. Unfortunately, a fencing foil is rather useless as a weapon, due to its flexible shaft and dull tip.", "price": 2000, "price_postapoc": 10, - "price_postapoc": 0, "material": "steel", "weight": "450 g", "volume": "1250 ml", @@ -1195,7 +1190,6 @@ "description": "This is a dull, cheaply made replica of a broad saber known for its use by sailors and pirates.", "price": 9600, "price_postapoc": 50, - "price_postapoc": 0, "material": "aluminum", "techniques": "WBLOCK_2", "flags": [ "SHEATH_SWORD" ], @@ -1353,7 +1347,6 @@ "description": "This is a dull, cheaply made replica of an early modern sword seeing use in the 16th, 17th, and 18th centuries. Called 'broad' to contrast with the slimmer rapiers.", "price": 12000, "price_postapoc": 50, - "price_postapoc": 500, "material": "aluminum", "flags": [ "SHEATH_SWORD" ], "techniques": "WBLOCK_2", From 48ae93f7b8cdd9f4e1ae15696f54086f315b2472 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 8 Apr 2020 00:40:26 +0000 Subject: [PATCH 3/4] Update data/json/items/melee/swords_and_blades.json --- data/json/items/melee/swords_and_blades.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index a3345573f1b46..0aeb092f51a50 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -395,7 +395,6 @@ "description": "This is a dull, cheaply made replica of an ancient Chinese doubled-edged straight sword, with an ornate guard.", "price": 10000, "price_postapoc": 500, - "price_postapoc": 0, "material": "aluminum", "flags": [ "SHEATH_SWORD" ], "techniques": [ "WBLOCK_2" ], From 06c689cb308f7960190fa532406f2110faa7d5c2 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 8 Apr 2020 01:32:13 +0000 Subject: [PATCH 4/4] Apply suggestions from code review --- data/json/items/melee/swords_and_blades.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 0aeb092f51a50..56f3e0dccd000 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -454,7 +454,6 @@ "description": "This is a dull, cheaply made replica of a curved sword, associated with various Middle Eastern and Central Asian countries.", "price": 9300, "price_postapoc": 50, - "price_postapoc": 0, "material": "aluminum", "techniques": [ "WBLOCK_2" ], "flags": [ "SHEATH_SWORD" ], @@ -494,7 +493,6 @@ "description": "This is a thin 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": 13500, "price_postapoc": 750, - "price_postapoc": 0, "material": "budget_steel", "techniques": [ "WBLOCK_2", "PRECISE" ], "flags": [ "SHEATH_SWORD" ], @@ -514,7 +512,6 @@ "description": "This is a dull, cheaply-made replica of a thin thrusting sword predating the rapier. It requires a larger baldric or scabbard, compared to smaller swords.", "price": 13500, "price_postapoc": 50, - "price_postapoc": 0, "material": "aluminum", "techniques": [ "WBLOCK_2", "PRECISE" ], "flags": [ "SHEATH_SWORD" ], @@ -967,7 +964,6 @@ "description": "A weapon used for fencing, the most noble of all sports. Unfortunately, a fencing foil is rather useless as a weapon, due to its flexible shaft and dull tip.", "price": 2000, "price_postapoc": 10, - "price_postapoc": 0, "material": "steel", "weight": "450 g", "volume": "1250 ml", @@ -1194,7 +1190,6 @@ "description": "This is a dull, cheaply made replica of a broad saber known for its use by sailors and pirates.", "price": 9600, "price_postapoc": 50, - "price_postapoc": 0, "material": "aluminum", "techniques": "WBLOCK_2", "flags": [ "SHEATH_SWORD" ], @@ -1352,7 +1347,6 @@ "description": "This is a dull, cheaply made replica of an early modern sword seeing use in the 16th, 17th, and 18th centuries. Called 'broad' to contrast with the slimmer rapiers.", "price": 12000, "price_postapoc": 50, - "price_postapoc": 500, "material": "aluminum", "flags": [ "SHEATH_SWORD" ], "techniques": "WBLOCK_2",