New power node type / Bugfixes / Random item caches

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

@@ -58,7 +58,7 @@ public class Blocks implements ContentList{
 
     //power
     combustionGenerator, thermalGenerator, turbineGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
-    fusionReactor, battery, batteryLarge, powerNode, powerNodeLarge,
+    fusionReactor, battery, batteryLarge, powerNode, powerNodeLarge, surgeTower,
 
     //production
     mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, plasmaDrill, waterExtractor, oilExtractor, cultivator,
@@ -741,12 +741,18 @@ public class Blocks implements ContentList{
 
         powerNodeLarge = new PowerNode("power-node-large"){{
             requirements(Category.power, ItemStack.with(Items.titanium, 10, Items.lead, 20, Items.silicon, 6));
-            requirements(Category.power, ItemStack.with(Items.copper, 2, Items.lead, 6));
             size = 2;
             maxNodes = 6;
             laserRange = 9.5f;
         }};
 
+        surgeTower = new PowerNode("surge-tower"){{
+            requirements(Category.power, ItemStack.with(Items.titanium, 15, Items.lead, 20, Items.silicon, 30, Items.surgealloy, 10));
+            size = 2;
+            maxNodes = 2;
+            laserRange = 40f;
+        }};
+
         battery = new Battery("battery"){{
             requirements(Category.power, ItemStack.with(Items.copper, 8, Items.lead, 30, Items.silicon, 4));
             consumes.powerBuffered(3200f, 1f);

core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java

@@ -28,6 +28,7 @@ public class LiquidBulletType extends BulletType{
         statusDuration = 90f;
         despawnEffect = Fx.none;
         hitEffect = Fx.hitLiquid;
+        shootEffect = Fx.none;
         drag = 0.01f;
         knockback = 0.5f;
     }

core/src/io/anuke/mindustry/input/InputHandler.java

@@ -16,6 +16,7 @@ import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.effect.ItemTransfer;
 import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
+import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.net.ValidateException;
@@ -184,7 +185,7 @@ public abstract class InputHandler implements InputProcessor{
         //consume tap event if necessary
         if(tile.getTeam() == player.getTeam() && tile.block().consumesTap){
             consumed = true;
-        }else if(tile.getTeam() == player.getTeam() && tile.block().synthetic() && !consumed){
+        }else if((tile.getTeam() == player.getTeam() || tile.getTeam() == Team.none) && tile.block().synthetic() && !consumed){
             if(tile.block().hasItems && tile.entity.items.total() > 0){
                 frag.inv.showFor(tile);
                 consumed = true;

core/src/io/anuke/mindustry/maps/generators/MapGenerator.java

@@ -6,15 +6,19 @@ import io.anuke.arc.math.geom.Point2;
 import io.anuke.arc.util.Structs;
 import io.anuke.arc.util.noise.Simplex;
 import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.content.Items;
+import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.MapIO;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.maps.MapTileData;
 import io.anuke.mindustry.maps.MapTileData.TileDataMarker;
+import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.OreBlock;
 import io.anuke.mindustry.world.blocks.StaticWall;
 import io.anuke.mindustry.world.blocks.storage.CoreBlock;
+import io.anuke.mindustry.world.blocks.storage.StorageBlock;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -27,8 +31,9 @@ public class MapGenerator extends Generator{
     /**The amount of final enemy spawns used. -1 to use everything in the map.
      * This amount of enemy spawns is selected randomly from the map.*/
     public int enemySpawns = -1;
-
+    /*Whether floor is distorted along with blocks.*/
     public boolean distortFloor = false;
+    public ItemStack[] storageDrops = ItemStack.with(Items.copper, 300, Items.lead, 300, Items.silicon, 200, Items.graphite, 200, Items.blastCompound, 200);
 
     public MapGenerator(String mapName){
         this.mapName = mapName;
@@ -114,6 +119,14 @@ public class MapGenerator extends Generator{
                         tile.setBlock(decor.wall);
                     }
                 }
+
+                if(tile.getTeam() == Team.none && tile.block() instanceof StorageBlock){
+                    for(ItemStack stack : storageDrops){
+                        if(Mathf.chance(0.3)){
+                            tile.entity.items.add(stack.item, Mathf.random(stack.amount));
+                        }
+                    }
+                }
             }
         }