Add SUPPRESS_INVISIBILITY flag, add an item in XE that uses it (#82603)

* Initial commit

* Fix field

* Update recipe

* Update src/creature.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: Standing-Storm

data/json/flags.json

@@ -2584,6 +2584,11 @@
     "type": "json_flag",
     "info": "The character can see through CAMOUFLAGE, NIGHT_INVISIBILITY, or the invisibility effect."
   },
+  {
+    "id": "SUPPRESS_INVISIBILITY",
+    "type": "json_flag",
+    "info": "If you're invisible, now you're not"
+  },
   {
     "id": "ANIMALEMPATH2",
     "type": "json_flag",

data/mods/Xedra_Evolved/effects/effects.json

@@ -3589,6 +3589,15 @@
     "desc": [ "" ],
     "show_in_info": false
   },
+  {
+    "type": "effect_type",
+    "//": "Hidden, reveals invisible monsters",
+    "id": "effect_xe_reveal_invisibility",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "show_in_info": false,
+    "flags": [ "SUPPRESS_INVISIBILITY" ]
+  },
   {
     "type": "effect_type",
     "//": "Checks if you have every single vampiric power when trying to learn new ones.",

data/mods/Xedra_Evolved/emitters.json

@@ -19,5 +19,12 @@
     "field": "fd_hot_air4",
     "intensity": 3,
     "qty": 100
+  },
+  {
+    "id": "emit_powder_of_revelation",
+    "type": "emit",
+    "field": "fd_powder_of_revelation",
+    "intensity": 1,
+    "qty": 50
   }
 ]

data/mods/Xedra_Evolved/field_type.json

@@ -444,5 +444,34 @@
     "percent_spread": 20,
     "phase": "gas",
     "looks_like": "fd_dust"
+  },
+  {
+    "id": "fd_powder_of_revelation",
+    "type": "field_type",
+    "intensity_levels": [
+      {
+        "name": "floating powder",
+        "sym": "%",
+        "translucency": 1,
+        "concentration": 1,
+        "effects": [
+          {
+            "effect_id": "effect_xe_reveal_invisibility",
+            "min_duration": "2 minutes",
+            "max_duration": "2 minutes",
+            "immune_inside_vehicle": true,
+            "message": "The powder coats you.",
+            "message_type": "bad"
+          }
+        ]
+      }
+    ],
+    "percent_spread": 30,
+    "priority": 8,
+    "half_life": "30 seconds",
+    "phase": "gas",
+    "display_items": true,
+    "display_field": true,
+    "looks_like": "fd_dust"
   }
 ]

data/mods/Xedra_Evolved/itemgroups/nests_itemgroups.json

@@ -179,7 +179,8 @@
       { "item": "alchemy_recipe_scorpion_periapta", "prob": 1 },
       { "item": "alchemy_recipe_butterfly_periapta", "prob": 1 },
       { "item": "alchemy_recipe_spider_periapta", "prob": 1 },
-      { "item": "alchemy_recipe_cold_iron_ingot", "prob": 1 }
+      { "item": "alchemy_recipe_cold_iron_ingot", "prob": 1 },
+      { "item": "alchemy_recipe_powder_of_revelation", "prob": 1 }
     ]
   },
   {

data/mods/Xedra_Evolved/items/alchemy.json

@@ -165,6 +165,20 @@
     "material": [ "powder" ],
     "price": "25 USD"
   },
