diff options
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | jc_more-military-base-overmap.patch | 190 |
2 files changed, 187 insertions, 23 deletions
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202110291727 -_pkgver=2021-10-29-1727 -pkgrel=1 +pkgver=202111071509 +_pkgver=2021-11-07-1509 +pkgrel=3 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -94,7 +94,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=('89d4382b933e4e37498036d79d64ee94b5422110606b7bc299a22f0b885caa30580f082a403e6fb3b642ebb7a1ab0a81f3769f36d37321fcac8dc62944898c1f' +b2sums=('589de344f3a37d69c6d1516790842170d5f58081a2d01377aaf7edb53f87545ffd3a418c007674ccc3f461b55349d0fc7ab8e36d6c2aaa77f99c1693beb6a842' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -140,10 +140,10 @@ b2sums=('89d4382b933e4e37498036d79d64ee94b5422110606b7bc299a22f0b885caa30580f082 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' 'f25f01c5b27dced202fe76c1717b9eaec65dfa5f28db1910529f60f5ec21cc89c1a15df26c2dd09066a0d89e3f7d87c790e7886c3c2f0978a25f5ec7d1236099' '2aff3bb0804a1860bc95e25433b10f11c185bb954a2e9dc6fbee912d8d453498f9140d516ea4f31fc545861f266400db5d830092dbe21a48b22a07fd3d62a393' - '7835b2a650b7619af28e52273df6f279bac209528937abb32940f40b0572bc97c09573b139248213ab59e3a68ab7a5a96bb54adab742c2fc56d56f0e36732091' + 'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f' '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b' 'b01c79202a2ddc6e6e3e2b97f767f5535e29213bd675238fad20f5ac26b639a111424a3d2861fe2e760b73a1d3c1d909e0360390caf1f21a6fc169b0bee4d665' - '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104' + '088a6d3f96ac76bf9c30da9befd7b4183080098db73cec03591224631ad1a8250d87eac1cca5ba8624ba78123a526d57ef374b2a6f4ea39d6b09bf2dc25a56d2' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' '9b1366ed5da56c77a60f9a174115a596e8466015e23dfc61ed3f4df27976dd0a35832b8fa454be9979b9ab6fdd3cf31cb35f446f8f0ef878b18c1f871f0d4ac0' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') @@ -163,7 +163,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2021-10-29-1727|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2021-11-07-1509|' Makefile # # # Hotfixes @@ -177,7 +177,7 @@ prepare() { patch -Np1 -i "$srcdir"/ammo-01_inconsistent-ammo-names.patch # Set a fixed loudness of 20x66mm shotgun shells like that of other shotguns: - # Other shotguns have fixed loudness to work around how the short range factors causes them to be far quieter than one would otherside expect. + # Other shotguns have fixed loudness to work around how the short range factors causes them to be far quieter than one would otherwise expect. patch -Np1 -i "$srcdir"/ammo-02_fix-20x66mm-loudness.patch # Change reloaded_50bmg to be based on 50bmg: @@ -223,7 +223,7 @@ prepare() { # # itemgroups fixes echo "Applying itemgroup fixes" # Stop police and SWAT carrying 4.6mm magazines despite having no compatible weapons: - # The H&K UCP was removed from the game some time ago. + # The H&K UCP was removed from the base game some time ago. patch -Np1 -i "$srcdir"/itemgroups-01_hk46-is-milspec.patch # Fix the pepperjack beef and burrito bowl MREs never dropping: @@ -365,7 +365,7 @@ prepare() { # Expand the overmap tiles for the miltiary base to be less MMMM patch -Np1 -i "$srcdir"/jc_more-military-base-overmap.patch - # Allow npcs to pull food from the camp larger at the full range of tiles camp actions can be assigned from. + # Allow npcs to pull food from the camp larder at the full range of tiles camp actions can be assigned from. patch -Np1 -i "$srcdir"/jc_npc-eat-from-further-camp.patch diff --git a/jc_more-military-base-overmap.patch b/jc_more-military-base-overmap.patch index 4e575c5..f2bc3cb 100644 --- a/jc_more-military-base-overmap.patch +++ b/jc_more-military-base-overmap.patch @@ -1,21 +1,98 @@ --- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json -@@ -168,7 +168,7 @@ +@@ -251,14 +251,10 @@ + "mil_base_6b", + "mil_base_7b", + "mil_base_8b", +- "mil_base_1c", + "mil_base_2c", + "mil_base_3c", + "mil_base_8c", + "mil_base_1d", +- "mil_base_5d", +- "mil_base_6d", +- "mil_base_7d", + "mil_base_8d", + "mil_base_1e", + "mil_base_1f", +@@ -267,17 +263,13 @@ + "mil_base_2h", + "mil_base_1i", + "mil_base_2i", +- "mil_base_1j", + "mil_base_2j", +- "mil_base_3j", + "mil_base_8j", + "mil_base_1k", + "mil_base_2k", + "mil_base_3k", + "mil_base_4k", +- "mil_base_5k", + "mil_base_6k", +- "mil_base_7k", + "mil_base_8k" + ], + "copy-from": "generic_military_base", +@@ -287,6 +279,22 @@ + }, { "type": "overmap_terrain", - "abstract": "generic_mil_helipad", -- "name": "military helipad", -+ "name": "military base - helipad", - "sym": "H", - "color": "red", - "see_cost": 5, -@@ -328,31 +328,39 @@ - "mil_base_7c" ++ "id": [ "mil_base_1c", "mil_base_1j", "mil_base_3j", "mil_base_5k", "mil_base_6k", "mil_base_7k" ], ++ "copy-from": "generic_military_base", ++ "name": "military base - storage containers", ++ "sym": "#", ++ "color": "yellow" ++ }, ++ { ++ "type": "overmap_terrain", ++ "id": [ "mil_base_1c1", "mil_base_1j1", "mil_base_3j1", "mil_base_5k1", "mil_base_6k1", "mil_base_7k1" ], ++ "copy-from": "generic_military_base", ++ "name": "military base - storage container roofs", ++ "sym": "#", ++ "color": "yellow" ++ }, ++ { ++ "type": "overmap_terrain", + "id": [ "mil_base_5a", "mil_base_6a", "mil_base_7a" ], + "copy-from": "generic_military_base", + "name": "parking lot", +@@ -322,70 +330,99 @@ + "mil_base_3e", + "mil_base_5c1", + "mil_base_5c", ++ "mil_base_5d1", ++ "mil_base_5d", + "mil_base_6c1", + "mil_base_6c", ++ "mil_base_6d1", ++ "mil_base_6d", + "mil_base_7c1", +- "mil_base_7c" ++ "mil_base_7c", ++ "mil_base_7d1", ++ "mil_base_7d" ], "copy-from": "generic_military_base", - "name": "military base - barracks" + "name": "military base - barracks", + "color": "light_green" ++ }, ++ { ++ "type": "overmap_terrain", ++ "id": [ ++ "mil_base_1b1", ++ "mil_base_3b1", ++ "mil_base_5b1", ++ "mil_base_8b1", ++ "mil_base_1g1", ++ "mil_base_8g1", ++ "mil_base_1k1", ++ "mil_base_4k1", ++ "mil_base_8k1" ++ ], ++ "copy-from": "generic_military_base", ++ "name": "military base - watch tower", ++ "sym": "T" }, { "type": "overmap_terrain", @@ -46,7 +123,8 @@ }, { "type": "overmap_terrain", - "id": [ "mil_base_5e1", "mil_base_5e" ], +- "id": [ "mil_base_5e1", "mil_base_5e" ], ++ "id": [ "mil_base_5e1", "mil_base_5e", "mil_base_6e1", "mil_base_6e" ], "copy-from": "generic_military_base", - "name": "military base - armory" + "name": "military base - armory", @@ -54,9 +132,17 @@ }, { "type": "overmap_terrain", -@@ -367,25 +375,32 @@ - "mil_base_7f" - ], +- "id": [ +- "mil_base_6e1", +- "mil_base_6e", +- "mil_base_7e1", +- "mil_base_7e", +- "mil_base_8e1", +- "mil_base_8e", +- "mil_base_7f1", +- "mil_base_7f" +- ], ++ "id": [ "mil_base_7e1", "mil_base_7e", "mil_base_8e1", "mil_base_8e", "mil_base_7f1", "mil_base_7f" ], "copy-from": "generic_military_base", - "name": "military base - motor pool" + "name": "military base - motor pool", @@ -91,3 +177,81 @@ }, { "type": "overmap_terrain", +@@ -416,7 +453,7 @@ + "type": "overmap_terrain", + "id": "mil_base_7i", + "copy-from": "generic_military_base", +- "name": "military helipad", ++ "name": "military base - helipad", + "sym": "H" + }, + { +@@ -465,16 +502,11 @@ + "type": "overmap_terrain", + "id": [ + "mil_base_1a1", +- "mil_base_1b1", +- "mil_base_1c1", + "mil_base_1d1", + "mil_base_1e1", + "mil_base_1f1", +- "mil_base_1g1", + "mil_base_1h1", + "mil_base_1i1", +- "mil_base_1j1", +- "mil_base_1k1", + "mil_base_2a1", + "mil_base_2b1", + "mil_base_2c1", +@@ -483,9 +515,7 @@ + "mil_base_2j1", + "mil_base_2k1", + "mil_base_3a1", +- "mil_base_3b1", + "mil_base_3c1", +- "mil_base_3j1", + "mil_base_3k1", + "mil_base_4a1", + "mil_base_4b1", +@@ -497,16 +527,11 @@ + "mil_base_4h1", + "mil_base_4i1", + "mil_base_4j1", +- "mil_base_4k1", + "mil_base_5a1", +- "mil_base_5b1", +- "mil_base_5d1", + "mil_base_5f1", + "mil_base_5j1", +- "mil_base_5k1", + "mil_base_6a1", + "mil_base_6b1", +- "mil_base_6d1", + "mil_base_6f1", + "mil_base_6g1", + "mil_base_6h1", +@@ -514,22 +539,17 @@ + "mil_base_6k1", + "mil_base_7a1", + "mil_base_7b1", +- "mil_base_7d1", + "mil_base_7g1", + "mil_base_7h1", + "mil_base_7i1", + "mil_base_7j1", +- "mil_base_7k1", + "mil_base_8a1", +- "mil_base_8b1", + "mil_base_8c1", + "mil_base_8d1", + "mil_base_8f1", +- "mil_base_8g1", + "mil_base_8h1", +- "mil_base_8j1", +- "mil_base_8k1", +- "mil_base_8i1" ++ "mil_base_8i1", ++ "mil_base_8j1" + ], + "copy-from": "generic_military_base", + "name": "open air", |