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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

EOfW{mYe7zv4t-w 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 btSZ>Y*BaI?fxohLGamIOdcwa0dqM1__@gO0 literal 8272 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 OquxeO`2PUL8~+3VWRjZz 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);