Updated to 2022-04-21-1455

Various patches updated for the addition of ballistic damage.
Add patch to allow helicopters to land on the mi-go landing pad.
Add patch to fix canned beans being listed as merely beans when plural.

1 files changed, 17 insertions, 17 deletions

diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
index 0d8126d..fbefbbb 100644
--- a/ammo-10_ammo-order-fix.patch
+++ b/ammo-10_ammo-order-fix.patch
@@ -20,7 +20,7 @@
 +    "stack_size": 20,
 +    "ammo_type": "20x66mm",
 +    "range": 12,
-+    "damage": { "damage_type": "stab", "amount": 60 },
++    "damage": { "damage_type": "bullet", "amount": 60 },
 +    "recoil": 2500,
 +    "loudness": 160,
 +    "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
@@ -35,7 +35,7 @@
 +    "price_postapoc": 4000,
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "count": 10,
-+    "relative": { "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
++    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
 +  },
 +  {
 +    "id": "20x66_slug",
@@ -46,7 +46,7 @@
 +    "price": 1500,
 +    "price_postapoc": 4000,
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-+    "damage": { "damage_type": "stab", "amount": 39, "armor_penetration": 8 },
++    "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 },
 +    "relative": { "range": 12 },
 +    "proportional": { "dispersion": 1.3 },
 +    "delete": { "effects": [ "SHOT" ] }
@@ -68,7 +68,7 @@
 -    "price_postapoc": 4000,
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "count": 10,
--    "relative": { "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
+-    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
 -  },
 -  {
      "id": "20x66_frag",
@@ -97,7 +97,7 @@
 -    "stack_size": 20,
 -    "ammo_type": "20x66mm",
 -    "range": 12,
--    "damage": { "damage_type": "stab", "amount": 60 },
+-    "damage": { "damage_type": "bullet", "amount": 60 },
 -    "recoil": 2500,
 -    "loudness": 160,
 -    "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
@@ -111,7 +111,7 @@
 -    "price": 1500,
 -    "price_postapoc": 4000,
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
--    "damage": { "damage_type": "stab", "amount": 39, "armor_penetration": 8 },
+-    "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 },
 -    "relative": { "range": 12 },
 -    "proportional": { "dispersion": 1.3 },
 -    "delete": { "effects": [ "SHOT" ] }
@@ -129,7 +129,7 @@
 -    "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 },
+-    "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 0 },
 -    "relative": { "range": 3 },
 -    "proportional": { "recoil": 1.5 }
 -  },
@@ -147,7 +147,7 @@
 +    "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 },
++    "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 0 },
 +    "relative": { "range": 3 },
 +    "proportional": { "recoil": 1.5 }
 +  },
@@ -167,7 +167,7 @@
 -    "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 } }
+-    "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 14 } }
 -  },
 -  {
      "id": "38_special",
@@ -183,7 +183,7 @@
 +    "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 } }
++    "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 14 } }
 +  },
 +  {
      "id": "reloaded_38_fmj",
@@ -201,7 +201,7 @@
 -    "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 } }
+-    "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 16 } }
 -  },
 -  {
      "id": "40sw",
@@ -217,7 +217,7 @@
 +    "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 } }
++    "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 16 } }
 +  },
 +  {
      "id": "bp_40fmj",
@@ -235,7 +235,7 @@
 -    "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 } }
+-    "relative": { "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 18 } }
 -  },
 -  {
      "id": "45_jhp",
@@ -251,7 +251,7 @@
 +    "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 } }
++    "relative": { "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 18 } }
 +  },
 +  {
      "id": "45_super",
@@ -268,14 +268,14 @@
 -    "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 } }
+-    "relative": { "damage": { "damage_type": "bullet", "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 }
+     "proportional": { "range": 0.95, "damage": { "damage_type": "bullet", "amount": 0.95, "armor_penetration": 0.95 }, "recoil": 0.95 }
    },
    {
 +    "id": "460_fmj",
@@ -283,7 +283,7 @@
 +    "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 } }
++    "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
 +  },
 +  {
      "id": "bp_460_fmj",