Replace mods trap->spell->eoc with trap->eoc

CleverRaven · Oct 30, 2024 · bf43bd0 · bf43bd0
1 parent ea60fd7
commit bf43bd0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 35 deletions.
diff --git a/data/mods/Aftershock/spells.json b/data/mods/Aftershock/spells.json
@@ -379,20 +379,5 @@
     "max_field_intensity": 4,
     "field_intensity_increment": 0.5,
     "damage_type": "cold"
-  },
-  {
-    "type": "SPELL",
-    "id": "escape_pod",
-    "name": "Escape Pod Launch",
-    "description": "You're slammed back against the seat as the pod launches at incredible speed from the ship!",
-    "effect": "effect_on_condition",
-    "effect_str": "EOC_ESCAPE_POD_CHAIR",
-    "valid_targets": "ground",
-    "max_level": 1,
-    "flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
-    "shape": "blast",
-    "min_range": 0,
-    "min_aoe": 1,
-    "max_aoe": 1
   }
 ]
diff --git a/data/mods/Aftershock/traps.json b/data/mods/Aftershock/traps.json
@@ -9,8 +9,8 @@
     "avoidance": 99,
     "difficulty": 99,
     "trap_radius": 2,
-    "action": "spell",
+    "action": "eocs",
     "flags": [ "UNCONSUMED", "UNDODGEABLE" ],
-    "spell_data": { "id": "escape_pod" }
+    "eocs": [ "EOC_ESCAPE_POD_CHAIR" ]
   }
 ]
diff --git a/data/mods/MindOverMatter/traps.json b/data/mods/MindOverMatter/traps.json
@@ -8,30 +8,14 @@
     "visibility": 12,
     "avoidance": 10,
     "difficulty": 99,
-    "action": "spell",
     "flags": [ "UNDODGEABLE", "AVATAR_ONLY" ],
     "//": "Needs to be AVATAR_ONLY, otherwise the summoned monsters trigger the trap again.",
-    "spell_data": { "id": "alien_meadow_roots_trigger_spell" },
+    "action": "eocs",
+    "eocs": [ "EOC_ALIEN_TRAP_TREE_FIND_TREE" ],
     "trigger_weight": "50000 g",
     "trigger_message_u": "As you step on the roots, they twitch slightly.",
     "trigger_message_npc": "As <npcname>' steps on the roots, they twitch slightly."
   },
-  {
-    "id": "alien_meadow_roots_trigger_spell",
-    "type": "SPELL",
-    "name": "Summon Alien Trap Enemies",
-    "description": "This spell summons hostile alien predators when the trap tree detects movement.",
-    "effect": "effect_on_condition",
-    "effect_str": "EOC_ALIEN_TRAP_TREE_FIND_TREE",
-    "shape": "blast",
-    "valid_targets": [ "self", "hostile", "ally" ],
-    "flags": [ "NO_EXPLOSION_SFX", "SILENT" ],
-    "spell_class": "NONE",
-    "min_range": 0,
-    "max_range": 0,
-    "min_aoe": 2,
-    "max_aoe": 2
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_ALIEN_TRAP_TREE_FIND_TREE",