Merge pull request #82550 from Standing-Storm/invisible-stalker

[Magiclysm] Add Aerial Assassin monster and `PERMANENT_INVISIBILITY` flag to go with it

Author: Standing-Storm

data/json/monsters/monster_flags.json

@@ -154,6 +154,11 @@
     "type": "monster_flag",
     "//": "Monster can see creatures even when they're invisible"
   },
+  {
+    "id": "PERMANENT_INVISIBILITY",
+    "type": "monster_flag",
+    "//": "The monster is PERMANENTLY invisible.  Be careful about using this one"
+  },
   {
     "id": "ELECTRIC",
     "type": "monster_flag",

data/mods/Magiclysm/monster_factions.json

@@ -39,12 +39,14 @@
   },
   {
     "type": "MONSTER_FACTION",
-    "name": "robot"
+    "name": "robot",
+    "neutral": [ "aerial_assassin" ]
   },
   {
     "type": "MONSTER_FACTION",
     "name": "wonder_forge",
     "hate": [ "zombie", "fungus" ],
+    "neutral": [ "aerial_assassin" ],
     "friendly": [ "forge_lords" ]
   },
   {
@@ -79,18 +81,37 @@
   },
   {
     "type": "MONSTER_FACTION",
-    "name": "magical_plant"
+    "name": "magical_plant",
+    "neutral": [ "triffid" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "triffid",
+    "copy-from": "triffid",
+    "extend": { "neutral": [ "aerial_assassin", "magical_plant" ] }
   },
   {
     "type": "MONSTER_FACTION",
     "name": "mi-go",
     "copy-from": "mi-go",
     "base_faction": "nether",
     "friendly": [ "mi-go_summon" ],
-    "neutral": [ "fish", "yrax", "small_animal", "slime", "passive_machine" ],
+    "neutral": [ "fish", "yrax", "small_animal", "slime", "passive_machine", "aerial_assassin" ],
     "by_mood": [ "nether" ],
     "hate": [ "zombie", "triffid", "fungus", "exodii", "isolated_artisans" ]
   },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "zombie",
+    "copy-from": "zombie",
+    "extend": { "neutral": [ "aerial_assassin" ] }
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "bot",
+    "copy-from": "bot",
+    "extend": { "neutral": [ "aerial_assassin" ] }
+  },
   {
     "type": "MONSTER_FACTION",
     "name": "mi-go_summon",
@@ -127,13 +148,29 @@
     "name": "animal",
     "copy-from": "animal",
     "friendly": [ "attack_player_only", "forest_spirit_faction", "earth_spirit_faction" ],
-    "neutral": [ "small_animal", "fish", "bot", "aquatic_predator", "robofac", "passive_machine", "nether_player_hate" ],
+    "neutral": [
+      "small_animal",
+      "fish",
+      "bot",
+      "aquatic_predator",
+      "robofac",
+      "passive_machine",
+      "nether_player_hate",
+      "aerial_assassin"
+    ],
     "by_mood": [ "animal" ]
   },
   {
     "type": "MONSTER_FACTION",
     "name": "herbivore",
     "copy-from": "herbivore",
     "friendly": [ "forest_spirit_faction", "earth_spirit_faction" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "aerial_assassin",
+    "base_faction": "nether_hate_humans",
+    "neutral": [ "animal", "zombie", "mi-go", "bot", "triffid", "passive_machine", "robot", "wonder_forge" ],
+    "by_mood": [ "dragon_black" ]
   }
 ]

data/mods/Magiclysm/monsters/summoned.json

@@ -101,5 +101,68 @@
       "EATS"
     ],
     "armor": { "bash": 60, "cut": 72, "acid": 18, "heat": 8, "bullet": 50, "psionic": 14 }
