From e63ff372ea2720be09464f62d763c4a95a38d9a2 Mon Sep 17 00:00:00 2001
From: Rob Schnautz <schnautzr@yahoo.com>
Date: Tue, 4 Jul 2023 15:33:56 -0500
Subject: [PATCH] fix bad paths to structure files, link naktamun with gym

---
 forge-gui/res/adventure/common/maps/map/gym.tmx        |  5 ++++-
 forge-gui/res/adventure/common/maps/map/naktamun.tmx   | 10 ++++++++--
 forge-gui/res/adventure/common/world/biomes/luxa.json  |  4 ++--
 .../res/adventure/common/world/biomes/outlands.json    |  4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/forge-gui/res/adventure/common/maps/map/gym.tmx b/forge-gui/res/adventure/common/maps/map/gym.tmx
index f7f2011477c..e867e97b3da 100644
--- a/forge-gui/res/adventure/common/maps/map/gym.tmx
+++ b/forge-gui/res/adventure/common/maps/map/gym.tmx
@@ -61,7 +61,10 @@
  <objectgroup id="3" name="Hidden Objects" locked="1">
   <object id="1" template="../obj/portal.tx" x="671.5" y="351.5">
    <properties>
-    <property name="direction" value="up"/>
+    <property name="direction" value="down"/>
+    <property name="portalState" value="active"/>
+    <property name="teleport" value="../common/maps/map/naktamun.tmx"/>
+    <property name="teleportObjectId" value="46"/>
    </properties>
   </object>
   <object id="10" template="../obj/entry_up.tx" x="672" y="352"/>
diff --git a/forge-gui/res/adventure/common/maps/map/naktamun.tmx b/forge-gui/res/adventure/common/maps/map/naktamun.tmx
index 4a9104791b2..dd3c46cbe0d 100644
--- a/forge-gui/res/adventure/common/maps/map/naktamun.tmx
+++ b/forge-gui/res/adventure/common/maps/map/naktamun.tmx
@@ -518,7 +518,6 @@
   </tile>
  </tileset>
  <tileset firstgid="10581" source="../tileset/buildings.tsx"/>
- <tileset firstgid="12373" source="../tileset/buildings.tsx"/>
  <layer id="1" name="Ground" width="64" height="64" locked="1">
   <data encoding="csv">
 74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,4657,32,4184,4184,4184,4184,4184,4184,4184,32,4657,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
@@ -1061,6 +1060,13 @@
     <property name="waypoints" value="38"/>
    </properties>
   </object>
-  <object id="46" template="../obj/portal.tx" name="Training Area" x="144" y="416"/>
+  <object id="46" template="../obj/portal.tx" name="Training Area" x="144" y="416">
+   <properties>
+    <property name="direction" value="up"/>
+    <property name="portalState" value="active"/>
+    <property name="teleport" value="../common/maps/map/gym.tmx"/>
+    <property name="teleportObjectId" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/forge-gui/res/adventure/common/world/biomes/luxa.json b/forge-gui/res/adventure/common/world/biomes/luxa.json
index cf93e5705c9..82412d8857d 100644
--- a/forge-gui/res/adventure/common/world/biomes/luxa.json
+++ b/forge-gui/res/adventure/common/world/biomes/luxa.json
@@ -43,8 +43,8 @@
 			"x": 0.5,
 			"y": 0.5,
 			"structureAtlasPath": "world/tilesets/terrain.atlas",
-			"sourcePath": "world/models/fill.png",
-			"maskPath": "world/masks/fill.png",
+			"sourcePath": "world/structures/models/fill.png",
+			"maskPath": "world/structures/masks/fill.png",
 			"height": 0.99,
 			"width": 0.9,
 			"periodicOutput": false,
diff --git a/forge-gui/res/adventure/common/world/biomes/outlands.json b/forge-gui/res/adventure/common/world/biomes/outlands.json
index ff3d4b8ceba..1c4173e964d 100644
--- a/forge-gui/res/adventure/common/world/biomes/outlands.json
+++ b/forge-gui/res/adventure/common/world/biomes/outlands.json
@@ -32,8 +32,8 @@
 			"x": 0.5,
 			"y": 0.5,
 			"structureAtlasPath": "world/structures/structures.atlas",
-			"sourcePath": "world/models/fill.png",
-			"maskPath": "world/masks/fill.png",
+			"sourcePath": "world/structures/models/fill.png",
+			"maskPath": "world/structures/masks/fill.png",
 			"height": 0.99,
 			"width": 0.9,
 			"periodicOutput": false,