Clean up prices, add postapoc prices.

8 files changed, 22 insertions, 14 deletions

diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json
index 1b05f50..1f227eb 100644
--- a/json/items/ammo/000shot.json
+++ b/json/items/ammo/000shot.json
@@ -44,7 +44,7 @@
     "weight": "32 g",
     "volume": "250 ml",
     "price": 750,
-    "price_postapoc": 1500,
+    "price_postapoc": 1200,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "plastic", "powder" ],
     "symbol": "=",
@@ -67,7 +67,7 @@
     "name": { "str": "000 flechette shell" },
     "description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.",
     "price": 3000,
-    "price_postapoc": 6000,
+    "price_postapoc": 1200,
     "count": 10,
     "relative": { "damage": { "damage_type": "stab", "amount": -5, "armor_penetration": 15 } }
   },
@@ -79,7 +79,7 @@
     "name": { "str": "000 shotgun slug" },
     "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.",
     "price": 600,
-    "price_postapoc": 1200,
+    "price_postapoc": 600,
     "relative": { "range": 12, "damage": { "damage_type": "stab", "armor_penetration": 8 }, "dispersion": 100 },
     "proportional": { "recoil": 1.4 },
     "delete": { "effects": [ "SHOT" ] }
@@ -92,7 +92,7 @@
     "name": { "str": "000 shotgun beanbag" },
     "description": "A beanbag round for shotguns, not deadly but designed to disable.",
     "price": 750,
-    "price_postapoc": 1500,
+    "price_postapoc": 300,
     "proportional": { "damage": { "damage_type": "stab", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
     "delete": { "effects": [ "SHOT" ] },
     "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
@@ -105,7 +105,7 @@
     "name": { "str": "000 incendiary shell" },
     "description": "A shell filled with a mix of metal and incendiary pellets. Damaging, and may cause flammable material to ignite.",
     "price": 1500,
-    "price_postapoc": 3000,
+    "price_postapoc": 2400,
     "extend": { "effects": [ "INCENDIARY" ] }
   },
   {
@@ -115,8 +115,8 @@
     "type": "AMMO",
     "name": { "str": "000 explosive slug" },
     "description": "A shotgun shell shooting a small explosive.  Damaging, but rather inaccurate and short ranged.  Banned in several states.",
-    "price": 6000,
-    "price_postapoc": 12000,
+    "price": 4500,
+    "price_postapoc": 2400,
     "count": 5,
     "proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } },
     "delete": { "effects": [ "SHOT" ] },
diff --git a/json/items/ammo/473.json b/json/items/ammo/473.json
index 4bc2e3f..b772a3c 100644
--- a/json/items/ammo/473.json
+++ b/json/items/ammo/473.json
@@ -7,8 +7,8 @@
     "description": "4.73x33mm caseless rounds. Designed for the H&K G11 rifle, these rounds encase the bullet within a block of solid propellant, greatly reducing ammunition mass while reducing metal requirements to manufacture. Being caseless rounds, these cannot be disassembled or reloaded.",
     "weight": "5200 mg",
     "volume": "250 ml",
-    "price": 225,
-    "price_postapoc": 12500,
+    "price": 175,
+    "price_postapoc": 7000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "material": [ "plastic", "powder" ],
     "symbol": "=",
diff --git a/json/items/gun/308.json b/json/items/gun/308.json
index 3da789e..020bf52 100644
--- a/json/items/gun/308.json
+++ b/json/items/gun/308.json
@@ -15,6 +15,7 @@
     "weight": "6670 g",
     "volume": "2250 ml",
     "price": 205000,
+    "price_postapoc": 3850,
     "to_hit": -1,
     "bashing": 12,
     "material": [ "steel", "plastic" ],
@@ -38,6 +39,7 @@
     "weight": "5280 g",
     "volume": "2250 ml",
     "price": 255000,
+    "price_postapoc": 4750,
     "barrel_length": "600 ml",
     "default_mods": [ "rifle_scope", "adjustable_stock" ]
   }
diff --git a/json/items/gun/46.json b/json/items/gun/46.json
index 30f7081..fd877ee 100644
--- a/json/items/gun/46.json
+++ b/json/items/gun/46.json
@@ -8,6 +8,7 @@
     "weight": "730 g",
     "volume": "500 ml",
     "price": 125000,
+    "price_postapoc": 2150,
     "to_hit": -2,
     "bashing": 6,
     "material": [ "steel", "plastic" ],
diff --git a/json/items/gun/473.json b/json/items/gun/473.json
index 233da80..cc72d7f 100644
--- a/json/items/gun/473.json
+++ b/json/items/gun/473.json
@@ -8,7 +8,8 @@
     "weight": "3650 g",
     "volume": "1750 ml",
     "looks_like": "rm51_assault_rifle",
-    "price": 1800000,
+    "price": 1500000,
+    "price_postapoc": 10000,
     "to_hit": -1,
     "bashing": 12,
     "material": [ "steel", "plastic" ],
diff --git a/json/items/magazine/000shot.json b/json/items/magazine/000shot.json
index 53d6e57..ad60008 100644
--- a/json/items/magazine/000shot.json
+++ b/json/items/magazine/000shot.json
@@ -7,7 +7,8 @@
     "description": "A removable plastic box magazine for the H&K CAWS shotgun. Holds 10 shells.",
     "weight": "210 g",
     "volume": "500 ml",
-    "price": 4500,
+    "price": 30000,
+    "price_postapoc": 175,
     "material": "plastic",
     "symbol": "#",
     "color": "dark_gray",
@@ -24,7 +25,8 @@
     "description": "A brass ammo belt for the H&K CAWS shotgun. Holds 20 shells.",
     "weight": "500 g",
     "volume": "500 ml",
-    "price": 10000,
+    "price": 30000,
+    "price_postapoc": 175,
     "material": "copper",
     "symbol": "#",
     "color": "light_gray",
diff --git a/json/items/magazine/308.json b/json/items/magazine/308.json
index ee82dc3..4c7d225 100644
--- a/json/items/magazine/308.json
+++ b/json/items/magazine/308.json
@@ -28,7 +28,8 @@
     "description": "A 10-round aluminum box magazine for the H&K PSG1A1 rifle.",
     "weight": "75 g",
     "volume": "250 ml",
-    "price": 900,
+    "price": 4500,
+    "price_postapoc": 90,
     "material": "aluminum",
     "symbol": "#",
     "color": "light_gray",
diff --git a/json/items/magazine/473.json b/json/items/magazine/473.json
index c0f4169..b2ef99c 100644
--- a/json/items/magazine/473.json
+++ b/json/items/magazine/473.json
@@ -7,7 +7,8 @@
     "description": "A 50 round box magazine for use with Heckler & Koch G11 caseless assault rifle.",
     "weight": "5 g",
     "volume": "500 ml",
-    "price": 25000,
+    "price": 20000,
+    "price_postapoc": 400,
     "material": [ "plastic" ],
     "symbol": "#",
     "color": "dark_gray",