diff options
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | custom.patch | 55 | ||||
| -rw-r--r-- | foods-02_fix-food-naming.patch | 11 |
3 files changed, 52 insertions, 22 deletions
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202112281204 _pkgver=2021-12-28-1204 -pkgrel=4 +pkgrel=5 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -43,6 +43,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "bionics-01_npc-can-use-more-bionics.patch" "foods-01_fix-food-materials.patch" + "foods-02_fix-food-naming.patch" "itemgroups-01_hk46-is-milspec.patch" "itemgroups-02_add-missing-mre.patch" @@ -107,6 +108,7 @@ b2sums=('2c210a107946431d889e52da1606fc5aae08ebd68879e77efe48a668c3b6c07d058f384 'd9cad0cef682927c07e3f7398b6e57b21b68f9069b99fab363d0e3f329337f25fafa216a82a431ee23a2de3f67a0ed68d024c1a932b76f58aeb5e9a49cfe5e6e' 'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad' '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871' + 'b3f3be15fb87b1cdb6230216328f648e66d06fd2eeee9a6a3ff3f6b8e94c5213af7a2a4643f1e59ca8801056325ad4be4b88d723c2ec52c4ecc6f8c356ff8c82' '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46' '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c' '8bb71fbec3deece7bd0f9084e20ef5853812e71e2ebcd43011f7779499cbb99c7a8bc5c618d8ef9f55e5ce54c9fc4a5f4d3167bb63f9821a68889f9f3e1386f5' @@ -217,6 +219,10 @@ prepare() { # This prevents odd outcomes such as carnivores drinking almond/soy milk and eating peanut butter. patch -Np1 -i "$srcdir"/foods-01_fix-food-materials.patch + # Fix several foods using unclear naming: + # Rename can_corn from corn to canned corn to make its limited use in recipes more clear. + patch -Np1 -i "$srcdir"/foods-02_fix-food-naming.patch + # # itemgroups fixes echo "Applying itemgroup fixes" diff --git a/custom.patch b/custom.patch index 85315ab..7ed870d 100644 --- a/custom.patch +++ b/custom.patch @@ -311,27 +311,6 @@ add( pgettext( "memorial_male", "Killed an innocent person, %s, in cold blood and " ---- 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/src/morale_types.cpp +++ b/src/morale_types.cpp @@ -138,6 +139,7 @@ @@ -354,6 +333,40 @@ extern const morale_type MORALE_MEATARIAN; extern const morale_type MORALE_ANTIFRUIT; +--- a/src/mutation.cpp ++++ b/src/mutation.cpp +@@ -80,6 +80,7 @@ + static const trait_id trait_STR_ALPHA( "STR_ALPHA" ); + 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 trait_id trait_TREE_COMMUNION( "TREE_COMMUNION" ); + static const trait_id trait_VOMITOUS( "VOMITOUS" ); + static const trait_id trait_WEB_WEAVER( "WEB_WEAVER" ); +@@ -887,6 +888,11 @@ + if( !mutagen ) { + return; + } ++ if( has_trait( trait_THRESH_VAMP ) ) { ++ add_msg_if_player( m_good, _( "Your Vampire blood quickly destroys the mutagenic contagion." ) ); ++ remove_effect( effect_accumulated_mutagen ); ++ return; ++ } + float mut_power = to_turns<float>( mutagen.get_duration() ) / to_turns<float> + ( mutagen.get_int_dur_factor() ); + add_msg_if_player( m_debug, "Mutation accumulation: %.1f", mut_power ); +@@ -926,6 +932,10 @@ + { + bool force_bad = one_in( 3 ); + bool force_good = false; ++ if( has_trait( trait_THRESH_VAMP ) ) { ++ add_msg_if_player( m_good, _( "Your Vampire blood quickly destroys the mutagenic contagion." ) ); ++ return; ++ } + if( has_trait( trait_ROBUST ) && force_bad ) { + // Robust Genetics gives you a 33% chance for a good mutation, + // instead of the 33% chance of a bad one. + --- a/src/npc.cpp +++ b/src/npc.cpp @@ -116,6 +116,7 @@ diff --git a/foods-02_fix-food-naming.patch b/foods-02_fix-food-naming.patch new file mode 100644 index 0000000..3952dc4 --- /dev/null +++ b/foods-02_fix-food-naming.patch @@ -0,0 +1,11 @@ +--- a/data/json/items/comestibles/veggy_dishes.json ++++ b/data/json/items/comestibles/veggy_dishes.json +@@ -162,7 +162,7 @@ + { + "type": "COMESTIBLE", + "id": "can_corn", +- "name": { "str_sp": "corn" }, ++ "name": { "str_sp": "canned corn" }, + "comestible_type": "FOOD", + "weight": "178 g", + "color": "yellow", |