diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-08-19 10:28:51 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-08-19 10:28:51 -0700 |
| commit | d44279d5106f6c45c1ab381605067090d92c58dd (patch) | |
| tree | 7569af4788e7bb2b94b57f474c04badb5ec06b0d | |
| parent | Updated to 2021-08-17-1012 (diff) | |
| download | cataclysm-bn-d44279d5106f6c45c1ab381605067090d92c58dd.tar.xz | |
Add missing dairy allergy to vampires
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | custom-2.patch | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202108171012 _pkgver=2021-08-17-1012 -pkgrel=2 +pkgrel=3 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -118,7 +118,7 @@ b2sums=('a382f7bbd31862cb4568d9510718d4586931294629f99cd753ae9f494532a854946d2da 'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9' '0bc675f798113cc744337ac2864c54510af89fc59450a3bf250cc49c1a1b17ebeddc007e38491978d367555ed7f4895266d68f50f01d30f79a7cacdc01f0f207' '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42' - '431b1757432f1bf3c8d838b149f23be7778367bc8a8a906294e4313ff34f4819bef93e493f6c9ce99ee2cbbe023d2f24893e6fd5352056c208e386702416a907' + '61413ebb78867f53a8fa733c10f7fbac1ef056042dbf11138bff5bafc69be8614955f37801bd802c120c072e9fad725131e4a4822f475d555d5e68c587014143' '0cf2d5cbf60c4c4a52cb7f2ecd4dd1757a811e3b0b6b5606f4417ba95901479bfc3fc9270377d5c4d855a94cd841e07229415dacce3475dcb7f03b01ebc3b949' 'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206' '83ea75e6c14667c134bf683f330235c40c7bb94c65e19a6fc4a09ba38da254d09264a86cba4cafcbcf9b79916bd8e16976cb1b49be2475fe315616a3cc857820' diff --git a/custom-2.patch b/custom-2.patch index 08fa1c0..2a5d017 100644 --- a/custom-2.patch +++ b/custom-2.patch @@ -98,7 +98,7 @@ } }; +const std::vector<std::string> vamp_blacklist {{ -+ flag_ALLERGEN_VEGGY, flag_ALLERGEN_FRUIT, flag_ALLERGEN_WHEAT, flag_ALLERGEN_NUT, flag_ALLERGEN_MEAT, flag_ALLERGEN_EGG, flag_ALLERGEN_JUNK, ++ flag_ALLERGEN_VEGGY, flag_ALLERGEN_FRUIT, flag_ALLERGEN_WHEAT, flag_ALLERGEN_NUT, flag_ALLERGEN_MEAT, flag_ALLERGEN_EGG, flag_ALLERGEN_JUNK, ALLERGEN_MILK, + } +}; // This ugly temp array is here because otherwise it goes @@ -130,7 +130,7 @@ const bool edible = comest->comesttype == comesttype_FOOD || food.has_flag( flag_USE_EAT_VERB ); int food_kcal = compute_effective_nutrients( food ).kcal; -@@ -1116,6 +1136,25 @@ +@@ -1116,6 +1135,25 @@ } } @@ -156,7 +156,7 @@ // Allergy check for food that is ingested (not gum) if( !food.has_flag( "NO_INGEST" ) ) { const auto allergy = allergy_type( food ); -@@ -1123,6 +1162,11 @@ +@@ -1123,6 +1161,11 @@ add_msg_if_player( m_bad, _( "Yuck! How can anybody eat this stuff?" ) ); add_morale( allergy, -75, -400, 30_minutes, 24_minutes ); } |