summaryrefslogtreecommitdiff
path: root/0033-add-missing-price-postapoc.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-29 18:01:32 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-29 18:01:32 -0700
commit444181f77cb649760c3099d9b96c8f863a8f8ddf (patch)
tree3e9e1e8c44a208c342fc919de1a24081739db884 /0033-add-missing-price-postapoc.patch
parentFix .50bmg ammo ordering (diff)
downloadcataclysm-bn-444181f77cb649760c3099d9b96c8f863a8f8ddf.tar.xz
Updated to 2021-10-29-1727
Reorganize patches into categories. Add patch to allow followers to eat from the basecamp stocks from farther away. -Reduces NPCs being prone to starve on large camps. Temporarily revert the book changes commit.
Diffstat (limited to '0033-add-missing-price-postapoc.patch')
-rw-r--r--0033-add-missing-price-postapoc.patch143
1 files changed, 0 insertions, 143 deletions
diff --git a/0033-add-missing-price-postapoc.patch b/0033-add-missing-price-postapoc.patch
deleted file mode 100644
index 0770483..0000000
--- a/0033-add-missing-price-postapoc.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/data/json/items/gun/223.json
-+++ b/data/json/items/gun/223.json
-@@ -118,7 +118,8 @@
- "description": "A bullpup assault rifle that was used by French armed forces only until recently. While the FAMAS was famous for its high fire rate, the MAS .223 is a semi-auto only variation imported to the US in the late eighties. It retains the integral bipod, though.",
- "weight": "3800 g",
- "volume": "4162 ml",
-- "price": 2800000,
-+ "price": 240000,
-+ "price_postapoc": 5000,
- "to_hit": -1,
- "bashing": 12,
- "material": [ "steel", "plastic" ],
-@@ -302,7 +303,8 @@
- ]
- ]
- ],
-- "relative": { "ranged_damage": { "damage_type": "stab", "amount": 1 }, "durability": 1 }
-+ "relative": { "ranged_damage": { "damage_type": "stab", "amount": 1 }, "durability": 1 },
-+ "proportional": { "price": 1.1 }
- },
- {
- "id": "m4a1",
-
---- a/data/json/items/gun/40.json
-+++ b/data/json/items/gun/40.json
-@@ -9,6 +9,7 @@
- "weight": "921 g",
- "volume": "518 ml",
- "price": 65000,
-+ "price_postapoc": 1600,
- "to_hit": -2,
- "bashing": 8,
- "material": [ "steel", "plastic" ],
-@@ -73,6 +74,7 @@
- "weight": "785 g",
- "volume": "505 ml",
- "price": 65000,
-+ "price_postapoc": 1600,
- "to_hit": -2,
- "bashing": 8,
- "material": [ "plastic", "steel" ],
-
---- a/data/json/items/gun/9mm.json
-+++ b/data/json/items/gun/9mm.json
-@@ -9,6 +9,7 @@
- "weight": "921 g",
- "volume": "518 ml",
- "price": 65000,
-+ "price_postapoc": 1600,
- "to_hit": -2,
- "bashing": 8,
- "material": [ "steel", "plastic" ],
-@@ -360,6 +361,7 @@
- "weight": "785 g",
- "volume": "505 ml",
- "price": 65000,
-+ "price_postapoc": 1750,
- "to_hit": -2,
- "bashing": 8,
- "material": [ "plastic", "steel" ],
-
---- a/data/json/items/magazine/223.json
-+++ b/data/json/items/magazine/223.json
-@@ -128,6 +128,7 @@
- "weight": "88 g",
- "volume": "50 ml",
- "price": 4000,
-+ "price_postapoc": 125,
- "material": "steel",
- "symbol": "#",
- "color": "light_gray",
-@@ -145,6 +146,7 @@
- "weight": "91 g",
- "volume": "350 ml",
- "price": 4000,
-+ "price_postapoc": 125,
- "material": "steel",
- "symbol": "#",
- "color": "light_gray",
-@@ -180,6 +182,7 @@
- "weight": "181 g",
- "volume": "600 ml",
- "price": 8500,
-+ "price_postapoc": 275,
- "material": [ "plastic", "steel" ],
- "symbol": "#",
- "color": "light_gray",
-@@ -218,6 +221,7 @@
- "weight": "181 g",
- "volume": "800 ml",
- "price": 12000,
-+ "price_postapoc": 750,
- "material": "aluminum",
- "symbol": "#",
- "color": "light_gray",
-@@ -235,6 +239,7 @@
- "weight": "581 g",
- "volume": "1050 ml",
- "price": 9250,
-+ "price_postapoc": 550,
- "to_hit": -2,
- "bashing": 4,
- "material": [ "steel", "plastic" ],
-@@ -255,6 +260,7 @@
- "weight": "567 g",
- "volume": "1500 ml",
- "price": 9500,
-+ "price_postapoc": 600,
- "to_hit": -2,
- "bashing": 4,
- "material": [ "plastic", "steel" ],
-@@ -275,6 +281,7 @@
- "weight": "272 g",
- "volume": "1 L",
- "price": 15000,
-+ "price_postapoc": 900,
- "material": "aluminum",
- "symbol": "#",
- "color": "light_gray",
-@@ -292,6 +299,7 @@
- "weight": "998 g",
- "volume": "1200 ml",
- "price": 14000,
-+ "price_postapoc": 850,
- "material": [ "plastic", "steel" ],
- "symbol": "#",
- "color": "light_gray",
-@@ -310,6 +318,7 @@
- "weight": "2220 g",
- "volume": "1700 ml",
- "price": 18000,
-+ "price_postapoc": 1000,
- "material": [ "plastic", "steel" ],
- "symbol": "#",
- "color": "light_gray",
-@@ -366,6 +375,7 @@
- "weight": "190 g",
- "volume": "620 ml",
- "price": 8600,
-+ "price_postapoc": 275,
- "material": [ "steel", "plastic" ],
- "symbol": "#",
- "color": "light_gray",