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 0000000000..f3bbc7bbc3 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-9-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-9-autotile.png new file mode 100644 index 0000000000..784130d2d3 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-9-autotile.png differ 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 0000000000..08b4c222d0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-generic.png differ 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 0000000000..2c113a2cd6 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-generic2.png differ 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;