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

Updated discord presence

Browse Source
This commit is contained in:
Anuken
2019-08-12 13:50:09 -04:00
parent d0ff0307f5
commit a1269c05c5
3 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
View File

@@ -14,6 +14,7 @@ import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.scene.utils.*; import io.anuke.arc.scene.utils.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.mindustry.content.*; import io.anuke.mindustry.content.*;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.core.GameState.*; import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.game.Saves.*; import io.anuke.mindustry.game.Saves.*;
@@ -55,6 +56,8 @@ public class DeployDialog extends FloatingDialog{
} }
public void setup(){ public void setup(){
Platform.instance.updateRPC();
cont.clear(); cont.clear();
titleTable.remove(); titleTable.remove();
margin(0f).marginBottom(8); margin(0f).marginBottom(8);

25
desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java
View File

@@ -76,24 +76,23 @@ public class DesktopPlatform extends Platform{
DiscordRichPresence presence = new DiscordRichPresence(); DiscordRichPresence presence = new DiscordRichPresence();
if(!state.is(State.menu)){ if(!state.is(State.menu)){
presence.state = state.rules.pvp ? "PvP" : state.rules.waves ? "Survival" : "Attack"; String map = world.getMap() == null ? "Unknown Map" : world.isZone() ? world.getZone().localizedName : Strings.capitalize(world.getMap().name());
if(world.getMap() == null){ String mode = state.rules.pvp ? "PvP" : state.rules.attackMode ? "Attack" : "Survival";
presence.details = "Unknown Map"; String players = Net.active() && playerGroup.size() > 1 ? " | " + playerGroup.size() + " Players" : "";
}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(Net.active() && playerGroup.size() > 1){ presence.state = mode + players;
presence.state = (state.rules.pvp ? "PvP | " : "") + playerGroup.size() + " Players";
}else if(state.rules.waves){ if(!state.rules.waves){
presence.state = "Survival"; presence.details = map;
}else{
presence.details = map + " | Wave " + state.wave;
presence.largeImageText = "Wave " + state.wave;
} }
}else{ }else{
if(ui.editor != null && ui.editor.isShown()){ if(ui.editor != null && ui.editor.isShown()){
presence.state = "In Editor"; presence.state = "In Editor";
}else if(ui.deploy != null && ui.deploy.isShown()){
presence.state = "In Launch Selection";
}else{ }else{
presence.state = "In Menu"; presence.state = "In Menu";
} }

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

@@ -78,24 +78,23 @@ public class DesktopPlatform extends Platform{
DiscordRichPresence presence = new DiscordRichPresence(); DiscordRichPresence presence = new DiscordRichPresence();
if(!state.is(State.menu)){ if(!state.is(State.menu)){
presence.state = state.rules.pvp ? "PvP" : state.rules.waves ? "Survival" : "Attack"; String map = world.getMap() == null ? "Unknown Map" : world.isZone() ? world.getZone().localizedName : Strings.capitalize(world.getMap().name());
if(world.getMap() == null){ String mode = state.rules.pvp ? "PvP" : state.rules.attackMode ? "Attack" : "Survival";
presence.details = "Unknown Map"; String players = Net.active() && playerGroup.size() > 1 ? " | " + playerGroup.size() + " Players" : "";
}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(Net.active() && playerGroup.size() > 1){ presence.state = mode + players;
presence.state = (state.rules.pvp ? "PvP | " : "") + playerGroup.size() + " Players";
}else if(state.rules.waves){ if(!state.rules.waves){
presence.state = "Survival"; presence.details = map;
}else{
presence.details = map + " | Wave " + state.wave;
presence.largeImageText = "Wave " + state.wave;
} }
}else{ }else{
if(ui.editor != null && ui.editor.isShown()){ if(ui.editor != null && ui.editor.isShown()){
presence.state = "In Editor"; presence.state = "In Editor";
}else if(ui.deploy != null && ui.deploy.isShown()){
presence.state = "In Launch Selection";
}else{ }else{
presence.state = "In Menu"; presence.state = "In Menu";
} }