fix bad paths to structure files, link naktamun with gym

This commit is contained in:
Rob Schnautz
2023-07-04 15:33:56 -05:00
parent fb9416f072
commit e63ff372ea
4 changed files with 16 additions and 7 deletions

View File

@@ -61,7 +61,10 @@
<objectgroup id="3" name="Hidden Objects" locked="1"> <objectgroup id="3" name="Hidden Objects" locked="1">
<object id="1" template="../obj/portal.tx" x="671.5" y="351.5"> <object id="1" template="../obj/portal.tx" x="671.5" y="351.5">
<properties> <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> </properties>
</object> </object>
<object id="10" template="../obj/entry_up.tx" x="672" y="352"/> <object id="10" template="../obj/entry_up.tx" x="672" y="352"/>

View File

@@ -518,7 +518,6 @@
</tile> </tile>
</tileset> </tileset>
<tileset firstgid="10581" source="../tileset/buildings.tsx"/> <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"> <layer id="1" name="Ground" width="64" height="64" locked="1">
<data encoding="csv"> <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, 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"/> <property name="waypoints" value="38"/>
</properties> </properties>
</object> </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> </objectgroup>
</map> </map>

View File

@@ -43,8 +43,8 @@
"x": 0.5, "x": 0.5,
"y": 0.5, "y": 0.5,
"structureAtlasPath": "world/tilesets/terrain.atlas", "structureAtlasPath": "world/tilesets/terrain.atlas",
"sourcePath": "world/models/fill.png", "sourcePath": "world/structures/models/fill.png",
"maskPath": "world/masks/fill.png", "maskPath": "world/structures/masks/fill.png",
"height": 0.99, "height": 0.99,
"width": 0.9, "width": 0.9,
"periodicOutput": false, "periodicOutput": false,

View File

@@ -32,8 +32,8 @@
"x": 0.5, "x": 0.5,
"y": 0.5, "y": 0.5,
"structureAtlasPath": "world/structures/structures.atlas", "structureAtlasPath": "world/structures/structures.atlas",
"sourcePath": "world/models/fill.png", "sourcePath": "world/structures/models/fill.png",
"maskPath": "world/masks/fill.png", "maskPath": "world/structures/masks/fill.png",
"height": 0.99, "height": 0.99,
"width": 0.9, "width": 0.9,
"periodicOutput": false, "periodicOutput": false,