From 378be0ef86403e62ecbed6d740c8cc5a71aa6821 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 29 Apr 2019 13:34:27 -0400
Subject: [PATCH] Better Discord presence

---
 core/src/io/anuke/mindustry/content/Zones.java    |  4 ++--
 .../anuke/mindustry/desktop/DesktopPlatform.java  | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index d4559dcacb..fd06f26da3 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -206,7 +206,7 @@ public class Zones implements ContentList{
             loadout = Loadouts.basicNucleus;
             baseLaunchCost = ItemStack.with();
             startingItems = ItemStack.list(Items.copper, 1500);
-            conditionWave = 3;
+            conditionWave = 2;
             launchPeriod = 1;
             zoneRequirements = ZoneRequirement.with(tarFields, 20);
             blockRequirements = new Block[]{Blocks.thermalGenerator};
@@ -214,7 +214,7 @@ public class Zones implements ContentList{
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
-                waveSpacing = 60 * 60 * 2.5f;
+                waveSpacing = 60 * 60 * 3.5f;
             }};
         }};
 
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
index f4d79f6b09..fd60c5cbdb 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
@@ -81,7 +81,7 @@ public class DesktopPlatform extends Platform{
         DiscordRichPresence presence = new DiscordRichPresence();
 
         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){
                 presence.details = "Unknown Map";
             }else if(!state.rules.waves){
@@ -91,12 +91,13 @@ public class DesktopPlatform extends Platform{
                 presence.largeImageText = "Wave " + state.wave;
             }
 
-            presence.state = unitGroups[player.getTeam().ordinal()].size() == 1 ? "1 Unit Active" :
-            (unitGroups[player.getTeam().ordinal()].size() + " Units Active");
-
-            if(Net.active()){
-                presence.partyMax = 100;
-                presence.partySize = playerGroup.size();
+            if(Net.active() && playerGroup.size() > 1){
+                presence.state = playerGroup.size() + " Players";
+            }else if(state.rules.waves){
+                presence.state = "Wave " + state.wave;
+            }else{
+                presence.state = unitGroups[player.getTeam().ordinal()].size() == 1 ? "1 Unit Active" :
+                        (unitGroups[player.getTeam().ordinal()].size() + " Units Active");
             }
         }else{
             if(ui.editor != null && ui.editor.isShown()){