diff --git a/forge-adventure/src/main/java/forge/adventure/scene/TileMapScene.java b/forge-adventure/src/main/java/forge/adventure/scene/TileMapScene.java
index 27ecf8f54a3..02ab5f08e94 100644
--- a/forge-adventure/src/main/java/forge/adventure/scene/TileMapScene.java
+++ b/forge-adventure/src/main/java/forge/adventure/scene/TileMapScene.java
@@ -58,7 +58,7 @@ public class TileMapScene extends HudScene {
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
- tiledMapRenderer.setView(stage.getCamera().combined, 0, 0, Scene.GetIntendedWidth(), Scene.GetIntendedHeight());
+ tiledMapRenderer.setView(stage.getCamera().combined, stage.getCamera().position.x-Scene.GetIntendedWidth()/2.0f, stage.getCamera().position.y-Scene.GetIntendedHeight()/2.0f, Scene.GetIntendedWidth(), Scene.GetIntendedHeight());
tiledMapRenderer.render();
hud.draw();
diff --git a/forge-adventure/src/main/java/forge/adventure/stage/GameHUD.java b/forge-adventure/src/main/java/forge/adventure/stage/GameHUD.java
index 841f9ecb5cd..509a0b442d2 100644
--- a/forge-adventure/src/main/java/forge/adventure/stage/GameHUD.java
+++ b/forge-adventure/src/main/java/forge/adventure/stage/GameHUD.java
@@ -1,7 +1,6 @@
package forge.adventure.stage;
import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Stage;
@@ -10,12 +9,12 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.viewport.FitViewport;
import forge.adventure.AdventureApplicationAdapter;
+import forge.adventure.player.AdventurePlayer;
import forge.adventure.scene.Scene;
import forge.adventure.scene.SceneType;
-import forge.adventure.util.Current;
import forge.adventure.util.Config;
+import forge.adventure.util.Current;
import forge.adventure.util.UIActor;
-import forge.adventure.player.AdventurePlayer;
import forge.adventure.world.WorldSave;
/**
@@ -39,10 +38,8 @@ public class GameHUD extends Stage {
UIActor ui = new UIActor(Config.instance().getFile("ui/hud.json"));
miniMap = ui.findActor("map");
- Pixmap player = new Pixmap(3, 3, Pixmap.Format.RGB888);
- player.setColor(1.0f, 0.0f, 0.0f, 1.0f);
- player.fill();
- miniMapPlayer = new Image(new Texture(player));
+
+ miniMapPlayer = new Image(new Texture(Config.instance().getFile("ui/minimap_player.png")));
avatar = ui.findActor("avatar");
@@ -94,7 +91,7 @@ public class GameHUD extends Stage {
super.draw(); //draw the Hud
int xPosMini = (int) (((float) xPos / (float) WorldSave.getCurrentSave().getWorld().getTileSize() / (float) WorldSave.getCurrentSave().getWorld().getWidthInTiles()) * miniMap.getWidth());
int yPosMini = (int) (((float) yPos / (float) WorldSave.getCurrentSave().getWorld().getTileSize() / (float) WorldSave.getCurrentSave().getWorld().getHeightInTiles()) * miniMap.getHeight());
- miniMapPlayer.setPosition(miniMap.getX() + xPosMini - 1, miniMap.getY() + yPosMini - 1);
+ miniMapPlayer.setPosition(miniMap.getX() + xPosMini - miniMapPlayer.getWidth()/2, miniMap.getY() + yPosMini - miniMapPlayer.getHeight()/2);
}
Texture miniMapTexture;
diff --git a/forge-adventure/src/main/java/forge/adventure/stage/PointOfInterestMapRenderer.java b/forge-adventure/src/main/java/forge/adventure/stage/PointOfInterestMapRenderer.java
index 9c4fc8e1006..8625e2051d8 100644
--- a/forge-adventure/src/main/java/forge/adventure/stage/PointOfInterestMapRenderer.java
+++ b/forge-adventure/src/main/java/forge/adventure/stage/PointOfInterestMapRenderer.java
@@ -13,6 +13,7 @@ public class PointOfInterestMapRenderer extends OrthogonalTiledMapRenderer {
public PointOfInterestMapRenderer(MapStage stage) {
super(null,stage.getBatch());
this.stage = stage;
+
}
@Override
diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-project b/forge-gui/res/adventure/Shandalar/maps/main.tiled-project
index 3517c07444d..b51eafb172b 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-project
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-project
@@ -3,7 +3,7 @@
"commands": [
],
"extensionsPath": "extensions",
- "folders": [
+ "folders": [
"map",
"obj",
"tileset"
diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
index 0ed50bc94d7..884aa126118 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
@@ -1,34 +1,366 @@
{
- "activeFile": "map/island_town.tmx",
+ "Map/SizeTest": {
+ "height": 4300,
+ "width": 2
+ },
+ "activeFile": "map/merfolkpool_3.tmx",
"expandedProjectPaths": [
+ "obj",
"tileset",
- "map",
- "obj"
+ "map"
],
"file.lastUsedOpenFilter": "Alle Dateien (*)",
"fileStates": {
- "map/cave_1.tmx": {
- "scale": 3.8134072580645157,
+ "map/barbariancamp_1.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/barbariancamp_2.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 1,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/barbariancamp_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/castle_plains.tmx": {
+ "scale": 3,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 231.83333333333331,
+ "y": 135.83333333333334
+ }
+ },
+ "map/castle_plains_1.tmx": {
+ "scale": 3,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/castle_plains_2.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/castle_plains_3.tmx": {
+ "scale": 3,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/catlair_1.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/catlair_2.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/catlair_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/cave6.tmx": {
+ "scale": 2,
"selectedLayer": 4,
"viewCenter": {
- "x": 232.07592059002357,
- "y": 136.0987602104206
+ "x": 231.5,
+ "y": 94.25
+ }
+ },
+ "map/cave6N1.tmx": {
+ "scale": 4,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 238,
+ "y": 241.625
+ }
+ },
+ "map/cave_1.tmx": {
+ "scale": 1,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_10.tmx": {
+ "scale": 1,
+ "selectedLayer": 1,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_11.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 232,
+ "y": 135.99999999999994
+ }
+ },
+ "map/cave_12.tmx": {
+ "scale": 1,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_13.tmx": {
+ "scale": 3,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_14.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_15.tmx": {
+ "scale": 3,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
}
},
"map/cave_2.tmx": {
- "scale": 3.8134072580645157,
- "selectedLayer": 1,
+ "scale": 1,
+ "selectedLayer": 4,
"viewCenter": {
- "x": 231.8136879113908,
- "y": 135.8365275317878
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_4.tmx": {
+ "scale": 1,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_5.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_6.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_6N1.tmx": {
+ "scale": 3,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 222,
+ "y": 190.83333333333331
+ }
+ },
+ "map/cave_6N2.tmx": {
+ "scale": 5.5,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 234,
+ "y": 248.8181818181818
+ }
+ },
+ "map/cave_7.tmx": {
+ "scale": 1,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_8.tmx": {
+ "scale": 3,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/cave_9.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 135.99999999999994
}
},
"map/crypt.tmx": {
- "scale": 3.8134072580645157,
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/crypt_2.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/crypt_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/crypt_4.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/djinnpalace_1.tmx": {
+ "scale": 2,
+ "selectedLayer": 5,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/djinnpalace_2.tmx": {
+ "scale": 2,
"selectedLayer": 0,
"viewCenter": {
- "x": 232.07592059002357,
- "y": 136.36099288905336
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/djinnpalace_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/djinnpalace_3B.tmx": {
+ "scale": 1.4518145161290323,
+ "selectedLayer": 2,
+ "viewCenter": {
+ "x": 231.43452298291902,
+ "y": 136.381058186363
+ }
+ },
+ "map/elftown.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/evilgrove_1.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/evilgrove_2.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/evilgrove_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/factory_1.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/factory_2.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/factory_3.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
}
},
"map/forest_town.tmx": {
@@ -39,7 +371,151 @@
"y": 136
}
},
+ "map/fort_1.tmx": {
+ "scale": 2,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/fort_2.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/fort_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/fort_4.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/fort_5.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/fort_6.tmx": {
+ "scale": 2,
+ "selectedLayer": 1,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/fort_7.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/fort_8.tmx": {
+ "scale": 2,
+ "selectedLayer": 1,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
"map/graveyard.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/graveyard_2.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/graveyard_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/graveyard_4.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 232,
+ "y": 135.99999999999994
+ }
+ },
+ "map/grove_1.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 5,
+ "viewCenter": {
+ "x": 232,
+ "y": 135.99999999999994
+ }
+ },
+ "map/grove_2.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 2,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/grove_3.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 1,
+ "viewCenter": {
+ "x": 232,
+ "y": 135.99999999999994
+ }
+ },
+ "map/grove_4.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 232,
+ "y": 135.99999999999994
+ }
+ },
+ "map/grove_5.tmx": {
+ "scale": 3,
+ "selectedLayer": 5,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/grove_6.tmx": {
+ "scale": 3,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/grove_7.tmx": {
"scale": 2,
"selectedLayer": 0,
"viewCenter": {
@@ -47,12 +523,180 @@
"y": 136
}
},
- "map/island_town.tmx": {
+ "map/grove_8.tmx": {
"scale": 3,
- "selectedLayer": 1,
+ "selectedLayer": 5,
"viewCenter": {
- "x": 251,
- "y": 73
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/island_town.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/magetower_1.tmx": {
+ "scale": 2,
+ "selectedLayer": 5,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/magetower_2.tmx": {
+ "scale": 2,
+ "selectedLayer": 5,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/magetower_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/magetower_4.tmx": {
+ "scale": 2,
+ "selectedLayer": 6,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/magetower_5.tmx": {
+ "scale": 1.3694556451612903,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 231.4788369525212,
+ "y": 136.5506072874494
+ }
+ },
+ "map/magetower_6.tmx": {
+ "scale": 3,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/magetower_7.tmx": {
+ "scale": 2,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/magetower_7B.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 232,
+ "y": 135.99999999999994
+ }
+ },
+ "map/maze_1.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 5,
+ "viewCenter": {
+ "x": 232,
+ "y": 135.99999999999994
+ }
+ },
+ "map/maze_2.tmx": {
+ "scale": 1,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/maze_3.tmx": {
+ "scale": 1,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 232,
+ "y": 136
+ }
+ },
+ "map/merfolkpool_1.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/merfolkpool_2.tmx": {
+ "scale": 4,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/merfolkpool_3.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240.66666666666669,
+ "y": 100
+ }
+ },
+ "map/merfolkpool_4.tmx": {
+ "scale": 2,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/merfolkpool_5.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/monastery_1.tmx": {
+ "scale": 1.4518145161290323,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 239.70004166088043,
+ "y": 136.381058186363
+ }
+ },
+ "map/monastery_2.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 2,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/monastery_3.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 2,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
+ "map/monestory.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 3,
+ "viewCenter": {
+ "x": 231.99999999999997,
+ "y": 136.33333333333331
}
},
"map/mountain_town.tmx": {
@@ -71,6 +715,30 @@
"y": 136.31402922020771
}
},
+ "map/skullcave_1.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/skullcave_2.tmx": {
+ "scale": 3,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/skullcave_3.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
"map/swamp_town.tmx": {
"scale": 1.7753124999999998,
"selectedLayer": 3,
@@ -79,6 +747,30 @@
"y": 136.31402922020771
}
},
+ "map/vampirecastle_1.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/vampirecastle_2.tmx": {
+ "scale": 1.5002083333333331,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 239.96667129565344,
+ "y": 136.647687821136
+ }
+ },
+ "map/vampirecastle_3.tmx": {
+ "scale": 2,
+ "selectedLayer": 4,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
"map/waste_town.tmx": {
"scale": 1.5,
"selectedLayer": 1,
@@ -87,38 +779,148 @@
"y": 135.99999999999994
}
},
+ "map/wurmpond_1.tmx": {
+ "scale": 2,
+ "selectedLayer": 0,
+ "viewCenter": {
+ "x": 240,
+ "y": 136
+ }
+ },
+ "map/yule_town.tmx": {
+ "scale": 1.5,
+ "selectedLayer": 5,
+ "viewCenter": {
+ "x": 240,
+ "y": 135.99999999999994
+ }
+ },
"tileset/buildings.tsx": {
- "scaleInDock": 1,
+ "scaleInDock": 1.5,
"scaleInEditor": 2
},
"tileset/main.tsx": {
- "scaleInDock": 1,
+ "dynamicWrapping": false,
+ "scaleInDock": 1.5,
"scaleInEditor": 3
}
},
+ "map.height": 60,
+ "map.lastUsedFormat": "tmx",
+ "map.layerDataFormat": null,
+ "map.tileHeight": 16,
+ "map.tileWidth": 16,
+ "map.width": 90,
"openFiles": [
+ "map/cave_1.tmx",
+ "map/cave_2.tmx",
"map/crypt.tmx",
- "map/waste_town.tmx",
"map/graveyard.tmx",
- "tileset/buildings.tsx",
- "tileset/main.tsx",
- "map/forest_town.tmx",
"map/island_town.tmx",
- "map/mountain_town.tmx",
+ "map/cave_3.tmx",
+ "map/cave_4.tmx",
+ "map/forest_town.tmx",
+ "map/cave_5.tmx",
"map/plains_town.tmx",
- "map/swamp_town.tmx"
+ "map/cave_6.tmx",
+ "map/cave_7.tmx",
+ "map/cave_8.tmx",
+ "map/cave_9.tmx",
+ "map/cave_10.tmx",
+ "map/cave_11.tmx",
+ "map/cave_12.tmx",
+ "map/cave_13.tmx",
+ "map/graveyard_2.tmx",
+ "map/crypt_2.tmx",
+ "map/graveyard_3.tmx",
+ "map/crypt_3.tmx",
+ "tileset/main.tsx",
+ "tileset/buildings.tsx",
+ "map/waste_town.tmx",
+ "map/elftown.tmx",
+ "map/cave_14.tmx",
+ "map/cave_15.tmx",
+ "map/magetower_1.tmx",
+ "map/merfolkpool_1.tmx",
+ "map/graveyard_4.tmx",
+ "map/crypt_4.tmx",
+ "map/evilgrove_1.tmx",
+ "map/grove_1.tmx",
+ "map/grove_2.tmx",
+ "map/grove_3.tmx",
+ "map/grove_4.tmx",
+ "map/grove_5.tmx",
+ "map/grove_6.tmx",
+ "map/grove_7.tmx",
+ "map/grove_8.tmx",
+ "map/magetower_2.tmx",
+ "map/magetower_3.tmx",
+ "map/magetower_4.tmx",
+ "map/magetower_5.tmx",
+ "map/factory_1.tmx",
+ "map/factory_2.tmx",
+ "map/factory_3.tmx",
+ "map/swamp_town.tmx",
+ "map/mountain_town.tmx",
+ "map/maze_1.tmx",
+ "map/maze_2.tmx",
+ "map/maze_3.tmx",
+ "map/djinnpalace_1.tmx",
+ "map/djinnpalace_2.tmx",
+ "map/vampirecastle_1.tmx",
+ "map/skullcave_1.tmx",
+ "map/skullcave_2.tmx",
+ "map/barbariancamp_1.tmx",
+ "map/magetower_6.tmx",
+ "map/magetower_7.tmx",
+ "map/magetower_7B.tmx",
+ "map/yule_town.tmx",
+ "map/wurmpond_1.tmx",
+ "map/castle_plains_1.tmx",
+ "map/fort_1.tmx",
+ "map/castle_plains_2.tmx",
+ "map/castle_plains_3.tmx",
+ "map/fort_2.tmx",
+ "map/fort_3.tmx",
+ "map/fort_4.tmx",
+ "map/fort_5.tmx",
+ "map/fort_6.tmx",
+ "map/fort_7.tmx",
+ "map/fort_8.tmx",
+ "map/catlair_1.tmx",
+ "map/catlair_2.tmx",
+ "map/catlair_3.tmx",
+ "map/barbariancamp_2.tmx",
+ "map/barbariancamp_3.tmx",
+ "map/djinnpalace_3.tmx",
+ "map/djinnpalace_3B.tmx",
+ "map/evilgrove_2.tmx",
+ "map/evilgrove_3.tmx",
+ "map/monastery_1.tmx",
+ "map/merfolkpool_2.tmx",
+ "map/merfolkpool_3.tmx",
+ "map/merfolkpool_4.tmx",
+ "map/merfolkpool_5.tmx",
+ "map/monastery_2.tmx",
+ "map/monastery_3.tmx",
+ "map/skullcave_3.tmx",
+ "map/vampirecastle_2.tmx",
+ "map/vampirecastle_3.tmx"
],
"project": "main.tiled-project",
+ "property.type": "object",
"recentFiles": [
+ "map/cave_1.tmx",
+ "map/cave_2.tmx",
"map/crypt.tmx",
- "map/waste_town.tmx",
"map/graveyard.tmx",
- "tileset/buildings.tsx",
- "tileset/main.tsx",
+ "map/island_town.tmx",
+ "map/cave_3.tmx",
+ "map/cave_4.tmx",
"map/forest_town.tmx",
- "map/swamp_town.tmx",
+ "map/cave_5.tmx",
"map/plains_town.tmx",
- "map/mountain_town.tmx",
- "map/island_town.tmx"
+ "map/cave_6.tmx",
+ "map/cave_7.tmx"
]
}
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_1.tmx
new file mode 100644
index 00000000000..0a761e0e0fb
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_1.tmx
@@ -0,0 +1,81 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_2.tmx
new file mode 100644
index 00000000000..d4aca177a12
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_2.tmx
@@ -0,0 +1,81 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_3.tmx
new file mode 100644
index 00000000000..b97c19d6e99
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/barbariancamp_3.tmx
@@ -0,0 +1,76 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_1.tmx
new file mode 100644
index 00000000000..3b2c46e1512
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_1.tmx
@@ -0,0 +1,61 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_2.tmx
new file mode 100644
index 00000000000..8c23ffc746d
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_2.tmx
@@ -0,0 +1,66 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_3.tmx
new file mode 100644
index 00000000000..3eb05d7c807
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_3.tmx
@@ -0,0 +1,67 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/catlair_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/catlair_1.tmx
new file mode 100644
index 00000000000..d9bcb1f06e8
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/catlair_1.tmx
@@ -0,0 +1,60 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/catlair_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/catlair_2.tmx
new file mode 100644
index 00000000000..b2583e60ec1
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/catlair_2.tmx
@@ -0,0 +1,56 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/catlair_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/catlair_3.tmx
new file mode 100644
index 00000000000..8b7da7987d0
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/catlair_3.tmx
@@ -0,0 +1,54 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_10.tmx
new file mode 100644
index 00000000000..386828836d1
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_10.tmx
@@ -0,0 +1,51 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_11.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_11.tmx
new file mode 100644
index 00000000000..7ea553fec8e
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_11.tmx
@@ -0,0 +1,56 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_12.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_12.tmx
new file mode 100644
index 00000000000..000e60460b8
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_12.tmx
@@ -0,0 +1,44 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_13.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_13.tmx
new file mode 100644
index 00000000000..74a7df23f79
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_13.tmx
@@ -0,0 +1,45 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_14.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_14.tmx
new file mode 100644
index 00000000000..14414e183d9
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_14.tmx
@@ -0,0 +1,59 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_15.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_15.tmx
new file mode 100644
index 00000000000..e65ce6ee17a
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_15.tmx
@@ -0,0 +1,38 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16.tmx
new file mode 100644
index 00000000000..ff554acb98c
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16.tmx
@@ -0,0 +1,39 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16B.tmx
new file mode 100644
index 00000000000..33af25fbb3b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16B.tmx
@@ -0,0 +1,52 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL1.tmx
new file mode 100644
index 00000000000..a9ae4ed9a89
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL1.tmx
@@ -0,0 +1,40 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2.tmx
new file mode 100644
index 00000000000..6a43cd61f0f
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2.tmx
@@ -0,0 +1,46 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2D.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2D.tmx
new file mode 100644
index 00000000000..71a9c832d9a
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2D.tmx
@@ -0,0 +1,68 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2U.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2U.tmx
new file mode 100644
index 00000000000..b928efd1faf
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2U.tmx
@@ -0,0 +1,47 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR1.tmx
new file mode 100644
index 00000000000..87ad4ac31c8
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR1.tmx
@@ -0,0 +1,40 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2.tmx
new file mode 100644
index 00000000000..7f43740ae36
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2.tmx
@@ -0,0 +1,52 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2D.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2D.tmx
new file mode 100644
index 00000000000..8f56398cd29
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2D.tmx
@@ -0,0 +1,41 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U1.tmx
new file mode 100644
index 00000000000..80574eed47b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U1.tmx
@@ -0,0 +1,46 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U2.tmx
new file mode 100644
index 00000000000..95158d120fb
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U2.tmx
@@ -0,0 +1,58 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3.tmx
new file mode 100644
index 00000000000..1c275cedb74
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3.tmx
@@ -0,0 +1,40 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3U.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3U.tmx
new file mode 100644
index 00000000000..6cfedfed3ba
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3U.tmx
@@ -0,0 +1,40 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16C.tmx
new file mode 100644
index 00000000000..91ab37c7ccc
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16C.tmx
@@ -0,0 +1,46 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16CL.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16CL.tmx
new file mode 100644
index 00000000000..a64eca4cb5d
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16CL.tmx
@@ -0,0 +1,64 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16D.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16D.tmx
new file mode 100644
index 00000000000..7c5e62cdce0
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_16D.tmx
@@ -0,0 +1,53 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_2.tmx
index 0a69eccf144..ece35462819 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_2.tmx
@@ -1,5 +1,5 @@
-