From e3956ebcf29fda92b41697975f3ef3db511b87cd Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 6 Jul 2019 11:02:55 -0400 Subject: [PATCH] Regression fixes --- core/assets/maps/saltFlats.msav | Bin 16449 -> 16485 bytes core/src/io/anuke/mindustry/Mindustry.java | 4 ++-- .../world/blocks/power/PowerNode.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/assets/maps/saltFlats.msav b/core/assets/maps/saltFlats.msav index ca47b1b82e140df68fa4a19d58748a18094334bc..787abceb555ccdc0a2a59a0123b6327eebc8f743 100644 GIT binary patch delta 15985 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 delta 15986 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 G@fiRb$9CHQ diff --git a/core/src/io/anuke/mindustry/Mindustry.java b/core/src/io/anuke/mindustry/Mindustry.java index 2d62924704..82f14aaa05 100644 --- a/core/src/io/anuke/mindustry/Mindustry.java +++ b/core/src/io/anuke/mindustry/Mindustry.java @@ -21,6 +21,7 @@ public class Mindustry extends ApplicationCore{ }); Time.mark(); + Vars.init(); Log.setUseColors(false); BundleLoader.load(); @@ -34,8 +35,6 @@ public class Mindustry extends ApplicationCore{ add(ui = new UI()); add(netServer = new NetServer()); add(netClient = new NetClient()); - - Events.fire(new GameLoadEvent()); } @Override @@ -64,5 +63,6 @@ public class Mindustry extends ApplicationCore{ super.init(); Log.info("Time to load [total]: {0}", Time.elapsed()); + Events.fire(new GameLoadEvent()); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 251a068866..03b23b0568 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -27,7 +27,7 @@ public class PowerNode extends PowerBlock{ //last distribution block placed private static int lastPlaced = -1; - protected Vector2 t1 = new Vector2(); + protected Vector2 t1 = new Vector2(), t2 = new Vector2(); protected TextureRegion laser, laserEnd; protected float laserRange = 6; @@ -211,7 +211,7 @@ public class PowerNode extends PowerBlock{ for(int i = 0; i < entity.power.links.size; i++){ Tile link = world.tile(entity.power.links.get(i)); - if(link != null && (link.pos() < tile.pos() || !(link.block() instanceof PowerNode) || !Core.camera.bounds(Tmp.r1).contains(link.drawx(), link.drawy()))){ + if(linkValid(tile, link) && (link.pos() < tile.pos() || !(link.block() instanceof PowerNode) || !Core.camera.bounds(Tmp.r1).contains(link.drawx(), link.drawy()))){ drawLaser(tile, link); } } @@ -248,13 +248,13 @@ public class PowerNode extends PowerBlock{ x2 = target.drawx(), y2 = target.drawy(); float angle1 = Angles.angle(x1, y1, x2, y2); - t1.trns(angle1, tile.block().size * tilesize / 2f - 1.5f); + t2.trns(angle1 + 180f, target.block().size * tilesize / 2f - 1.5f); x1 += t1.x; y1 += t1.y; - x2 -= t1.x; - y2 -= t1.y; + x2 += t2.x; + y2 += t2.y; Draw.color(Pal.powerLight, Color.WHITE, Mathf.absin(Time.time(), 8f, 0.3f) + 0.2f); Shapes.laser(laser, laserEnd, x1, y1, x2, y2, 0.6f);