[Xedra Evolved] The holy light of the sun burns vampires' impure flesh (#82941)

Author: Standing-Storm

data/json/flags.json

@@ -2359,6 +2359,16 @@
     "type": "json_flag",
     "info": "This tool can test for voltage."
   },
+  {
+    "id": "SUNBURN_SUPERNATURAL",
+    "type": "json_flag",
+    "info": "You burn in the sunlight like a vampire.  Probably because you're a vampire."
+  },
+  {
+    "id": "SUNBURN_SUPERNATURAL_REDUCTION",
+    "type": "json_flag",
+    "info": "You burn in the sunlight like a vampire, but not quite as badly."
+  },
   {
     "id": "SHREDDED",
     "type": "json_flag",

data/mods/Xedra_Evolved/effects/effects.json

@@ -3656,6 +3656,14 @@
     "show_in_info": false,
     "flags": [ "SUPPRESS_INVISIBILITY" ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_vampire_burn_to_death_in_sunlight",
+    "//": "Hidden effect, carries the flags so that vampires who blot out the sun with their powers don't burn in sunlight.",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "flags": [ "SUNBURN", "SUNBURN_SUPERNATURAL" ]
+  },
   {
     "type": "effect_type",
     "//": "Checks if you have every single vampiric power when trying to learn new ones.",

data/mods/Xedra_Evolved/eocs/eoc_conditions.json

@@ -65,5 +65,11 @@
       ]
     },
     "effect": [  ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_CONDITION_XE_VAMPIRE_AVOID_BURNING_IN_SUNLIGHT",
+    "condition": { "and": [ { "not": { "is_weather": "blotted_sun" } } ] },
+    "effect": [  ]
   }
 ]

data/mods/Xedra_Evolved/mod_interactions/skyisland/vampire_sun_protection.json

@@ -0,0 +1,8 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_CONDITION_XE_VAMPIRE_AVOID_BURNING_IN_SUNLIGHT",
+    "condition": { "and": [ { "not": { "is_weather": "blotted_sun" } }, { "not": { "u_has_trait": "mut_skyisland_sunblock_real" } } ] },
+    "effect": [  ]
+  }
+]

data/mods/Xedra_Evolved/mutations/mutations.json

@@ -700,7 +700,8 @@
           { "type": "bullet", "multiply": -0.08 }
         ]
       }
-    ]
+    ],
+    "active_flags": [ "SUNBURN_SUPERNATURAL_REDUCTION" ]
   },
   {
     "type": "mutation",
@@ -1037,13 +1038,13 @@
     "id": "VAMPIRE3",
     "name": { "str": "Mortal hungers are replaced with immortal hungers" },
     "points": 0,
-    "description": "You replace some of your regular caloric intake with blood and begin to see some of the more esoteric abilities inherent to vampirism.",
+    "description": "You replace some of your regular caloric intake with blood and begin to see some of the more esoteric abilities inherent to vampirism, though the sun now burns exposed flesh.",
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
     "vitamins_absorb_multi": [ [ "all", [ [ "human_blood_vitamin", 1.25 ] ] ] ],
     "vitamin_rates": [ [ "human_blood_vitamin", 720 ], [ "mutagen", 300 ] ],
-    "flags": [ "CANNIBAL", "ALBINO", "DAYFEAR", "HEMOVORE" ],
+    "flags": [ "CANNIBAL", "SUNBURN", "ALBINO", "DAYFEAR", "HEMOVORE" ],
     "enchantments": [
       { "condition": { "not": "is_day" }, "values": [ { "value": "OVERMAP_SIGHT", "add": 1 } ] },
       { "values": [ { "value": "STAMINA_REGEN_MOD", "add": 0.2 }, { "value": "METABOLISM", "multiply": -0.2 } ] }
@@ -1172,7 +1173,7 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "flags": [ "CANNIBAL", "SUNBURN", "DAYFEAR", "HEMOVORE", "MEND_ALL" ],
+    "flags": [ "CANNIBAL", "DAYFEAR", "HEMOVORE", "MEND_ALL" ],
     "enchantments": [
       {
         "values": [
@@ -1223,6 +1224,10 @@
           { "effect": "effect_vampire_immune_to_classic_zombification", "intensity": 1 },
           { "effect": "effect_dhampir_corpselike_pallor_pale", "intensity": 1 }
         ]
+      },
+      {
+        "condition": { "test_eoc": "EOC_CONDITION_XE_VAMPIRE_AVOID_BURNING_IN_SUNLIGHT" },
+        "ench_effects": [ { "effect": "effect_vampire_burn_to_death_in_sunlight", "intensity": 1 } ]
       }
     ]
   },
@@ -1430,7 +1435,7 @@
     "purifiable": false,
     "valid": false,
     "can_only_eat": [ "blood", "hblood", "fae_blood", "vampire_blood" ],
-    "flags": [ "CANNIBAL", "SUNBURN", "DAYFEAR", "NO_THIRST" ],
+    "flags": [ "CANNIBAL", "DAYFEAR", "NO_THIRST" ],
     "vitamin_rates": [ [ "vitC", -500 ], [ "iron", -500 ], [ "calcium", -500 ] ],
     "//": "When weariness can be modified through Json, this mutation should make the player immune to it.",
     "enchantments": [
@@ -1443,6 +1448,10 @@
           { "value": "THIRST", "multiply": -1 },
           { "value": "METABOLISM", "multiply": -1 }
         ]
+      },
+      {
+        "condition": { "test_eoc": "EOC_CONDITION_XE_VAMPIRE_AVOID_BURNING_IN_SUNLIGHT" },
+        "ench_effects": [ { "effect": "effect_vampire_burn_to_death_in_sunlight", "intensity": 1 } ]
       }
     ]
   },

