From 04dfda0c554648e8c2efbed04596647c79971356 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 28 Jun 2019 23:47:43 -0400 Subject: [PATCH] Some minor map tweaks and fixes --- core/assets/maps/groundZero.msav | Bin 8272 -> 8233 bytes .../mindustry/graphics/OverlayRenderer.java | 11 +++++++++++ core/src/io/anuke/mindustry/net/Net.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/core/assets/maps/groundZero.msav b/core/assets/maps/groundZero.msav index 492d8ff61e3eca09f2ce8ee37d0d4dbed05135fb..217af54584acd1d9dea5357ad34b58f0eb998d73 100644 GIT binary patch literal 8233 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 AIsgCw literal 8272 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 diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index 494099befb..bccb17ebb7 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -22,6 +22,7 @@ import static io.anuke.mindustry.Vars.*; public class OverlayRenderer{ private static final float indicatorLength = 14f; + private static final float spawnerMargin = tilesize*11f; private static final Rectangle rect = new Rectangle(); private float buildFadeTime; @@ -92,6 +93,16 @@ public class OverlayRenderer{ } } + Lines.stroke(2f); + Draw.color(Color.GRAY, Color.LIGHT_GRAY, Mathf.absin(Time.time(), 8f, 1f)); + + for(Tile tile : world.spawner.getGroundSpawns()){ + if(tile.withinDst(player.x, player.y, state.rules.dropZoneRadius + spawnerMargin)){ + Draw.alpha(Mathf.clamp(1f - (player.dst(tile) - state.rules.dropZoneRadius) / spawnerMargin)); + Lines.dashCircle(tile.worldx(), tile.worldy(), state.rules.dropZoneRadius); + } + } + Draw.reset(); //draw selected block bars and info diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index c80552996f..3943e8a4e2 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -53,7 +53,7 @@ public class Net{ error = Core.bundle.get("error.unreachable"); }else if(type.contains("timeout")){ error = Core.bundle.get("error.timedout"); - }else if(error.equals("alreadyconnected")){ + }else if(error.equals("alreadyconnected") || error.contains("connection is closed")){ error = Core.bundle.get("error.alreadyconnected"); }else if(!error.isEmpty()){ error = Core.bundle.get("error.any") + "\n" + Strings.parseException(e, true);