Merge pull request #39612 from Brian-Otten/post-apoc-price-controls-10

Adds post apoc prices to corpses, generic, and gunmods. (part 10 of reworking all prices)
CleverRaven · Apr 17, 2020 · 03db3fc · 03db3fc
2 parents b75cf3f + 3d90ccc
commit 03db3fc
Show file tree

Hide file tree

Showing 24 changed files with 148 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
   }
 ]