From 79510060d3bd99b71d0f6fde0081b14f59d5e695 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 9 May 2021 12:41:21 -0700 Subject: Add patch for medical zombie names Add patch to nerf light-step Update tileset and soundpack --- 0016-medical-zombies-called-zombies.patch | 29 +++++++++++++++++++++++++++++ 0017-nerf-lightstep.patch | 16 ++++++++++++++++ PKGBUILD | 16 +++++++++++++--- 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 0016-medical-zombies-called-zombies.patch create mode 100644 0017-nerf-lightstep.patch diff --git a/0016-medical-zombies-called-zombies.patch b/0016-medical-zombies-called-zombies.patch new file mode 100644 index 0000000..fe0b222 --- /dev/null +++ b/0016-medical-zombies-called-zombies.patch @@ -0,0 +1,29 @@ +--- a/data/json/monsters/zed_medical.json ++++ b/data/json/monsters/zed_medical.json +@@ -2,7 +2,7 @@ + { + "id": "mon_zombie_nurse", + "type": "MONSTER", +- "name": { "str": "nurse" }, ++ "name": { "str": "zombie nurse" }, + "description": "Instead of one of its forearms, this zombie has a muscular tube ending in a stinger that is moist with stringy slime. It is single-mindedly focused on using just that one limb to fight.", + "default_faction": "zombie", + "bodytype": "human", +@@ -33,7 +33,7 @@ + "id": "mon_zombie_surgeon", + "type": "MONSTER", + "copy-from": "mon_zombie_nurse", +- "name": { "str": "surgeon" }, ++ "name": { "str": "zombie surgeon" }, + "description": "A dripping stinger where one hand would be, a set of razor-like claws in place of the other one. This zombie's cold, focused eyes look down at you from above a \"mask\" of melded flesh.", + "default_faction": "zombie", + "hp": 150, +@@ -58,7 +58,7 @@ + "id": "mon_zombie_vivisector", + "type": "MONSTER", + "copy-from": "mon_zombie_surgeon", +- "name": { "str": "vivisector" }, ++ "name": { "str": "zombie vivisector" }, + "description": "This humanoid has a long bone \"syringe\" in place of one forearm, a large saw as the opposing hand, and a pair of digitigrade legs ending in raptor-like feet. Its head is featureless, except for its \"human\" eyes, which smile with inhuman malice and scorn.", + "default_faction": "zombie", + "color": "light_green_white", diff --git a/0017-nerf-lightstep.patch b/0017-nerf-lightstep.patch new file mode 100644 index 0000000..8fa46cd --- /dev/null +++ b/0017-nerf-lightstep.patch @@ -0,0 +1,16 @@ +--- a/data/json/mutations/mutations.json ++++ b/data/json/mutations/mutations.json +@@ -507,11 +507,11 @@ + "id": "LIGHTSTEP", + "name": { "str": "Light Step" }, + "points": 1, +- "description": "You make no noise while walking.", ++ "description": "You make less noise while walking.", + "starting_trait": true, + "category": [ "BIRD", "ELFA", "FELINE" ], + "cancels": [ "CLUMSY" ], +- "noise_modifier": 0.0 ++ "noise_modifier": 0.4 + }, + { + "type": "mutation", diff --git a/PKGBUILD b/PKGBUILD index 67cb5ac..797d032 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn pkgver=1710 -pkgrel=1.2 +pkgrel=1.3 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -46,6 +46,8 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "0013-fix-20x66mm-loudness.patch" "0014-portable-generator-engine.patch" "0015-normalize-drone-volume.patch" + "0016-medical-zombies-called-zombies.patch" + "0017-nerf-lightstep.patch" "jc_ammo-loudness-ap-times-2.patch" "jc_allow-bio-firestarter-on-smoker.patch" @@ -83,6 +85,8 @@ b2sums=('117ac58ac4190370bd77611b7e528baf629323b5a3f90ef97119a67e0991564be7eea8f 'c1b6e59c840aee812570d9fb30f045b371473282c2289aaefe66483e6aae995fb93549882811fcb869d77f1c27a62ba4e486a8e20327846fd0602926739296ae' '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a' '8203bb062d72559da908a5020963503303c0aaa4a2ab61e57cfb713f58de40f1cb50b8b6dfbeec3a9addc41cbec5ae17fbf57230c3614f9b69fe6b0c55bf3fad' + '7e49f473cd5c5811ff6456b58be6f8cb438ec712b388c156902f837b556550710bb79924f94f6818a6332e653ec0740d7688165ca105b159faeeeeec2b105dd6' + '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' 'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9' '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56' @@ -90,9 +94,9 @@ b2sums=('117ac58ac4190370bd77611b7e528baf629323b5a3f90ef97119a67e0991564be7eea8f 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' '8d2085a7c7f0a38ea4feb213a99f2bd93ec98e91aa564f3aa54e39b9ed1dd901f0629c3c0715ce00d84286f3831e8901131eecd0e0e9e79bbbe7928673f4e081' 'b6a6c9c1791bc625b773aa1d0b90f98f0821aa06807353f1c179cbbb9090391e9ab7fe8d567a029bcf94dddf31c40d3e525d1033d2de81520726c0e69021f278' - '89a5a7548bb0d47c78e12db3c915f1f9647ebba66baf8e3f4ab9579f8023585a1ca8e4c33224b4290d37a6b97aaa2bca3d785b1c6a066a661fac80d80c4dea21' + '07c33b20274bb4d2aa4d2dbcef11941154bc2e9fa7241fed7289599683423dca497a50957aae2044016a5275a1e593285cf1f25aa49594a3e3169efaad750d2b' '020f01c7cafede24e9eca44facf3beb638b51248ece3ff0d6f27af385c980c4a4c31cd9d69f1082c0204d13cddc39415c72d88e489ef689d72e35f6070f60b40' - 'f54bb10b6c5920b22942b1e312c315280afb720d3a897dce9333563cae3343668460d24b7d01bf36768974c729d92177e886f5ee0d22d746b19454a2ab6208fb' + '8fc23de05cc0d4ea63e921dd5c575ee83715753d2f2d0b9f0d503cb14a3263af4970fa5fb19a9b8387414b501f3dc4b8b6c91db4c929f9543556a7973a84a3b1' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') prepare() { @@ -173,6 +177,12 @@ prepare() { # Normalize the manhack volumes to that of the base grenade/explosive patch -Np1 -i "$srcdir"/0015-normalize-drone-volume.patch + # Prefix medical zombies with "zombie" like other zombies. + patch -Np1 -i "$srcdir"/0016-medical-zombies-called-zombies.patch + + # Light Step feels too powerful in Bright Nights + patch -Np1 -i "$srcdir"/0017-nerf-lightstep.patch + # Various other fixes for bugs I came across that modify src # Fix ammo loudness mulitplying by six instead of two -- cgit v1.2.1