From ccdd23fe6cc0e1de713b09d94921afdb22056484 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 3 May 2017 12:09:59 -0400 Subject: [PATCH] Added a maze map --- core/assets/maps/maze.png | Bin 0 -> 2765 bytes core/src/io/anuke/mindustry/Vars.java | 2 +- core/src/io/anuke/mindustry/ai/Pathfind.java | 8 +++++--- .../anuke/mindustry/desktop/DesktopLauncher.java | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 core/assets/maps/maze.png diff --git a/core/assets/maps/maze.png b/core/assets/maps/maze.png new file mode 100644 index 0000000000000000000000000000000000000000..4143027ff7cb96242e27d366373bb5251b8ee4f6 GIT binary patch literal 2765 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 cgs#- literal 0 HcmV?d00001 diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 0f01f2b0d9..21ac682d6a 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -33,7 +33,7 @@ public class Vars{ public static float breaktime = 0; - public static final String[] maps = {"delta", "canyon", "pit", "test"}; + public static final String[] maps = {"delta", "canyon", "pit", "maze"}; public static Pixmap[] mapPixmaps; public static Texture[] mapTextures; public static int worldsize = 128; diff --git a/core/src/io/anuke/mindustry/ai/Pathfind.java b/core/src/io/anuke/mindustry/ai/Pathfind.java index 4ea6f6e578..ca75f6f26a 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfind.java +++ b/core/src/io/anuke/mindustry/ai/Pathfind.java @@ -9,6 +9,7 @@ import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.entities.Enemy; import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.core.Effects; public class Pathfind{ static MHueristic heuristic = new MHueristic(); static PassTileGraph passgraph = new PassTileGraph(); @@ -51,7 +52,7 @@ public class Pathfind{ static public void updatePath(){ if(paths.size == 0){ - pathSequences = new Tile[3][0]; + pathSequences = new Tile[spawnpoints.size][0]; for(int i = 0; i < spawnpoints.size; i ++){ DefaultGraphPath path = new DefaultGraphPath<>(); paths.add(path); @@ -74,11 +75,12 @@ public class Pathfind{ pathSequences[i][node] = tile; } - /* + + if(debug) for(Tile tile : path){ Effects.effect("ind", tile.worldx(), tile.worldy()); } - */ + } } diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 38528b0810..6827911a6d 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -11,6 +11,7 @@ public class DesktopLauncher { config.setTitle("Mindustry"); config.setMaximized(true); config.useVsync(false); + config.setWindowedMode(800, 600); new Lwjgl3Application(new Mindustry(), config); } }