From 5d5d354f7dbb300db7b07139efd4c3dd37b671fd Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 21 Mar 2019 10:36:33 -0400
Subject: [PATCH] Balancing

---
 .../io/anuke/mindustry/content/Blocks.java    |  6 ++---
 .../io/anuke/mindustry/game/DefaultWaves.java | 25 +++++++++++--------
 .../world/blocks/distribution/ItemBridge.java | 13 ----------
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 8cf7c8c696..7101d079c4 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -869,7 +869,7 @@ public class Blocks implements ContentList{
         batteryLarge = new Battery("battery-large"){{
             requirements(Category.power, ItemStack.with(Items.titanium, 40, Items.lead, 80, Items.silicon, 30));
             size = 3;
-            consumes.powerBuffered(20000f, 1f);
+            consumes.powerBuffered(37440f, 1f);
         }};
 
         combustionGenerator = new BurnerGenerator("combustion-generator"){{
@@ -914,13 +914,13 @@ public class Blocks implements ContentList{
 
         solarPanel = new SolarGenerator("solar-panel"){{
             requirements(Category.power, ItemStack.with(Items.lead, 20, Items.silicon, 30));
-            powerProduction = 0.045f;
+            powerProduction = 0.06f;
         }};
 
         largeSolarPanel = new SolarGenerator("solar-panel-large"){{
             requirements(Category.power, ItemStack.with(Items.lead, 200, Items.silicon, 290, Items.phasefabric, 30));
             size = 3;
-            powerProduction = 0.55f;
+            powerProduction = 0.9f;
         }};
 
         thoriumReactor = new NuclearReactor("thorium-reactor"){{
diff --git a/core/src/io/anuke/mindustry/game/DefaultWaves.java b/core/src/io/anuke/mindustry/game/DefaultWaves.java
index 8880c2996d..2a54a06d20 100644
--- a/core/src/io/anuke/mindustry/game/DefaultWaves.java
+++ b/core/src/io/anuke/mindustry/game/DefaultWaves.java
@@ -14,18 +14,18 @@ public class DefaultWaves{
             spawns = Array.with(
                 new SpawnGroup(UnitTypes.dagger){{
                     end = 8;
-                    unitScaling = 2;
+                    unitScaling = 1.5f;
                 }},
 
                 new SpawnGroup(UnitTypes.wraith){{
                     begin = 12;
                     end = 14;
-                    unitScaling = 2;
+                    unitScaling = 1f;
                 }},
 
                 new SpawnGroup(UnitTypes.dagger){{
                     begin = 11;
-                    unitScaling = 2;
+                    unitScaling = 1.7f;
                     spacing = 2;
                     max = 4;
                 }},
@@ -43,7 +43,6 @@ public class DefaultWaves{
                     unitScaling = 1;
                     unitAmount = 1;
                     spacing = 2;
-                    end = 30;
                 }},
 
                 new SpawnGroup(UnitTypes.titan){{
@@ -73,7 +72,7 @@ public class DefaultWaves{
                     unitScaling = 1;
                     spacing = 2;
 
-                    max = 7;
+                    max = 12;
                 }},
 
                 new SpawnGroup(UnitTypes.dagger){{
@@ -90,15 +89,14 @@ public class DefaultWaves{
                     unitAmount = 1;
                     unitScaling = 3;
                     effect = StatusEffects.shielded;
-                    max = 10;
                 }},
 
                 new SpawnGroup(UnitTypes.fortress){{
                     begin = 40;
                     spacing = 5;
                     unitAmount = 2;
-                    unitScaling = 3;
-                    max = 10;
+                    unitScaling = 2;
+                    max = 20;
                 }},
 
                 new SpawnGroup(UnitTypes.dagger){{
@@ -150,16 +148,21 @@ public class DefaultWaves{
                     unitScaling = 3;
                     spacing = 4;
                     max = 8;
-                    end = 74;
+                }},
+
+                new SpawnGroup(UnitTypes.eruptor){{
+                    begin = 31;
+                    unitAmount = 4;
+                    unitScaling = 1;
+                    spacing = 3;
                 }},
 
                 new SpawnGroup(UnitTypes.ghoul){{
-                    begin = 53;
+                    begin = 90;
                     unitAmount = 2;
                     unitScaling = 3;
                     spacing = 4;
                     max = 8;
-                    end = 74;
                 }}
             );
         }
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
index 20be93efda..abaad60151 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
@@ -10,7 +10,6 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
-import io.anuke.arc.math.geom.Point2;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.entities.type.Player;
 import io.anuke.mindustry.entities.type.TileEntity;
@@ -94,18 +93,6 @@ public class ItemBridge extends Block{
         if(world.tile(x, y) != null && linkValid(world.tile(x, y), world.tile(lastPlaced)) && lastPlaced != Pos.get(x, y)){
             return world.tile(lastPlaced);
         }
-
-        for(int j = 0; j < 4; j ++){
-            Point2 p = Geometry.d4(j + 1);
-            for(int i = 1; i <= range; i++){
-                Tile tile = world.tile(x + p.x * i, y + p.y * i);
-
-                if(tile == null) break;
-                if(tile.block() == this && !(tile.x == x && tile.y == y) && tile.entity != null && tile.<ItemBridgeEntity>entity().link == Pos.invalid){
-                    return tile;
-                }
-            }
-        }
         return null;
     }