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.

1 files changed, 0 insertions, 182 deletions

diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
deleted file mode 100644
index 2c55e7f..0000000
--- a/0003-inconsistent-ammo-names.patch
+++ /dev/null
@@ -1,182 +0,0 @@
---- a/data/json/items/ammo/223.json
-+++ b/data/json/items/ammo/223.json
-@@ -39,7 +39,7 @@
-     "id": "556_incendiary",
-     "copy-from": "556",
-     "type": "AMMO",
--    "name": { "str": "5.56 NATO tracer" },
-+    "name": { "str": "5.56 NATO M856 tracer" },
-     "description": "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
-     "extend": { "effects": [ "INCENDIARY" ] }
-   },
-@@ -61,7 +61,7 @@
-     "id": "bp_556",
-     "copy-from": "556",
-     "type": "AMMO",
--    "name": { "str": "5.56 NATO, black powder" },
-+    "name": { "str": "5.56 NATO M855A1, black powder" },
-     "proportional": {
-       "price": 0.3,
-       "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
-@@ -75,7 +75,7 @@
-     "id": "bp_556_incendiary",
-     "copy-from": "556_incendiary",
-     "type": "AMMO",
--    "name": { "str": "5.56 NATO tracer, black powder" },
-+    "name": { "str": "5.56 NATO M856 tracer, black powder" },
-     "proportional": {
-       "price": 0.3,
-       "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
-@@ -98,7 +98,7 @@
-     "id": "reloaded_556",
-     "copy-from": "556",
-     "type": "AMMO",
--    "name": { "str": "5.56 NATO, reloaded" },
-+    "name": { "str": "5.56 NATO M885A1, reloaded" },
-     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-@@ -107,7 +107,7 @@
-     "id": "reloaded_556_incendiary",
-     "copy-from": "556_incendiary",
-     "type": "AMMO",
--    "name": { "str": "5.56 NATO tracer, reloaded" },
-+    "name": { "str": "5.56 NATO M856 tracer, reloaded" },
-     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
---- a/data/json/items/ammo/308.json
-+++ b/data/json/items/ammo/308.json
-@@ -26,7 +26,7 @@
-     "id": "762_51",
-     "copy-from": "308",
-     "type": "AMMO",
--    "name": { "str": "7.62x51mm M80" },
-+    "name": { "str": "7.62x51mm NATO M80" },
-     "casing": "762_51_casing",
-     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
-     "relative": { "damage": { "damage_type": "stab", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
-@@ -37,7 +37,7 @@
-     "id": "762_51_incendiary",
-     "copy-from": "762_51",
-     "type": "AMMO",
--    "name": { "str": "7.62x51mm NATO tracer" },
-+    "name": { "str": "7.62x51mm NATO M62 tracer" },
-     "description": "This ammunition is a one-in-five mix of M80 and M62 tracer rounds to help keep the weapon they are fired from on target.",
-     "extend": { "effects": [ "INCENDIARY" ] }
-   },
-@@ -59,7 +59,7 @@
-     "id": "bp_762_51",
-     "copy-from": "762_51",
-     "type": "AMMO",
--    "name": { "str": "7.62x51mm, black powder" },
-+    "name": { "str": "7.62x51mm NATO M80, black powder" },
-     "proportional": {
-       "price": 0.3,
-       "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
-@@ -73,7 +73,7 @@
-     "id": "bp_762_51_incendiary",
-     "copy-from": "762_51_incendiary",
-     "type": "AMMO",
--    "name": { "str": "7.62x51mm tracer, black powder" },
-+    "name": { "str": "7.62x51mm NATO M62 tracer, black powder" },
-     "proportional": {
-       "price": 0.3,
-       "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
-@@ -96,7 +96,7 @@
-     "id": "reloaded_762_51",
-     "copy-from": "762_51",
-     "type": "AMMO",
--    "name": { "str": "7.62x51mm, reloaded" },
-+    "name": { "str": "7.62x51mm NATO M80, reloaded" },
-     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-@@ -105,7 +105,7 @@
-     "id": "reloaded_762_51_incendiary",
-     "copy-from": "762_51_incendiary",
-     "type": "AMMO",
--    "name": { "str": "7.62x51mm incendiary, reloaded" },
-+    "name": { "str": "7.62x51mm NATO M62 tracer, reloaded" },
-     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
---- a/data/json/items/ammo/357mag.json
-+++ b/data/json/items/ammo/357mag.json
-@@ -2,8 +2,8 @@
-   {
-     "id": "357mag_fmj",
-     "type": "AMMO",
--    "name": { "str": ".357 magnum FMJ" },
--    "description": "Jacketed .357 magnum ammunition.  The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
-+    "name": { "str": ".357 Magnum FMJ" },
-+    "description": "Jacketed .357 Magnum ammunition.  The .357 Magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
-     "weight": "8 g",
-     "volume": "250 ml",
-     "price": 140,
-@@ -27,8 +27,8 @@
-     "id": "357mag_jhp",
-     "copy-from": "357mag_fmj",
-     "type": "AMMO",
--    "name": { "str": ".357 magnum JHP" },
--    "description": "Jacketed hollow point .357 magnum ammunition.  The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
-+    "name": { "str": ".357 Magnum JHP" },
-+    "description": "Jacketed hollow point .357 Magnum ammunition.  The .357 Magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
-     "damage": { "damage_type": "stab", "amount": 42, "armor_penetration": 0 }
-   },
-   {
---- a/data/json/items/ammo/45.json
-+++ b/data/json/items/ammo/45.json
-@@ -76,7 +76,7 @@
-     "id": "reloaded_45_acp",
-     "copy-from": "45_acp",
-     "type": "AMMO",
--    "name": { "str": ".45 FMJ, reloaded" },
-+    "name": { "str": ".45 ACP FMJ, reloaded" },
-     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
---- a/data/json/items/ammo/50.json
-+++ b/data/json/items/ammo/50.json
-@@ -70,7 +70,7 @@
-     "id": "reloaded_50_incendiary",
-     "copy-from": "50_incendiary",
-     "type": "AMMO",
--    "name": { "str": ".50 BMG tracer, reloaded" },
-+    "name": { "str": ".50 BMG M17 tracer, reloaded" },
-     "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.  This one has been hand-reloaded.",
-     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-@@ -90,7 +90,7 @@
-     "id": "reloaded_50ss",
-     "copy-from": "50ss",
-     "type": "AMMO",
--    "name": { "str": ".50 BMG AP, reloaded" },
-+    "name": { "str": ".50 BMG M2 AP, reloaded" },
-     "description": "Variant of the .50 BMG round that uses a core hardened steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded.",
-     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
---- a/data/json/items/ammo/5x50.json
-+++ b/data/json/items/ammo/5x50.json
-@@ -38,7 +38,7 @@
-     "id": "reloaded_5x50dart",
-     "copy-from": "5x50dart",
-     "type": "AMMO",
--    "name": { "str": "5x50mm flechette, reloaded" },
-+    "name": { "str": "RA110 5x50mm flechette, reloaded" },
-     "price_postapoc": 1200,
-     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.  This one has been hand-reloaded.",
-     "effects": [ "COOKOFF", "RECYCLED" ],
---- a/data/json/items/ammo/762x25.json
-+++ b/data/json/items/ammo/762x25.json
-@@ -68,7 +68,8 @@
-     "id": "reloaded_762_25",
-     "copy-from": "762_25hot",
-     "type": "AMMO",
--    "name": { "str": "7.62x25mm, reloaded" },
--    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 }
-+    "name": { "str": "7.62x25mm FMJ, reloaded" },
-+    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 },
-+    "extend": { "effects": [ "RECYCLED" ] }
-   }
- ]