diff --git a/core/assets/maps/nuclearProductionComplex.mmap b/core/assets/maps/nuclearProductionComplex.mmap index 9ed6f320e3..2668fec58a 100644 Binary files a/core/assets/maps/nuclearProductionComplex.mmap and b/core/assets/maps/nuclearProductionComplex.mmap differ diff --git a/core/assets/maps/ruinousShores.mmap b/core/assets/maps/ruinousShores.mmap index f863ac1f6f..c8b4855a75 100644 Binary files a/core/assets/maps/ruinousShores.mmap and b/core/assets/maps/ruinousShores.mmap differ diff --git a/core/src/io/anuke/mindustry/game/DefaultWaves.java b/core/src/io/anuke/mindustry/game/DefaultWaves.java index a2bee78936..b572d412c5 100644 --- a/core/src/io/anuke/mindustry/game/DefaultWaves.java +++ b/core/src/io/anuke/mindustry/game/DefaultWaves.java @@ -155,6 +155,27 @@ public class DefaultWaves{ spacing = 3; }}, + new SpawnGroup(UnitTypes.chaosArray){{ + begin = 41; + unitAmount = 1; + unitScaling = 1; + spacing = 30; + }}, + + new SpawnGroup(UnitTypes.eradicator){{ + begin = 81; + unitAmount = 1; + unitScaling = 1; + spacing = 40; + }}, + + new SpawnGroup(UnitTypes.lich){{ + begin = 131; + unitAmount = 1; + unitScaling = 1; + spacing = 40; + }}, + new SpawnGroup(UnitTypes.ghoul){{ begin = 90; unitAmount = 2; diff --git a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java index d6b0ec8375..6d860232c9 100644 --- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java @@ -111,7 +111,7 @@ public class MapGenerator extends Generator{ if(((tile.block() instanceof StaticWall && tiles[newX][newY].block() instanceof StaticWall) || (tile.block() == Blocks.air && !tiles[newX][newY].block().synthetic()) - || (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall)) && tiles[newX][newY].block() != Blocks.spawn){ + || (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall)) && tiles[newX][newY].block() != Blocks.spawn && tile.block() != Blocks.spawn){ tile.setBlock(tiles[newX][newY].block()); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 4e862edaaa..9049435f3f 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -181,8 +181,6 @@ public class SettingsMenuDialog extends SettingsDialog{ if(!mobile){ - graphics.sliderPref("antialias", 0, 0, 5, 1, s -> (s == 0 ? 0 : (1 << s)) + "x"); - graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b)); graphics.checkPref("fullscreen", false, b -> { if(b){ diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 7750ca6edd..a8499aa995 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -1,14 +1,10 @@ package io.anuke.mindustry.desktop; -import io.anuke.arc.*; +import io.anuke.arc.ApplicationListener; import io.anuke.arc.backends.lwjgl3.Lwjgl3Application; import io.anuke.arc.backends.lwjgl3.Lwjgl3ApplicationConfiguration; -import io.anuke.arc.files.FileHandle; -import io.anuke.arc.util.OS; import io.anuke.mindustry.Mindustry; -import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; -import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.*; public class DesktopLauncher extends Lwjgl3Application{ @@ -26,21 +22,6 @@ public class DesktopLauncher extends Lwjgl3Application{ config.setWindowedMode(960, 540); config.setWindowIcon("sprites/icon.png"); - try{ - Settings settings = new Settings(){ - @Override - public FileHandle getDataDirectory(){ - return dataDirectory == null ? new FileHandle(OS.getAppDataDirectoryString(appName)) : dataDirectory; - } - }; - settings.setAppName(Vars.appName); - settings.loadValues(); - int level = settings.getInt("antialias", 0); - config.setBackBufferConfig(8, 8, 8, 8, 0, 0, level == 0 ? 0 : 1 << level); - }catch(Throwable t){ - t.printStackTrace(); - } - Platform.instance = new DesktopPlatform(arg); Net.setClientProvider(new ArcNetClient());