+  },
+  {
+    "id": "mon_aerial_assassin",
+    "type": "MONSTER",
+    "name": { "str": "aerial assassin" },
+    "description": "A puff of wind, barely visible.  Only a few eddies in the air indicate that there is anything here at all.",
+    "default_faction": "aerial_assassin",
+    "species": [ "WIND_SPIRIT" ],
+    "diff": 2,
+    "volume": "750 ml",
+    "weight": "1 kg",
+    "hp": 60,
+    "speed": 90,
+    "symbol": "I",
+    "color": "white",
+    "aggression": 20,
+    "morale": 100,
+    "melee_skill": 6,
+    "melee_dice": 1,
+    "melee_dice_sides": 8,
+    "melee_damage": [ { "damage_type": "bash", "amount": 3 } ],
+    "dodge": 4,
+    "vision_day": 25,
+    "vision_night": 8,
+    "families": [ "prof_wp_netherium_abomination" ],
+    "harvest": "exempt",
+    "special_attacks": [
+      {
+        "type": "monster_attack",
+        "attack_type": "melee",
+        "id": "smash",
+        "move_cost": 150,
+        "cooldown": 35,
+        "damage_max_instance": [ { "damage_type": "bash", "amount": 3 } ],
+        "throw_strength": 20,
+        "hit_dmg_u": "A blast of wind hurls you off your feet!",
+        "hit_dmg_npc": "A blast of wind hurls <npcname> off their feet!",
+        "no_dmg_msg_u": "A blast of wind whips your clothes as it flies past.",
+        "no_dmg_msg_npc": "A blast of wind whips <npcname>'s clothes as it flies past.",
+        "miss_msg_u": "A blast of wind hurls you off your feet!",
+        "miss_msg_npc": "A blast of wind hurls <npcname> off their feet!"
+      }
+    ],
+    "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s blows away." },
+    "flags": [
+      "SEES",
+      "HEARS",
+      "GOODHEARING",
+      "NOHEAD",
+      "HARDTOSHOOT",
+      "WEBWALK",
+      "FLIES",
+      "PLASTIC",
+      "ACIDPROOF",
+      "STUN_IMMUNE",
+      "COLDPROOF",
+      "BIOLOGICALPROOF",
+      "BULLETPROOF",
+      "HIT_AND_RUN",
+      "NO_BREATHE",
+      "NOGIB",
+      "PERMANENT_INVISIBILITY"
+    ]
   }
 ]

data/mods/Magiclysm/species.json

@@ -113,5 +113,12 @@
     "description": "A magical being of rock and stone.",
     "flags": [ "NEVER_WANDER", "NO_FUNG_DMG" ],
     "anger_triggers": [ "FRIEND_ATTACKED" ]
+  },
+  {
+    "type": "SPECIES",
+    "id": "WIND_SPIRIT",
+    "description": "A magical being of wind and gale.",
+    "flags": [ "NEVER_WANDER", "NO_FUNG_DMG" ],
+    "anger_triggers": [ "FRIEND_ATTACKED" ]
   }
 ]

data/mods/Magiclysm/worldgen/forge_of_wonders.json

@@ -147,7 +147,7 @@
         { "monster": "GROUP_FORGE_DWARVES", "x": [ 58, 60 ], "y": [ 19, 21 ], "density": 0.1 },
         { "monster": "GROUP_FORGE_AUTOMATA", "x": [ 42, 47 ], "y": [ 9, 14 ], "density": 0.1 }
       ],
