From a073b0ab18e1e8a23d0f790516c4bae839351be4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 24 Feb 2019 21:44:35 -0500
Subject: [PATCH] bugfixes etc etc etc

---
 core/src/io/anuke/mindustry/content/Zones.java              | 6 +++---
 core/src/io/anuke/mindustry/core/Logic.java                 | 2 +-
 core/src/io/anuke/mindustry/type/Zone.java                  | 1 +
 .../anuke/mindustry/world/blocks/distribution/Conveyor.java | 2 +-
 .../io/anuke/mindustry/world/blocks/power/PowerNode.java    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index a0691cc060..55c57289bd 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -22,20 +22,20 @@ public class Zones implements ContentList{
             baseLaunchCost = ItemStack.with(Items.copper, -50);
             startingItems = ItemStack.list(Items.copper, 50);
             alwaysUnlocked = true;
-            conditionWave = 10;
+            conditionWave = 5;
             launchPeriod = 5;
             resources = new Item[]{Items.copper, Items.scrap};
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
-                waveSpacing = 60 * 60 * 2; //2 mins
+                waveSpacing = 60 * 60 * 2;
                 spawns = Array.with(
                     new SpawnGroup(UnitTypes.dagger){{
                         unitScaling = 1.5f;
                     }},
 
                     new SpawnGroup(UnitTypes.dagger){{
-                        begin = 10;
+                        begin = 5;
                         unitScaling = 2;
                     }},
 
diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java
index 6aa0dc8682..83b3d52f31 100644
--- a/core/src/io/anuke/mindustry/core/Logic.java
+++ b/core/src/io/anuke/mindustry/core/Logic.java
@@ -122,7 +122,7 @@ public class Logic implements ApplicationListener{
         Time.runTask(30f, () -> {
             for(Tile tile : new ObjectSetIterator<>(state.teams.get(defaultTeam).cores)){
                 for(Item item : content.items()){
-                    data.addItem(item, tile.entity.items.get(item) / playerGroup.size());
+                    data.addItem(item, tile.entity.items.get(item));
                 }
                 world.removeBlock(tile);
             }
diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java
index f7184951fd..e7d72001a8 100644
--- a/core/src/io/anuke/mindustry/type/Zone.java
+++ b/core/src/io/anuke/mindustry/type/Zone.java
@@ -103,6 +103,7 @@ public class Zone extends UnlockableContent{
             for(ItemStack other : startingItems){
                 if(other.item == out.item){
                     out.amount += other.amount;
+                    out.amount = Math.max(out.amount, 0);
                 }
             }
             stacks.add(out);
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
index 6faba6c9cc..e421be3bd9 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
@@ -172,7 +172,7 @@ public class Conveyor extends Block{
         }
 
         if(entity.convey.size * itemSpace < 0.9f){
-            unit.velocity().add((tx * speed + centerx) * entity.delta(), (ty * speed + centery) * entity.delta());
+            unit.applyImpulse((tx * speed + centerx) * entity.delta(), (ty * speed + centery) * entity.delta());
         }
     }
 
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 46e169f940..338b433d9f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
@@ -261,7 +261,7 @@ public class PowerNode extends PowerBlock{
         //Lines.stroke(2f);
         //Lines.line(x1, y1, x2, y2);
 
-        Shapes.laser("laser", "laser-end", x1, y1, x2, y2, 0.5f);
+        Shapes.laser("laser", "laser-end", x1, y1, x2, y2, 0.6f);
     }
 
 }