+  {
+    "id": "xe_alchemy_powder_of_revelation",
+    "name": { "str": "powder of revelation", "str_pl": "handfuls of powder of revelation" },
+    "description": "A dull grayish powder with a slight shimmering opalescence.  When thrown it will fill the air and reveal the true form and existence of any creature whose form it coats.",
+    "type": "ITEM",
+    "weight": "265 g",
+    "volume": "250 ml",
+    "symbol": ":",
+    "container": "flask_glass",
+    "color": "light_gray",
+    "material": [ "powder" ],
+    "price": "2 USD",
+    "drop_action": { "type": "emit_actor", "emits": [ "emit_powder_of_revelation" ], "scale_qty": false }
+  },
   {
     "id": "charm_of_marzanna",
     "copy-from": "garnet_silver_pendant_necklace",

data/mods/Xedra_Evolved/items/alchemy_recipes.json

@@ -275,6 +275,23 @@
     "read_skill": "fabrication"
   },
   {
+    "type": "ITEM",
+    "subtypes": [ "BOOK" ],
+    "id": "alchemy_recipe_powder_of_revelation",
+    "copy-from": "schematics_generic",
+    "looks_like": "spell_scroll",
+    "name": { "str_sp": "scribbled notes (powder of revelation)" },
+    "description": "An handwritten set of notes detailing an alchemical recipe for creating some sort of powder that it claims will \"Reveal that which is hidden\".",
+    "required_level": 3,
+    "max_level": 3,
+    "intelligence": 10,
+    "time": "45 m",
+    "symbol": "ç",
+    "color": "light_green",
+    "read_skill": "fabrication"
+  },
+  {
+    "//": "Tier 4 begins here",
     "type": "ITEM",
     "subtypes": [ "BOOK" ],
     "id": "alchemy_recipe_life_extension_potion",
@@ -355,6 +372,7 @@
     "read_skill": "fabrication"
   },
   {
+    "//": "Tier 5 begins here",
     "type": "ITEM",
     "subtypes": [ "BOOK" ],
     "id": "alchemy_recipe_plant_imbuement",

data/mods/Xedra_Evolved/recipes/alchemy.json

@@ -365,6 +365,32 @@
     "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
     "components": [ [ [ "chem_sulphur", 1 ] ], [ [ "chem_manganese_dioxide", 1 ] ], [ [ "xe_elder_ginseng", 1 ] ], [ [ "water", 2 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "xe_alchemy_powder_of_revelation",
+    "category": "CC_XEDRA",
+    "subcategory": "CSC_XEDRA_ALCHEMY",
+    "skill_used": "chemistry",
+    "skills_required": [ "deduction", 4 ],
+    "difficulty": 4,
+    "time": "1 h 30 m",
+    "proficiencies": [
+      { "proficiency": "prof_intro_chemistry" },
+      { "proficiency": "prof_inorganic_chemistry" },
+      { "proficiency": "prof_intro_chem_synth" }
+    ],
+    "book_learn": [ [ "alchemy_recipe_powder_of_revelation", 5 ] ],
+    "qualities": [ { "id": "BOIL", "level": 1 } ],
+    "tools": [ [ [ "water_boiling_heat", 120, "LIST" ] ] ],
+    "components": [
+      [ [ "clay_lump", 1 ] ],
+      [ [ "edible_blood", 6, "LIST" ], [ "blank_blood", 1 ] ],
+      [ [ "water_clean", 5 ] ],
+      [ [ "corpse_ash", 25 ] ]
+    ],
+    "flags": [ "SECRET" ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

doc/JSON/JSON_FLAGS.md

@@ -446,6 +446,7 @@ Character flags can be `trait_id`, `json_flag_id` or `flag_id`.  Some of these a
 - ```SUNBURN``` TBD, probably related to `ALBINO`.
 - ```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
 - ```TELEPORT_LOCK``` You cannot teleport.  This has none of the protective effects of `DIMENSIONAL_ANCHOR`.
 - ```TEMPORARY_SHAPESHIFT``` You are in another shape due to some supernatural effect.
 - ```TEMPORARY_SHAPESHIFT_NO_HANDS``` You do not have hands in your new shapeshifted form, and so cannot pick up or manipulate objects. 

src/creature.cpp

@@ -138,6 +138,7 @@ static const json_character_flag json_flag_IGNORE_TEMP( "IGNORE_TEMP" );
 static const json_character_flag json_flag_INVISIBLE( "INVISIBLE" );
 static const json_character_flag json_flag_LIMB_LOWER( "LIMB_LOWER" );
 static const json_character_flag json_flag_LIMB_UPPER( "LIMB_UPPER" );
+static const json_character_flag json_flag_SUPPRESS_INVISIBILITY( "SUPPRESS_INVISIBILITY" );
 static const json_character_flag json_flag_TEEPSHIELD( "TEEPSHIELD" );
 static const json_character_flag json_flag_TRUE_SEEING( "TRUE_SEEING" );
 
@@ -557,8 +558,9 @@ bool Creature::sees( const map &here, const Creature &critter ) const
     }
 
     // Invisibility checked after stumbling and after invisibility detection methods
-    if( critter.has_effect_with_flag( json_flag_INVISIBLE ) ||
-        critter.has_flag( mon_flag_PERMANENT_INVISIBILITY ) ) {
+    if( ( critter.has_effect_with_flag( json_flag_INVISIBLE ) ||
+          critter.has_flag( mon_flag_PERMANENT_INVISIBILITY ) ) &&
+        !critter.has_effect_with_flag( json_flag_SUPPRESS_INVISIBILITY ) ) {
         return false;
     }