Merge pull request #82723 from Standing-Storm/new-myopia-flag-for-goblins

[Mods] Add MYOPIC_SUPERNATURAL and MYOPIC_IN_LIGHT_SUPERNATURAL flags

Author: Standing-Storm

data/json/flags.json

@@ -488,6 +488,16 @@
     "type": "json_flag",
     "info": "This gear <good>corrects nearsightedness</good>."
   },
+  {
+    "id": "MYOPIC_SUPERNATURAL",
+    "type": "json_flag",
+    "//": "Like MYOPIC, but can't be fixed by glasses."
+  },
+  {
+    "id": "MYOPIC_IN_LIGHT_SUPERNATURAL",
+    "type": "json_flag",
+    "//": "Like MYOPIC_IN_LIGHT, but can't be fixed by glasses."
+  },
   {
     "id": "FILTHY",
     "type": "json_flag",

data/mods/Magiclysm/mutations/mutation_paths/fantasy_species.json

@@ -577,7 +577,7 @@
     "description": "Your people have always had an easier time operating at night, away from the hated light of the sun.",
     "mixed_effect": true,
     "valid": false,
-    "flags": [ "MYOPIC_IN_LIGHT" ],
+    "flags": [ "MYOPIC_IN_LIGHT_SUPERNATURAL" ],
     "category": [ "SPECIES_GOBLIN" ],
     "enchantments": [
       {

data/mods/MindOverMatter/effects/effects_nether_attunement.json

@@ -81,7 +81,7 @@
     "remove_message": "Your vision finally clears.",
     "rating": "bad",
     "limb_score_mods": [ { "limb_score": "night_vis", "modifier": 0.1 }, { "limb_score": "vision", "modifier": 0.2 } ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD", "HYPEROPIC", "MYOPIC", "MYOPIC_IN_LIGHT" ]
+    "flags": [ "EFFECT_LIMB_SCORE_MOD", "HYPEROPIC", "MYOPIC_SUPERNATURAL" ]
   },
   {
     "type": "effect_type",

data/mods/MindOverMatter/effects/effects_penalty.json

@@ -357,7 +357,7 @@
     "show_in_info": true,
     "limb_score_mods": [ { "limb_score": "vision", "modifier": 0.5 }, { "limb_score": "night_vis", "modifier": 0.5 } ],
     "base_mods": { "hit_mod": [ -2 ] },
-    "flags": [ "MYOPIC_IN_LIGHT", "EFFECT_LIMB_SCORE_MOD" ]
+    "flags": [ "MYOPIC_SUPERNATURAL", "EFFECT_LIMB_SCORE_MOD" ]
   },
   {
     "type": "effect_type",

doc/JSON/JSON_FLAGS.md

@@ -406,6 +406,8 @@ Character flags can be `trait_id`, `json_flag_id` or `flag_id`.  Some of these a
 - ```MYCUS_IMMUNE``` Critter is immune to fungal hase field (`fd_fungal_haze`)
 - ```MYOPIC``` You are nearsighted: vision range is severely reduced without glasses.
 - ```MYOPIC_IN_LIGHT``` You are nearsighted in light, but can see normally in low-light conditions.
+- ```MYOPIC_SUPERNATURAL``` You are nearsighted in such a way that glasses cannot fix it, such as by magic.
+- ```MYOPIC_IN_LIGHT_SUPERNATURAL``` You are nearsighted in light in such a way that glasses cannot fix it, such as by magic.
 - ```NIGHT_VISION``` You can see in the dark.
 - ```NO_DISEASE``` This mutation grants immunity to diseases.
 - ```NO_RADIATION``` This mutation grants immunity to radiations.

src/character.cpp

@@ -330,6 +330,9 @@ static const json_character_flag json_flag_INVERTEBRATEBLOOD( "INVERTEBRATEBLOOD
 static const json_character_flag json_flag_INVISIBLE( "INVISIBLE" );
 static const json_character_flag json_flag_MYOPIC( "MYOPIC" );
 static const json_character_flag json_flag_MYOPIC_IN_LIGHT( "MYOPIC_IN_LIGHT" );
+static const json_character_flag
+json_flag_MYOPIC_IN_LIGHT_SUPERNATURAL( "MYOPIC_IN_LIGHT_SUPERNATURAL" );
+static const json_character_flag json_flag_MYOPIC_SUPERNATURAL( "MYOPIC_SUPERNATURAL" );
 static const json_character_flag json_flag_NIGHT_VISION( "NIGHT_VISION" );
 static const json_character_flag json_flag_NON_THRESH( "NON_THRESH" );
 static const json_character_flag json_flag_NO_RADIATION( "NO_RADIATION" );
@@ -1473,6 +1476,8 @@ bool Character::sight_impaired() const
              !has_effect( effect_contacts ) &&
              !has_effect( effect_transition_contacts ) &&
              !has_flag( json_flag_ENHANCED_VISION ) ) ||
+           ( in_light && has_flag( json_flag_MYOPIC_IN_LIGHT_SUPERNATURAL ) ) ||
+           has_flag( json_flag_MYOPIC_SUPERNATURAL ) ||
            has_trait( trait_PER_SLIME ) || is_blind();
 }
 
@@ -2685,10 +2690,13 @@ void Character::recalc_sight_limits()
         sight_max = 2;
     } else if( has_trait( trait_PER_SLIME ) ) {
         sight_max = 8;
-    } else if( ( has_flag( json_flag_MYOPIC ) || ( in_light &&
-                 has_flag( json_flag_MYOPIC_IN_LIGHT ) ) ) &&
-               !worn_with_flag( flag_FIX_NEARSIGHT ) && !has_effect( effect_contacts ) &&
-               !has_effect( effect_transition_contacts ) ) {
+    } else if( ( ( has_flag( json_flag_MYOPIC ) || ( in_light &&
+                   has_flag( json_flag_MYOPIC_IN_LIGHT ) ) ) &&
+                 !worn_with_flag( flag_FIX_NEARSIGHT ) && !has_effect( effect_contacts ) &&
+                 !has_effect( effect_transition_contacts ) ) ||
+               ( in_light && has_flag( json_flag_MYOPIC_IN_LIGHT_SUPERNATURAL ) ) ||
+               has_flag( json_flag_MYOPIC_SUPERNATURAL )
+             ) {
         sight_max = 12;
     } else if( has_effect( effect_darkness ) ) {
         vision_mode_cache.set( DARKNESS );