diff --git a/forge-gui/res/adventure/common/maps/map/desertbuildingtiles.tsx b/forge-gui/res/adventure/common/maps/map/desertbuildingtiles.tsx deleted file mode 100644 index f36c022034a..00000000000 --- a/forge-gui/res/adventure/common/maps/map/desertbuildingtiles.tsx +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/forge-gui/res/adventure/common/maps/map/naktamun.tmx b/forge-gui/res/adventure/common/maps/map/naktamun.tmx index 4a9104791b2..ff3edbae4ae 100644 --- a/forge-gui/res/adventure/common/maps/map/naktamun.tmx +++ b/forge-gui/res/adventure/common/maps/map/naktamun.tmx @@ -1,5 +1,5 @@ - + @@ -518,7 +518,82 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, @@ -933,73 +1008,6 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1052,7 +1060,7 @@ ] } ] - + @@ -1061,6 +1069,5 @@ - diff --git a/forge-gui/res/adventure/common/maps/map/gym.tmx b/forge-gui/res/adventure/common/maps/map/naktamun/gym.tmx similarity index 97% rename from forge-gui/res/adventure/common/maps/map/gym.tmx rename to forge-gui/res/adventure/common/maps/map/naktamun/gym.tmx index f7f2011477c..ae151d1f100 100644 --- a/forge-gui/res/adventure/common/maps/map/gym.tmx +++ b/forge-gui/res/adventure/common/maps/map/naktamun/gym.tmx @@ -1,9 +1,19 @@ - - - - + + + + + + + + + + + + + + 2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452, @@ -58,14 +68,6 @@ 2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452,2452 - - - - - - - - @@ -178,37 +180,37 @@ - + - + - + - + - + - + - + diff --git a/forge-gui/res/adventure/common/maps/tileset/desertbuildingtiles.png b/forge-gui/res/adventure/common/maps/tileset/desertbuildingtiles.png index edacd848194..2a1f1ca3ea5 100644 Binary files a/forge-gui/res/adventure/common/maps/tileset/desertbuildingtiles.png and b/forge-gui/res/adventure/common/maps/tileset/desertbuildingtiles.png differ diff --git a/forge-gui/res/adventure/common/maps/tileset/desertbuildingtiles.tsx b/forge-gui/res/adventure/common/maps/tileset/desertbuildingtiles.tsx new file mode 100644 index 00000000000..cf06f6599b0 --- /dev/null +++ b/forge-gui/res/adventure/common/maps/tileset/desertbuildingtiles.tsx @@ -0,0 +1,1406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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,