mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-11 00:07:46 +07:00
Code Issues Packages Projects Releases Wiki Activity

Some minor map tweaks and fixes

Browse Source
This commit is contained in:
Anuken
2019-06-28 23:47:43 -04:00
parent b6df916700
commit 04dfda0c55
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/groundZero.msav
View File

Binary file not shown.

11
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@ -22,6 +22,7 @@ import static io.anuke.mindustry.Vars.*;
public class OverlayRenderer{ public class OverlayRenderer{
private static final float indicatorLength = 14f; private static final float indicatorLength = 14f;
private static final float spawnerMargin = tilesize*11f;
private static final Rectangle rect = new Rectangle(); private static final Rectangle rect = new Rectangle();
private float buildFadeTime; 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.reset();
//draw selected block bars and info //draw selected block bars and info

2
core/src/io/anuke/mindustry/net/Net.java
View File

@ -53,7 +53,7 @@ public class Net{
error = Core.bundle.get("error.unreachable"); error = Core.bundle.get("error.unreachable");
}else if(type.contains("timeout")){ }else if(type.contains("timeout")){
error = Core.bundle.get("error.timedout"); 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"); error = Core.bundle.get("error.alreadyconnected");
}else if(!error.isEmpty()){ }else if(!error.isEmpty()){
error = Core.bundle.get("error.any") + "\n" + Strings.parseException(e, true); error = Core.bundle.get("error.any") + "\n" + Strings.parseException(e, true);