Fixed incorrect power source sprite

2019-04-30 00:07:38 -04:00
parent 3c643c917a
commit 6fd5f1563a
9 changed files with 870 additions and 887 deletions
--- a/core/assets-raw/sprites_replacement/blocks/power/power-infinite.png
+++ b/core/assets-raw/sprites_replacement/blocks/power/power-infinite.png
--- a/core/assets/sprites/block_colors.png
+++ b/core/assets/sprites/block_colors.png
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
--- a/core/assets/sprites/sprites.png
+++ b/core/assets/sprites/sprites.png
--- a/core/assets/sprites/sprites2.png
+++ b/core/assets/sprites/sprites2.png
--- a/core/assets/sprites/sprites_fallback.atlas
+++ b/core/assets/sprites/sprites_fallback.atlas
--- a/core/assets/sprites/sprites_fallback4.png
+++ b/core/assets/sprites/sprites_fallback4.png
--- a/core/assets/sprites/sprites_fallback5.png
+++ b/core/assets/sprites/sprites_fallback5.png
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
@@ -92,12 +92,9 @@ public class DesktopPlatform extends Platform{
            }

            if(Net.active() && playerGroup.size() > 1){
-                presence.state = playerGroup.size() + " Players";
+                presence.state = (state.rules.pvp ? "PvP | " : "") + 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");
+                presence.state = "Survival";
            }
        }else{
            if(ui.editor != null && ui.editor.isShown()){