diff --git a/data/json/items/resources/alien.json b/data/json/items/resources/alien.json index 88bf6e0e96ee0..a655f1125d39c 100644 --- a/data/json/items/resources/alien.json +++ b/data/json/items/resources/alien.json @@ -8,6 +8,7 @@ "weight": "70 g", "volume": "250 ml", "price": 0, + "price_postapoc": 0, "material": "alien_resin", "symbol": ",", "color": "light_gray", @@ -22,6 +23,7 @@ "weight": "70000 g", "volume": "22000 ml", "price": 10000, + "price_postapoc": 500, "material": "alien_resin", "symbol": "0", "color": "light_blue", diff --git a/data/json/items/resources/chemicals.json b/data/json/items/resources/chemicals.json index b6c8aac3309fa..c04c5f67e37fd 100644 --- a/data/json/items/resources/chemicals.json +++ b/data/json/items/resources/chemicals.json @@ -9,6 +9,7 @@ "weight": "1725 mg", "volume": "250 ml", "price": 2500, + "price_postapoc": 100, "material": "powder_nonflam", "symbol": "=", "color": "dark_gray", @@ -25,6 +26,7 @@ "weight": "1540 mg", "volume": "250 ml", "price": 2500, + "price_postapoc": 50, "material": "powder_nonflam", "symbol": "=", "color": "dark_gray", diff --git a/data/json/items/resources/fasteners.json b/data/json/items/resources/fasteners.json index e84fc0ccf9391..fce9f5ee1b587 100644 --- a/data/json/items/resources/fasteners.json +++ b/data/json/items/resources/fasteners.json @@ -8,6 +8,7 @@ "weight": "24 g", "volume": "5 ml", "price": 100, + "price_postapoc": 0, "material": "steel", "symbol": "=", "color": "dark_gray", @@ -22,6 +23,7 @@ "weight": "1 g", "volume": "20 ml", "price": 100, + "price_postapoc": 0, "material": "plastic", "symbol": "=", "color": "dark_gray", @@ -36,6 +38,7 @@ "description": "A steel button, usually found on clothing.", "weight": "8 g", "price": 300, + "price_postapoc": 0, "material": "steel" }, { @@ -62,6 +65,7 @@ "weight": "2 g", "volume": "2 ml", "price": 100, + "price_postapoc": 0, "material": "cotton", "symbol": "=", "color": "dark_gray", @@ -84,6 +88,7 @@ "weight": "4 g", "volume": "4 ml", "price": 100, + "price_postapoc": 0, "material": [ "plastic", "cotton" ], "symbol": "=", "color": "dark_gray", diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json index d68ef645a6fae..4657e8fc8d243 100644 --- a/data/json/items/resources/glass.json +++ b/data/json/items/resources/glass.json @@ -30,6 +30,7 @@ "description": "A large sheet of glass. Easily shattered. Useful for repairing windows.", "category": "spare_parts", "price": 5000, + "price_postapoc": 100, "material": "glass", "weight": "31250 g", "volume": "12500 ml", @@ -52,6 +53,7 @@ "description": "A large sheet of glass strengthened with steel wiring.", "category": "spare_parts", "price": 10000, + "price_postapoc": 250, "material": [ "glass", "steel" ], "weight": "40123 g", "volume": "12500 ml", @@ -67,6 +69,7 @@ "description": "A small pane of glass strengthened with steel wiring.", "category": "spare_parts", "price": 5000, + "price_postapoc": 100, "material": [ "glass", "steel" ], "weight": "10040 g", "volume": "3 L", @@ -82,6 +85,7 @@ "description": "A large, durable sheet of tempered glass, approximately six millimeters thick. A common type of safety glass with the curious property of breaking into small, non-lethal pieces upon shattering.", "category": "spare_parts", "price": 10000, + "price_postapoc": 100, "material": "glass", "weight": "22700 g", "volume": "22700 ml", diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json index ef247dd103831..74b6526adc909 100644 --- a/data/json/items/resources/home_improvement.json +++ b/data/json/items/resources/home_improvement.json @@ -4,6 +4,7 @@ "id": "r_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "red paint", "str_pl": "red paint" }, "symbol": "o", "color": "red", @@ -19,6 +20,7 @@ "id": "b_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "blue paint", "str_pl": "blue paint" }, "symbol": "o", "color": "blue", @@ -34,6 +36,7 @@ "id": "w_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "white paint", "str_pl": "white paint" }, "symbol": "o", "color": "white", @@ -49,6 +52,7 @@ "id": "g_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "green paint", "str_pl": "green paint" }, "symbol": "o", "color": "green", @@ -64,6 +68,7 @@ "id": "p_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "purple paint", "str_pl": "purple paint" }, "symbol": "o", "color": "magenta", @@ -79,6 +84,7 @@ "id": "y_paint", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "yellow paint", "str_pl": "yellow paint" }, "symbol": "o", "color": "yellow", @@ -94,6 +100,7 @@ "id": "r_carpet", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "red carpet" }, "symbol": "}", "color": "red", @@ -109,6 +116,7 @@ "id": "g_carpet", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "green carpet" }, "symbol": "}", "color": "green", @@ -124,6 +132,7 @@ "id": "y_carpet", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "yellow carpet" }, "symbol": "}", "color": "yellow", @@ -139,6 +148,7 @@ "id": "p_carpet", "category": "other", "price": 120, + "price_postapoc": 0, "name": { "str": "purple carpet" }, "symbol": "}", "color": "magenta", @@ -158,6 +168,7 @@ "category": "spare_parts", "description": "A metal cylinder with a small lens inside intended to be installed on a door.", "price": 12000, + "price_postapoc": 50, "material": [ "aluminum", "glass" ], "weight": "5 g", "volume": "250 ml", @@ -173,6 +184,7 @@ "category": "spare_parts", "description": "A roll of fine mesh screen for bug barriers on porches.", "price": 1200, + "price_postapoc": 50, "material": [ "plastic" ], "weight": "25 g", "volume": "1000 ml", diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 81324a9cb476f..62284d5a5d8f0 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -15,7 +15,7 @@ "volume": "1 L", "bashing": 12, "price": 7500, - "price_postapoc": 300 + "price_postapoc": 10 }, { "id": "scrap", @@ -26,6 +26,7 @@ "weight": "50 g", "volume": "250 ml", "price": 500, + "price_postapoc": 10, "count": 2, "stack_size": 10, "//": "Density 7.60g/cm³ ~ 1.9kg/250ml @ 50g/unit ~ stack 40 but fragments stacks poorly so only 25% of this", @@ -50,7 +51,7 @@ "cutting": 6, "flags": [ "STAB" ], "qualities": [ [ "BUTCHER", -42 ] ], - "price_postapoc": 500 + "price_postapoc": 10 }, { "type": "GENERIC", @@ -67,7 +68,7 @@ "volume": "500 ml", "bashing": 5, "price": 7500, - "price_postapoc": 300 + "price_postapoc": 10 }, { "id": "material_aluminium_ingot", @@ -79,7 +80,7 @@ "//": "Density 2.70g/cm³ = 675g/250ml", "volume": "250 ml", "price": 500, - "price_postapoc": 125, + "price_postapoc": 10, "material": [ "aluminum" ], "symbol": ",", "color": "light_gray", @@ -95,6 +96,7 @@ "//": "Density 9.78g/cm³ ~ 2.4kg/250ml @ stack 1000 = 2g/unit", "volume": "50ml", "price": 6500, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "lead" ], @@ -112,7 +114,7 @@ "//": "Density 19.32g/cm³ ~ 4.8kg/250ml @ stack 1000 = 5g/unit", "volume": "50ml", "price": 100000, - "price_postapoc": 100, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "gold" ], @@ -147,7 +149,7 @@ "weight": "7 g", "volume": "50ml", "price": 3000, - "price_postapoc": 75, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "zinc" ], @@ -165,6 +167,7 @@ "//": "Density 11.34g/cm³ ~ 2.8kg/250ml @ stack 1000 = 3g/unit", "volume": "50ml", "price": 5000, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "lead" ], @@ -182,6 +185,7 @@ "//": "Weight should be 1.12g because magnesium is 64% less dense than aluminum (1.74g/cm³ vs 2.70g/cm³), at 250ml aluminium powder has a weight of ~0.176kg at 250ml, assuming same particle size => magnesium powder has a weight of ~0.112kg at 250ml", "volume": "250 ml", "price": 5000, + "price_postapoc": 50, "count": 100, "stack_size": 100, "container": "bag_plastic", @@ -200,7 +204,7 @@ "//": "Density 10.40g/cm³ ~ 2.6kg/250ml @ stack 1000 = 3g/unit", "volume": "50ml", "price": 100000, - "price_postapoc": 100, + "price_postapoc": 10, "count": 100, "stack_size": 200, "material": [ "silver" ], @@ -218,6 +222,7 @@ "weight": "250 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 10, "bashing": 5, "to_hit": -3, "stack_size": 8, @@ -236,6 +241,7 @@ "weight": "250 g", "volume": "250 ml", "price": 1000, + "price_postapoc": 10, "bashing": 8, "to_hit": -2, "stack_size": 4, @@ -255,6 +261,7 @@ "weight": "1000 g", "volume": "250 ml", "price": 2000, + "price_postapoc": 50, "bashing": 12, "to_hit": -4, "stack_size": 2, @@ -274,6 +281,7 @@ "weight": "300 g", "volume": "250 ml", "price": 3000, + "price_postapoc": 10, "bashing": 5, "to_hit": -3, "stack_size": 6, @@ -292,6 +300,7 @@ "category": "spare_parts", "description": "A small chunk of copper, usable for crafting or repairs.", "price": 1000, + "price_postapoc": 10, "material": "copper", "weight": "50 g", "volume": "62 ml", @@ -303,6 +312,7 @@ "id": "tin", "category": "spare_parts", "price": 750, + "price_postapoc": 10, "name": { "str": "tin powder", "str_pl": "tin powder" }, "symbol": "=", "color": "light_gray", @@ -320,6 +330,7 @@ "id": "solder_wire", "category": "spare_parts", "price": 5000, + "price_postapoc": 50, "name": { "str": "solder", "str_pl": "solder" }, "symbol": "=", "color": "light_gray", diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json index 24123cc03e8eb..0c1ca84efcd61 100644 --- a/data/json/items/resources/misc.json +++ b/data/json/items/resources/misc.json @@ -12,7 +12,8 @@ "volume": "250 ml", "cutting": 10, "flags": [ "SPEAR" ], - "price": 3000 + "price": 3000, + "price_postapoc": 0 }, { "type": "GENERIC", @@ -59,7 +60,8 @@ "volume": "250 ml", "cutting": 8, "flags": [ "SPEAR", "SHEATH_KNIFE" ], - "price": 500 + "price": 500, + "price_postapoc": 0 }, { "id": "incendiary", @@ -70,6 +72,7 @@ "weight": "2 g", "volume": "500 ml", "price": 10000, + "price_postapoc": 100, "container": "bag_plastic", "material": [ "powder" ], "symbol": "=", @@ -87,6 +90,7 @@ "weight": "20000 g", "volume": "300000 ml", "price": 1000, + "price_postapoc": 500, "material": [ "cotton", "steel" ], "symbol": "0", "color": "white", @@ -102,6 +106,7 @@ "weight": "6 kg", "volume": "300000 ml", "price": 1000, + "price_postapoc": 750, "material": [ "cotton" ], "symbol": "0", "color": "white", @@ -116,6 +121,7 @@ "weight": "6 g", "volume": "80 ml", "price": 500, + "price_postapoc": 500, "container": "bag_plastic", "material": [ "cotton" ], "symbol": ",", @@ -148,6 +154,7 @@ "weight": "140 g", "volume": "500 ml", "price": 100, + "price_postapoc": 10, "material": "plastic", "symbol": "=", "color": "dark_gray", @@ -162,6 +169,7 @@ "weight": "2500 g", "volume": "1533 ml", "price": 60000, + "price_postapoc": 100, "material": "ceramic", "symbol": ",", "color": "dark_gray" @@ -175,6 +183,7 @@ "weight": "1 kg", "volume": "600 ml", "price": 60000, + "price_postapoc": 100, "material": "ceramic", "symbol": ",", "color": "dark_gray" @@ -188,6 +197,7 @@ "category": "spare_parts", "description": "A collapsible buttstock designed for the M320 grenade launcher. When combined with this stock, the M320 can be used as a standalone weapon", "price": 10000, + "price_postapoc": 250, "material": [ "plastic", "steel" ], "weight": "600 g", "volume": "250 ml", @@ -206,6 +216,7 @@ "volume": "250 ml", "cutting": 8, "flags": [ "SPEAR", "SHEATH_KNIFE" ], - "price": 1000 + "price": 1000, + "price_postapoc": 0 } ] diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 73cd1dd47c633..dd24080256aa7 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -8,6 +8,7 @@ "weight": "50 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "plastic", "symbol": ",", "color": "light_blue", @@ -22,6 +23,7 @@ "weight": "55 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "nylon", "symbol": ",", "color": "white", @@ -36,6 +38,7 @@ "weight": "87 g", "volume": "250 ml", "price": 0, + "price_postapoc": 10, "material": "lycra", "symbol": ",", "color": "light_blue", @@ -50,6 +53,7 @@ "weight": "1000 g", "volume": "2 L", "price": 0, + "price_postapoc": 25, "material": "plastic", "symbol": ")", "color": "light_blue", @@ -64,6 +68,7 @@ "weight": "14875 g", "volume": "12500 ml", "price": 0, + "price_postapoc": 25, "material": "plastic", "symbol": ")", "color": "light_blue" diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index 3f7fa6451c872..56432e2aa7818 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -8,6 +8,7 @@ "weight": "1 g", "volume": "1 ml", "price": 1, + "price_postapoc": 5, "material": "cotton", "symbol": "=", "color": "dark_gray", @@ -21,6 +22,7 @@ "name": { "str": "faux fur scraps", "str_pl": "faux fur scraps" }, "description": "Oddly-shaped smallish bits of faux fur, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, + "price_postapoc": 5, "material": "faux_fur" }, { @@ -103,6 +105,7 @@ "weight": "5 g", "volume": "300 ml", "price": 1000, + "price_postapoc": 100, "material": "cotton", "symbol": "=", "color": "dark_gray", @@ -118,6 +121,7 @@ "weight": "100 g", "volume": "60 ml", "price": 200, + "price_postapoc": 50, "count": 1 }, { @@ -129,6 +133,7 @@ "weight": "10 g", "volume": "4500 ml", "price": 5000, + "price_postapoc": 100, "material": "faux_fur", "symbol": "=", "color": "dark_gray", @@ -144,6 +149,7 @@ "weight": "200 g", "volume": "900 ml", "price": 1000, + "price_postapoc": 50, "count": 1 }, { @@ -155,6 +161,7 @@ "weight": "8 g", "volume": "1800 ml", "price": 2500, + "price_postapoc": 250, "material": "wool", "symbol": "=", "color": "dark_gray", @@ -170,6 +177,7 @@ "weight": "160 g", "volume": "360 ml", "price": 500, + "price_postapoc": 100, "count": 1 }, { @@ -181,6 +189,7 @@ "weight": "5 g", "volume": "300 ml", "price": 15000, + "price_postapoc": 500, "material": "kevlar", "symbol": "=", "color": "dark_gray", @@ -196,6 +205,7 @@ "weight": "3 g", "volume": "300 ml", "price": 5000, + "price_postapoc": 100, "material": "lycra", "symbol": "=", "color": "dark_gray", @@ -211,6 +221,7 @@ "weight": "60 g", "volume": "60 ml", "price": 1000, + "price_postapoc": 50, "count": 1 }, { @@ -222,6 +233,7 @@ "weight": "6 g", "volume": "300 ml", "price": 5000, + "price_postapoc": 100, "material": "neoprene", "symbol": "=", "color": "dark_gray", @@ -237,6 +249,7 @@ "weight": "120 g", "volume": "60 ml", "price": 1000, + "price_postapoc": 50, "count": 1 }, { @@ -248,6 +261,7 @@ "weight": "5 g", "volume": "300 ml", "price": 15000, + "price_postapoc": 250, "material": "nomex", "symbol": "=", "color": "dark_gray", @@ -263,6 +277,7 @@ "weight": "100 g", "volume": "60 ml", "price": 3000, + "price_postapoc": 50, "count": 1 }, { @@ -274,6 +289,7 @@ "weight": "3 g", "volume": "300 ml", "price": 5000, + "price_postapoc": 100, "material": "nylon", "symbol": "=", "color": "dark_gray", @@ -289,6 +305,7 @@ "weight": "60 g", "volume": "60 ml", "price": 1000, + "price_postapoc": 50, "count": 1 }, { @@ -296,6 +313,7 @@ "id": "thread_kevlar", "category": "spare_parts", "price": 5000, + "price_postapoc": 250, "name": { "str": "Kevlar thread" }, "symbol": "=", "color": "light_gray", @@ -314,6 +332,7 @@ "id": "thread_nomex", "category": "spare_parts", "price": 5000, + "price_postapoc": 100, "name": { "str": "Nomex thread" }, "symbol": "=", "color": "light_gray", diff --git a/data/json/items/resources/wood.json b/data/json/items/resources/wood.json index 81b95894982c1..f737047ff918e 100644 --- a/data/json/items/resources/wood.json +++ b/data/json/items/resources/wood.json @@ -8,7 +8,7 @@ "description": "A large chunk of log, cut from a tree. (a)ctivate a wood axe or wood saw to cut it into planks.", "category": "other", "price": 10000, - "price_postapoc": 100, + "price_postapoc": 10, "material": "wood", "weight": "9071 g", "volume": "10 L", @@ -82,7 +82,7 @@ "bashing": 25, "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE" ], "price": 4000, - "price_postapoc": 8000, + "price_postapoc": 50, "qualities": [ [ "HAMMER", 1 ] ] }, { @@ -100,7 +100,7 @@ "volume": "4400 ml", "bashing": 10, "price": 1000, - "price_postapoc": 0, + "price_postapoc": 10, "flags": [ "FIREWOOD" ] }, { @@ -118,7 +118,7 @@ "material": [ "wood" ], "bashing": 16, "price": 40000, - "price_postapoc": 0, + "price_postapoc": 50, "flags": [ "FIREWOOD" ] }, { @@ -138,7 +138,7 @@ "volume": "3 L", "bashing": 8, "price": 8000, - "price_postapoc": 0, + "price_postapoc": 10, "flags": [ "FIREWOOD" ] }, { @@ -157,7 +157,7 @@ "volume": "6250 ml", "bashing": 8, "price": 20000, - "price_postapoc": 0, + "price_postapoc": 10, "flags": [ "FIREWOOD" ] } ]