diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-container-team.png b/core/assets-raw/sprites/blocks/storage/reinforced-container-team.png new file mode 100644 index 0000000000..5fc137c8af Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/reinforced-container-team.png differ diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-container.png b/core/assets-raw/sprites/blocks/storage/reinforced-container.png new file mode 100644 index 0000000000..383e61661d Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/reinforced-container.png differ diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-vault-team.png b/core/assets-raw/sprites/blocks/storage/reinforced-vault-team.png new file mode 100644 index 0000000000..41e6c8dee5 Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/reinforced-vault-team.png differ diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-vault.png b/core/assets-raw/sprites/blocks/storage/reinforced-vault.png new file mode 100644 index 0000000000..75ef47676c Binary files /dev/null and b/core/assets-raw/sprites/blocks/storage/reinforced-vault.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index e260614319..bb02b73a59 100755 --- a/core/assets/icons/icons.properties +++ b/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 diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 6012e9a171..05d7ebccf0 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index c76b8a6e5d..43fa5e4c00 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/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 diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index e2969bf16c..4fcc792bbd 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/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 diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java index 1bf6e1e1cb..a337c2381e 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/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; } diff --git a/core/src/mindustry/world/draw/DrawRegion.java b/core/src/mindustry/world/draw/DrawRegion.java index f2aba1349a..a702ff8a65 100644 --- a/core/src/mindustry/world/draw/DrawRegion.java +++ b/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); } diff --git a/tools/build.gradle b/tools/build.gradle index f71606aa7a..623a471f97 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -250,8 +250,10 @@ task pack(dependsOn: [classes, configurations.runtimeClasspath]){ if(!file.isDirectory()) file.file.text = file.file.text.replace("4096", "2048") } - //pack fallback 2048x2048 sprites - TexturePacker.process(new File(rootDir, "core/assets-raw/sprites_out/").absolutePath, new File(rootDir, "core/assets/sprites/fallback/").absolutePath, "sprites.aatls") + //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") + } } }