[Xedra Evolved] Require Traverse the Wilds to target a tree as the en…

…dpoint (#72655) * Require teleporting to a tree * Edit description * Update data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update EoC for map_run_eocs * Update spell --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Oct 30, 2024 · e48fae3 · e48fae3
1 parent a61a138
commit e48fae3
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 20 deletions.
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json
@@ -245,19 +245,47 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_ARVORE_WALK_WILDS_TELEPORT_CHECK",
-    "condition": {
-      "or": [
-        { "u_at_om_location": "forest_thick" },
-        { "u_at_om_location": "forest" },
-        { "u_at_om_location": "forest_water" },
-        { "u_at_om_location": "arvore_genius_loci_NW" },
-        { "u_at_om_location": "arvore_genius_loci_NE" },
-        { "u_at_om_location": "arvore_genius_loci_SW" },
-        { "u_at_om_location": "arvore_genius_loci_SE" }
-      ]
-    },
-    "effect": [ { "u_cast_spell": { "id": "arvore_traverse_the_wilds_real" }, "targeted": true } ],
-    "false_effect": { "u_message": "You need to be in a forest or swamp to traverse the wilds.", "type": "bad" }
+    "effect": [
+      {
+        "u_map_run_eocs": [
+          {
+            "id": "EOC_ARVORE_WALK_WILDS_TELEPORT_ACTION",
+            "effect": [
+              {
+                "if": {
+                  "u_query_tile": "line_of_sight",
+                  "target_var": { "context_val": "arvore_walk_wilds_location" },
+                  "range": {
+                    "math": [ "( ( (u_spell_level('arvore_traverse_the_wilds') * 1.5) + 5) * (scaling_factor(u_val('perception') ) ) )" ]
+                  },
+                  "z_level": false,
+                  "message": "Select tree to step to."
+                },
+                "then": {
+                  "if": {
+                    "or": [
+                      { "map_terrain_with_flag": "TREE", "loc": { "context_val": "arvore_walk_wilds_location" } },
+                      { "map_terrain_with_flag": "YOUNG", "loc": { "context_val": "arvore_walk_wilds_location" } }
+                    ]
+                  },
+                  "then": [
+                    { "u_teleport": { "context_val": "arvore_walk_wilds_location" }, "force": true },
+                    { "u_message": "You step into the tree and step out of another one nearby.", "type": "neutral" }
+                  ],
+                  "else": { "u_message": "You must select a tree to step to." }
+                },
+                "else": { "u_message": "Canceled" }
+              }
+            ],
+            "false_effect": { "u_message": "You need to be standing next to a tree to traverse the wilds.", "type": "bad" }
+          }
+        ],
+        "range": 1,
+        "store_coordinates_in": { "context_val": "arvore_walk_wilds_origin" },
+        "stop_at_first": true,
+        "condition": { "map_terrain_with_flag": "TREE", "loc": { "context_val": "arvore_walk_wilds_origin" } }
+      }
+    ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json
@@ -886,7 +886,8 @@
     "id": "arvore_traverse_the_wilds",
     "type": "SPELL",
     "name": "Traverse the Wilds",
-    "description": "Roots grow together and so forests are connected.  The Arvore may use this connection to quickly transport themselves while standing in a forest or a swamp.",
+    "description": "Roots grow together and so forests are connected.  The Arvore may use this connection to quickly transport themselves tree to tree, stepping into an adjacent tree and then stepping out of another one within the spell's range.",
+    "message": "",
     "valid_targets": [ "self" ],
     "skill": "deduction",
     "flags": [ "VERBAL", "SOMATIC", "SILENT" ],
@@ -909,18 +910,20 @@
     "id": "arvore_traverse_the_wilds_real",
     "type": "SPELL",
     "name": "Traverse the Wilds Real",
-    "description": "This is the actual spell that teleports you when you use Traverse the Wilds.  It's a bug if you have it directly",
+    "description": "Roots grow together and so forests are connected.  The Arvore may use this connection to quickly transport themselves tree to tree, stepping into an adjacent tree and then stepping out of another one within the spell's range.",
+    "message": "",
     "valid_targets": [ "ground", "ally", "hostile" ],
     "skill": "deduction",
     "flags": [ "SILENT", "TARGET_TELEPORT", "NO_PROJECTILE" ],
     "effect": "short_range_teleport",
     "shape": "blast",
     "max_level": { "math": [ "per_to_level(1)" ] },
-    "min_aoe": 4,
-    "max_aoe": 1,
-    "aoe_increment": -0.25,
-    "min_range": { "math": [ "( ( (u_spell_level('arvore_traverse_the_wilds') * 1) + 5) * (scaling_factor(u_val('perception') ) ) )" ] },
-    "max_range": { "math": [ "( ( (u_spell_level('arvore_traverse_the_wilds') * 1) + 5) * (scaling_factor(u_val('perception') ) ) )" ] }
+    "min_range": {
+      "math": [ "( ( (u_spell_level('arvore_traverse_the_wilds') * 1.5) + 5) * (scaling_factor(u_val('perception') ) ) )" ]
+    },
+    "max_range": {
+      "math": [ "( ( (u_spell_level('arvore_traverse_the_wilds') * 1.5) + 5) * (scaling_factor(u_val('perception') ) ) )" ]
+    }
   },
   {
     "id": "arvore_forest_translocate",