From e658a430f4f5a3fae4d2ffeb58de7e892e4bde3b Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 11 Jan 2026 18:55:04 -0500 Subject: [PATCH] Polar Aerodrome moved to hidden sector --- .../240.msav} | Bin core/assets/planets/serpulo.json | 2 +- core/src/mindustry/content/SectorPresets.java | 7 +------ core/src/mindustry/maps/SectorSubmissions.java | 1 + core/src/mindustry/type/Sector.java | 2 +- .../mindustry/ui/dialogs/SectorSelectDialog.java | 2 +- .../world/blocks/environment/TiledFloor.java | 3 +++ .../world/blocks/environment/TiledWall.java | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) rename core/assets/maps/{polarAerodrome.msav => hidden-serpulo/240.msav} (100%) diff --git a/core/assets/maps/polarAerodrome.msav b/core/assets/maps/hidden-serpulo/240.msav similarity index 100% rename from core/assets/maps/polarAerodrome.msav rename to core/assets/maps/hidden-serpulo/240.msav diff --git a/core/assets/planets/serpulo.json b/core/assets/planets/serpulo.json index 61c3c7a190..8758cdea21 100644 --- a/core/assets/planets/serpulo.json +++ b/core/assets/planets/serpulo.json @@ -1 +1 @@ -{presets:{windsweptIslands:97,stainedMountains:223,weatheredChannels:166,craters:219,extractionOutpost:213,coastline:164,navalFortress:165,frontier:86,sunkenPier:173,groundZero:170,mycelialBastion:143,facility32m:65,atolls:75,overgrowth:142,testingGrounds:169,frozenForest:64,saltFlats:98,taintedWoods:145,infestedCanyons:85,desolateRift:271,nuclearComplex:228,ruinousShores:41,planetaryTerminal:217,impact0078:266,seaPort:214,fallenVessel:95,fungalPass:221,tarFields:99,biomassFacility:23},attackSectors:[0,6,13,16,19,20,24,27,30,47,55,66,67,69,76,92,94,103,111,116,127,133,138,150,157,161,162,176,180,185,191,192,197,200,204,207,225,230,237,242,243,244,245,246,247,248,251,254,259,263,265]} \ No newline at end of file +{presets:{windsweptIslands:97,stainedMountains:223,weatheredChannels:166,craters:219,extractionOutpost:213,coastline:164,navalFortress:165,frontier:86,sunkenPier:173,groundZero:170,mycelialBastion:143,facility32m:65,atolls:75,overgrowth:142,testingGrounds:169,frozenForest:64,saltFlats:98,taintedWoods:145,infestedCanyons:85,desolateRift:271,nuclearComplex:228,ruinousShores:41,planetaryTerminal:217,impact0078:266,seaPort:214,fallenVessel:95,fungalPass:221,tarFields:99,biomassFacility:23},attackSectors:[0,6,13,16,19,20,24,27,30,47,55,66,67,69,76,92,94,103,111,116,127,133,138,150,157,161,162,176,180,185,191,192,197,200,204,207,225,230,237,240,242,243,244,245,246,247,248,251,254,259,263,265]} \ No newline at end of file diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index d0f5ac7c1f..12b79a9058 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -9,7 +9,7 @@ public class SectorPresets{ public static SectorPreset groundZero, craters, biomassFacility, taintedWoods, frozenForest, ruinousShores, facility32m, windsweptIslands, stainedMountains, tarFields, - frontier, fungalPass, infestedCanyons, atolls, sunkenPier, mycelialBastion, extractionOutpost, saltFlats, testingGrounds, overgrowth, //polarAerodrome, + frontier, fungalPass, infestedCanyons, atolls, sunkenPier, mycelialBastion, extractionOutpost, saltFlats, testingGrounds, overgrowth, impact0078, desolateRift, fallenVessel, nuclearComplex, planetaryTerminal, coastline, navalFortress, weatheredChannels, seaPort, @@ -86,11 +86,6 @@ public class SectorPresets{ difficulty = 5; }}; - //TODO: removed for now - //polarAerodrome = new SectorPreset("polarAerodrome", serpulo, 68){{ - // difficulty = 7; - //}}; - coastline = new SectorPreset("coastline", serpulo, 108){{ captureWave = 30; difficulty = 5; diff --git a/core/src/mindustry/maps/SectorSubmissions.java b/core/src/mindustry/maps/SectorSubmissions.java index 06dc23056b..b4d30f98fb 100644 --- a/core/src/mindustry/maps/SectorSubmissions.java +++ b/core/src/mindustry/maps/SectorSubmissions.java @@ -65,6 +65,7 @@ public class SectorSubmissions{ registerSerpuloSector(20, "Namero", "https://discord.com/channels/391020510269669376/1379926794114961634/1406768731471872162"); registerSerpuloSector(162, "Bravo Tizmo", "https://discord.com/channels/391020510269669376/1379926884606808247/1443239231366500415"); registerSerpuloSector(230, "Jamespire", "https://discord.com/channels/391020510269669376/1379926927585841163/1442675816084406305"); + registerSerpuloSector(240, "hhhi17", "https://discord.com/channels/391020510269669376/1253758616117186590/1253758616117186590"); /* UNUSED SECTORS: registerHiddenSectors(serpulo, diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index c8a1ca63b7..b76fceb312 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -142,7 +142,7 @@ public class Sector{ /** @return whether the enemy has a generated base here. */ public boolean hasEnemyBase(){ - return ((generateEnemyBase && preset == null) || (preset != null && preset.captureWave == 0)) && (save == null || info.attack); + return ((generateEnemyBase && preset == null) || (preset != null && preset.captureWave == 0)) && (save == null || info.attack || !hasBase()); } public boolean isBeingPlayed(){ diff --git a/core/src/mindustry/ui/dialogs/SectorSelectDialog.java b/core/src/mindustry/ui/dialogs/SectorSelectDialog.java index c1ab07af05..3626c94d78 100644 --- a/core/src/mindustry/ui/dialogs/SectorSelectDialog.java +++ b/core/src/mindustry/ui/dialogs/SectorSelectDialog.java @@ -22,7 +22,7 @@ public class SectorSelectDialog extends BaseDialog{ TextField search; public SectorSelectDialog(){ - super("@content.sector.name"); + super("@database-category.sector"); cont.top(); cont.table(s -> { diff --git a/core/src/mindustry/world/blocks/environment/TiledFloor.java b/core/src/mindustry/world/blocks/environment/TiledFloor.java index 5e258dddf0..9250ce1146 100644 --- a/core/src/mindustry/world/blocks/environment/TiledFloor.java +++ b/core/src/mindustry/world/blocks/environment/TiledFloor.java @@ -51,6 +51,9 @@ public class TiledFloor extends Floor{ @Override public void floorChanged(Tile tile){ + //TODO: none of this state needs to update on servers right now, but it could cause issues if blocks require a certain alignment + //either way, this wouldn't be called on map load on servers, so it's broken there + if(headless) return; if(!world.isGenerating() && TiledState.changes(state(tile)) != world.floorChanges){ scan(tile); diff --git a/core/src/mindustry/world/blocks/environment/TiledWall.java b/core/src/mindustry/world/blocks/environment/TiledWall.java index c3c0103e42..22d3695547 100644 --- a/core/src/mindustry/world/blocks/environment/TiledWall.java +++ b/core/src/mindustry/world/blocks/environment/TiledWall.java @@ -50,7 +50,7 @@ public class TiledWall extends StaticWall{ @Override public void blockChanged(Tile tile){ - super.blockChanged(tile); + if(headless) return; if(!world.isGenerating() && TiledState.changes(state(tile)) != world.tileChanges){ scan(tile);