Power transfer algo fix / Battery link fix / Fireball fix / 'and'

core/src/io/anuke/mindustry/content/UnitTypes.java

@@ -18,6 +18,7 @@ public class UnitTypes implements ContentList {
             maxVelocity = 0.8f;
             ammoCapacity = 0;
             range = 50f;
+            healSpeed = 0.05f;
             health = 45;
         }};
 
@@ -67,7 +68,7 @@ public class UnitTypes implements ContentList {
             health = 45;
             buildPower = 0.9f;
             minePower = 1.1f;
-            healSpeed = 0.3f;
+            healSpeed = 0.09f;
         }};
     }
 

core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java

@@ -15,7 +15,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.PowerBlock;
 import io.anuke.mindustry.world.blocks.distribution.Sorter;
-import io.anuke.mindustry.world.blocks.power.PowerDistributor;
+import io.anuke.mindustry.world.blocks.power.PowerNode;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.scene.ui.ButtonGroup;
 import io.anuke.ucore.scene.ui.ImageButton;
@@ -36,7 +36,7 @@ public class DebugBlocks extends BlockList implements ContentList{
             }
         };
 
-        powerInfinite = new PowerDistributor("powerinfinite") {
+        powerInfinite = new PowerNode("powerinfinite") {
             {
                 powerCapacity = 10000f;
                 powerSpeed = 100f;

core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java

@@ -58,20 +58,20 @@ public class PowerBlocks extends BlockList implements ContentList {
             health = 600;
         }};
 
-        battery = new PowerGenerator("battery") {{
+        battery = new PowerDistributor("battery") {{
             powerCapacity = 320f;
         }};
 
-        batteryLarge = new PowerGenerator("battery-large") {{
+        batteryLarge = new PowerDistributor("battery-large") {{
             size = 3;
             powerCapacity = 2000f;
         }};
 
-        powerNode = new PowerDistributor("power-node") {{
+        powerNode = new PowerNode("power-node") {{
             shadow = "shadow-round-1";
         }};
 
-        powerNodeLarge = new PowerDistributor("power-node-large") {{
+        powerNodeLarge = new PowerNode("power-node-large") {{
             size = 2;
             powerSpeed = 1f;
             maxNodes = 5;

core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java

@@ -79,6 +79,7 @@ public class ProductionBlocks extends BlockList implements ContentList {
             result = Liquids.oil;
             inputLiquid = Liquids.water;
             updateEffect = BlockFx.pulverize;
+            liquidCapacity = 50f;
             updateEffectChance = 0.05f;
             inputLiquidUse = 0.3f;
             powerUse = 0.6f;

core/src/io/anuke/mindustry/content/bullets/TurretBullets.java

@@ -39,7 +39,9 @@ public class TurretBullets extends BulletList implements ContentList {
             {
                 pierce = true;
                 hitTiles = false;
-                drag = 0.3f;
+                collides = false;
+                collidesTiles = false;
+                drag = 0.03f;
             }
 
             @Override