Merge pull request #39613 from Brian-Otten/post-apoc-price-controls-11

Adds post apoc prices to magazines. (part 11 of reworking all prices)
CleverRaven · Apr 17, 2020 · 01b0a9a · 01b0a9a
2 parents 03db3fc + 6c48f4d
commit 01b0a9a
Show file tree

Hide file tree

Showing 36 changed files with 172 additions and 0 deletions.
diff --git a/data/json/items/magazine/12mm.json b/data/json/items/magazine/12mm.json
@@ -8,6 +8,7 @@
     "weight": "168 g",
     "volume": "250 ml",
     "price": 8000,
+    "price_postapoc": 500,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",

diff --git a/data/json/items/magazine/20x60mm.json b/data/json/items/magazine/20x60mm.json
@@ -8,6 +8,7 @@
     "weight": "210 g",
     "volume": "250 ml",
     "price": 40000,
+    "price_postapoc": 250,
     "material": [ "superalloy", "plastic" ],
     "symbol": "#",
     "color": "dark_gray",
@@ -26,6 +27,7 @@
     "weight": "280 g",
     "volume": "500 ml",
     "price": 40000,
+    "price_postapoc": 500,
     "material": [ "superalloy", "plastic" ],
     "symbol": "#",
     "color": "dark_gray",
@@ -44,6 +46,7 @@
     "weight": "280 g",
     "volume": "750 ml",
     "price": 60000,
+    "price_postapoc": 1000,
     "material": [ "superalloy", "plastic" ],
     "symbol": "#",
     "color": "dark_gray",

diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json
@@ -8,6 +8,7 @@
     "weight": "64 g",
     "volume": "250 ml",
     "price": 600,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -24,6 +25,7 @@
     "weight": "760 g",
     "volume": "500 ml",
     "price": 7300,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -42,6 +44,7 @@
     "weight": "180 g",
     "volume": "250 ml",
     "price": 1200,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -58,6 +61,7 @@
     "weight": "60 g",
     "volume": "250 ml",
     "price": 1700,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -75,6 +79,7 @@
     "weight": "180 g",
     "volume": "500 ml",
     "price": 7900,
+    "price_postapoc": 200,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -92,6 +97,7 @@
     "weight": "80 g",
     "volume": "250 ml",
     "price": 1400,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -110,6 +116,7 @@
     "weight": "70 g",
     "volume": "250 ml",
     "price": 2100,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -127,6 +134,7 @@
     "weight": "55 g",
     "volume": "27ml",
     "price": 2800,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -144,6 +152,7 @@
     "weight": "25 g",
     "volume": "126 ml",
     "price": 3250,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",

diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
@@ -20,6 +20,7 @@
     "weight": "340 g",
     "volume": "480 ml",
     "price": 115000,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -37,6 +38,7 @@
     "weight": "60 g",
     "volume": "250 ml",
     "price": 4000,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -55,6 +57,7 @@
     "weight": "100 g",
     "volume": "250 ml",
     "price": 5000,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -72,6 +75,7 @@
     "weight": "360 g",
     "volume": "500 ml",
     "price": 8000,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -89,6 +93,7 @@
     "weight": "360 g",
     "volume": "500 ml",
     "price": 8000,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -106,6 +111,7 @@
     "weight": "600 g",
     "volume": "1 L",
     "price": 9000,
+    "price_postapoc": 500,
     "to_hit": -2,
     "bashing": 4,
     "material": [ "steel", "plastic" ],
@@ -126,6 +132,7 @@
     "weight": "80 g",
     "volume": "250 ml",
     "price": 1200,
+    "price_postapoc": 50,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -139,6 +146,7 @@
     "id": "ruger_makeshiftmag",
     "copy-from": "survivor223mag",
     "type": "MAGAZINE",
+    "price_postapoc": 50,
     "name": { "str": "Ruger makeshift magazine" },
     "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Ruger Mini-14 rifle."
   }

diff --git a/data/json/items/magazine/300.json b/data/json/items/magazine/300.json
@@ -8,6 +8,7 @@
     "weight": "78 g",
     "volume": "250 ml",
     "price": 3500,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",

diff --git a/data/json/items/magazine/3006.json b/data/json/items/magazine/3006.json
@@ -9,6 +9,7 @@
     "weight": "40 g",
     "volume": "50ml",
     "price": 500,
+    "price_postapoc": 50,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -25,6 +26,7 @@
     "weight": "40 g",
     "volume": "250 ml",
     "price": 5600,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -42,6 +44,7 @@
     "weight": "30 g",
     "volume": "250 ml",
     "price": 600,
