From 36e2e48468e13c0a79288a536974ad2d10906485 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 14 Jan 2023 07:54:15 -0800 Subject: Remove BN unsupported proficiencies field from godco patch. --- PKGBUILD | 39 ++++----------------------------------- npc-03_godco-update.patch | 3 +-- terrain-01_fix-movecost.patch | 22 ---------------------- 3 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 terrain-01_fix-movecost.patch diff --git a/PKGBUILD b/PKGBUILD index 50304be..96102ba 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,8 +15,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202212171221 -_pkgver=2022-12-17-1221 +pkgver=202301082230 +_pkgver=2023-01-08-2230 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -37,7 +37,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "revert-02_revert-book-revamp.patch" "revert-03_generic-nv.patch" "revert-04_telescopic-lenses.patch" - #"revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch" "revert-06_Obsolete-useless-hub01-basement-1457.patch" "revert-07_Remove-handload-quality-distinction-1481.patch" "revert-08_undo-rifle-balance-pass.patch" @@ -56,7 +55,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "bionics-01_npc-can-use-more-bionics.patch" "faction-01_more-factions.patch" - #"faction-02_more-monster-factions.patch" "faction-03_fix-food-supply-calculations.patch" "factioncamp-01_remove-legacy-recruiting-penalty.patch" @@ -73,7 +71,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "mission-01_typos.patch" "monsters-01_medical-zombies-called-zombies.patch" - #"monsters-02_power-leech-update.patch" "mutations-01_nerf-lightstep.patch" "mutations-02_fix-evac3-background-visible.patch" @@ -89,13 +86,10 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "npc-08_nurse-takes-more-meds.patch" "npc-09_broker-takes-more-foods.patch" "npc-10_bunker-merchant.patch" - #"npc-nn_refugee.patch" - #"npc-nn_robofac-v2.patch" "npc-20_dialogue-fixes.patch" "recipes-01_4570-dragon-can-be-dismantled.patch" - "terrain-01_fix-movecost.patch" "terrain-02_fix-doors-for-npcs.patch" "terrain-03_tacoma-clinic-add-missing-floor.patch" "terrain-04_lumbermill-gasoline-not-spilled.patch" @@ -133,7 +127,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=('bfd55c6268b988a32d50f3704011c492c54ea0f9088186d438767392296b6fa95919f197cb1ca9c2d4624701d41840ab07f63f59b246e07c478dd1593f551cf3' +b2sums=('ee5468cbab4c9d47183c0e3b1f2836d744e0dce62155de5c2a118cf69ea642d4ce77358aa5e8a7b70d9ac9bb7e932a955f851458d8da97f4960c9bd268345720' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -180,7 +174,6 @@ b2sums=('bfd55c6268b988a32d50f3704011c492c54ea0f9088186d438767392296b6fa95919f19 '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b' 'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e' '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f' - '24c12ac534e8895ca34a4bb882822069aca16e9ede6655057c5b6d6de7b777e13b5fb327f83b4ef8401671b817d0fe7884e1933c372ecd953cba18ab26d070d1' '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3' 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8' @@ -243,7 +236,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-12-17-1221"|' Makefile + sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2023-01-08-2230"|' Makefile # # # Hotfixes @@ -263,9 +256,6 @@ prepare() { # Revert Hub 01 basement removal. patch -NREp1 -i "$srcdir"/revert-06_Obsolete-useless-hub01-basement-1457.patch - - # Revert removal of filthy/faulty bionics patch. - #patch -NREp1 -i "$srcdir"/revert-05_No-filth-and-fault-on-uninstalled-bionics-1389.patch # Revert the book changes for now. patch -NREp1 -i "$srcdir"/revert-02_revert-book-revamp.patch @@ -301,7 +291,6 @@ prepare() { # Having copy-from items occuring earlier in a json than the item being copied from prevents items based on it being modified. patch -Np1 -i "$srcdir"/ammo-10_ammo-order-fix.patch - # Fix 40mm rounds having no volume. # Changing abstracts with mods does not seem to work, so here this is. patch -Np1 -i "$srcdir"/ammo-11_fix-volumeless-40mm.patch @@ -330,9 +319,6 @@ prepare() { # Backport the factions.json updates from DDA patch -Np1 -i "$srcdir"/faction-01_more-factions.patch - # Backport the monster_factions.json updates from DDA - #patch -Np1 -i "$srcdir"/faction-02_more-monster-factions.patch - # Fix faction food supply being calculated at 288 calories per person instead of 2500. patch -Np1 -i "$srcdir"/faction-03_fix-food-supply-calculations.patch @@ -390,9 +376,6 @@ prepare() { # It just felt weird seeing "nurse" in the enemy list. patch -Np1 -i "$srcdir"/monsters-01_medical-zombies-called-zombies.patch - # Port the updates to power leeches from DDA - #patch -Np1 -i "$srcdir"/monsters-02_power-leech-update.patch - # # mutation fixes echo "Applying mutation fixes" @@ -442,14 +425,6 @@ prepare() { # Port the bunker merchant from DDA patch -Np1 -i "$srcdir"/npc-10_bunker-merchant.patch - # Port the updates to Free Merchant Center from DDA - # Relies on new json functions :/ - #patch -Np1 -i "$srcdir"/npc-nn_refugee.patch - - # Port the updates to Hub 01 from DDA - # Relies on new json functions :/ - #patch -Np1 -i "$srcdir"/zz_npc-nn_robofac-v2.patch - # Assorted typos in NPC dialogue. # Fix Jack Isherwood mission listing 10 jars, when it is actually 20. patch -Np1 -i "$srcdir"/npc-20_dialogue-fixes.patch @@ -463,12 +438,6 @@ prepare() { # # terrain and overmap fixes echo "Applying terrain and overmap fixes" - - # Fix several tiles to movecost 2: - # This allows helicopters to land on the mi-go landing pad. - # Also allows dragging shopping carts through open subway gates. - patch -Np1 -i "$srcdir"/terrain-01_fix-movecost.patch - # Fix some doors being unusable by npcs (incorrect door flag): # The DOOR flag is for terrain that can be opened, not those already open. patch -Np1 -i "$srcdir"/terrain-02_fix-doors-for-npcs.patch diff --git a/npc-03_godco-update.patch b/npc-03_godco-update.patch index 140a797..104ef1c 100644 --- a/npc-03_godco-update.patch +++ b/npc-03_godco-update.patch @@ -342,7 +342,7 @@ +] --- a/data/json/npcs/godco/NPC_Zachary_Montes.json +++ b/data/json/npcs/godco/NPC_Zachary_Montes.json -@@ -0,0 +1,179 @@ +@@ -0,0 +1,178 @@ +[ + { + "type": "npc", @@ -369,7 +369,6 @@ + "worn_override": "GODCO_zachary_worn", + "carry_override": "GODCO_zachary_carried", + "weapon_override": "GODCO_zachary_wield", -+ "proficiencies": [ "prof_carpentry_basic", "prof_carving" ], + "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" }, { "trait": "FACIAL_HAIR_BEARD" } ], + "skills": [ + { "bonus": 1, "skill": "melee" }, diff --git a/terrain-01_fix-movecost.patch b/terrain-01_fix-movecost.patch deleted file mode 100644 index 00be3a5..0000000 --- a/terrain-01_fix-movecost.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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, ---- a/data/json/furniture_and_terrain/terrain-fences-gates.json -+++ b/data/json/furniture_and_terrain/terrain-fences-gates.json -@@ -732,7 +732,7 @@ - "symbol": ",", - "color": "light_gray", - "looks_like": "t_fencegate_o", -- "move_cost": 1, -+ "move_cost": 2, - "coverage": 60, - "flags": [ "TRANSPARENT", "DOOR", "BURROWABLE", "FLAT", "ROAD" ], - "connects_to": "WOODFENCE", -- cgit v1.2.1