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 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>VE*pu;uumf z=k1)+xwjoeTvewgNElA=-S*BQbVu_Sp(Wz_cRNm>P-|dT*43DOL%`JdPme|M{EG8$ zbeiq_-^T_#IbrjA`tjwL*KMeKQ$M|KYsFui+SnSNKi~d1pLH}{{p{?4{PXg>4(pX3 zy#6tn@kJm@jck4VE;b9f_mi&g`~Pcml;ZjO`*iG{P5b#i|8Vm1wq0faz5l$CRA9d! zYPNPu*1a>jpWn;39q*gV8TDoV5r3wDruBhGo+`0qazuTzKW=}eM(yq=fkhv${)~wge{a@4(B*YJ+b`1OdY?5XlOwBcih#~PqYQ75 zJ6ag*8!9(%+6uJVk&R%(4e^D=MP38zoB2A!LE+s$KD@57|#HOaAB*@SNZQh zVCOi{FT(VPK?!L519pK=BpFQwBS>|f!bj#k`*r_2Ul&;@=j8wI_3Qgjw$A%|{^RC4 z2B!^n_SgUPUtRoP_20jzA76g?=zO+*$&|3OFL~?g>x}Ik&dzSUKYxAjtS8-GSoj+*0OZ-q_9d)||ka(Vl4$}9sg0!OHBNxDEN+cZ#$O9yWO{_ zpSk<6hL4+q^v_-eZT0W=j zjn79teie~1Ve!8=iwWn{&h0*Bp2$1Pyg(8xsoXy8=Lz-;mTm% z#Kx5N*uM#{fLoxEpJUKcn$E_p5c?CV@u!-m$maN58H{cLaJ(Pw;L$T3E98A^Dtx5> zZGO>exi4Q+G+uDY15pIv{=Viq%sYG~=nQ8Y#RDm3JP|!Zx8fa0`%ze#8_!UiMiOvY;%~)hHhXowlR7l)#mZyN zxa6tsoNP?@nb}B7Fq7U}d;S>{U!?6i2u(N;7;`eMP4hw%DnnuIM8sh0zQ2{u+68#n z8ZEv^yJR9Y)Sj1n4lwFqA_16E{JKzAW(_dr2&&mPBS&In7&O#n0E5Ur(%%J^MD(0H z(eSDZm031LqX8G<7;~NrF0%fx3p98JDfc=nuURSXTt?e)LMLm}(@2*}skVW%-w z6UoGXhry;g#UilGsn%t9(A;d6ybT7 zJA!3ZxIrv2=)T#fd>(2|qqF&+vhltR8UnI62K|qWMe`}AQj=56X0NrsAi%J~zbujhTXoy=O>hAx=>9a?R=(8jUL;tgV3 z2tC&$fDvYDszv95c^P-R7gfMbWBm+7ePggpDnKZ0PwR4Ys)ZE!T*}iK2w-jWRyC$a zxyn9EK2crDT{0)j`NV-013o|RBK;?r#D?PLm*!PyqRRGudYizpby=v@#htsLd~z#= z4SZlF{~HFA;UW#^B^GKElt!wTX3s8~SO0nGaU)b)a#m+bUK+^miD2Pv6EdwP_6dCq zNMpDNUu;G1X^_oshHPOa?ldbi21QrD94iV0o!Txd*76`D3JH+xu{wFh%z9%Aqf|dO$a0F$snaylgZX zn|!HMsjGCD`E)v+!Nxt@^u^~T=08Cy8{pSIoGG}r7Y%vi`-b&aje8uSt~tOh*E}q4 zKaf3+I#E0kIi}~E@4PyaI6xh0;n{JL-4HrPK*e6;-)56SQ_bk=Za+^T23f9ND}nEN zf3(N#US79=dQv1lrRW}ao=5fPi{?F;bsK8rB8L#?((s2>i7BeUejy0??shXWGXJnj zyuR>l*VttCRN&USQMqexxDk$?I=(xr`2@3Bgr{oH@i~9Z7OlTZS_cBh@2~m9qY4C| z^xc4u8L68kdT!|+WSrakpaieA3DcuWxAV)B&dMTEcqzfm5ABR6$(_>-iq6rCFIOt+ zYa62=%6~?frzqp+Pu4_W4V_tkPqQE2gQh5fx=(gR5BfD$GFQdL7&rf4B|=ay+~2yL T*~9TQd^$kDA(C&sPZ;U_R~X;uumf z=k1)mMUM+X1^6~Q6oB91FGk@dmluvv&Pw{YX(uth3{-O2q+q~cQetsDt zW`FJU{Qmv>cW*0AIK1=qoYa43&tKneT|PIG`BlX8`#K9bOLacyPrJZ!MV=bzjseahbS_l;k@@9k^VjDBQ3c~Uz2|CHjRa*stH zY~y6Bmr_+ZVd;KmV>6S*H5S(sk_TdM@A_I6ytOW%;qUK-9>TADCN9|Detp`5r*BLD zOJ^;3ey4OgYgaL!X5Nl-X&mugTYwIt1270v@q1#{eYJ1k;N`0%(=g>zCGLxr7ygA9uRJL3^YhQgu4 zRF7(iy?yQNlg=MMe{IWCoV7%ff%919l7r>Jd5j(gXV&H3t=he^>|I2V$``JJUp8Xd zZmo8c6*<4XZ%;Bk7B^Yx;pyA2|CPV!SDh916d0u1hEpD2I67_i-_pMqel~4y*f^7+ z?dAF-E174`{`=KO;8kJ?Zv)HapFe+$XYI_Zbd_JKk#;#41ezw1=&S%`0x%hvtq)`i}@6CNNwat?!*Ju4* z!tN~br!ecEj?J?>E59ygeek)lBFkgKq7q4zo+^8-#pUB<=Nd z+4z_7hO|Qejpv`mciS`AGo4ia_VbUT*hYH>p(hiots{>7WAHGTJLCE1U^?pQ;uumf z=j|QeyhjcK4vEJfad4D9(J;Qf^FQYYz9X`eSc|6Eo0pZ}zIwR&ex8zH>eTr%!V}{E z{rUU-Ta{I5SD{>+UeW)*Z;RfZJ1kJfP;&A2`)CV}T_^s2*Oh5`^zDBAzjnbRT{r6g z|7CX*$bS9z{W88quXpK}FL&GMb8>EN@89!t|3BvX@KfQ~!g+t5dX$5?o_yFL~f!#R<7}yC(@pB>(S!=Fj%v9_wG{|?79x=narwzKScqQ*b_Yjf;h z%N^jDCS5KjdhpKA-KP9b<&WPjs*_#v?6+QmvgtaO>@(&Kyjvw28FSWbZa+P^Y^C$B@|T6ON;%#%=x+d@5g|W@>N9>f4^T`uYS?>{r>!i3NMtt|Np3WfFsHE z?f=ua9h5snH~yEeXE$hyh<^Y7`u4{Cd;LwjQnUWt-JkNm___Li0VBSzPxQkd3m=&D z_k8Wy!}={1pFUshNm%>yB*VAk&ff~|PMvc=>i7A7P95s|=gr~BdS`EX-=Fy*55v0m zLh|~repa$J7&BNfLx|VAz3v-c{(n-NVGiSgpEV7qq+_}XJ+Z#w^Hu;e&*d8C$qP&nI8*G-3*?telF{r5}E)U C@MH7< literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 594c419296..14f185c521 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -608,3 +608,5 @@ 63074=crux-floor-5|block-crux-floor-5-ui 63073=crux-floor-6|block-crux-floor-6-ui 63072=crux-floor-7|block-crux-floor-7-ui +63071=crux-floor-8|block-crux-floor-8-ui +63070=crux-floor-9|block-crux-floor-9-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index aeb94adadb..b0ccdff4b3 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -59,7 +59,7 @@ public class Blocks{ shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystalOrbs, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, - darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, coloredFloor, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, cruxFloor8, cruxFloor9, coloredFloor, pebbles, tendrils, //ores @@ -857,6 +857,18 @@ public class Blocks{ autotileMidVariants = 9; }}; + cruxFloor8 = new Floor("crux-floor-8"){{ + autotile = true; + drawEdgeOut = false; + drawEdgeIn = false; + }}; + + cruxFloor9 = new Floor("crux-floor-9"){{ + autotile = true; + drawEdgeOut = false; + drawEdgeIn = false; + }}; + coloredFloor = new ColoredFloor("colored-floor"){{ autotile = true; drawEdgeOut = false; diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java index da9b0154f3..4bae99e420 100644 --- a/core/src/mindustry/world/blocks/environment/Floor.java +++ b/core/src/mindustry/world/blocks/environment/Floor.java @@ -151,7 +151,7 @@ public class Floor extends Block{ if(autotileMidVariants > 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;