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, 328 insertions, 0 deletions

diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
new file mode 100644
index 0000000..3422126
--- /dev/null
+++ b/ammo-10_ammo-order-fix.patch
@@ -0,0 +1,328 @@
+--- a/data/json/items/ammo/20x66mm.json
++++ b/data/json/items/ammo/20x66mm.json
+@@ -1,5 +1,54 @@
+ [
+   {
++    "id": "20x66_shot",
++    "type": "AMMO",
++    "name": { "str": "20x66mm buckshot" },
++    "//": "2.5x the Generic Rate of $1/shot",
++    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
++    "weight": "56 g",
++    "volume": "250 ml",
++    "price": 1500,
++    "price_postapoc": 4000,
++    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
++    "material": [ "steel", "powder" ],
++    "symbol": "=",
++    "color": "pink",
++    "count": 20,
++    "stack_size": 20,
++    "ammo_type": "20x66mm",
++    "range": 12,
++    "damage": { "damage_type": "stab", "amount": 60 },
++    "recoil": 2500,
++    "loudness": 160,
++    "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
++  },
++  {
++    "id": "20x66_flechette",
++    "copy-from": "20x66_shot",
++    "type": "AMMO",
++    "name": { "str": "20x66mm flechette" },
++    "description": "20x66mm caseless shotgun rounds, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
++    "price": 4000,
++    "price_postapoc": 4000,
++    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
++    "count": 10,
++    "relative": { "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
++  },
++  {
++    "id": "20x66_slug",
++    "copy-from": "20x66_shot",
++    "type": "AMMO",
++    "name": { "str": "20x66mm slug" },
++    "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
++    "price": 1500,
++    "price_postapoc": 4000,
++    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
++    "damage": { "damage_type": "stab", "amount": 39, "armor_penetration": 8 },
++    "relative": { "range": 12 },
++    "proportional": { "dispersion": 1.3 },
++    "delete": { "effects": [ "SHOT" ] }
++  },
++  {
+     "id": "20x66_beanbag",
+     "copy-from": "20x66_shot",
+     "type": "AMMO",
+@@ -74,18 +122,6 @@
+     "effects": [ "NO_EMBED" ]
+   },
+   {
+-    "id": "20x66_flechette",
+-    "copy-from": "20x66_shot",
+-    "type": "AMMO",
+-    "name": { "str": "20x66mm flechette" },
+-    "description": "20x66mm caseless shotgun rounds, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+-    "price": 4000,
+-    "price_postapoc": 4000,
+-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+-    "count": 10,
+-    "relative": { "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
+-  },
+-  {
+     "id": "20x66_frag",
+     "copy-from": "20x66_slug",
+     "type": "AMMO",
+@@ -109,42 +145,5 @@
+     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+     "count": 10,
+     "extend": { "effects": [ "INCENDIARY" ] }
+-  },
+-  {
+-    "id": "20x66_shot",
+-    "type": "AMMO",
+-    "name": { "str": "20x66mm buckshot" },
+-    "//": "2.5x the Generic Rate of $1/shot",
+-    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+-    "weight": "56 g",
+-    "volume": "250 ml",
+-    "price": 1500,
+-    "price_postapoc": 4000,
+-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+-    "material": [ "steel", "powder" ],
+-    "symbol": "=",
+-    "color": "pink",
+-    "count": 20,
+-    "stack_size": 20,
+-    "ammo_type": "20x66mm",
+-    "range": 12,
+-    "damage": { "damage_type": "stab", "amount": 60 },
+-    "recoil": 2500,
+-    "loudness": 160,
+-    "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
+-  },
+-  {
+-    "id": "20x66_slug",
+-    "copy-from": "20x66_shot",
+-    "type": "AMMO",
+-    "name": { "str": "20x66mm slug" },
+-    "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+-    "price": 1500,
+-    "price_postapoc": 4000,
+-    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+-    "damage": { "damage_type": "stab", "amount": 39, "armor_penetration": 8 },
+-    "relative": { "range": 12 },
+-    "proportional": { "dispersion": 1.3 },
+-    "delete": { "effects": [ "SHOT" ] }
+   }
+ ]
+
+--- a/data/json/items/ammo/22.json
++++ b/data/json/items/ammo/22.json
+@@ -1,16 +1,5 @@
+ [
+   {
+-    "id": "22_cphp",
+-    "copy-from": "22_lr",
+-    "type": "AMMO",
+-    "name": { "str": ".22 CPHP" },
+-    "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets.  Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.",
+-    "//": "Hollowpoint damage increase of 25%",
+-    "damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 0 },
+-    "relative": { "range": 3 },
+-    "proportional": { "recoil": 1.5 }
+-  },
+-  {
+     "id": "22_lr",
+     "type": "AMMO",
+     "name": { "str": ".22 LR" },
+
+@@ -35,6 +24,17 @@
+     "effects": [ "COOKOFF" ]
+   },
+   {
++    "id": "22_cphp",
++    "copy-from": "22_lr",
++    "type": "AMMO",
++    "name": { "str": ".22 CPHP" },
++    "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets.  Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.",
++    "//": "Hollowpoint damage increase of 25%",
++    "damage": { "damage_type": "stab", "amount": 20, "armor_penetration": 0 },
++    "relative": { "range": 3 },
++    "proportional": { "recoil": 1.5 }
++  },
++  {
+     "id": "22_ratshot",
+     "copy-from": "22_cphp",
+     "type": "AMMO",
+
+--- a/data/json/items/ammo/38.json
++++ b/data/json/items/ammo/38.json
+@@ -1,14 +1,5 @@
+ [
+   {
+-    "id": "38_fmj",
+-    "copy-from": "38_special",
+-    "type": "AMMO",
+-    "name": { "str": ".38 FMJ" },
+-    "description": ".38 Special ammunition with brass jacketed 130gr bullets.  The .38 Special round has been known from its inception for its accuracy and low recoil.",
+-    "//": "Base damage of 20, balance increase of two-nineths.",
+-    "relative": { "damage": { "damage_type": "stab", "amount": -6, "armor_penetration": 14 } }
+-  },
+-  {
+     "id": "38_special",
+     "type": "AMMO",
+     "name": { "str": ".38 Special" },
+@@ -33,6 +24,15 @@
+     "effects": [ "COOKOFF" ]
+   },
+   {
++    "id": "38_fmj",
++    "copy-from": "38_special",
++    "type": "AMMO",
++    "name": { "str": ".38 FMJ" },
++    "description": ".38 Special ammunition with brass jacketed 130gr bullets.  The .38 Special round has been known from its inception for its accuracy and low recoil.",
++    "//": "Base damage of 20, balance increase of two-nineths.",
++    "relative": { "damage": { "damage_type": "stab", "amount": -6, "armor_penetration": 14 } }
++  },
++  {
+     "id": "reloaded_38_fmj",
+     "copy-from": "38_fmj",
+     "type": "AMMO",
+
+--- a/data/json/items/ammo/40.json
++++ b/data/json/items/ammo/40.json
+@@ -1,14 +1,5 @@
+ [
+   {
+-    "id": "40fmj",
+-    "copy-from": "40sw",
+-    "type": "AMMO",
+-    "name": { "str": ".40 S&W FMJ" },
+-    "description": ".40 S&W ammunition with 180gr FMJ bullets.  Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.",
+-    "//": "Base damage of 23, balance increase of two-nineths.",
+-    "relative": { "damage": { "damage_type": "stab", "amount": -7, "armor_penetration": 16 } }
+-  },
+-  {
+     "id": "40sw",
+     "type": "AMMO",
+     "name": { "str": ".40 S&W JHP" },
+@@ -33,6 +24,15 @@
+     "effects": [ "COOKOFF" ]
+   },
+   {
++    "id": "40fmj",
++    "copy-from": "40sw",
++    "type": "AMMO",
++    "name": { "str": ".40 S&W FMJ" },
++    "description": ".40 S&W ammunition with 180gr FMJ bullets.  Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.",
++    "//": "Base damage of 23, balance increase of two-nineths.",
++    "relative": { "damage": { "damage_type": "stab", "amount": -7, "armor_penetration": 16 } }
++  },
++  {
+     "id": "bp_40fmj",
+     "copy-from": "40fmj",
+     "type": "AMMO",
+
+--- a/data/json/items/ammo/45.json
++++ b/data/json/items/ammo/45.json
+@@ -1,14 +1,5 @@
+ [
+   {
+-    "id": "45_acp",
+-    "copy-from": "45_jhp",
+-    "type": "AMMO",
+-    "name": { "str": ".45 ACP FMJ" },
+-    "description": ".45 ACP ammunition with 230gr FMJ bullets.  Noted for its stopping power, the .45 ACP round has been common for almost 150 years.",
+-    "//": "Base damage of 27, balance increase of two-nineths.",
+-    "relative": { "damage": { "damage_type": "stab", "amount": -8, "armor_penetration": 18 } }
+-  },
+-  {
+     "id": "45_jhp",
+     "type": "AMMO",
+     "name": { "str": ".45 ACP JHP" },
+@@ -32,6 +23,15 @@
+     "effects": [ "COOKOFF" ]
+   },
+   {
++    "id": "45_acp",
++    "copy-from": "45_jhp",
++    "type": "AMMO",
++    "name": { "str": ".45 ACP FMJ" },
++    "description": ".45 ACP ammunition with 230gr FMJ bullets.  Noted for its stopping power, the .45 ACP round has been common for almost 150 years.",
++    "//": "Base damage of 27, balance increase of two-nineths.",
++    "relative": { "damage": { "damage_type": "stab", "amount": -8, "armor_penetration": 18 } }
++  },
++  {
+     "id": "45_super",
+     "copy-from": "45_jhp",
+     "type": "AMMO",
+
+--- a/data/json/items/ammo/460.json
++++ b/data/json/items/ammo/460.json
+@@ -1,13 +1,5 @@
+ [
+   {
+-    "id": "460_fmj",
+-    "copy-from": "460_rowland",
+-    "type": "AMMO",
+-    "name": { "str": ".460 Rowland HCFN" },
+-    "description": "A plated, hard cast flat nosed variant of the .460 Rowland round.  This increases penetration slightly at the cost of reduced damage from expansion.",
+-    "relative": { "damage": { "damage_type": "stab", "amount": -4, "armor_penetration": 8 } }
+-  },
+-  {
+     "id": "460_rowland",
+     "copy-from": "44magnum",
+     "type": "AMMO",
+@@ -18,6 +10,14 @@
+     "proportional": { "range": 0.95, "damage": { "damage_type": "stab", "amount": 0.95, "armor_penetration": 0.95 }, "recoil": 0.95 }
+   },
+   {
++    "id": "460_fmj",
++    "copy-from": "460_rowland",
++    "type": "AMMO",
++    "name": { "str": ".460 Rowland HCFN" },
++    "description": "A plated, hard cast flat nosed variant of the .460 Rowland round.  This increases penetration slightly at the cost of reduced damage from expansion.",
++    "relative": { "damage": { "damage_type": "stab", "amount": -4, "armor_penetration": 8 } }
++  },
++  {
+     "id": "bp_460_fmj",
+     "copy-from": "460_fmj",
+     "type": "AMMO",
+
+--- a/data/json/items/ammo/50.json
++++ b/data/json/items/ammo/50.json
+@@ -1,15 +1,5 @@
+ [
+   {
+-    "id": "50_incendiary",
+-    "copy-from": "50bmg",
+-    "type": "AMMO",
+-    "name": { "str": ".50 BMG M17 tracer" },
+-    "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.",
+-    "count": 10,
+-    "effects": [ "INCENDIARY" ],
+-    "dispersion": 310
+-  },
+-  {
+     "id": "50bmg",
+     "type": "AMMO",
+     "name": { "str": ".50 BMG M33 Ball" },
+@@ -33,6 +23,16 @@
+     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
+   },
+   {
++    "id": "50_incendiary",
++    "copy-from": "50bmg",
++    "type": "AMMO",
++    "name": { "str": ".50 BMG M17 tracer" },
++    "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.",
++    "count": 10,
++    "effects": [ "INCENDIARY" ],
++    "dispersion": 310
++  },
++  {
+     "id": "50match",
+     "copy-from": "50bmg",
+     "type": "AMMO",