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

Gamemodes removed

Browse Source
This commit is contained in:
Anuken
2019-01-12 16:55:24 -05:00
parent 777bd60f88
commit 8aa1509f47
49 changed files with 741 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/src/io/anuke/mindustry/desktop/CrashHandler.java
View File

@@ -77,7 +77,6 @@ public class CrashHandler{
ex(() -> value.addChild("build", new JsonValue(Version.build)));
ex(() -> value.addChild("net", new JsonValue(fn)));
ex(() -> value.addChild("server", new JsonValue(fs)));
ex(() -> value.addChild("gamemode", new JsonValue(Vars.state.mode.name())));
ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name())));
ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name"))));
ex(() -> value.addChild("trace", new JsonValue(parseException(e))));

13
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@@ -11,7 +11,6 @@ import io.anuke.arc.util.Strings;
import io.anuke.arc.util.serialization.Base64Coder;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.ui.dialogs.FileChooser;
@@ -51,22 +50,18 @@ public class DesktopPlatform extends Platform{
DiscordRichPresence presence = new DiscordRichPresence();
if(!state.is(State.menu)){
presence.state = Strings.capitalize(state.mode.name());
presence.state = state.rules.waves ? "Survival" : "Attack";
if(world.getMap() == null){
presence.details = "Unknown Map";
}else if(state.mode.disableWaves){
}else if(!state.rules.waves){
presence.details = Strings.capitalize(world.getMap().name);
}else{
presence.details = Strings.capitalize(world.getMap().name) + " | Wave " + state.wave;
presence.largeImageText = "Wave " + state.wave;
}
if(state.mode != GameMode.attack){
presence.state = Strings.capitalize(state.mode.name());
}else{
presence.state = unitGroups[players[0].getTeam().ordinal()].size() == 1 ? "1 Unit Active" :
(unitGroups[players[0].getTeam().ordinal()].size() + " Units Active");
}
presence.state = unitGroups[players[0].getTeam().ordinal()].size() == 1 ? "1 Unit Active" :
(unitGroups[players[0].getTeam().ordinal()].size() + " Units Active");
if(Net.active()){
presence.partyMax = 16;