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

Better Discord presence

Browse Source
This commit is contained in:
Anuken
2019-04-29 13:34:27 -04:00
parent 29e90969eb
commit 378be0ef86
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/content/Zones.java
View File

@@ -206,7 +206,7 @@ public class Zones implements ContentList{
loadout = Loadouts.basicNucleus; loadout = Loadouts.basicNucleus;
baseLaunchCost = ItemStack.with(); baseLaunchCost = ItemStack.with();
startingItems = ItemStack.list(Items.copper, 1500); startingItems = ItemStack.list(Items.copper, 1500);
conditionWave = 3; conditionWave = 2;
launchPeriod = 1; launchPeriod = 1;
zoneRequirements = ZoneRequirement.with(tarFields, 20); zoneRequirements = ZoneRequirement.with(tarFields, 20);
blockRequirements = new Block[]{Blocks.thermalGenerator}; blockRequirements = new Block[]{Blocks.thermalGenerator};
@@ -214,7 +214,7 @@ public class Zones implements ContentList{
rules = () -> new Rules(){{ rules = () -> new Rules(){{
waves = true; waves = true;
waveTimer = true; waveTimer = true;
waveSpacing = 60 * 60 * 2.5f; waveSpacing = 60 * 60 * 3.5f;
}}; }};
}}; }};

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

@@ -81,7 +81,7 @@ 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.waves ? "Survival" : "Attack"; presence.state = state.rules.pvp ? "PvP" : state.rules.waves ? "Survival" : "Attack";
if(world.getMap() == null){ if(world.getMap() == null){
presence.details = "Unknown Map"; presence.details = "Unknown Map";
}else if(!state.rules.waves){ }else if(!state.rules.waves){
@@ -91,12 +91,13 @@ public class DesktopPlatform extends Platform{
presence.largeImageText = "Wave " + state.wave; presence.largeImageText = "Wave " + state.wave;
} }
presence.state = unitGroups[player.getTeam().ordinal()].size() == 1 ? "1 Unit Active" : if(Net.active() && playerGroup.size() > 1){
(unitGroups[player.getTeam().ordinal()].size() + " Units Active"); presence.state = playerGroup.size() + " Players";
}else if(state.rules.waves){
if(Net.active()){ presence.state = "Wave " + state.wave;
presence.partyMax = 100; }else{
presence.partySize = playerGroup.size(); presence.state = unitGroups[player.getTeam().ordinal()].size() == 1 ? "1 Unit Active" :
(unitGroups[player.getTeam().ordinal()].size() + " Units Active");
} }
}else{ }else{
if(ui.editor != null && ui.editor.isShown()){ if(ui.editor != null && ui.editor.isShown()){