From 3d90ccc4f7e6eb2242fd0e99601f68923732072c Mon Sep 17 00:00:00 2001 From: Brian-Otten Date: Thu, 16 Apr 2020 22:59:11 +0200 Subject: [PATCH] more prices --- data/json/items/corpses/inactive_bots.json | 32 ++++++++++++++++++-- data/json/items/generic/bathroom_house.json | 4 +-- data/json/items/generic/bedding.json | 5 +++ data/json/items/generic/casing.json | 1 + data/json/items/generic/spares.json | 27 +++++++++++------ data/json/items/generic/storage.json | 1 + data/json/items/generic/string.json | 1 + data/json/items/generic/toys_and_sports.json | 11 +++++++ data/json/items/gunmod/accessories.json | 5 +++ data/json/items/gunmod/barrel.json | 2 ++ data/json/items/gunmod/bionicmods.json | 1 + data/json/items/gunmod/brass_catcher.json | 1 + data/json/items/gunmod/conversions.json | 1 + data/json/items/gunmod/grip.json | 3 ++ data/json/items/gunmod/laser_gunmods.json | 5 +++ data/json/items/gunmod/loading_port.json | 1 + data/json/items/gunmod/mechanism.json | 4 +++ data/json/items/gunmod/mount.json | 7 +++++ data/json/items/gunmod/muzzle.json | 9 ++++++ data/json/items/gunmod/rail.json | 4 +++ data/json/items/gunmod/sights.json | 11 +++++++ data/json/items/gunmod/sling.json | 1 + data/json/items/gunmod/stock.json | 6 ++++ data/json/items/gunmod/underbarrel.json | 18 +++++++++++ 24 files changed, 148 insertions(+), 13 deletions(-) diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index 1c8ce6d575dcd..e366fea6c3d7d 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -7,6 +7,7 @@ "weight": "4700 g", "volume": "750 ml", "price": 64500, + "price_postapoc": 3000, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -33,6 +34,7 @@ "weight": "5870 g", "volume": "250 ml", "price": 67500, + "price_postapoc": 3000, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -59,6 +61,7 @@ "weight": "4536 g", "volume": "750 ml", "price": 59500, + "price_postapoc": 500, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -85,6 +88,7 @@ "weight": "5360 g", "volume": "750 ml", "price": 60500, + "price_postapoc": 500, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -111,6 +115,7 @@ "weight": "4480 g", "volume": "250 ml", "price": 60000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -137,6 +142,7 @@ "weight": "40750 g", "volume": "30 L", "price": 600000, + "price_postapoc": 12000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -159,6 +165,7 @@ "weight": "172 kg", "volume": "30 L", "price": 500500, + "price_postapoc": 8000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -181,6 +188,7 @@ "weight": "5400 g", "volume": "750 ml", "price": 60000, + "price_postapoc": 500, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -207,6 +215,7 @@ "weight": "25000 g", "volume": "18750 ml", "price": 2677500, + "price_postapoc": 10000, "to_hit": -3, "bashing": 6, "cutting": 6, @@ -234,6 +243,7 @@ "volume": "30 L", "price": 500000, "to_hit": -3, + "price_postapoc": 5000, "bashing": 8, "material": [ "steel", "plastic" ], "symbol": ";", @@ -255,6 +265,7 @@ "weight": "172 kg", "volume": "30 L", "price": 500000, + "price_postapoc": 6000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -277,6 +288,7 @@ "weight": "125000 g", "volume": "60 L", "price": 200500, + "price_postapoc": 2000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -299,6 +311,7 @@ "weight": "40750 g", "volume": "30 L", "price": 400000, + "price_postapoc": 3000, "to_hit": -3, "bashing": 8, "material": [ "steel", "plastic" ], @@ -321,6 +334,7 @@ "weight": "40750 g", "volume": "30 L", "price": 750000, + "price_postapoc": 4000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -345,6 +359,7 @@ "weight": "40750 g", "volume": "30 L", "price": 750000, + "price_postapoc": 3000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -369,6 +384,7 @@ "volume": "62500 ml", "weight": "81500 g", "price": 750000, + "price_postapoc": 2000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -393,6 +409,7 @@ "volume": "62500 ml", "weight": "81500 g", "price": 750000, + "price_postapoc": 250, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -417,6 +434,7 @@ "volume": "62500 ml", "weight": "81500 g", "price": 750000, + "price_postapoc": 100, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -442,6 +460,7 @@ "volume": "62500 ml", "//": "It is a disgusting mass of rotting flesh and jagged metal pieces, no one will buy it.", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 8, "material": [ "steel", "flesh" ], @@ -468,6 +487,7 @@ "volume": "62500 ml", "//": "It is an affront to humanity, no one will buy it.", "price": 0, + "price_postapoc": 0, "to_hit": -3, "bashing": 8, "material": [ "steel", "flesh" ], @@ -494,6 +514,7 @@ "weight": "81500 g", "volume": "62500 ml", "price": 100000, + "price_postapoc": 500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -520,6 +541,7 @@ "weight": "40750 g", "volume": "30 L", "price": 10000, + "price_postapoc": 500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -545,6 +567,7 @@ "weight": "81500 g", "volume": "62500 ml", "price": 10000, + "price_postapoc": 500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -571,6 +594,7 @@ "weight": "81500 g", "volume": "62500 ml", "price": 25000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -597,6 +621,7 @@ "weight": "81500 g", "volume": "62500 ml", "price": 35000, + "price_postapoc": 1500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -623,6 +648,7 @@ "weight": "40750 g", "volume": "30 L", "price": 80000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -649,6 +675,7 @@ "weight": "100000 g", "volume": "65000 ml", "price": 80000, + "price_postapoc": 1500, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -674,6 +701,7 @@ "weight": "120000 g", "volume": "92500 ml", "price": 500000, + "price_postapoc": 1000, "to_hit": -3, "bashing": 8, "material": [ "steel" ], @@ -699,7 +727,7 @@ "volume": "95 L", "weight": "250 kg", "price": 10000000, - "price_postapoc": 100000, + "price_postapoc": 10000, "to_hit": -3, "bashing": 6, "material": [ "steel" ], @@ -724,7 +752,7 @@ "volume": "95 L", "weight": "300 kg", "price": 100000000, - "price_postapoc": 500000, + "price_postapoc": 25000, "to_hit": -3, "bashing": 6, "material": [ "steel" ], diff --git a/data/json/items/generic/bathroom_house.json b/data/json/items/generic/bathroom_house.json index 7de5093cd91c4..de118f4703746 100644 --- a/data/json/items/generic/bathroom_house.json +++ b/data/json/items/generic/bathroom_house.json @@ -30,7 +30,7 @@ "symbol": "t", "copy-from": "base_toiletries", "price": 800, - "price_postapoc": 1200, + "price_postapoc": 500, "//": "the end of the world doesn't mean everyone is okay with having ZZ Top beards. disposable razors are a hot commodity. The razor also loses the Cutting 1 quality. Don't ask how we confirmed this.", "weight": "110 g", "material": [ "plastic", "steel" ], @@ -125,7 +125,7 @@ "symbol": "p", "color": "red", "price": 800, - "price_postapoc": 50, + "price_postapoc": 10, "weight": "590 g", "volume": "2100 ml", "//": "the volume is pretty bulky, but this is an old fashioned model.", diff --git a/data/json/items/generic/bedding.json b/data/json/items/generic/bedding.json index 17e67cba8d9d3..d92aa43526505 100644 --- a/data/json/items/generic/bedding.json +++ b/data/json/items/generic/bedding.json @@ -7,6 +7,7 @@ "weight": "771 g", "volume": "5 L", "price": 2000, + "price_postapoc": 50, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", @@ -27,6 +28,7 @@ "weight": "1123 g", "volume": "15 L", "price": 5500, + "price_postapoc": 50, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", @@ -48,6 +50,7 @@ "weight": "3500 g", "volume": "31 L", "price": 5500, + "price_postapoc": 150, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", @@ -69,6 +72,7 @@ "weight": "3500 g", "volume": "31 L", "price": 19500, + "price_postapoc": 250, "to_hit": -1, "material": [ "cotton", "fur" ], "symbol": "[", @@ -90,6 +94,7 @@ "weight": "1600 g", "volume": "14 L", "price": 20500, + "price_postapoc": 500, "to_hit": -1, "material": [ "cotton" ], "symbol": "[", diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json index 729d87acf6e8f..510b4ba9c1f4a 100644 --- a/data/json/items/generic/casing.json +++ b/data/json/items/generic/casing.json @@ -34,6 +34,7 @@ "type": "GENERIC", "category": "spare_parts", "price": 100, + "price_postapoc": 0, "name": { "str": "unused .22 casing" }, "symbol": "=", "color": "yellow", diff --git a/data/json/items/generic/spares.json b/data/json/items/generic/spares.json index 7eb53acd56aa3..bd47aa388a24a 100644 --- a/data/json/items/generic/spares.json +++ b/data/json/items/generic/spares.json @@ -17,7 +17,8 @@ "material": [ "plastic", "steel" ], "weight": "850 g", "volume": "500 ml", - "price": 1200 + "price": 1200, + "price_postapoc": 500 }, { "id": "drivebelt_makeshift", @@ -28,7 +29,8 @@ "material": [ "cotton", "leather" ], "weight": "1250 g", "volume": "750 ml", - "price": 200 + "price": 200, + "price_postapoc": 50 }, { "id": "filter_air", @@ -39,7 +41,8 @@ "material": [ "plastic", "paper" ], "weight": "360 g", "volume": "500 ml", - "price": 1900 + "price": 1900, + "price_postapoc": 200 }, { "id": "filter_air_makeshift", @@ -50,7 +53,8 @@ "material": [ "plastic", "paper" ], "weight": "480 g", "volume": "750 ml", - "price": 200 + "price": 200, + "price_postapoc": 50 }, { "id": "filter_liquid", @@ -61,7 +65,8 @@ "material": [ "steel", "paper" ], "weight": "480 g", "volume": "500 ml", - "price": 1900 + "price": 1900, + "price_postapoc": 250 }, { "id": "filter_liquid_makeshift", @@ -72,7 +77,8 @@ "material": [ "steel", "paper" ], "weight": "690 g", "volume": "750 ml", - "price": 200 + "price": 200, + "price_postapoc": 50 }, { "id": "glowplug", @@ -83,7 +89,8 @@ "material": [ "plastic", "copper" ], "weight": "260 g", "volume": "250 ml", - "price": 2300 + "price": 2300, + "price_postapoc": 500 }, { "id": "pump_complex", @@ -94,7 +101,8 @@ "material": "iron", "weight": "2800 g", "volume": "1250 ml", - "price": 28900 + "price": 28900, + "price_postapoc": 750 }, { "id": "well_pump", @@ -105,6 +113,7 @@ "material": "iron", "weight": "2400 g", "volume": "1 L", - "price": 1800 + "price": 1800, + "price_postapoc": 500 } ] diff --git a/data/json/items/generic/storage.json b/data/json/items/generic/storage.json index 87f93e39c79f8..44211962c1242 100644 --- a/data/json/items/generic/storage.json +++ b/data/json/items/generic/storage.json @@ -7,6 +7,7 @@ "weight": "100 g", "volume": "150 ml", "price": 100, + "price_postapoc": 0, "material": [ "plastic", "steel" ], "symbol": ";", "color": "brown" diff --git a/data/json/items/generic/string.json b/data/json/items/generic/string.json index d8d5ab3f8a9fe..718999993696a 100644 --- a/data/json/items/generic/string.json +++ b/data/json/items/generic/string.json @@ -26,6 +26,7 @@ "weight": "6 g", "volume": "10ml", "price": 10, + "price_postapoc": 10, "material": "cotton", "symbol": ",", "color": "light_gray", diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json index c4148a7296a1a..7e319259ff626 100644 --- a/data/json/items/generic/toys_and_sports.json +++ b/data/json/items/generic/toys_and_sports.json @@ -7,6 +7,7 @@ "weight": "907 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 0, "to_hit": -1, "material": "plastic", "symbol": "|", @@ -39,6 +40,7 @@ "weight": "907 g", "volume": "750 ml", "price": 2000, + "price_postapoc": 0, "to_hit": -1, "material": "plastic", "symbol": "|", @@ -72,6 +74,7 @@ "weight": "3 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 0, "material": "wood", "symbol": "-", "color": "white" @@ -85,6 +88,7 @@ "weight": "50 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 0, "material": "plastic", "symbol": "*", "color": "white", @@ -116,6 +120,7 @@ "description": "A large, heavy ball. Before the apocalypse, its main purpose was to be rolled along waxed floors.", "category": "other", "price": 3000, + "price_postapoc": 10, "material": "ceramic", "weight": "2000 g", "volume": "2500 ml", @@ -131,6 +136,7 @@ "category": "other", "description": "A baseball, good for throwing at enemies. Getting hit with one of these hurts a lot more than you might think.", "price": 1000, + "price_postapoc": 0, "material": "leather", "weight": "150 g", "volume": "250 ml", @@ -146,6 +152,7 @@ "category": "other", "description": "An oval made of leather and string, it's easily thrown but does little damage. You could take it apart into leather if you wanted.", "price": 1000, + "price_postapoc": 10, "material": "leather", "weight": "400 g", "volume": "750 ml", @@ -161,6 +168,7 @@ "category": "other", "description": "A high-quality indoor basketball. You may throw it at zombies.", "price": 1200, + "price_postapoc": 10, "material": "leather", "weight": "800 g", "volume": "1 L", @@ -176,6 +184,7 @@ "category": "other", "description": "A standard regulation volleyball.", "price": 1000, + "price_postapoc": 10, "material": "leather", "weight": "260 g", "volume": "1 L", @@ -191,6 +200,7 @@ "category": "other", "description": "A brightly colored beach volleyball. It is slightly larger than a regular white one.", "price": 1200, + "price_postapoc": 10, "material": "leather", "weight": "280 g", "volume": "1 L", @@ -206,6 +216,7 @@ "category": "other", "description": "A heavy circular block of solid rubber, normally used for playing hockey. You can throw it to cause some serious harm.", "price": 1000, + "price_postapoc": 0, "material": "plastic", "weight": "170 g", "volume": "250 ml", diff --git a/data/json/items/gunmod/accessories.json b/data/json/items/gunmod/accessories.json index 7a67d9e7ffe53..35d7fad905599 100644 --- a/data/json/items/gunmod/accessories.json +++ b/data/json/items/gunmod/accessories.json @@ -8,6 +8,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 4000, + "price_postapoc": 250, "material": [ "plastic", "aluminum" ], "symbol": ":", "color": "dark_gray", @@ -24,6 +25,7 @@ "weight": "88 g", "volume": "500 ml", "price": 4000, + "price_postapoc": 500, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "brown", @@ -41,6 +43,7 @@ "weight": "300 g", "volume": "500 ml", "price": 15000, + "price_postapoc": 750, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "brown", @@ -59,6 +62,7 @@ "weight": "50 g", "volume": "250 ml", "price": 500, + "price_postapoc": 250, "material": [ "plastic" ], "symbol": ":", "color": "brown", @@ -78,6 +82,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 2000, + "price_postapoc": 50, "material": "steel", "symbol": ":", "color": "light_gray", diff --git a/data/json/items/gunmod/barrel.json b/data/json/items/gunmod/barrel.json index 57de0ed937740..080d415e57c6c 100644 --- a/data/json/items/gunmod/barrel.json +++ b/data/json/items/gunmod/barrel.json @@ -6,6 +6,7 @@ "description": "A shortened barrel results in markedly reduced accuracy, and a minor increase in noise, but also greatly improves the ease with which the weapon can be carried and wielded.", "volume": "0 ml", "price": 12000, + "price_postapoc": 250, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -23,6 +24,7 @@ "weight": "450 g", "volume": "500 ml", "price": 20000, + "price_postapoc": 0, "bashing": 5, "material": [ "steel" ], "symbol": ":", diff --git a/data/json/items/gunmod/bionicmods.json b/data/json/items/gunmod/bionicmods.json index bcb02d997a400..91d16c74821c1 100644 --- a/data/json/items/gunmod/bionicmods.json +++ b/data/json/items/gunmod/bionicmods.json @@ -7,6 +7,7 @@ "weight": "1 g", "volume": "0 ml", "price": 85000, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", diff --git a/data/json/items/gunmod/brass_catcher.json b/data/json/items/gunmod/brass_catcher.json index de1dbf3cd58cc..4e71dbf363ee0 100644 --- a/data/json/items/gunmod/brass_catcher.json +++ b/data/json/items/gunmod/brass_catcher.json @@ -7,6 +7,7 @@ "weight": "114 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 50, "material": [ "cotton" ], "symbol": ":", "color": "light_gray", diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json index 0881b4320b1ff..484d615fa9c13 100644 --- a/data/json/items/gunmod/conversions.json +++ b/data/json/items/gunmod/conversions.json @@ -9,6 +9,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 50000, + "price_postapoc": 1000, "material": "steel", "symbol": ":", "color": "green", diff --git a/data/json/items/gunmod/grip.json b/data/json/items/gunmod/grip.json index 9a48f6d11a132..5b2fb0b915d6f 100644 --- a/data/json/items/gunmod/grip.json +++ b/data/json/items/gunmod/grip.json @@ -8,6 +8,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 48000, + "price_postapoc": 750, "material": [ "plastic" ], "symbol": ":", "color": "dark_gray", @@ -28,6 +29,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 38000, + "price_postapoc": 750, "material": [ "steel" ], "symbol": ":", "color": "dark_gray", @@ -46,6 +48,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 38000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "dark_gray", diff --git a/data/json/items/gunmod/laser_gunmods.json b/data/json/items/gunmod/laser_gunmods.json index f1aca26e0474c..7ce7b3c476218 100644 --- a/data/json/items/gunmod/laser_gunmods.json +++ b/data/json/items/gunmod/laser_gunmods.json @@ -7,6 +7,7 @@ "weight": "380 g", "volume": "250 ml", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -25,6 +26,7 @@ "weight": "380 g", "volume": "250 ml", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -43,6 +45,7 @@ "weight": "380 g", "volume": "1 L", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -63,6 +66,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -80,6 +84,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 84000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_gray", diff --git a/data/json/items/gunmod/loading_port.json b/data/json/items/gunmod/loading_port.json index f513145be08a0..dc8e14cafa6bc 100644 --- a/data/json/items/gunmod/loading_port.json +++ b/data/json/items/gunmod/loading_port.json @@ -8,6 +8,7 @@ "volume": "149 ml", "integral_volume": "149 ml", "price": 15700, + "price_postapoc": 250, "install_time": "8 m", "material": "aluminum", "symbol": ":", diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json index beb86f137e5cc..2e6556bc7bfb9 100644 --- a/data/json/items/gunmod/mechanism.json +++ b/data/json/items/gunmod/mechanism.json @@ -9,6 +9,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 1500, + "price_postapoc": 500, "material": [ "steel", "superalloy" ], "symbol": ":", "color": "dark_gray", @@ -28,6 +29,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 65000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "red", @@ -49,6 +51,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 24000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "red", @@ -73,6 +76,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 50000, + "price_postapoc": 750, "material": [ "plastic" ], "symbol": ":", "color": "dark_gray", diff --git a/data/json/items/gunmod/mount.json b/data/json/items/gunmod/mount.json index d06cfb3831599..12a7655816121 100644 --- a/data/json/items/gunmod/mount.json +++ b/data/json/items/gunmod/mount.json @@ -8,6 +8,7 @@ "volume": "50 ml", "integral_volume": "0 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -26,6 +27,7 @@ "weight": "10 g", "volume": "8 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -44,6 +46,7 @@ "weight": "10 g", "volume": "8 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -62,6 +65,7 @@ "weight": "60 g", "volume": "80 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -80,6 +84,7 @@ "weight": "60 g", "volume": "80 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -99,6 +104,7 @@ "volume": "50 ml", "integral_volume": "0 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -117,6 +123,7 @@ "weight": "10 g", "volume": "8 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", diff --git a/data/json/items/gunmod/muzzle.json b/data/json/items/gunmod/muzzle.json index 306394b3ea649..7364de1babd42 100644 --- a/data/json/items/gunmod/muzzle.json +++ b/data/json/items/gunmod/muzzle.json @@ -8,6 +8,7 @@ "integral_weight": "0 g", "volume": "0 ml", "price": 72000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -26,6 +27,7 @@ "weight": "380 g", "volume": "250 ml", "price": 84000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -52,6 +54,7 @@ "weight": "880 g", "volume": "750 ml", "price": 480, + "price_postapoc": 250, "to_hit": 1, "bashing": 3, "material": [ "steel" ], @@ -75,6 +78,7 @@ "weight": "880 g", "volume": "750 ml", "price": 480, + "price_postapoc": 250, "to_hit": 1, "bashing": 3, "material": [ "steel" ], @@ -97,6 +101,7 @@ "weight": "202 g", "volume": "2 L", "price": 480, + "price_postapoc": 10, "material": [ "plastic" ], "symbol": ":", "color": "cyan", @@ -118,6 +123,7 @@ "weight": "0 g", "volume": "0 ml", "price": 0, + "price_postapoc": 1500, "material": [ "superalloy", "ceramic" ], "mod_targets": [ "rifle" ], "handling_modifier": 0, @@ -133,6 +139,7 @@ "weight": "968 g", "volume": "1286 ml", "price": 140000, + "price_postapoc": 2000, "to_hit": 1, "bashing": 3, "material": [ "steel" ], @@ -156,6 +163,7 @@ "weight": "490 g", "volume": "247 ml", "price": 77000, + "price_postapoc": 1500, "to_hit": 1, "bashing": 3, "material": [ "steel" ], @@ -195,6 +203,7 @@ "//": "SilencerCo Omega 45K", "volume": "179 ml", "price": 78000, + "price_postapoc": 1500, "material": "steel", "symbol": ":", "color": "dark_gray", diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json index e39e843939db3..e81908143eb89 100644 --- a/data/json/items/gunmod/rail.json +++ b/data/json/items/gunmod/rail.json @@ -7,6 +7,7 @@ "weight": "1450 g", "volume": "500 ml", "price": 50000, + "price_postapoc": 1500, "material": [ "steel", "wood" ], "symbol": ":", "color": "light_red", @@ -61,6 +62,7 @@ "weight": "40 g", "volume": "125ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel" ], "symbol": ":", "color": "light_gray", @@ -86,6 +88,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 12000, + "price_postapoc": 500, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -104,6 +107,7 @@ "volume": "750 ml", "integral_volume": "500 ml", "price": 68000, + "price_postapoc": 750, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "blue", diff --git a/data/json/items/gunmod/sights.json b/data/json/items/gunmod/sights.json index 4069a2c333fb1..ef5b1da7ab228 100644 --- a/data/json/items/gunmod/sights.json +++ b/data/json/items/gunmod/sights.json @@ -8,6 +8,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 5000, + "price_postapoc": 500, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "dark_gray", @@ -26,6 +27,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 3000, + "price_postapoc": 100, "material": [ "aluminum", "plastic" ], "symbol": ":", "color": "dark_gray", @@ -43,6 +45,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 20000, + "price_postapoc": 750, "material": [ "aluminum", "plastic", "glass" ], "symbol": ":", "color": "dark_gray", @@ -62,6 +65,7 @@ "weight": "255 g", "volume": "335 ml", "price": 68000, + "price_postapoc": 750, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -82,6 +86,7 @@ "integral_volume": 0, "integral_weight": 0, "price": 72000, + "price_postapoc": 250, "material": [ "steel" ], "symbol": ":", "color": "dark_gray", @@ -100,6 +105,7 @@ "weight": "212 g", "volume": "250 ml", "price": 54000, + "price_postapoc": 500, "material": [ "aluminum", "glass" ], "symbol": ":", "color": "dark_gray", @@ -119,6 +125,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 68000, + "price_postapoc": 500, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -138,6 +145,7 @@ "weight": "669 g", "volume": "435 ml", "price": 68000, + "price_postapoc": 750, "material": [ "aluminum", "glass" ], "symbol": ":", "color": "dark_gray", @@ -165,6 +173,7 @@ "weight": "280 g", "volume": "112 ml", "price": 68000, + "price_postapoc": 750, "material": [ "aluminum", "glass" ], "symbol": ":", "color": "dark_gray", @@ -205,6 +214,7 @@ "weight": "300 g", "volume": "250 ml", "price": 30000, + "price_postapoc": 250, "material": [ "plastic", "steel", "glass" ], "symbol": ":", "color": "dark_gray", @@ -226,6 +236,7 @@ "weight": "220 g", "volume": "250 ml", "price": 27000, + "price_postapoc": 500, "material": [ "plastic", "steel", "glass" ], "symbol": ":", "color": "dark_gray", diff --git a/data/json/items/gunmod/sling.json b/data/json/items/gunmod/sling.json index c90f809627874..4a3c1834a6d24 100644 --- a/data/json/items/gunmod/sling.json +++ b/data/json/items/gunmod/sling.json @@ -8,6 +8,7 @@ "volume": "250 ml", "integral_volume": "250 ml", "price": 480, + "price_postapoc": 10, "material": "cotton", "symbol": ":", "color": "green", diff --git a/data/json/items/gunmod/stock.json b/data/json/items/gunmod/stock.json index a49377196f865..c3174daf5b775 100644 --- a/data/json/items/gunmod/stock.json +++ b/data/json/items/gunmod/stock.json @@ -9,6 +9,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 38000, + "price_postapoc": 500, "to_hit": 1, "bashing": 6, "material": [ "plastic", "steel" ], @@ -29,6 +30,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 42000, + "price_postapoc": 250, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -47,6 +49,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 30000, + "price_postapoc": 250, "material": [ "steel" ], "symbol": ":", "color": "dark_gray", @@ -64,6 +67,7 @@ "weight": "350 g", "volume": "500 ml", "price": 38000, + "price_postapoc": 500, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -82,6 +86,7 @@ "integral_volume": "0 ml", "integral_weight": "0 g", "price": 400, + "price_postapoc": 500, "to_hit": 1, "bashing": 6, "material": [ "plastic", "steel" ], @@ -101,6 +106,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 4500, + "price_postapoc": 500, "to_hit": 1, "bashing": 2, "material": [ "plastic", "steel" ], diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index fd73f2c267572..e15125307443c 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -7,6 +7,7 @@ "weight": "400 g", "volume": "500 ml", "price": 68000, + "price_postapoc": 500, "to_hit": -1, "bashing": 10, "material": "steel", @@ -35,6 +36,7 @@ "weight": "2600 g", "volume": "0 ml", "price": 95000, + "price_postapoc": 500, "to_hit": -1, "material": [ "steel" ], "symbol": ":", @@ -52,6 +54,7 @@ "weight": "1134 g", "volume": "1 L", "price": 10000, + "price_postapoc": 500, "to_hit": -1, "material": [ "steel" ], "symbol": ":", @@ -70,6 +73,7 @@ "weight": "68 g", "volume": "119 ml", "price": 6000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "brown", @@ -95,6 +99,7 @@ "weight": "1 g", "volume": "250 ml", "price": 4000, + "price_postapoc": 500, "to_hit": -1, "cutting": 10, "material": [ "steel" ], @@ -114,6 +119,7 @@ "weight": "1550 g", "volume": "1750 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -138,6 +144,7 @@ "weight": "1550 g", "volume": "1750 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -163,6 +170,7 @@ "volume": "1750 ml", "integral_volume": "0 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -188,6 +196,7 @@ "volume": "1750 ml", "integral_volume": "0 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -213,6 +222,7 @@ "volume": "250 ml", "integral_volume": "0 ml", "price": 10000, + "price_postapoc": 500, "material": [ "plastic", "steel" ], "symbol": ":", "color": "dark_gray", @@ -255,6 +265,7 @@ "weight": "1360 g", "volume": "500 ml", "price": 65000, + "price_postapoc": 1000, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_red", @@ -280,6 +291,7 @@ "weight": "1500 g", "volume": "500 ml", "price": 84000, + "price_postapoc": 1000, "material": "steel", "symbol": ":", "color": "dark_gray", @@ -304,6 +316,7 @@ "description": "The integrated 12 gauge shotgun barrel of the Chiappa M6 Survival Gun. It's irremovable.", "volume": "0 ml", "price": 0, + "price_postapoc": 0, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -333,6 +346,7 @@ "weight": "2600 g", "volume": "500 ml", "price": 95000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_red", @@ -358,6 +372,7 @@ "weight": "2080 g", "volume": "750 ml", "price": 25000, + "price_postapoc": 500, "material": [ "steel", "plastic" ], "symbol": ":", "color": "light_gray", @@ -374,6 +389,7 @@ "weight": "122 g", "volume": "250 ml", "price": 4000, + "price_postapoc": 1000, "to_hit": -4, "cutting": 6, "material": [ "steel" ], @@ -393,6 +409,7 @@ "weight": "1140 g", "volume": "750 ml", "price": 120000, + "price_postapoc": 5000, "material": [ "superalloy", "ceramic" ], "symbol": ":", "color": "dark_gray", @@ -420,6 +437,7 @@ "weight": "1500 g", "volume": "750 ml", "price": 65000, + "price_postapoc": 1000, "material": [ "steel" ], "symbol": ":", "color": "light_red",