From fbd9a7c40a74e5623bc7e1dda9ee0d1d5862276e Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 14 Jul 2025 23:49:09 -0400 Subject: [PATCH] More floor stuff --- .../blocks/environment/crux-floor-8-autotile.png | Bin 0 -> 1085 bytes .../blocks/environment/crux-floor-9-autotile.png | Bin 0 -> 1698 bytes .../blocks/environment/crux-floor-generic.png | Bin 0 -> 1041 bytes .../blocks/environment/crux-floor-generic2.png | Bin 0 -> 779 bytes core/assets/icons/icons.properties | 2 ++ core/src/mindustry/content/Blocks.java | 14 +++++++++++++- .../world/blocks/environment/Floor.java | 2 +- .../mindustry/world/meta/BuildVisibility.java | 10 +++++----- 8 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-9-autotile.png create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-generic.png create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-generic2.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png new file mode 100644 index 0000000000000000000000000000000000000000..f3bbc7bbc32af3c3d1c9e6ae44959b7e597bc630 GIT binary patch literal 1085 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 VlWfuG!oa}5;OXk;vd$@?2>@-qXqW&1 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-generic.png b/core/assets-raw/sprites/blocks/environment/crux-floor-generic.png new file mode 100644 index 0000000000000000000000000000000000000000..08b4c222d0bc0bd35c5d2845267016402bbc6252 GIT binary patch literal 1041 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+7>k44ofy`glX=O&zxQX)jA8<&2<>TeCH}m^VX8y+ADWCXmp5o!&q!T%5{X^^Jw|T$q z{roaQ%>LTx`ThI%@7`9LaCqnIIjR57p1;1`x_oXV^Q(yG_jML>mg;=YpLT)e#?$*T z|Cu>+HlC<|ntjOfdF+ficKx4AzOuZz&p)|O`joxt?;F2*-`m%!8U4t7@}zY3|0%^s zrOBoD;i-u1OCcxzoi!{6TvJ%nHROkA+P{ra>A zPv4gQm(E)7{7&g~)~;ec&Ac7w(m3uPI%96J@A}uD{ZHjy9WIZ1&-0-A;nq%`f3{nV zJLhr+{pPsGw9IUw*V&w)Ye|~5Dx3$J3g)=)c38xk@ZoW#3g@IWh6+0Y2N@OtcE%%) z42467sUFo3d;8kkC!Ifj{@RwOIBSU{1Lv{IB?rrc^B6r0&aBJ5TeW*-*}I4!l`mWc zzih;^-CFG?D{_8&-=1W8EN-&W!_&84|0{pduR1I2>7CN)+J;jeUpP8#_TSRK7k)Nv zZ`e4Kq3z}RBP*F_&i?z=N8nXr32y_-<)1%)l|5fKyQapIv#leFMaj{sHf@^F9J~I- zUl-qJRdBS~9vSITQ0udzu0W6@H8S74T>Gb`zD|6t9oM{xcV;edt7VxnbE#(o1DlR# z)6_`uM-lbu7p}+u6k{{cpZ3%I+U1E>*M6FNXE@28{-fXRpt9kp*8l(aSQQ#|#eUx3 z%l#s}ecJp8Tjt>XtU6Qcb86o|XV|W0^yB4|lrW|LH+ceFXNf#Z%Xv|Hoi_=pVzQ2>bGb{}{LvGKCZx7`-Po{AKLfPFVdQ&MBb@0164cSpWb4 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-generic2.png b/core/assets-raw/sprites/blocks/environment/crux-floor-generic2.png new file mode 100644 index 0000000000000000000000000000000000000000..2c113a2cd6ab9d9c88426cf23013caa1afc9ded1 GIT binary patch literal 779 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4mJh`hQoG=rx_R+7>k44ofy`glX=O&z;x8p z#WAE}&f7b_d5;_f91@Q|;@~KIqG5b{=YP%*d`Dy_u@+6SH!mx{ef4nl{X8YZ)T#4j zgeS!R`}6nvw<@dBu0pvsy`ukr-xj?+cUYi|q2%K4_t6#{yH5Q5t}D~>=-d7Jf9--t zx^C3}|I6+skp24a`(=EKUhmQ`U+%Wi=j7bl-oNMP{(sE%;itl}h4cPA^(qhB^?&F3 znLH1EJ7(;hCAh}aUh=@diW73{c25$HNdDjd%%APS$@S{$O|yRcpY@Mp{PKr~;T*$* zp-8AP?}%M@TkfQAwe4K7{mY*H3;sMgoIzP*dhsWB({KMX{vD2Iber(LY-ic?M2&y; z*XG#2mOH>PO}bo6^x&PJyG{9>${)X5R42RS*>AlBWz%&m*=Nifc(+P4GUlw=%8_=T zdBwa-)lJho=kHHFW8R>kYF=9G|7Fh4-G4s@l$5V3n)v(u;(GOquJ8BfKU8?3^!@)w zy#pLcu5bUJzU`pgA-eIud_B8CQ$+Op|JS!S?%(Tg+LfC1=kETL|HaSM_X`;DeSM-I z{#f|Hq`&8D&mPuqsrdByYEQ!2pC=i<9e4g#aChpQ15&@w|8we4-#>2-N7g%g)BFC+ z4|y2Yy%&<#fAzDHwZWLdf*C@*-tBeY@bdqY+6;3T5B#iY;Qdjat^?1RSvvQvlzYCPdAG*N?Copj$1*T5FnGH9 KxvX 1){ autotileMidRegions = new TextureRegion[autotileMidVariants]; for(int i = 0; i < autotileMidVariants; i++){ - autotileMidRegions[i] = Core.atlas.find((i == 0 ? name + "-13" : name + "-mid-" + (i + 1))); + autotileMidRegions[i] = Core.atlas.find(i == 0 ? name + "-13" : name + "-mid-" + (i + 1)); } } } diff --git a/core/src/mindustry/world/meta/BuildVisibility.java b/core/src/mindustry/world/meta/BuildVisibility.java index 8b7042d6b0..c4809d2e62 100644 --- a/core/src/mindustry/world/meta/BuildVisibility.java +++ b/core/src/mindustry/world/meta/BuildVisibility.java @@ -11,15 +11,15 @@ public class BuildVisibility{ shown = new BuildVisibility(() -> true), debugOnly = new BuildVisibility(() -> false), editorOnly = new BuildVisibility(() -> Vars.state.rules.editor), - coreZoneOnly = new BuildVisibility(() -> Vars.indexer.isBlockPresent(Blocks.coreZone)), + coreZoneOnly = new BuildVisibility(() -> Vars.indexer.isBlockPresent(Blocks.coreZone) || !Vars.state.isGame()), worldProcessorOnly = new BuildVisibility(() -> Vars.state.rules.editor || Vars.state.rules.allowEditWorldProcessors), sandboxOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.infiniteResources), - campaignOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.isCampaign()), + campaignOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.isCampaign() || !Vars.state.isGame()), legacyLaunchPadOnly = new BuildVisibility(() -> (Vars.state == null || Vars.state.isCampaign() && Vars.state.getPlanet().campaignRules.legacyLaunchPads) && Blocks.advancedLaunchPad != null && Blocks.advancedLaunchPad.unlocked()), - notLegacyLaunchPadOnly = new BuildVisibility(() -> (Vars.state == null || Vars.state.rules.infiniteResources || Vars.state.isCampaign() && !Vars.state.getPlanet().campaignRules.legacyLaunchPads)), - lightingOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign()), + notLegacyLaunchPadOnly = new BuildVisibility(() -> (Vars.state == null || !Vars.state.isGame() || Vars.state.rules.infiniteResources || Vars.state.isCampaign() && !Vars.state.getPlanet().campaignRules.legacyLaunchPads)), + lightingOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.lighting || Vars.state.isCampaign() || !Vars.state.isGame()), ammoOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.unitAmmo), - fogOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.fog || Vars.state.rules.editor); + fogOnly = new BuildVisibility(() -> Vars.state == null || Vars.state.rules.fog || Vars.state.rules.editor || !Vars.state.isGame()); private final Boolp visible;