From c3274622b2f3c880ceb9433559cb20d04f53c05d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 29 Sep 2020 11:53:45 -0400
Subject: [PATCH] Fixed #2763

---
 core/src/mindustry/content/Blocks.java           | 2 +-
 core/src/mindustry/content/TechTree.java         | 3 +++
 core/src/mindustry/content/UnitTypes.java        | 4 ++--
 core/src/mindustry/editor/MapGenerateDialog.java | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index bedf96addd..65b7c7f84a 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1582,7 +1582,7 @@ public class Blocks implements ContentList{
             health = 250 * size * size;
             range = 140f;
             hasPower = true;
-            consumes.power(8f);
+            consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null);
             size = 2;
             shootLength = 5f;
             bulletDamage = 25f;
diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index b1a17c7ef9..8a35f958fe 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -109,6 +109,9 @@ public class TechTree implements ContentList{
 
                 node(Items.coal, with(Items.lead, 3000), () -> {
                     node(Items.graphite, with(Items.coal, 1000), () -> {
+                        node(illuminator, () -> {
+                        });
+
                         node(graphitePress, () -> {
                             node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> {
                                 node(pneumaticDrill, () -> {
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index ac1027e72d..1eed21063b 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -446,7 +446,7 @@ public class UnitTypes implements ContentList{
             mineTier = 1;
             hitSize = 29f;
             itemCapacity = 80;
-            health = 19000f;
+            health = 18000f;
             buildSpeed = 1.7f;
             armor = 9f;
             landShake = 1.5f;
@@ -488,7 +488,7 @@ public class UnitTypes implements ContentList{
                 firstShotDelay = Fx.greenLaserCharge.lifetime;
 
                 bullet = new LaserBulletType(){{
-                    length = 500f;
+                    length = 460f;
                     damage = 550f;
                     width = 75f;
 
diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java
index 472a20dee0..a4a4c0c181 100644
--- a/core/src/mindustry/editor/MapGenerateDialog.java
+++ b/core/src/mindustry/editor/MapGenerateDialog.java
@@ -417,7 +417,7 @@ public class MapGenerateDialog extends BaseDialog{
         public void set(Block floor, Block wall, Block ore, Team team){
             this.floor = floor.id;
             this.block = wall.id;
-            this.ore = ore.id;
+            this.ore = floor.asFloor().isLiquid ? 0 : ore.id;
             this.team = (byte)team.id;
         }