From 178ce7454b5a3690b772b7f724723c4b1c8f9f36 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 10 May 2025 17:27:16 -0400
Subject: [PATCH] Tweaks to attack sector positions

---
 core/src/mindustry/content/Planets.java       | 1 +
 core/src/mindustry/content/SectorPresets.java | 6 +++++-
 core/src/mindustry/game/Universe.java         | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java
index 4770dc038b..3fd4395bd2 100644
--- a/core/src/mindustry/content/Planets.java
+++ b/core/src/mindustry/content/Planets.java
@@ -125,6 +125,7 @@ public class Planets{
         }};
 
         serpulo = new Planet("serpulo", sun, 1f, 3){{
+            attackSectorBitString = "YSwI0FQAAhtUABAAAAAMoiUEMEQAAFAAAAAEACsKAMEKAg==";
             generator = new SerpuloPlanetGenerator();
             meshLoader = () -> new HexMesh(this, 6);
             cloudMeshLoader = () -> new MultiMesh(
diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java
index ce80371f3f..7c61c02bdd 100644
--- a/core/src/mindustry/content/SectorPresets.java
+++ b/core/src/mindustry/content/SectorPresets.java
@@ -170,13 +170,16 @@ public class SectorPresets{
         173,//Front Line by stormrider: https://discord.com/channels/391020510269669376/1165421701362897000/1188484967064404061
         25, //HochuPizzu by wpx: https://discord.com/channels/391020510269669376/1165421701362897000/1170279703056228515
         12, //Salt Outpost by skeledragon: https://discord.com/channels/391020510269669376/1165421701362897000/1193441915459338361
-        82, //Desert Wastes by xaphiro_: https://discord.com/channels/391020510269669376/1165421701362897000/1226498922898264157
+        106,//Desert Wastes by xaphiro_: https://discord.com/channels/391020510269669376/1165421701362897000/1226498922898264157
         243,//Port 012 by skeledragon: https://discord.com/channels/391020510269669376/1165421701362897000/1174884280242012262
         240 //Cold Grove by wpx: https://discord.com/channels/391020510269669376/1165421701362897000/1230550892718194742
         );
 
+        //these are hidden wave presets (TODO) find a better way to do this
         Vars.content.sector("sector-serpulo-173").captureWave = 17;
         Vars.content.sector("sector-serpulo-240").captureWave = 40;
+        serpulo.sectors.get(173).generateEnemyBase = false;
+        serpulo.sectors.get(240).generateEnemyBase = false;
 
         //endregion
         //region erekir
@@ -265,6 +268,7 @@ public class SectorPresets{
             new SectorPreset("sector-" + planet.name + "-" + id, "hidden/" + planet + "-" + id, planet, id){{
                 requireUnlock = false;
             }};
+            planet.sectors.get(id).generateEnemyBase = true;
         }
     }
 }
diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java
index e82224d6e5..6e428219a6 100644
--- a/core/src/mindustry/game/Universe.java
+++ b/core/src/mindustry/game/Universe.java
@@ -274,7 +274,7 @@ public class Universe{
 
                     //queue random invasions
                     if(!sector.isAttacked() && sector.planet.campaignRules.sectorInvasion && sector.info.minutesCaptured > invasionGracePeriod && sector.info.hasSpawns){
-                        int count = sector.near().count(s -> s.hasEnemyBase() && !s.hasBase());
+                        int count = sector.near().count(s -> s.hasEnemyBase() && !s.hasBase() && (s.preset == null || !s.preset.requireUnlock));
 
                         //invasion chance depends on # of nearby bases
                         if(count > 0 && Mathf.chance(baseInvasionChance * (0.8f + (count - 1) * 0.3f))){