data/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json

@@ -636,7 +636,7 @@
     "eoc_type": "EVENT",
     "required_event": "gains_mutation",
     "condition": { "compare_string": [ "ANATHEMA_WEAKNESS_SUN_BURN", { "context_val": "trait" } ] },
-    "effect": [ { "u_message": "You know with certainty that standing under the sun is now a lethal threat.", "type": "bad" } ]
+    "effect": [ { "u_message": "You know with certainty that standing under the sun will slay you in moments.", "type": "bad" } ]
   },
   {
     "type": "effect_on_condition",
@@ -2669,62 +2669,6 @@
       }
     ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_SUN_BURN_CHECK",
-    "//": "Until the day a single effect can damage all bodyparts at once, Slain by the Sun will need this EOC to work.",
-    "recurrence": 1,
-    "condition": {
-      "and": [
-        { "u_has_trait": "ANATHEMA_WEAKNESS_SUN_BURN" },
-        "is_day",
-        "u_is_outside",
-        { "not": { "is_weather": "blotted_sun" } },
-        { "not": { "u_has_effect": "effect_sun_burn_grace_period" } }
-      ]
-    },
-    "deactivate_condition": { "not": { "u_has_trait": "ANATHEMA_WEAKNESS_SUN_BURN" } },
-    "effect": [
-      { "u_add_effect": "effect_slain_by_the_sun", "duration": 100, "target_part": "arm_l" },
-      { "u_add_effect": "effect_slain_by_the_sun", "duration": 100, "target_part": "arm_r" },
-      { "u_add_effect": "effect_slain_by_the_sun", "duration": 100, "target_part": "leg_l" },
-      { "u_add_effect": "effect_slain_by_the_sun", "duration": 100, "target_part": "leg_r" },
-      { "u_add_effect": "effect_slain_by_the_sun", "duration": 100, "target_part": "torso" },
-      { "u_add_effect": "effect_slain_by_the_sun", "duration": 100, "target_part": "head" },
-      { "u_message": "You are under the sun!  You must find shelter from its rays or you will die!", "type": "bad" }
-    ],
-    "false_effect": [
-      {
-        "run_eocs": [
-          {
-            "id": "EOC_SUN_BURN_CHECK_REMOVE",
-            "condition": {
-              "or": [
-                { "math": [ "u_effect_intensity('effect_slain_by_the_sun', 'bodypart': 'arm_l') >= 1" ] },
-                { "math": [ "u_effect_intensity('effect_slain_by_the_sun', 'bodypart': 'arm_r') >= 1" ] },
-                { "math": [ "u_effect_intensity('effect_slain_by_the_sun', 'bodypart': 'leg_l') >= 1" ] },
-                { "math": [ "u_effect_intensity('effect_slain_by_the_sun', 'bodypart': 'leg_r') >= 1" ] },
-                { "math": [ "u_effect_intensity('effect_slain_by_the_sun', 'bodypart': 'torso') >= 1" ] },
-                { "math": [ "u_effect_intensity('effect_slain_by_the_sun', 'bodypart': 'head') >= 1" ] }
-              ]
-            },
-            "effect": [
-              { "u_lose_effect": "effect_slain_by_the_sun", "target_part": "arm_l" },
-              { "u_lose_effect": "effect_slain_by_the_sun", "target_part": "arm_r" },
-              { "u_lose_effect": "effect_slain_by_the_sun", "target_part": "leg_l" },
-              { "u_lose_effect": "effect_slain_by_the_sun", "target_part": "leg_r" },
-              { "u_lose_effect": "effect_slain_by_the_sun", "target_part": "torso" },
-              { "u_lose_effect": "effect_slain_by_the_sun", "target_part": "head" },
-              {
-                "u_message": "The sun's rays cannot reach you anymore.  You no longer feel like you're burning alive.",
-                "type": "good"
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_ANATHEMA_MIND_CHAOS",

data/mods/Xedra_Evolved/obsoletion_and_migration/eocs.json

@@ -137,5 +137,10 @@
       { "u_lose_effect": "effect_changeling_wearing_iron" },
       { "u_lose_effect": "effect_changeling_wearing_steel" }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_SUN_BURN_CHECK",
+    "effect": [  ]
   }
 ]

doc/JSON/JSON_FLAGS.md

@@ -445,7 +445,9 @@ Character flags can be `trait_id`, `json_flag_id` or `flag_id`.  Some of these a
 - ```STOP_SLEEP_DEPRIVATION``` Stops Sleep Deprivation while awake and boosts it while sleeping.
 - ```STRICT_HUMANITARIAN``` You can eat foodstuffs tagged with `STRICT_HUMANITARIANISM` without morale penalties.
 - ```SUFFOCATION_IMMUNE``` You cannot suffocate by being crushed from multiple enemies.
-- ```SUNBURN``` TBD, probably related to `ALBINO`.
+- ```SUNBURN``` A worse version of ```ALBINO```, causing you to suffer even more severe damage.
+- ```SUNBURN_SUPERNATURAL``` The kind of sun damage that a vampire would suffer, leading to death in minutes.
+- ```SUNBURN_SUPERNATURAL_REDUCTION``` Reduces the damage taken by ```SUNBURN_SUPERNATURAL``` by 75%.
 - ```SUPER_CLAIRVOYANCE``` Gives a super clairvoyance effect (works with multiple z-levels), used for debug purposes.
 - ```SAFECRACK_NO_TOOL``` Allows to open safes without stethoscope.
 - ```SUPPRESS_INVISIBILITY``` Any invisibility effects on the creature, including the `PERMANENT_INVISIBILITY` flag, are ignored for the duration of the effect with this flag
@@ -1197,7 +1199,7 @@ Used to describe monster characteristics and set their properties and abilities.
 - ```PATH_AVOID_FALL``` This monster will path around cliffs instead of off of them.
 - ```PATH_AVOID_FIRE``` This monster will path around heat-related dangers instead of through them.
 - ```PAY_BOT``` Creature can be turned into a pet for a limited time in exchange of e-money.
-- ```PERMANENT_INVISIBILITY` The monster is invisible under all circumstances and requires preternatural means to detect.  Use with caution
+- ```PERMANENT_INVISIBILITY``` The monster is invisible under all circumstances and requires preternatural means to detect.  Use with caution
 - ```PET_HARNESSABLE``` Creature can be attached to a harness.
 - ```PET_MOUNTABLE``` Creature can be ridden or attached to a harness.
 - ```PET_WONT_FOLLOW``` This monster won't follow the player automatically when tamed.

src/suffer.cpp

@@ -132,6 +132,9 @@ static const json_character_flag json_flag_PAIN_IMMUNE( "PAIN_IMMUNE" );
 static const json_character_flag json_flag_RAD_DETECT( "RAD_DETECT" );
 static const json_character_flag json_flag_SUFFOCATION_IMMUNE( "SUFFOCATION_IMMUNE" );
 static const json_character_flag json_flag_SUNBURN( "SUNBURN" );
+static const json_character_flag json_flag_SUNBURN_SUPERNATURAL( "SUNBURN_SUPERNATURAL" );
+static const json_character_flag
+json_flag_SUNBURN_SUPERNATURAL_REDUCTION( "SUNBURN_SUPERNATURAL_REDUCTION" );
 
 static const morale_type morale_feeling_bad( "morale_feeling_bad" );
 static const morale_type morale_feeling_good( "morale_feeling_good" );
@@ -810,8 +813,14 @@ static float heavy_eff_chance( float exp )
 
 void suffer::from_sunburn( Character &you, bool severe )
 {
-    // Sunburn effects and albinism/datura occur about once per minute
-    if( !one_turn_in( 1_minutes ) ) {
+    // Sunburn effects and albinism/datura occur about once per minute unless you have the SUNBURN_SUPERNATURAL flag
+    if( !one_turn_in( 1_minutes ) && !you.has_flag( json_flag_SUNBURN_SUPERNATURAL ) ) {
+        return;
+    }
+
+    // If you have SUNBURN_SUPERNATURAL but some means of protection, you burn 75% slower
+    if( !one_turn_in( 4_seconds ) && you.has_flag( json_flag_SUNBURN_SUPERNATURAL ) &&
+        you.has_flag( json_flag_SUNBURN_SUPERNATURAL_REDUCTION ) ) {
         return;
     }
 
@@ -865,16 +874,21 @@ void suffer::from_sunburn( Character &you, bool severe )
         bodypart_id bp = bp_exp.first;
         float exposure = bp_exp.second;
 
-        if( bp == bodypart_id( "eyes" ) ) {
-            // Sunglasses can keep the sun off the eyes.
+        if( you.has_flag( json_flag_SUNBURN_SUPERNATURAL ) ) {
+            exposure = 1;
+        }
+
+        if( bp == bodypart_id( "eyes" ) && !you.has_flag( json_flag_SUNBURN_SUPERNATURAL ) ) {
+            // Sunglasses can keep the sun off the eyes. SUNBURN_SUPERNATURAL ignores clothing
             if( you.has_flag( json_flag_GLARE_RESIST )
                 || you.worn_with_flag( flag_SUN_GLASSES )
                 || you.worn_with_flag( flag_BLIND ) ) {
                 continue;
             }
             // If no UV-/glare-protection gear is worn the eyes should be treated as unprotected
             exposure = 1.0;
-        } else if( ( you.get_wielded_item() && you.get_wielded_item()->has_flag( flag_RAIN_PROTECT ) )
+        } else if( !you.has_flag( json_flag_SUNBURN_SUPERNATURAL ) && ( ( you.get_wielded_item() &&
+                   you.get_wielded_item()->has_flag( flag_RAIN_PROTECT ) )
                    || ( ( bp == body_part_hand_l || bp == body_part_hand_r )
                         && you.worn_with_flag( flag_POCKETS )
                         && you.can_use_pockets() )
@@ -883,7 +897,7 @@ void suffer::from_sunburn( Character &you, bool severe )
                         && you.can_use_hood() )
                    || ( bp == body_part_mouth
                         && you.worn_with_flag( flag_COLLAR )
-                        && you.can_use_collar() ) ) {
+                        && you.can_use_collar() ) ) ) {
             // Eyes suffer even in the presence of the checks in this branch!
             // Umbrellas can keep the sun off all bodyparts
             // Pockets can keep the sun off your hands if you don't wield a too large item