From 31f3dc55140948c4ca4c4980309349c8157a1e6a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 1 Oct 2022 20:31:54 -0400
Subject: [PATCH] Misc tweaks & balancing

---
 core/src/mindustry/content/Blocks.java              |  2 +-
 core/src/mindustry/content/ErekirTechTree.java      | 13 ++++++-------
 core/src/mindustry/content/UnitTypes.java           | 12 ++++++------
 .../world/blocks/liquid/ArmoredConduit.java         |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 40194443c1..5c7ead7d64 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2790,7 +2790,7 @@ public class Blocks{
         largePlasmaBore = new BeamDrill("large-plasma-bore"){{
             requirements(Category.production, with(Items.silicon, 100, Items.oxide, 25, Items.beryllium, 100, Items.tungsten, 70));
             consumePower(0.8f);
-            drillTime = 110f;
+            drillTime = 100f;
 
             tier = 5;
             size = 3;
diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java
index fc43e16bf2..c257b8ddb7 100644
--- a/core/src/mindustry/content/ErekirTechTree.java
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -8,8 +8,6 @@ import mindustry.type.*;
 import mindustry.type.unit.*;
 import mindustry.world.blocks.defense.turrets.*;
 
-import java.awt.*;
-
 import static mindustry.Vars.*;
 import static mindustry.content.Blocks.*;
 import static mindustry.content.SectorPresets.*;
@@ -432,14 +430,15 @@ public class ErekirTechTree{
 
                         nodeProduce(Items.thorium, () -> {
                             nodeProduce(Items.carbide, () -> {
-                                nodeProduce(Items.surgeAlloy, () -> {
-                                    nodeProduce(Items.phaseFabric, () -> {
-
-                                    });
-                                });
 
                                 //nodeProduce(Liquids.gallium, () -> {});
                             });
+
+                            nodeProduce(Items.surgeAlloy, () -> {
+                                nodeProduce(Items.phaseFabric, () -> {
+
+                                });
+                            });
                         });
                     });
                 });
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 7a22a6525b..cc1b352b11 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -2578,7 +2578,7 @@ public class UnitTypes{
             treadPullOffset = 5;
             speed = 0.64f;
             rotateSpeed = 1.5f;
-            health = 4500;
+            health = 4800;
             armor = 10f;
             itemCapacity = 0;
             treadRects = new Rect[]{new Rect(16 - 60f, 48 - 70f, 30, 75), new Rect(44 - 60f, 17 - 70f, 17, 60)};
@@ -2598,7 +2598,7 @@ public class UnitTypes{
                 y = -1f;
                 heatColor = Color.valueOf("f9350f");
                 cooldownTime = 30f;
-                bullet = new BasicBulletType(7f, 90){{
+                bullet = new BasicBulletType(7f, 100){{
                     sprite = "missile-large";
                     width = 7.5f;
                     height = 13f;
@@ -2644,7 +2644,7 @@ public class UnitTypes{
             hitSize = 28f;
             treadPullOffset = 4;
             speed = 0.63f;
-            health = 10000;
+            health = 11000;
             armor = 20f;
             itemCapacity = 0;
             crushDamage = 13f / 5f;
@@ -3707,7 +3707,7 @@ public class UnitTypes{
                     trailInterval = 3f;
                     trailParam = 4f;
                     speed = 3f;
-                    damage = 80f;
+                    damage = 75f;
                     lifetime = 75f;
                     width = height = 15f;
                     backColor = Pal.sapBulletBack;
@@ -3725,7 +3725,7 @@ public class UnitTypes{
                     }};
 
                     intervalBullet = new LightningBulletType(){{
-                        damage = 18;
+                        damage = 16;
                         collidesAir = false;
                         ammoMultiplier = 1f;
                         lightningColor = Pal.sapBullet;
@@ -3750,7 +3750,7 @@ public class UnitTypes{
                     bulletInterval = 4f;
 
                     lightningColor = Pal.sapBullet;
-                    lightningDamage = 21;
+                    lightningDamage = 17;
                     lightning = 8;
                     lightningLength = 2;
                     lightningLengthRand = 8;
diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
index 2d87ebe3d6..a6ae61edfe 100644
--- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
+++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
@@ -21,7 +21,7 @@ public class ArmoredConduit extends Conduit{
     public class ArmoredConduitBuild extends ConduitBuild{
         @Override
         public boolean acceptLiquid(Building source, Liquid liquid){
-            return super.acceptLiquid(source, liquid) && (tile == null || source.block instanceof Conduit || source.block instanceof DirectionLiquidBridge ||
+            return super.acceptLiquid(source, liquid) && (tile == null || source.block instanceof Conduit || source.block instanceof DirectionLiquidBridge || source.block instanceof LiquidJunction ||
                 source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation);
         }
     }