bugfixes etc etc etc

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;
                     }},
 

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);
             }

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);

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());
         }
     }
 

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);
     }
 
 }