Merge pull request #82567 from Standing-Storm/fix-tanglevine

[Magiclysm] Fix triffid vineweavers attacking their own summons

Author: Maleclypse

data/mods/Magiclysm/Spells/alien_mages.json

@@ -140,7 +140,7 @@
     "valid_targets": [ "ground" ],
     "flags": [ "RANDOM_AOE", "RANDOM_DURATION", "HOSTILE_SUMMON" ],
     "effect": "summon",
-    "effect_str": "mon_tanglevine",
+    "effect_str": "mon_tanglevine_triffid",
     "shape": "blast",
     "max_level": 15,
     "min_damage": 1,

data/mods/Magiclysm/monsters/mics.json

@@ -6,7 +6,7 @@
     "description": "An image made from light, nearly identical to the real deal.",
     "looks_like": "player",
     "default_faction": "factionless",
-    "species": [ "UNKNOWN" ],
+    "species": [ "SUMMONED_CREATURE" ],
     "volume": "62500 ml",
     "weight": "81500 g",
     "hp": 1,
@@ -43,6 +43,7 @@
     "description": "A conjured glowing longsword that darts and dodges around, slicing and cutting your foes into small pieces.",
     "looks_like": "longsword",
     "default_faction": "player",
+    "species": [ "SUMMONED_CREATURE" ],
     "volume": "62500 ml",
     "weight": "81500 g",
     "hp": 30,
@@ -80,7 +81,7 @@
     "name": "hologram",
     "description": "Hologram copy of you.",
     "default_faction": "player",
-    "species": [ "UNKNOWN" ],
+    "species": [ "SUMMONED_CREATURE" ],
     "volume": "62500 ml",
     "weight": "1 g",
     "hp": 1,
@@ -104,7 +105,7 @@
     "description": "A summoned watcher spirit, translucent and barely visible.  It gazes all around itself.",
     "default_faction": "player",
     "bodytype": "blob",
-    "species": [ "AIR_SPIRIT" ],
+    "species": [ "AIR_SPIRIT", "SUMMONED_CREATURE" ],
     "volume": "1500 ml",
     "weight": "136 g",
     "hp": 20,

data/mods/Magiclysm/monsters/plants.json

@@ -55,5 +55,12 @@
     "death_function": { "message": "The %s rots into nothingness in moments.", "corpse_type": "NO_CORPSE" },
     "flags": [ "HEARS", "GOODHEARING", "IMMOBILE", "NOHEAD", "HARDTOSHOOT", "GRABS", "PLASTIC" ],
     "armor": { "bash": 18, "stab": 10, "electric": 3, "bullet": 22 }
+  },
+  {
+    "type": "MONSTER",
+    "id": "mon_tanglevine_triffid",
+    "copy-from": "mon_tanglevine",
+    "species": [ "PLANT", "SUMMONED_CREATURE" ],
+    "default_faction": "triffid"
   }
 ]

data/mods/Magiclysm/monsters/summoned.json

@@ -6,6 +6,7 @@
     "copy-from": "mon_shadow",
     "name": { "str": "shadow" },
     "description": "This is an animate shadow.  Looking like nothing more than an errant patch of normal shadow, it draws your attention by the way it moves subtly and whispers softly in the back of your mind.  Strange intrusive thoughts accompany the quiet murmur, awakening your most horrific memories and fears.",
+    "species": [ "NETHER", "SUMMONED_CREATURE" ],
     "hp": 60,
     "speed": 150,
     "melee_skill": 8,
@@ -41,13 +42,15 @@
     "copy-from": "mon_magi_shadow",
     "name": { "str": "shadow" },
     "description": "This is an animate shadow.  Looking like nothing more than an errant patch of normal shadow, it draws your attention by the way it moves subtly and whispers softly in the back of your mind.  Strange intrusive thoughts accompany the quiet murmur, awakening your most horrific memories and fears.",
+    "species": [ "NETHER", "SUMMONED_CREATURE" ],
     "default_faction": "zombie"
   },
   {
     "id": "mon_keeper_of_the_glades_shaman",
     "copy-from": "mon_keeper_of_the_glades",
     "type": "MONSTER",
     "name": { "str_sp": "keeper of the glades" },
+    "species": [ "FOREST_SPIRIT", "SUMMONED_CREATURE" ],
     "extend": { "special_attacks": [  ] }
   },
   {

data/mods/Magiclysm/species.json

@@ -4,6 +4,11 @@
     "id": "MAGICAL_BEAST",
     "description": "a magical beast"
   },
+  {
+    "type": "SPECIES",
+    "id": "SUMMONED_CREATURE",
+    "description": "a creature summoned by magic"
+  },
   {
     "type": "SPECIES",
     "id": "DRAGON",