From 42b8ece85a99791ba96bd05d991089e704a3ede2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 31 Oct 2020 09:01:06 -0400
Subject: [PATCH] Fixed #3200 / Fixed #3196 / Fixed #3198

---
 core/src/mindustry/content/Blocks.java              |  4 ++--
 core/src/mindustry/core/UI.java                     | 13 +++++++------
 core/src/mindustry/game/Waves.java                  |  2 +-
 .../world/blocks/defense/turrets/Turret.java        |  1 +
 .../mindustry/world/blocks/distribution/Router.java |  1 +
 gradle.properties                                   |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 37f8c647e4..eb1461f67e 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1545,9 +1545,9 @@ public class Blocks implements ContentList{
 
             hasPower = true;
             size = 2;
-            force = 7f;
+            force = 8f;
             scaledForce = 7f;
-            range = 220f;
+            range = 230f;
             damage = 0.3f;
             health = 160 * size * size;
             rotateSpeed = 10;
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index d7ec068be8..163c6c4a2e 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -328,20 +328,21 @@ public class UI implements ApplicationListener, Loadable{
 
     /** Shows a label in the world. This label is behind everything. Does not fade. */
     public void showLabel(String info, float duration, float worldx, float worldy){
-        Table table = new Table();
-        table.setFillParent(true);
+        var table = new Table(Styles.black3).margin(4);
         table.touchable = Touchable.disabled;
         table.update(() -> {
             if(state.isMenu()) table.remove();
+            Vec2 v = Core.camera.project(worldx, worldy);
+            table.setPosition(v.x, v.y, Align.center);
         });
         table.actions(Actions.delay(duration), Actions.remove());
-        table.align(Align.center).table(Styles.black3, t -> t.margin(4).add(info).style(Styles.outlineLabel)).update(t -> {
-            Vec2 v = Core.camera.project(worldx, worldy);
-            t.setPosition(v.x, v.y, Align.center);
-        });
+        table.add(info).style(Styles.outlineLabel);
+        table.pack();
         table.act(0f);
         //make sure it's at the back
         Core.scene.root.addChildAt(0, table);
+
+        table.getChildren().first().act(0f);
     }
 
     public void showInfo(String info){
diff --git a/core/src/mindustry/game/Waves.java b/core/src/mindustry/game/Waves.java
index 42d6f1bb7b..e889141889 100644
--- a/core/src/mindustry/game/Waves.java
+++ b/core/src/mindustry/game/Waves.java
@@ -342,7 +342,7 @@ public class Waves{
         int bossWave = (int)(rand.random(50, 70) * Mathf.lerp(1f, 0.6f, difficulty));
         int bossSpacing = (int)(rand.random(25, 40) * Mathf.lerp(1f, 0.6f, difficulty));
 
-        int bossTier = difficulty < 0.5 ? 4 : 5;
+        int bossTier = difficulty < 0.5 ? 3 : 4;
 
         //main boss progression
         out.add(new SpawnGroup(Structs.random(species)[bossTier]){{
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 6d3d12f0a5..794e136e06 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -233,6 +233,7 @@ public abstract class Turret extends ReloadTurret{
             unit.health(health);
             unit.rotation(rotation);
             unit.team(team);
+            unit.set(x, y);
 
             if(logicControlTime > 0){
                 logicControlTime -= Time.delta;
diff --git a/core/src/mindustry/world/blocks/distribution/Router.java b/core/src/mindustry/world/blocks/distribution/Router.java
index 766a1bafff..141f188446 100644
--- a/core/src/mindustry/world/blocks/distribution/Router.java
+++ b/core/src/mindustry/world/blocks/distribution/Router.java
@@ -99,6 +99,7 @@ public class Router extends Block{
                 unit.health(health);
                 unit.ammo(unit.type().ammoCapacity * (items.total() > 0 ? 1f : 0f));
                 unit.team(team);
+                unit.set(x, y);
 
                 int angle = Mathf.mod((int)((angleTo(unit.aimX(), unit.aimY()) + 45) / 90), 4);
 
diff --git a/gradle.properties b/gradle.properties
index 44d84c3995..dc961b8e69 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=392916100da348316b514af0af19fc48a04255b9
+archash=57726650a54aa55dae98cf4d5f17cd6cd3218a3d