-      "monster": { "ö": { "monster": "mon_forgedemons" } },
+      "monster": { "ö": { "monster": "mon_forgedemons" }, "÷": { "monster": "mon_aerial_assassin", "chance": 1 } },
       "place_zones": [
         { "type": "LOOT_ITEM_GROUP", "filter": "NC_FORGE_LORD_SHOP", "faction": "forge_lords", "x": [ 43, 46 ], "y": 13 },
         {

data/mods/Magiclysm/worldgen/wizard-towers.json

@@ -30,7 +30,8 @@
         ",*Q_____## Y|H    A##,,,........;;;;;;;;;;;;;...........................................................................",
         ",*______*#=##ww#ww##,,,,.........;;;;;;;;;;;............................................................................"
       ],
-      "palettes": [ "wizardtower1_palette" ]
+      "palettes": [ "wizardtower1_palette" ],
+      "place_monster": [ { "monster": "mon_aerial_assassin", "x": [ 82, 85 ], "y": [ 9, 14 ], "chance": 20 } ]
     }
   },
   {
@@ -67,7 +68,8 @@
       "palettes": [ "wizardtower1_palette" ],
       "terrain": {
         ",": [ [ "t_region_groundcover_urban", 50 ], [ "t_region_groundcover_forest", 5 ], "t_region_shrub", "t_region_tree" ]
-      }
+      },
+      "place_monster": [ { "monster": "mon_aerial_assassin", "x": [ 82, 85 ], "y": [ 10, 13 ], "chance": 20 } ]
     }
   },
   {

doc/JSON/JSON_FLAGS.md

@@ -1193,6 +1193,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
 - ```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/creature.cpp

@@ -545,7 +545,8 @@ bool Creature::sees( const map &here, const Creature &critter ) const
     // Check means to detect invisibility here
     if( ( has_flag( json_flag_TRUE_SEEING ) || has_flag( mon_flag_TRUESIGHT ) ) &&
         ( critter.has_flag( mon_flag_CAMOUFLAGE ) || critter.has_effect_with_flag( json_flag_INVISIBLE ) ||
-          critter.has_flag( mon_flag_NIGHT_INVISIBILITY ) ) ) {
+          critter.has_flag( mon_flag_NIGHT_INVISIBILITY ) ||
+          critter.has_flag( mon_flag_PERMANENT_INVISIBILITY ) ) ) {
         return true;
     }
 
@@ -556,7 +557,8 @@ 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 ) ) {
+    if( critter.has_effect_with_flag( json_flag_INVISIBLE ) ||
+        critter.has_flag( mon_flag_PERMANENT_INVISIBILITY ) ) {
         return false;
     }
 

src/mtype.cpp

@@ -133,6 +133,7 @@ mon_flag_id mon_flag_ACIDPROOF,
             mon_flag_PATH_AVOID_FALL,
             mon_flag_PATH_AVOID_FIRE,
             mon_flag_PAY_BOT,
+            mon_flag_PERMANENT_INVISIBILITY,
             mon_flag_PET_HARNESSABLE,
             mon_flag_PET_MOUNTABLE,
             mon_flag_PET_WONT_FOLLOW,
@@ -264,6 +265,7 @@ void set_mon_flag_ids()
     mon_flag_PATH_AVOID_FALL = mon_flag_id( "PATH_AVOID_FALL" );
     mon_flag_PATH_AVOID_FIRE = mon_flag_id( "PATH_AVOID_FIRE" );
     mon_flag_PAY_BOT = mon_flag_id( "PAY_BOT" );
+    mon_flag_PERMANENT_INVISIBILITY = mon_flag_id( "PERMANENT_INVISIBILITY" );
     mon_flag_PET_HARNESSABLE = mon_flag_id( "PET_HARNESSABLE" );
     mon_flag_PET_MOUNTABLE = mon_flag_id( "PET_MOUNTABLE" );
     mon_flag_PET_WONT_FOLLOW = mon_flag_id( "PET_WONT_FOLLOW" );

src/mtype.h

@@ -174,6 +174,7 @@ extern mon_flag_id mon_flag_ACIDPROOF,
        mon_flag_PATH_AVOID_FALL,
        mon_flag_PATH_AVOID_FIRE,
        mon_flag_PAY_BOT,
+       mon_flag_PERMANENT_INVISIBILITY,
        mon_flag_PET_HARNESSABLE,
        mon_flag_PET_MOUNTABLE,
        mon_flag_PET_WONT_FOLLOW,