reinforced vault/container

core/assets/icons/icons.properties

@@ -459,3 +459,4 @@
 63247=phase-synthesizer|block-phase-synthesizer-ui
 63246=sublimate|block-sublimate-ui
 63245=reinforced-container|block-reinforced-container-ui
+63244=reinforced-vault|block-reinforced-vault-ui

core/src/mindustry/content/Blocks.java

@@ -1109,9 +1109,11 @@ public class Blocks implements ContentList{
                 strokeMax = 2.5f;
                 radius = 10f;
                 amount = 3;
-            }}, new DrawLiquidRegion(Liquids.slag), new DrawBlock(), new DrawHeatInput(), new DrawHeatRegion(){{
+            }}, new DrawLiquidRegion(Liquids.slag), new DrawBlock(), new DrawHeatInput(),
+            new DrawHeatRegion(){{
                 heatColor = Color.valueOf("ff6060ff");
-            }}, new DrawHeatRegion("-vents"){{
+            }},
+            new DrawHeatRegion("-vents"){{
                 heatColor.a = 1f;
             }});
             iconOverride = new String[]{"-bottom", ""};
@@ -2147,12 +2149,20 @@ public class Blocks implements ContentList{
         }};
 
         reinforcedContainer = new StorageBlock("reinforced-container"){{
-            requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125));
+            requirements(Category.effect, with(Items.tungsten, 250, Items.graphite, 100));
             size = 3;
+            //TODO should it really be kept the same, at 1000?
             itemCapacity = 1000;
             health = size * size * 120;
         }};
 
+        reinforcedVault = new StorageBlock("reinforced-vault"){{
+            requirements(Category.effect, with(Items.tungsten, 250, Items.graphite, 100));
+            size = 4;
+            itemCapacity = 2500;
+            health = size * size * 120;
+        }};
+
         //endregion
         //region turrets
 

core/src/mindustry/content/Bullets.java

@@ -42,6 +42,7 @@ public class Bullets implements ContentList{
             status = StatusEffects.shocked;
             statusDuration = 10f;
             hittable = false;
+            lightColor = Color.white;
         }};
 
         //this is just a copy of the damage lightning bullet that doesn't damage air units

core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java

@@ -55,7 +55,7 @@ public class LaserTurret extends PowerTurret{
         public void updateTile(){
             super.updateTile();
 
-            if(!bullet.isAdded() || bullet.type == null){
+            if(bullet != null && (!bullet.isAdded() || bullet.type == null)){
                 bullet = null;
             }
 

core/src/mindustry/world/draw/DrawRegion.java

@@ -11,6 +11,7 @@ import mindustry.world.*;
 public class DrawRegion extends DrawBlock{
     public TextureRegion region;
     public String suffix = "";
+    public float rotateSpeed, x, y;
     /** Any number <=0 disables layer changes. */
     public float layer = -1;
 
@@ -25,7 +26,7 @@ public class DrawRegion extends DrawBlock{
     public void drawBase(Building build){
         float z = Draw.z();
         if(layer > 0) Draw.z(layer);
-        Draw.rect(region, build.x, build.y);
+        Draw.rect(region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed);
         Draw.z(z);
     }
 

tools/build.gradle

@@ -250,9 +250,11 @@ task pack(dependsOn: [classes, configurations.runtimeClasspath]){
             if(!file.isDirectory()) file.file.text = file.file.text.replace("4096", "2048")
         }
 
-        //pack fallback 2048x2048 sprites
+        //pack fallback 2048x2048 sprites - disabled when debugging
+        if(!project.hasProperty("args")){
             TexturePacker.process(new File(rootDir, "core/assets-raw/sprites_out/").absolutePath, new File(rootDir, "core/assets/sprites/fallback/").absolutePath, "sprites.aatls")
         }
+    }
 }
 
 task genSprites(dependsOn: classes, type: JavaExec){