Bugfixes

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

@@ -627,7 +627,7 @@ public class Blocks implements ContentList{
             requirements(Category.crafting, ItemStack.with(Items.lead, 70, Items.silicon, 60));
             liquidCapacity = 60f;
             craftTime = 20f;
-            outputLiquid = new LiquidStack(Liquids.oil, 4f);
+            outputLiquid = new LiquidStack(Liquids.oil, 6f);
             size = 2;
             health = 320;
             hasLiquids = true;
@@ -1451,7 +1451,7 @@ public class Blocks implements ContentList{
             );
             xRand = 4f;
             reload = 6f;
-            range = 190f;
+            range = 200f;
             size = 3;
             recoil = 3f;
             rotatespeed = 10f;

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

@@ -643,6 +643,8 @@ public class Bullets implements ContentList{
         lightning = new BulletType(0.001f, 12f){
             {
                 lifetime = 1f;
+                shootEffect = Fx.hitLancer;
+                smokeEffect = Fx.none;
                 despawnEffect = Fx.none;
                 hitEffect = Fx.hitLancer;
                 keepVelocity = false;

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

@@ -75,10 +75,12 @@ public class Mechs implements ContentList{
                 engineColor = Color.valueOf("d3ddff");
 
                 weapon = new Weapon("shockgun"){{
+                    shake = 2f;
                     length = 1f;
                     reload = 40f;
+                    shotDelay = 3f;
                     roundrobin = true;
-                    shots = 1;
+                    shots = 3;
                     inaccuracy = 0f;
                     velocityRnd = 0.2f;
                     ejectEffect = Fx.none;

core/src/io/anuke/mindustry/world/BlockStorage.java

@@ -3,6 +3,7 @@ package io.anuke.mindustry.world;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Vector2;
+import io.anuke.arc.util.Log;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.content.Fx;

core/src/io/anuke/mindustry/world/blocks/production/Pump.java

@@ -4,6 +4,7 @@ import io.anuke.arc.Core;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.g2d.TextureRegion;
+import io.anuke.arc.util.Log;
 import io.anuke.mindustry.graphics.Layer;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;

core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java

@@ -1,6 +1,7 @@
 package io.anuke.mindustry.world.consumers;
 
 import io.anuke.arc.scene.ui.layout.Table;
+import io.anuke.arc.util.Log;
 import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.ui.ReqImage;

core/src/io/anuke/mindustry/world/modules/ConsumeModule.java

@@ -22,13 +22,13 @@ public class ConsumeModule extends BlockModule{
         boolean docons = entity.block.shouldConsume(entity.tile);
 
         for(Consume cons : entity.block.consumes.all()){
+            if(cons.isOptional()) continue;
+
             if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){
                 cons.update(entity);
             }
 
-            if(!cons.isOptional()){
-                valid &= cons.valid(entity);
-            }
+            valid &= cons.valid(entity);
         }
 
         for(Consume cons : entity.block.consumes.optionals()){