From 4a71693a8ccacbcbac4a2967179eb1fe8c7d1936 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 30 Aug 2021 14:36:10 -0700 Subject: Fix body part IDs in custom.patch Add honey allergy to vampires in custom-2.patch --- PKGBUILD | 6 +++--- custom-2.patch | 19 ++++++++++++++++--- custom.patch | 18 +++++++++--------- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a18e43e..bd39ffb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202108271610 _pkgver=2021-08-27-1610 -pkgrel=1 +pkgrel=3 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -113,8 +113,8 @@ b2sums=('f4d9b3d26e3d33893fa918086ba538ae4de0874908b18474a7930fabe761711e9640684 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' 'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9' '749badf61daf2957ecc1ad880628e8ffa1fac70e08523151c86f17fec2e6a5e65240fa2545f54936163bdb1dc677a258d138ebccada1c54694d2a39d830d2755' - '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42' - '4cd04fbb255bd47fba5c9df51bcc740fe893d6632e56de9676c0a8ccd472c12b783829e89c3ce71fda1ad25ceb1dac855de85483a17a7e0d4531e02dddc5fc03' + '6ef7242c46b80bd4701629a75a7ac667ff2db76d30c975c743488ab5be51ecffd746f78a4c636e4318610d09613484961f07e4ac1c52817f1f6230c4b0a50abb' + '2fd66bf048d5ccdcb6030fe554744617e23673f80571b57b6194272447f7200444ad0079183e816289ca531be0243d2b22f294ef93977ef8cfe83888142439aa' '1a9518dadbc619cb97ca6dae4b6833083a312bd58d4596e4a231c005b3c89335a56bca62b644fc97340bdb37ff0f94043b5ba0b2d8ac379c8ef8b24adf2e7104' 'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206' '83ea75e6c14667c134bf683f330235c40c7bb94c65e19a6fc4a09ba38da254d09264a86cba4cafcbcf9b79916bd8e16976cb1b49be2475fe315616a3cc857820' diff --git a/custom-2.patch b/custom-2.patch index 384786b..f7b67ac 100644 --- a/custom-2.patch +++ b/custom-2.patch @@ -86,6 +86,14 @@ static const trait_id trait_VEGETARIAN( "VEGETARIAN" ); static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); +@@ -114,6 +114,7 @@ + static const std::string flag_HIDDEN_HALLU( "HIDDEN_HALLU" ); + static const std::string flag_ALLERGEN_EGG( "ALLERGEN_EGG" ); + static const std::string flag_ALLERGEN_FRUIT( "ALLERGEN_FRUIT" ); ++static const std::string flag_ALLERGEN_HONEY( "ALLERGEN_HONEY" ); + static const std::string flag_ALLERGEN_JUNK( "ALLERGEN_JUNK" ); + static const std::string flag_ALLERGEN_MEAT( "ALLERGEN_MEAT" ); + static const std::string flag_ALLERGEN_MILK( "ALLERGEN_MILK" ); @@ -143,11 +144,17 @@ static const std::string flag_RAW( "RAW" ); static const std::string flag_URSINE_HONEY( "URSINE_HONEY" ); @@ -98,7 +106,7 @@ } }; +const std::vector 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_MILK, ++ flag_ALLERGEN_VEGGY, flag_ALLERGEN_FRUIT, flag_ALLERGEN_WHEAT, flag_ALLERGEN_NUT, flag_ALLERGEN_MEAT, flag_ALLERGEN_EGG, flag_ALLERGEN_JUNK, flag_ALLERGEN_MILK, flag_ALLERGEN_HONEY, + } +}; // This ugly temp array is here because otherwise it goes @@ -197,7 +205,7 @@ --- a/src/item_factory.cpp +++ b/src/item_factory.cpp -@@ -2220,6 +2220,7 @@ +@@ -2219,6 +2219,7 @@ // First allergens: // An item is an allergen even if it has trace amounts of allergenic material std::make_pair( material_id( "hflesh" ), "CANNIBALISM" ), @@ -205,7 +213,12 @@ std::make_pair( material_id( "hflesh" ), "ALLERGEN_MEAT" ), std::make_pair( material_id( "iflesh" ), "ALLERGEN_MEAT" ), -@@ -2238,6 +2239,8 @@ +@@ -2233,10 +2234,13 @@ + std::make_pair( material_id( "mushroom" ), "ALLERGEN_VEGGY" ), + std::make_pair( material_id( "milk" ), "ALLERGEN_MILK" ), + std::make_pair( material_id( "egg" ), "ALLERGEN_EGG" ), ++ std::make_pair( material_id( "honey" ), "ALLERGEN_HONEY" ), + std::make_pair( material_id( "junk" ), "ALLERGEN_JUNK" ), // Not food, but we can keep it here std::make_pair( material_id( "wool" ), "ALLERGEN_WOOL" ), // Now "made of". Those flags should not be passed diff --git a/custom.patch b/custom.patch index d669295..35f522d 100644 --- a/custom.patch +++ b/custom.patch @@ -166,7 +166,7 @@ "percent_spread": 10, "outdoor_age_speedup": "0 turns", - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 7 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 7 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 7 ] ], "traits": [ "THRESH_VAMP" ] }, "priority": 8, "half_life": "2 minutes", "phase": "gas", @@ -175,7 +175,7 @@ "dirty_transparency_cache": true, "has_fume": true, - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ], "traits": [ "THRESH_VAMP" ] }, "priority": 8, "half_life": "10 minutes", "phase": "gas", @@ -184,7 +184,7 @@ "dirty_transparency_cache": true, "has_fume": true, - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ], [ "EYES", 15 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ], [ "eyes", 15 ] ], "traits": [ "THRESH_VAMP" ] }, "priority": 8, "half_life": "5 minutes", "phase": "gas", @@ -193,7 +193,7 @@ "gas_absorption_factor": 15, "dirty_transparency_cache": true, - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ], "traits": [ "THRESH_VAMP" ] }, "phase": "gas", "display_items": false, "display_field": true, @@ -202,7 +202,7 @@ "dirty_transparency_cache": true, "has_fume": true, - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ], "traits": [ "THRESH_VAMP" ] }, "priority": 8, "half_life": "50 minutes", "phase": "gas", @@ -211,7 +211,7 @@ "dirty_transparency_cache": true, "has_fume": true, - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ], "traits": [ "THRESH_VAMP" ] }, "priority": 8, "half_life": "15 minutes", "phase": "gas", @@ -220,7 +220,7 @@ "dirty_transparency_cache": true, "has_fume": true, - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ], "traits": [ "THRESH_VAMP" ] }, "priority": 8, "half_life": "10 minutes", "phase": "gas" @@ -229,7 +229,7 @@ "dirty_transparency_cache": true, "has_fume": true, - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ], "traits": [ "THRESH_VAMP" ] }, "priority": 8, "half_life": "30 minutes", "phase": "gas", @@ -238,7 +238,7 @@ "dirty_transparency_cache": true, "has_fume": true, - "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }, -+ "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ], "traits": [ "THRESH_VAMP" ] }, ++ "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ], "traits": [ "THRESH_VAMP" ] }, "priority": 8, "half_life": "30 minutes", "phase": "gas", -- cgit v1.2.1