From 66a806c3046b6e978efc2be22a1def748b3e21f1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 19 Feb 2022 19:42:21 -0500 Subject: [PATCH] Smaller storage --- .../storage/reinforced-container-team.png | Bin 756 -> 538 bytes .../blocks/storage/reinforced-container.png | Bin 1374 -> 1277 bytes .../blocks/storage/reinforced-vault-team.png | Bin 1212 -> 756 bytes .../blocks/storage/reinforced-vault.png | Bin 2126 -> 1374 bytes core/src/mindustry/content/Blocks.java | 21 +++++++++--------- .../world/blocks/storage/CoreBlock.java | 4 ++-- .../world/blocks/storage/StorageBlock.java | 1 + 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-container-team.png b/core/assets-raw/sprites/blocks/storage/reinforced-container-team.png index 5fc137c8af977ca992a26ad973b53ad39b1ca36c..dae1a854c0eef8a8c2a1bad471642d1e6d76266a 100644 GIT binary patch literal 538 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z<9;e z#WAE}&f8gM3lA9xw9YqrsglX0XBp(dm8hZ8TJVI)S7ock@~;BPZ>FxPmG1pE_e@X1 z*L{YUF8ebD9yZ{aRi?Q#O;Exwh_ zF*$BZkXPo(Ju5^xET6f$Mkif%n*RCc!n4m`hKOFeb0#pk`>YOo#yy?2+ve%%o;2aO z+K`Yb*P$Z8z|`=x|N0EhS+;WPEqSAyG)^(fIeIWJe8Qr&XhY45Dnpf5RhDP2ed%4j zx9q~Hr7t!c9%p9S`{35E242NU3(DE|h%)T4ez10j;vt=H@=&(gajh#~T~DrCe`?w+ z@kr+d_r&H~JI%gaqJJo8OQb`#-S)R(fece5k{k`#Hyq_)cKYtPqMBifOhA>-xf^ne qRS(8+tl8`MD$0Soai`%gZf>1RpEz=>mNPIgFnGH9xvXk44ofy`glX=O&z_iZO z#WAE}&fB?X3vWB{xNVdvpJb94UsR%~>GIeqrlWt~4c{YM4cd8(H~rk~&2?bA%>MEz zX$}JCFRg2s8gpi5q0I5E&%HE{DxVYFvu>}tA9r*52B~|ly$aUHLm1O)y#t<1(>t)n zpL5k56{a(<%-{Tsi|$_fr@0_DK<(R|fRaL+$JP1=(j1x2{F-o~`r}z9))|?qa~A$c zJIHkAR=&w6wdpTZ*MD%e*u7z1%9DAUxUCkqteKN~JKzU9(-8%SGqKlN?e5**tasH# z|K|rTfo29n4uNKdANQs_Kb?9__~+j*CA<9Br6;WXzvYM678TaKt{+mEw@*0-Mf0Xf{M)Y)MppA@VXwVo5gPD-u?Ua$HH$n&bPPcZ>;|H`J375oBh9k zJ8xv$Hpj|KGu0sZ{`!PjJO0KqPndB0>yFQtm3mq#_MMxRzFR@%$VQVF@psyk4$j{i zEVg<+^MnV-CHtQ;FgVz3juYt4*NLB9vN={@?s*FdPp(82&6bHvCd_u9B)|>w4G$LL z%rb^F=Iz1KCyKR{8g)76aCnt$_G-;H; zvp7@9?c?{$w|=hSTJYm|=EMUYMiOq5WDj_3VxG}f>NRWXQn7cYH`l(2`}8njngmOS zV}k@shv#p3qxJgwk<+slO|Pk7g$fE599!rgcJ3k5xrjfVJ$IbT9p{;EFrOCg{PAaz zr1I>^iH+Yy)|557yH*|Rog^T%rTvlnk^Tt}?q*I z9vPExv5Q-WMY~Y2PROHE@OVRmNRW#U7pJ|rV^e}9qxMg>4KE^Bh34n}Ej>Tu=ry~{ zN$cjl`*rWe7dHr?0=A;jQf1iK( zr6ktQEj2G$UiV>4LyNc#r^!|BO;xHn#q+}sxi#?VXK*U}a@q?0J8Gwt__S5rg^BUm zA*rd!dT# zb7KbEw3HP4ss+pHDL#n7pC)15>YX#9;~3UQxL5@c0U1o|cj zUYR+4VrzQ{LkiQT4-aaCA|PVo2j}#-vJ{jmR~_PRIn89Cu4FC0O)o)ZkHY~CmaiQz zViI37ZQAbdCh{oiz)Pzy;wOdI#WNPyi3=>6t+4gtcE@jq+l1FMNKBm2+Wy~-A$$hN zp74c2c2$c+#CEcW*dK#9sQbafF7;z8etK0r5EWX>{LprRRGfm0qVfvk^GzQP$oM;% z?wR0O!1|?4oWs3=7*n+$~pyBsObsuV_i&1F3v{kefel#x!j~1{T!~ZH8H*dp_*pifpcS zQhRucg~1oBtwUqa0jZfS+M*05o(a6k7ZVRoy}qGN<>4t-2FK|Q8^n65g~Y@iB+TA4 z7Ee>SHGS5!1Y48J?>(QEGYE9>t~RLW++@45n?>8EggYTnn<4p%mO(kE)^9_0PO*E= z!aLS8Bm`=+Bwtb5v->AU@we_n&Ke9HUd&R*Rz&JZ#!1}N=jLC@prFB|DdmOAw-m=*DK?D zqO3pD!BhS literal 1374 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 diff --git a/core/assets-raw/sprites/blocks/storage/reinforced-vault.png b/core/assets-raw/sprites/blocks/storage/reinforced-vault.png index 75ef47676c7bfc0fcc2bd0697451c0c787027c74..383e61661db9207bc513e842e882ecd216749c55 100644 GIT binary patch literal 1374 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 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 992327c257..5d992684fb 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2611,7 +2611,7 @@ public class Blocks{ isFirstTier = true; unitType = UnitTypes.evoke; health = 7000; - itemCapacity = 8000; + itemCapacity = 2000; size = 4; thrusterLength = 34/4f; armor = 5f; @@ -2629,7 +2629,7 @@ public class Blocks{ unitType = UnitTypes.incite; health = 18000; - itemCapacity = 11000; + itemCapacity = 3000; size = 5; thrusterLength = 40/4f; armor = 10f; @@ -2645,7 +2645,7 @@ public class Blocks{ unitType = UnitTypes.emanate; health = 30000; - itemCapacity = 16000; + itemCapacity = 4000; size = 6; thrusterLength = 48/4f; armor = 15f; @@ -2677,18 +2677,19 @@ public class Blocks{ }}; reinforcedContainer = new StorageBlock("reinforced-container"){{ - requirements(Category.effect, with(Items.tungsten, 100, Items.graphite, 50, Items.beryllium, 50)); - size = 3; - //TODO should it really be kept the same, at 1000? - itemCapacity = 1200; + requirements(Category.effect, with(Items.tungsten, 80, Items.graphite, 80)); + size = 2; + itemCapacity = 250; scaledHealth = 120; + coreMerge = false; }}; reinforcedVault = new StorageBlock("reinforced-vault"){{ - requirements(Category.effect, with(Items.tungsten, 250, Items.carbide, 125, Items.beryllium, 100)); - size = 4; - itemCapacity = 2500; + requirements(Category.effect, with(Items.tungsten, 125, Items.thorium, 70, Items.beryllium, 100)); + size = 3; + itemCapacity = 900; scaledHealth = 120; + coreMerge = false; }}; //endregion diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 5c787dcc16..36f3bd04d1 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -104,7 +104,7 @@ public class CoreBlock extends StorageBlock{ public void init(){ //assign to update clipSize internally lightRadius = 30f + 20f * size; - fogRadius = Math.max(fogRadius, (int)(lightRadius / 8f * 2.5f)); + fogRadius = Math.max(fogRadius, (int)(lightRadius / 8f * 2f)); emitLight = true; super.init(); @@ -434,7 +434,7 @@ public class CoreBlock extends StorageBlock{ } public boolean owns(Building core, Building tile){ - return tile instanceof StorageBuild b && (b.linkedCore == core || b.linkedCore == null); + return tile instanceof StorageBuild b && ((StorageBlock)b.block).coreMerge && (b.linkedCore == core || b.linkedCore == null); } @Override diff --git a/core/src/mindustry/world/blocks/storage/StorageBlock.java b/core/src/mindustry/world/blocks/storage/StorageBlock.java index 9b0d482153..10d7712f99 100644 --- a/core/src/mindustry/world/blocks/storage/StorageBlock.java +++ b/core/src/mindustry/world/blocks/storage/StorageBlock.java @@ -13,6 +13,7 @@ import mindustry.world.meta.*; import static mindustry.Vars.*; public class StorageBlock extends Block{ + public boolean coreMerge = true; public StorageBlock(String name){ super(name);