Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed antialiasing due to bugs / Improved default waves

Browse Source
This commit is contained in:
Anuken
2019-04-30 12:05:01 -04:00
parent 6fd5f1563a
commit cf61dd0704
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/nuclearProductionComplex.mmap
View File

Binary file not shown.

BIN
core/assets/maps/ruinousShores.mmap
View File

Binary file not shown.

21
core/src/io/anuke/mindustry/game/DefaultWaves.java
View File

@@ -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;

2
core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
View File

@@ -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());
}

2
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -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){

21
desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
View File

@@ -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());