From 879bdfbb84235e8adcb0bf68070cd8616cfaf668 Mon Sep 17 00:00:00 2001
From: ZeinaKC <122146011+kittycatto1@users.noreply.github.com>
Date: Sat, 16 May 2026 18:49:09 +0300
Subject: [PATCH] Reorganise SceneData.cs

---
 AdditionalFastTravel/SceneData.cs | 82 +++++++++++++++----------------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/AdditionalFastTravel/SceneData.cs b/AdditionalFastTravel/SceneData.cs
index bbb68d2..0ee75a8 100644
--- a/AdditionalFastTravel/SceneData.cs
+++ b/AdditionalFastTravel/SceneData.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace ATLYSS_AdditionalFastTravel;
 
@@ -111,7 +111,6 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
             Path = "Assets/Scenes/00_zone_forest/_zone00_sanctum.unity",
             Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase)
             {
-                ["Spawn"] = new Vector3(8.4f, 7.3f, -16.1f),
                 ["Shop"] = new Vector3(200f, 11f, -110f),
                 ["Enchanting"] = new Vector3(310f, 11f, -281f),
                 ["Barracks"] = new Vector3(-160f, 29f, -600f),
@@ -135,38 +134,26 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
             Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase),
             Spawnpoints = [
                 "spawnPoint",
-                "terraceSpawn",
                 "arcwoodSpawn",
-                "tuulValleyPoint"
+                "terraceSpawn",
+                "tuulValleySpawn"
             ],
         },
-        ["EffoldTerrace"] = new KnownSceneData()
-        {
-            Path = "Assets/Scenes/00_zone_forest/_zone00_effoldTerrace.unity",
-            Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase)
-            {
-                ["CenterArea"] = new Vector3(20f, 18f, 45f),
-            },
-            Spawnpoints = [
-                "startPoint"
-            ]
-        },
         ["ArcwoodPass"] = new KnownSceneData()
         {
             Path = "Assets/Scenes/00_zone_forest/_zone00_arcwoodPass.unity",
             Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase)
             {
+                ["Chapel"] = new Vector3(-54f, 1f, 1702f),
                 ["CatacombsEntrance"] = new Vector3(298f, 42f, 1819f),
-                ["CatacombsMerchants"] = new Vector3(-54f, 1f, 1702f),
-                ["CatacombsBadgeMerchants"] = new Vector3(136f, 81f, 2585f),
-                ["FishingPond"] = new Vector3(453f, 48f, 1770f),
+                ["BadgeMerchants"] = new Vector3(136f, 81f, 2585f),
             },
             Spawnpoints = [
                 "spawnPoint",
-                "keepSpawn",
-                "catacombWaypoint",
+                "Waypoint",
+                "DungeonPortal"
                 "endDungeonSpawn",
-                "fortSpawn"
+                "crescentSpawn",
             ]
         },
         ["CatacombsArena"] = new KnownSceneData()
@@ -177,14 +164,25 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
                 "spawnPoint"
             ],
         },
+        ["EffoldTerrace"] = new KnownSceneData()
+        {
+            Path = "Assets/Scenes/00_zone_forest/_zone00_effoldTerrace.unity",
+            Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase)
+            {
+                ["CenterArea"] = new Vector3(20f, 18f, 45f),
+            },
+            Spawnpoints = [
+                "startPoint"
+            ]
+        },
         ["CrescentRoad"] = new KnownSceneData()
         {
             Path = "Assets/Scenes/00_zone_forest/_zone00_crescentRoad.unity",
             Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase),
             Spawnpoints = [
                 "spawnPoint",
-                "keepSpawn",
-                "gardenPoint"
+                "crescentSpawn",
+                "gardenSpawn"
             ]
         },
         ["CrescentKeep"] = new KnownSceneData()
@@ -193,15 +191,13 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
             Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase)
             {
                 ["KeepEntrance"] = new Vector3(-150f, 55f, 235f),
-                ["GroveDungeonLobby"] = new Vector3(-1265f, 225f, 575f),
-                ["GroveDungeonBadgeMerchants"] = new Vector3(-1265f, 225f, 655f),
+                ["GroveLobby"] = new Vector3(-1265f, 225f, 575f),
             },
             Spawnpoints = [
                 "startPoint",
-                "ckeepWaypoint1",
+                "Waypoint1",
+                "Waypoint2"
                 "moonGateSpawn",
-                "groveEntrance",
-                "ckeepWaypoint2"
             ]
         },
         ["LuvoraGarden"] = new KnownSceneData()
@@ -218,7 +214,7 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
             Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase),
             Spawnpoints = [
                 "spawnPoint",
-                "enclavePoint"
+                "enclaveSpawn"
             ]
         },
         ["TuulEnclave"] = new KnownSceneData()
@@ -227,7 +223,7 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
             Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase),
             Spawnpoints = [
                 "spawnPoint",
-                "enclavePoint"
+                "enclaveSpawn"
             ]
         },
         ["BularrFortress"] = new KnownSceneData()
@@ -242,6 +238,17 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
                 "fortSpawn"
             ]
         },
+        ["GateOfTheMoon"] = new KnownSceneData()
+        {
+            Path = "Assets/Scenes/00_zone_forest/_zone00_gateOfTheMoon.unity",
+            Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase)
+            {
+                ["RedwoudEntrance"] = new Vector3(805f, 5f, 820f),
+            },
+            Spawnpoints = [
+                "spawnPoint"
+            ]
+        },
         ["WallOfTheStars"] = new KnownSceneData()
         {
             Path = "Assets/Scenes/00_zone_forest/_zone00_wallOfTheStars.unity",
@@ -251,7 +258,7 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
             },
             Spawnpoints = [
                 "spawnPoint",
-                "wallStarWaypoint",
+                "Waypoint",
                 "trialSpawn"
             ]
         },
@@ -270,17 +277,6 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
                 "spawnPoint"
             ]
         },
-        ["GateOfTheMoon"] = new KnownSceneData()
-        {
-            Path = "Assets/Scenes/00_zone_forest/_zone00_gateOfTheMoon.unity",
-            Gotos = new Dictionary<string, Vector3>(StringComparer.InvariantCultureIgnoreCase)
-            {
-                ["RedwoudEntrance"] = new Vector3(805f, 5f, 820f),
-            },
-            Spawnpoints = [
-                "spawnPoint"
-            ]
-        },
         // TODO: Make accessible when area is updated
         // ["RedWoud"] = new KnownSceneData()
         // {
@@ -294,4 +290,4 @@ public static Dictionary<string, Vector3> GetCurrentSceneSpawnPoints()
         //     ]
         // },
     };
-}
\ No newline at end of file
+}