Merge pull request #3 from CleverRaven/master

merge
Maleclypse · Jun 26, 2019 · 4ce8939 · 4ce8939
2 parents 8cc730f + 34186b1
commit 4ce8939
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -836,6 +836,7 @@
     "weight": 60,
     "volume": 0,
     "price": 5000,
+    "price_postapoc": 700,
     "material": [ "silver" ],
     "symbol": "[",
     "color": "yellow",
@@ -865,6 +866,7 @@
     "name": "detective badge",
     "description": "A tarnished golden shield gives an air of authority to the wearer.",
     "material": [ "gold" ],
+    "price_postapoc": 2000,
     "proportional": { "weight": 2 }
   },
   {
@@ -889,6 +891,7 @@
     "name": "doctor badge",
     "material": [ "plastic" ],
     "weight": 10,
+    "price_postapoc": 30,
     "description": "A plastic name tag marking the wearer as a real doctor of the medical kind."
   },
   {
@@ -897,6 +900,7 @@
     "type": "ARMOR",
     "name": "Foodkid badge",
     "material": [ "plastic" ],
+    "price_postapoc": 30,
     "weight": 10,
     "description": "A star shaped badge, on it you can read \"Foodkid\" in bold letters.  This is Foodperson's trusty sidekick's badge."
   },
@@ -2172,6 +2176,7 @@
     "weight": 10,
     "volume": 0,
     "price": 25000,
+    "price_postapoc": 200,
     "material": [ "silver" ],
     "symbol": "[",
     "color": "light_gray",
@@ -2185,6 +2190,7 @@
     "weight": 86,
     "volume": 0,
     "price": 2500,
+    "price_postapoc": 100,
     "material": [ "copper" ],
     "symbol": "[",
     "color": "brown"
@@ -2197,6 +2203,7 @@
     "weight": 50,
     "volume": 0,
     "price": 2900,
+    "price_postapoc": 50,
     "material": [ "copper" ],
     "symbol": "[",
     "color": "brown"
@@ -2420,6 +2427,7 @@
     "weight": 10,
     "volume": 0,
     "price": 50000,
+    "price_postapoc": 1500,
     "bashing": 3,
     "cutting": 3,
     "material": [ "gold" ],
@@ -2437,6 +2445,7 @@
     "weight": 12,
     "volume": 0,
     "price": 190000,
+    "price_postapoc": 1700,
     "material": [ "gold" ],
     "symbol": "[",
     "color": "yellow",
@@ -2490,6 +2499,7 @@
     "weight": 65,
     "volume": 1,
     "price": 12000,
+    "price_postapoc": 700,
     "to_hit": -1,
     "material": [ "steel" ],
     "symbol": "[",
@@ -2759,6 +2769,7 @@
     "weight": 10,
     "volume": 0,
     "price": 1200,
+    "price_postapoc": 10,
     "material": [ "plastic" ],
     "symbol": "[",
     "color": "dark_gray",
@@ -4089,6 +4100,7 @@
     "weight": 40,
     "volume": 0,
     "price": 46000,
+    "price_postapoc": 1000,
     "material": [ "gold" ],
     "symbol": "[",
     "color": "yellow",
@@ -4102,6 +4114,7 @@
     "weight": 10,
     "volume": 0,
     "price": 20000,
+    "price_postapoc": 500,
     "bashing": 2,
     "cutting": 2,
     "material": [ "gold" ],
@@ -4118,6 +4131,7 @@
     "weight": 10,
     "volume": 0,
     "price": 13000,
+    "price_postapoc": 500,
     "material": [ "gold" ],
     "symbol": "[",
     "color": "yellow",
@@ -4132,6 +4146,7 @@
     "weight": 60,
     "volume": 1,
     "price": 50000,
+    "price_postapoc": 2000,
     "to_hit": -1,
     "material": [ "steel", "gold" ],
     "symbol": "[",
@@ -5056,6 +5071,7 @@
     "weight": 22,
     "volume": 0,
     "price": 5000,
+    "price_postapoc": 500,
     "material": "gold",
     "symbol": ",",
     "color": "yellow",
@@ -6501,6 +6517,7 @@
     "weight": 30,
     "volume": 0,
     "price": 4000,
+    "price_postapoc": 200,
     "material": [ "silver" ],
     "symbol": "[",
     "color": "light_gray",
@@ -7032,6 +7049,7 @@
     "weight": 30,
     "volume": 0,
     "price": 12000,
+    "price_postapoc": 400,
     "material": [ "silver" ],
     "symbol": "[",
     "color": "light_gray",
@@ -7399,6 +7417,7 @@
     "weight": 30,
     "volume": 0,
     "price": 590000,
+    "price_postapoc": 2000,
     "material": [ "stone" ],
     "symbol": "[",
     "color": "white",
@@ -7915,6 +7934,7 @@
     "weight": 10,
     "volume": 0,
     "price": 30000,
+    "price_postapoc": 500,
     "material": [ "gold" ],
     "symbol": "[",
     "color": "yellow",
@@ -8015,6 +8035,7 @@
     "weight": 80,
     "volume": 1,
     "price": 2200000,
+    "price_postapoc": 3000,
     "to_hit": -1,
     "material": [ "gold", "silver" ],
     "symbol": "[",
@@ -8195,6 +8216,7 @@
     "weight": 30,
     "volume": 0,
     "price": 25000,
+    "price_postapoc": 500,
     "material": [ "silver" ],
     "symbol": "[",
     "color": "light_gray",
@@ -8208,6 +8230,7 @@
     "weight": 9,
     "volume": 0,
     "price": 8000,
+    "price_postapoc": 200,
     "material": [ "silver" ],
     "symbol": "[",
     "color": "light_gray",
@@ -9402,6 +9425,7 @@
     "weight": 12,
     "volume": 0,
     "price": 28000,
+    "price_postapoc": 200,
     "material": [ "silver" ],
     "symbol": "[",
     "color": "light_gray",
@@ -10225,6 +10249,7 @@
     "weight": 50,
     "volume": 1,
     "price": 5000,
+    "price_postapoc": 300,
     "to_hit": -1,
     "material": [ "plastic", "steel" ],
     "symbol": "[",