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, 15 insertions, 15 deletions

diff --git a/ammo-01_inconsistent-ammo-names.patch b/ammo-01_inconsistent-ammo-names.patch
index 9d12fbc..2cf57bc 100644
--- a/ammo-01_inconsistent-ammo-names.patch
+++ b/ammo-01_inconsistent-ammo-names.patch
@@ -17,7 +17,7 @@
 +    "name": { "str": "5.56 NATO M855A1, black powder" },
      "proportional": {
        "price": 0.3,
-       "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+       "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
 @@ -75,7 +75,7 @@
      "id": "bp_556_incendiary",
      "copy-from": "556_incendiary",
@@ -26,14 +26,14 @@
 +    "name": { "str": "5.56 NATO M856 tracer, black powder" },
      "proportional": {
        "price": 0.3,
-       "damage": { "damage_type": "stab", "amount": 0.57, "armor_penetration": 0.5 },
+       "damage": { "damage_type": "bullet", "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 M855A1, reloaded" },
-     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
      "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 @@ -107,7 +107,7 @@
@@ -42,7 +42,7 @@
      "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 },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
      "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 --- a/data/json/items/ammo/308.json
@@ -55,7 +55,7 @@
 +    "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 },
+     "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
 @@ -37,7 +37,7 @@
      "id": "762_51_incendiary",
      "copy-from": "762_51",
@@ -73,7 +73,7 @@
 +    "name": { "str": "7.62x51mm NATO M80, black powder" },
      "proportional": {
        "price": 0.3,
-       "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
+       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
 @@ -73,7 +73,7 @@
      "id": "bp_762_51_incendiary",
      "copy-from": "762_51_incendiary",
@@ -82,14 +82,14 @@
 +    "name": { "str": "7.62x51mm NATO M62 tracer, black powder" },
      "proportional": {
        "price": 0.3,
-       "damage": { "damage_type": "stab", "amount": 0.76, "armor_penetration": 0.5 },
+       "damage": { "damage_type": "bullet", "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 },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
      "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 @@ -105,7 +105,7 @@
@@ -98,7 +98,7 @@
      "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 },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
      "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 --- a/data/json/items/ammo/357mag.json
@@ -122,7 +122,7 @@
 -    "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 }
+     "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 0 }
    },
    {
 --- a/data/json/items/ammo/45.json
@@ -133,7 +133,7 @@
      "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 },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
      "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 --- a/data/json/items/ammo/50.json
@@ -145,7 +145,7 @@
 -    "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 },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
 @@ -90,7 +90,7 @@
      "id": "reloaded_50ss",
@@ -154,7 +154,7 @@
 -    "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 },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
      "extend": { "effects": [ "RECYCLED" ] },
 --- a/data/json/items/ammo/5x50.json
 +++ b/data/json/items/ammo/5x50.json
@@ -174,9 +174,9 @@
      "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 }
+-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "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 },
++    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 },
 +    "extend": { "effects": [ "RECYCLED" ] }
    }
  ]