diff options
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | custom.patch | 49 | ||||
| -rw-r--r-- | hotfix_mp3-player.patch | 44 |
3 files changed, 100 insertions, 9 deletions
@@ -12,8 +12,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn -pkgver=1999 -pkgrel=1 +pkgver=2006 +pkgrel=1.3 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -32,6 +32,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "0.F_backport-tacoma-barn-door-position.patch" "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch" "0.F_backport-inhaler-mission-no-autofail.patch" + "hotfix_mp3-player.patch" "0001-quiverfull-house-correct-stairs.patch" "0002-ankle-ammo-pouch-is-not-a-backpack.patch" @@ -68,7 +69,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B "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=('2280b9d7898a0e76365811fa0fd62275a4f8641f20fb3b68c566d9a7278a9bbb69202e46baa7014e7fb75bbfcf6adc7c4aa9d88769066876cdfe45b814d0d41c' +b2sums=('e8228109ac7494ba3a5f5b42422926f116b9c0e002f89174872a26bb0bb88f540a5f83018912ee58e96083cf7d0259e35f68fa17fc8d8584ebd75b5600e9939f' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -76,6 +77,7 @@ b2sums=('2280b9d7898a0e76365811fa0fd62275a4f8641f20fb3b68c566d9a7278a9bbb69202e4 'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3' '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc' '9e2c26bf0e2bb4fd60de8cad1f9c05f329d99a56c64189bc2747915c48d208b63038d45a90f7a1c8e8bb0ac33461f217acf7e57f752f0acff117e2062459e9bb' + 'b88e0ca20faa64469f3e970067b2bc77aa0f0b8b661f637c0ad701b05c3a9e4908500b81cfb5746ff6f0c83f619c463150291f462a725d6d691cc338a6cd0d34' '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa' '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3' 'ade420aa80816ebcf19485bb4617352a1654c8e436babc3e51290757432e44dd69da3a4403c1e9dab816b2d2d0db70a86504f707e9d3696a192ecef30622fc9b' @@ -102,9 +104,9 @@ b2sums=('2280b9d7898a0e76365811fa0fd62275a4f8641f20fb3b68c566d9a7278a9bbb69202e4 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600' 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' 'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9' - '1fe0d7a8353323381690f68d678d8f5822dc9ccf73a117485fa9df9997d66406989b801e2f9a7c10a859ac333cb0a3d5843800be26cf58f825306103a03a2e0a' + '747b2c3c1423ecabc1eb7accdb061c8a130120cc7295f36d3567c94113f64562ae2e4bd399cde4b738a539545215d6315b5e0a228e3a479742e8d3b8d94a6ec5' 'd45f849e595131c517f644e8a39473a4bec9515894b38d2e278a0b08c64c437fa755109077e98761166ce6eed227f5b8fb4fff9444670e583a49cbc778ba92f2' - '7613dbc937adf3bc962f1b94d6403ece380e0b235da56e1732e0bcb68f8bb234e8e18c956365e1a8158db7ed45125d163896ffd5f572242278098ef228c991cb' + '59d69127a79d1c9f09dd324903ed0b4793991ae1d3f45f01c4710e329cd222fafbf252a29275345072c370245931c3e897a586044a46a83c13225a288bc96993' '8fc23de05cc0d4ea63e921dd5c575ee83715753d2f2d0b9f0d503cb14a3263af4970fa5fb19a9b8387414b501f3dc4b8b6c91db4c929f9543556a7973a84a3b1' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') @@ -125,7 +127,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = the-fork|VERSION = 1999|' Makefile + sed -i 's|VERSION = the-fork|VERSION = 2006|' Makefile # gcc11 support @@ -146,6 +148,8 @@ prepare() { # Fix npcs with the inhaler mission instantly dying upon mission acceptance patch -Np1 -i "$srcdir"/0.F_backport-inhaler-mission-no-autofail.patch + patch -Np1 -i "$srcdir"/hotfix_mp3-player.patch + # Various other fixes for bugs I came across # Fix Quiverfull house to have the correct stairs that modify json diff --git a/custom.patch b/custom.patch index 8affbee..5c6cb5f 100644 --- a/custom.patch +++ b/custom.patch @@ -1,6 +1,6 @@ --- a/src/character.cpp +++ b/src/character.cpp -@@ -251,6 +251,7 @@ +@@ -288,9 +288,11 @@ static const trait_id trait_THRESH_INSECT( "THRESH_INSECT" ); static const trait_id trait_THRESH_PLANT( "THRESH_PLANT" ); static const trait_id trait_THRESH_SPIDER( "THRESH_SPIDER" ); @@ -8,15 +8,37 @@ static const trait_id trait_TOUGH_FEET( "TOUGH_FEET" ); static const trait_id trait_TRANSPIRATION( "TRANSPIRATION" ); static const trait_id trait_URSINE_EYE( "URSINE_EYE" ); -@@ -4775,7 +4775,7 @@ ++static const trait_id trait_VAMP_HUNGER( "VAMP_HUNGER" ); + static const trait_id trait_VISCOUS( "VISCOUS" ); + static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); + static const trait_id trait_WEBBED( "WEBBED" ); +@@ -4545,6 +4547,7 @@ + const bool npc_no_food = is_npc() && get_option<bool>( "NO_NPC_FOOD" ); + const bool foodless = debug_ls || npc_no_food; + const bool mouse = has_trait( trait_NO_THIRST ); ++ const bool vamp = has_trait( trait_VAMP_HUNGER ); + const bool mycus = has_trait( trait_M_DEPENDENT ); + const float kcal_per_time = bmr() / ( 12.0f * 24.0f ); + const int five_mins = ticks_between( from, to, 5_minutes ); +@@ -4568,7 +4571,7 @@ + } + // Mycus and Metabolic Rehydration makes thirst unnecessary + // since water is not limited by intake but by absorption, we can just set thirst to zero +- if( mycus || mouse ) { ++ if( mycus || mouse || vamp ) { + set_thirst( 0 ); + } + } +@@ -4985,7 +4988,7 @@ - void Character::update_bodytemp() + void Character::update_bodytemp( const map &m, weather_manager &weather ) { - if( has_trait( trait_DEBUG_NOTEMP ) ) { + if( has_trait( trait_DEBUG_NOTEMP ) || has_trait( trait_THRESH_VAMP ) ) { temp_cur.fill( BODYTEMP_NORM ); temp_conv.fill( BODYTEMP_NORM ); return; + --- a/src/map_field.cpp +++ b/src/map_field.cpp @@ -88,6 +88,7 @@ @@ -153,6 +175,27 @@ "priority": 8, "half_life": "30 minutes", "phase": "gas", +--- a/src/monattack.cpp ++++ b/src/monattack.cpp +@@ -143,6 +143,7 @@ + static const trait_id trait_TAIL_CATTLE( "TAIL_CATTLE" ); + static const trait_id trait_THRESH_MARLOSS( "THRESH_MARLOSS" ); + static const trait_id trait_THRESH_MYCUS( "THRESH_MYCUS" ); ++static const trait_id trait_THRESH_VAMP( "THRESH_VAMP" ); + + static const mtype_id mon_ant_acid_larva( "mon_ant_acid_larva" ); + static const mtype_id mon_ant_acid_queen( "mon_ant_acid_queen" ); +@@ -2758,6 +2759,9 @@ + damage_instance dam = damage_instance(); + dam.add_damage( DT_STAB, 6, 10, 0.6, 1 ); + bool hit = sting_shoot( z, target, dam, range ); ++ if( target->has_trait( trait_THRESH_VAMP ) ) { ++ return true; ++ } + if( hit ) { + //Add checks if previous NPC/player conditions are removed + dynamic_cast<player *>( target )->mutate(); + --- a/data/json/mutations/mutation_ordering.json +++ b/data/json/mutations/mutation_ordering.json @@ -73,6 +73,7 @@ diff --git a/hotfix_mp3-player.patch b/hotfix_mp3-player.patch new file mode 100644 index 0000000..e6191ed --- /dev/null +++ b/hotfix_mp3-player.patch @@ -0,0 +1,44 @@ +--- a/src/monster.cpp ++++ b/src/monster.cpp +@@ -1507,12 +1507,7 @@ + + if( total_dealt > 6 && stab_cut > 0 && has_flag( MF_BLEED ) ) { + // Maybe should only be if DT_CUT > 6... Balance question +- if( target.is_player() || target.is_npc() ) { +- target.add_effect( effect_bleed, 6_minutes, bp_hit ); +- } else { +- target.add_effect( effect_bleed, 6_minutes, bp_hit ); +- } +- ++ target.add_effect( effect_bleed, 6_minutes, bp_hit ); + } + } + +--- a/data/json/effects.json ++++ b/data/json/effects.json +@@ -373,7 +373,7 @@ + "id": "earphones", + "name": [ "Wearing earphones" ], + "desc": [ "You are wearing earphones and can't hear much from outside world." ], +- "permanent": true, ++ "max_duration": "1 s", + "rating": "bad" + }, + { +@@ -526,6 +526,7 @@ + "name": [ "Sleep Deprived" ], + "desc": [ "Your sleep debt has been steadily increasing for a while. You should get some rest." ], + "rating": "bad", ++ "permanent": true, + "max_intensity": 100, + "int_dur_factor": 480, + "resist_effects": [ "meth" ], +@@ -1405,7 +1406,7 @@ + { + "type": "effect_type", + "id": "music", +- "permanent": true ++ "max_duration": "1 s" + }, + { + "type": "effect_type", |