diff options
Diffstat (limited to 'custom-2.patch')
| -rw-r--r-- | custom-2.patch | 19 |
1 files changed, 16 insertions, 3 deletions
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<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_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 |