+    "price_postapoc": 50,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -60,6 +63,7 @@
     "weight": "300 g",
     "volume": "750 ml",
     "price": 8500,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -79,6 +83,7 @@
     "weight": "200 g",
     "volume": "500 ml",
     "price": 3600,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",

diff --git a/data/json/items/magazine/308.json b/data/json/items/magazine/308.json
@@ -19,6 +19,7 @@
     "weight": "360 g",
     "volume": "750 ml",
     "price": 2100,
+    "price_postapoc": 500,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -36,6 +37,7 @@
     "weight": "240 g",
     "volume": "500 ml",
     "price": 1200,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -53,6 +55,7 @@
     "weight": "80 g",
     "volume": "250 ml",
     "price": 1200,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -71,6 +74,7 @@
     "weight": "650 g",
     "volume": "1 L",
     "price": 7900,
+    "price_postapoc": 500,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -89,6 +93,7 @@
     "weight": "120 g",
     "volume": "500 ml",
     "price": 1200,
+    "price_postapoc": 100,
     "material": "aluminum",
     "symbol": "#",
     "color": "light_gray",
@@ -113,6 +118,7 @@
     "weight": "280 g",
     "volume": "500 ml",
     "price": 1700,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -130,6 +136,7 @@
     "weight": "60 g",
     "volume": "250 ml",
     "price": 2900,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -143,6 +150,7 @@
     "id": "m14_makeshiftmag",
     "copy-from": "fal_makeshiftmag",
     "type": "MAGAZINE",
+    "price_postapoc": 50,
     "name": { "str": "M14 makeshift magazine" },
     "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with M14 rifle."
   },
@@ -155,6 +163,7 @@
     "weight": "400 g",
     "volume": "1 L",
     "price": 8900,
+    "price_postapoc": 750,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -168,6 +177,7 @@
     "id": "scarhmag_30rd",
     "copy-from": "falbigmag",
     "type": "MAGAZINE",
+    "price_postapoc": 250,
     "name": { "str": "FN SCAR-H 30-round magazine" },
     "description": "A 30-round steel box magazine for the FN SCAR-H rifle.  This one actually seems to be a modified FN FAL magazine."
   },
@@ -180,6 +190,7 @@
     "weight": "300 g",
     "volume": "500 ml",
     "price": 5600,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -192,6 +203,7 @@
     "id": "scarh_makeshiftmag",
     "copy-from": "fal_makeshiftmag",
     "type": "MAGAZINE",
+    "price_postapoc": 50,
     "name": { "str": "FN SCAR-H makeshift magazine" },
     "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with FN SCAR-H rifle."
   },
@@ -204,6 +216,7 @@
     "weight": "160 g",
     "volume": "500 ml",
     "price": 5600,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -221,6 +234,7 @@
     "weight": "110 g",
     "volume": "250 ml",
     "price": 5000,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -233,6 +247,7 @@
     "id": "hk417_makeshiftmag",
     "copy-from": "fal_makeshiftmag",
     "type": "MAGAZINE",
+    "price_postapoc": 50,
     "name": { "str": "HK417 makeshift magazine" },
     "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with HK417 rifle."
   },
@@ -245,6 +260,7 @@
     "weight": "300 g",
     "volume": "500 ml",
     "price": 3000,
+    "price_postapoc": 250,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -257,6 +273,7 @@
     "id": "ar10_makeshiftmag",
     "copy-from": "fal_makeshiftmag",
     "type": "MAGAZINE",
+    "price_postapoc": 50,
     "name": { "str": "AR-10 makeshift magazine" },
     "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with AR-10 rifle."
   }

diff --git a/data/json/items/magazine/32.json b/data/json/items/magazine/32.json
@@ -8,6 +8,7 @@
     "weight": "80 g",
     "volume": "250 ml",
     "price": 2600,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -25,6 +26,7 @@
     "weight": "70 g",
     "volume": "250 ml",
     "price": 1900,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -42,6 +44,7 @@
     "weight": "120 g",
     "volume": "250 ml",
     "price": 2300,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -59,6 +62,7 @@
     "weight": "65 g",
     "volume": "41ml",
     "price": 2600,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",

diff --git a/data/json/items/magazine/357sig.json b/data/json/items/magazine/357sig.json
@@ -8,6 +8,7 @@
     "weight": "150 g",
     "volume": "250 ml",
     "price": 3000,
+    "price_postapoc": 100,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
@@ -25,6 +26,7 @@
     "weight": "105 g",
     "volume": "250 ml",
     "price": 2900,
+    "price_postapoc": 100,
     "material": "plastic",
     "symbol": "#",
     "color": "light_gray",