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.

8 files changed, 79 insertions, 49 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0d12c77..672398c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202204061910
-_pkgver=2022-04-06-1910
-pkgrel=3
+pkgver=202204211455
+_pkgver=2022-04-21-1455
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -89,6 +89,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "sound-01_fix-broken-smash-fail.patch"
 
+        "terrain-01_migo-platform-landing-pad.patch"
         "terrain-03_tacoma-clinic-add-missing-floor.patch"
         "terrain-04_lumbermill-gasoline-not-spilled.patch"
         "terrain-05_community-garden-fertilizer-not-spilled.patch"
@@ -125,7 +126,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('9ed4ff61d64e7820cafce1ba6079a265d9a5f66159d771c764c98468b2be108a3f881d1d87ced948d91fe795f2deb41033ec16ef03f6fda602ed92b06879d6ac'
+b2sums=('cf7aeed14e838465914996f63c53056fd6a5949069a506f27a057ba0c70ebdbf7c22b1052f8c32b9a66c09428c906fffc4f6bddf617639d3d60d8f00ef63a2a3'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -134,11 +135,11 @@ b2sums=('9ed4ff61d64e7820cafce1ba6079a265d9a5f66159d771c764c98468b2be108a3f881d1
         '32f7c7090c094bcf87c116ccc4843f63c2f7600f591e26ab7d5a31d7c3abfcc5dec0edf5a9750dba07fe087c3880bbd6d322d0435ebbce06c930bd32c9c814d9'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '1ccdb603f476b642475d95acae66bf85377ad05740d4886e72cecdfb55f1df0b059f4f4dee2dbdb3a976d9e3c23b88972b26e91b15d10f2b53d39e6d167d9668'
-        '88668ebe3c1f66da6515043c799872082fdc7ddd85c31a1713e5753caa6ed862c047a910af80fa4f5717f0b921a863c7de24b1985a9a8242d129ca14f120a988'
-        '0b782de320b3e459380cd618d5db2f3998a6dae879a84a3e4c58b1c61ecb1109f7a63485c2d6c77682eb62ba4a4aa4763a1f25eadde52486f1ce481acbf02504'
-        '3fb051162e4dfc5aca3d4f41ebea18ac85d661f0ebba056a807a2a6ecf34ca117a11aeb286790f5ea6f9c6528d6b6981076da405ea0992ce8870bbe6951bdc2d'
+        '207f765e998c5a92db2030e25779c98d57ed50ce6664d94439e4fdb4654466b764723f7b58872a186dea5f7504793efe4d93df2d8390139649a45d32eec06848'
+        '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
+        '7fa3cc2cc13171aa395accc061a8582f0254a01377b3d60ded4c8d82c5a4f1af65b8e1b6c4fccf0b5fb9a6de1cd59121aae353e6d374726f058c3718bfb9743f'
         '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c'
-        '22b06ee2014dac33808ba9c32269eeb8a58b36f8ecfb651fcea859d231272838e63328e8938d130afcdb9670341d1dd34f997f36ad7be3c7bd7a178533f43702'
+        '5373d056122de79bb3348897f08d00fdcfba3f140446894efa8aaddeab34d3f303301e9553853940adfde095bc967bd1f67c4d7066799d5e083fb0af1ff64b31'
         '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4'
         'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65'
         'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad'
@@ -146,7 +147,7 @@ b2sums=('9ed4ff61d64e7820cafce1ba6079a265d9a5f66159d771c764c98468b2be108a3f881d1
         '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837'
         'c8c140527b4dd6ab4b5db09abd451628b12a2cdcfcf9e47c435dae9f30fbbf3e7499f7e1070c1fb08e25085696d103b4728191e8758f4fa05e769a5d7746abf2'
         '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871'
-        'b3f3be15fb87b1cdb6230216328f648e66d06fd2eeee9a6a3ff3f6b8e94c5213af7a2a4643f1e59ca8801056325ad4be4b88d723c2ec52c4ecc6f8c356ff8c82'
+        '32975862668e4c28bf345cf9e2e3a2f754f7d7d50208f1d840e3b2ca47da1c19bcff9bdf6dc841ec803c64fd633b479d1d598ee22119589732f7cff1fa6dd6dd'
         '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46'
         '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c'
         'dae75d9cd00f1f3ceabf257f1d82d245ace6582cf7ea98a40c1d1eb9b7e1832cb2a0c13f25c814a05a70931c42a06694a67829ea55554cc680eaa8ddf16c84a8'
@@ -169,6 +170,7 @@ b2sums=('9ed4ff61d64e7820cafce1ba6079a265d9a5f66159d771c764c98468b2be108a3f881d1
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
         'ee51e67633252dc7af9117891dc1ece1bfa5f5660bdf665404747a756a828affcd072fa114e3911355bc38a2b6ce9e1e1156c5e5f4d33a3655750e08b2a4e6ae'
+        '0b34beb3afa14605d73d84f1d75bf8182ff0fcb2396e82d06e170cf0dc0d30386071959bd1be3553182c37bb5661a81cf6be8c4e0a14e4df0b01889cfe7edaf1'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
         '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
@@ -182,7 +184,7 @@ b2sums=('9ed4ff61d64e7820cafce1ba6079a265d9a5f66159d771c764c98468b2be108a3f881d1
         '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
-        '5a5a61ccb7e2e343fb6de2e3426688485a2f4ad65d4b001d8bd542907fd8ceb9315da7fd9e5f89a5aa6210edcd5f334c73657fc16349000d6f6a394303e22000'
+        '3616a6305e89963ee8041fd5a3784063ca5b6513b7fe56a5c24eda1bbe07377793d54f07010aad1212cf2310fcf5b5d3e157f8d8b7a85dfc0cdf5ff71f2ed884'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'dede4f0774159243f87121e4d53107bb9de31f9658823fc7ab02124974b87defecf3ab0f2edf6779f2fe1ca437f16f83bf193cf3143fd5eb3a686b731319c11f'
@@ -193,8 +195,8 @@ b2sums=('9ed4ff61d64e7820cafce1ba6079a265d9a5f66159d771c764c98468b2be108a3f881d1
         'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f'
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
-        '1de3fed057adb6c0d41c97bbb5af2b753147ea8f8ac7023759684054aead266100dc8c8e0cc261c7a5cf922e4194e8cabaf626fb5f7974c6036edc64f25cc8f9'
-        'e5d38a8512620245d90409d35bb1b8462a74e3348e8ecef0225d631a7472ce58fdf1855610ebba077dbed552030dbdcb37aacfd02be71fd5d96e770fa26835fc'
+        'd05c48c376f23dd7fda2b5249b5985665de8344774f420a95151f7484ab33c38fb78b2ff279cedf762877dca3abd91c4d9e4900547e9c31e7636e1d90cc13d2b'
+        'e8edef84346ec74a39225665d65f404aeb5db3be12572fc9539f27aec06c54d208a5fdab67c881237866c4e9795b06445d426baf32d9b3a223a0e661de13be0c'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ec8f713c6fae84f6659f76d4edc0f237766329080e33e65a5affc5d0c37cc7906b0daaaa1f275d89c8ddacb5db0ee16b69222956c9f2c402ce44b55aa040ead0'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -214,7 +216,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-04-06-1910|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-04-21-1455|' Makefile
 
 
   # # # Hotfixes
@@ -304,6 +306,7 @@ prepare() {
 
   # Fix several foods using unclear naming:
   # Rename can_corn from corn to canned corn to make its limited use in recipes more clear.
+  # Fix pluralization of canned beans to also be canned beans.
   patch -Np1 -i "$srcdir"/foods-02_fix-food-naming.patch
 
 
@@ -421,6 +424,11 @@ prepare() {
 
   # # terrain and overmap fixes
   echo "Applying terrain and overmap fixes"
+
+  # Set t_platform_resin movecost to 2:
+  # This allows helicopters to land on the the mi-go landing pad.
+  patch -Np1 -i "$srcdir"/terrain-01_migo-platform-landing-pad.patch
+
   # Fix missing floor in the tacoma clinic:
   # The hospital is still a mess. :/
   patch -Np1 -i "$srcdir"/terrain-03_tacoma-clinic-add-missing-floor.patch
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" ] }
    }
  ]
diff --git a/ammo-02_fix-20x66mm-loudness.patch b/ammo-02_fix-20x66mm-loudness.patch
index 1dc324c..fe95749 100644
--- a/ammo-02_fix-20x66mm-loudness.patch
+++ b/ammo-02_fix-20x66mm-loudness.patch
@@ -2,7 +2,7 @@
 +++ b/data/json/items/ammo/20x66mm.json
 @@ -124,6 +124,7 @@
      "range": 12,
-     "damage": { "damage_type": "stab", "amount": 60 },
+     "damage": { "damage_type": "bullet", "amount": 60 },
      "recoil": 2500,
 +    "loudness": 160,
      "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
diff --git a/ammo-03_fix-reloaded-50bmg.patch b/ammo-03_fix-reloaded-50bmg.patch
index b8241aa..88b561a 100644
--- a/ammo-03_fix-reloaded-50bmg.patch
+++ b/ammo-03_fix-reloaded-50bmg.patch
@@ -11,6 +11,6 @@
 +    "name": { "str": ".50 BMG M33 Ball, reloaded" },
 -    "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
 +    "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.  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" ] },
      "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
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",
diff --git a/etc-02_add-missing-price-postapoc.patch b/etc-02_add-missing-price-postapoc.patch
index 0770483..0636201 100644
--- a/etc-02_add-missing-price-postapoc.patch
+++ b/etc-02_add-missing-price-postapoc.patch
@@ -14,8 +14,8 @@
          ]
        ]
      ],
--    "relative": { "ranged_damage": { "damage_type": "stab", "amount": 1 }, "durability": 1 }
-+    "relative": { "ranged_damage": { "damage_type": "stab", "amount": 1 }, "durability": 1 },
+-    "relative": { "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "durability": 1 }
++    "relative": { "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "durability": 1 },
 +    "proportional": { "price": 1.1 }
    },
    {
diff --git a/foods-02_fix-food-naming.patch b/foods-02_fix-food-naming.patch
index 3952dc4..b96e49c 100644
--- a/foods-02_fix-food-naming.patch
+++ b/foods-02_fix-food-naming.patch
@@ -9,3 +9,14 @@
      "comestible_type": "FOOD",
      "weight": "178 g",
      "color": "yellow",
+--- a/data/json/items/comestibles/other.json
++++ b/data/json/items/comestibles/other.json
+@@ -265,7 +265,7 @@
+   {
+     "type": "COMESTIBLE",
+     "id": "can_beans",
+-    "name": { "str": "canned beans", "str_pl": "beans" },
++    "name": { "str": "canned beans", "str_pl": "canned beans" },
+     "weight": "256 g",
+     "color": "brown",
+     "spoils_in": "2 days",
diff --git a/terrain-01_migo-platform-landing-pad.patch b/terrain-01_migo-platform-landing-pad.patch
new file mode 100644
index 0000000..3901bcf
--- /dev/null
+++ b/terrain-01_migo-platform-landing-pad.patch
@@ -0,0 +1,11 @@
+--- a/data/json/furniture_and_terrain/terrain-migo.json
++++ b/data/json/furniture_and_terrain/terrain-migo.json
+@@ -66,7 +66,7 @@
+     "symbol": "~",
+     "color": "light_gray",
+     "looks_like": "t_floor_resin",
+-    "move_cost": 1,
++    "move_cost": 2,
+     "flags": [ "TRANSPARENT", "COLLAPSES", "FLAT", "ROAD", "NONFLAMMABLE" ],
+     "bash": {
+       "str_min": 250,