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