From 78590abfc0fca83f64b9de227e2cfdc33fe1ec9b Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 24 Nov 2021 18:28:50 -0500 Subject: [PATCH] reinforced vault/container --- .../storage/reinforced-container-team.png | Bin 0 -> 756 bytes .../blocks/storage/reinforced-container.png | Bin 0 -> 1374 bytes .../blocks/storage/reinforced-vault-team.png | Bin 0 -> 1212 bytes .../blocks/storage/reinforced-vault.png | Bin 0 -> 2126 bytes core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 3523 -> 3541 bytes core/src/mindustry/content/Blocks.java | 16 +++++++++++++--- core/src/mindustry/content/Bullets.java | 1 + .../blocks/defense/turrets/LaserTurret.java | 2 +- core/src/mindustry/world/draw/DrawRegion.java | 3 ++- tools/build.gradle | 6 ++++-- 11 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/storage/reinforced-container-team.png create mode 100644 core/assets-raw/sprites/blocks/storage/reinforced-container.png create mode 100644 core/assets-raw/sprites/blocks/storage/reinforced-vault-team.png create mode 100644 core/assets-raw/sprites/blocks/storage/reinforced-vault.png 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 0000000000000000000000000000000000000000..5fc137c8af977ca992a26ad973b53ad39b1ca36c GIT binary patch literal 756 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>U|Q$t;uumf z=k46Hg|{7e+&0RTPcli2FDg;gbb0I))6u{0hVPNB2JJk?n|^Ng<~p!lW`FsVGzWq6 zm)12*jX5*3Q0Dm7=U$pemCp(8S+`f+kGna2gVa6OUIpvpA&hCY-T_ah=^a?(&$()j z3e%Za=5Kz+MRza#(_9c6p!V%fKuMv^<7)i_X^u>1eoeSg{qZal>x@j*ISYTJ9b`Il zE8pak+VmHy>p!?!?A|ah<;lEF+*XTQ*33!09q@yl>4<{Enb>QscK7aY*1PJW|MLTv zKr@3O2ax!2Z_4x2sn>*m{{2$2%YR*Z!pi?!eu!;RVa-ck`*Zs)Hid)zYtOxYrqt7N zd*#->t9L7?$ShBNc3}&z>!G??>~`+mzh8eW{C4Afdwc%I>R+F~nXSIr|NFP|Mz(Ep zth_W+4U+G#PnfmiZ#?sa3CF+g_C9B!{gKVt-r_BVfaWMC*b`)tt$Q{iXUN%L?1>bvnScZDQ#rGMG{t_45- znat;2^rJAu|5)Ikim>x-L4R!4sq&gaBKh)p1PS092y{3W{DkxZRY@vVHxra>WBK~yt+;J{Tx ki_-QGMqBZECF|q+)l;MG4qg4+1Wd*Zp00i_>zopr01S{^-v9sr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..383e61661db9207bc513e842e882ecd216749c55 GIT binary patch literal 1374 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 Eg7f9b3;+NC literal 0 HcmV?d00001 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 6012e9a17194a2de725609adb07e894e14d21b11..05d7ebccf08e8604df39e31b6d3c957ccc25b133 100644 GIT binary patch delta 34 pcmX>seN~!?;qXSLKyE>SqSVa1wEUvv)D+#a#L}FS%|YCSOaRR%3&8*Y delta 16 XcmcaAeOQ`_;m}5=K<>?{+yzVkF@gm* 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") + } } }