diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-09-09 20:03:49 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-09-09 20:03:49 -0700 |
| commit | 973d5040ffd62d98d8ed11e184dcd518007d54d1 (patch) | |
| tree | 9021da7e27f7f5c14b728ae86dc763dc82756050 /vampirism.patch | |
| parent | Fix examine->search->no result crash. (diff) | |
| download | cataclysm-bn-973d5040ffd62d98d8ed11e184dcd518007d54d1.tar.xz | |
Updated to 2022-09-09-2252
Fixed johhnycakes to be veggy material and not wheat since only cornmeal can make them.
Updated other patches for recent changes.
Diffstat (limited to 'vampirism.patch')
| -rw-r--r-- | vampirism.patch | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/vampirism.patch b/vampirism.patch index 776d9a1..d47c965 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -151,11 +151,12 @@ static const trait_id trait_VEGETARIAN( "VEGETARIAN" ); static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); -@@ -114,6 +114,9 @@ +@@ -114,6 +114,10 @@ static const std::string flag_HIDDEN_HALLU( "HIDDEN_HALLU" ); +static const std::string flag_ALLERGEN_ALCOHOL( "ALLERGEN_ALCOHOL" ); static const std::string flag_ALLERGEN_EGG( "ALLERGEN_EGG" ); +static const std::string flag_ALLERGEN_FOODSTUFF( "ALLERGEN_FOODSTUFF" ); ++static const std::string flag_ALLERGEN_WATER( "ALLERGEN_WATER" ); 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" ); @@ -173,7 +174,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_HONEY, flag_ALLERGEN_FOODSTUFF, flag_ALLERGEN_ALCOHOL, ++ 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, flag_ALLERGEN_FOODSTUFF, flag_ALLERGEN_ALCOHOL, flag_ALLERGEN_WATER, + } +}; // This ugly temp array is here because otherwise it goes @@ -341,12 +342,13 @@ std::make_pair( material_id( "hflesh" ), "ALLERGEN_MEAT" ), std::make_pair( material_id( "iflesh" ), "ALLERGEN_MEAT" ), -@@ -2266,10 +2266,15 @@ +@@ -2266,10 +2266,16 @@ 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( "alcohol" ), "ALLERGEN_ALCOHOL" ), + std::make_pair( material_id( "foodplace_foodstuff" ), "ALLERGEN_FOODSTUFF" ), ++ std::make_pair( material_id( "water" ), "ALLERGEN_WATER" ), + std::make_pair( material_id( "honey" ), "ALLERGEN_HONEY" ), std::make_pair( material_id( "junk" ), "ALLERGEN_JUNK" ), // Not food, but we can keep it here @@ -721,7 +723,7 @@ --- a/data/json/flags.json +++ b/data/json/flags.json -@@ -1117,6 +1117,21 @@ +@@ -1117,6 +1117,26 @@ "context": [ "COMESTIBLE" ] }, { @@ -740,6 +742,11 @@ + "context": [ "COMESTIBLE" ] + }, + { ++ "id": "ALLERGEN_WATER", ++ "type": "json_flag", ++ "context": [ "COMESTIBLE" ] ++ }, ++ { "id": "ALLERGEN_JUNK", "type": "json_flag", "context": [ "COMESTIBLE" ] |