Intruders now have 30 waves, Conflict has zero

mod.json

@@ -6,9 +6,8 @@
     "repo": "TeamOct/fictional-octo-system",
     "subtitle": "See you later!",
     "description": "A mod focused on space exploration.",
-    "version": "1.1 pre-alpha",
+    "version": "1.1 beta build-1",
     "minGameVersion": 146,
     "java": true,
-    "hidden": false,
-    "hideBrowser": true
+    "hidden": false
 }

src/fos/content/FOSBlocks.java

@@ -292,7 +292,7 @@ public static void load() {
         }};
         improvedDrill = new Drill("improved-drill"){{
             size = 3;
-            tier = 4;
+            tier = 5;
             drillTime = 200f;
             squareSprite = false;
 

src/fos/content/FOSPlanets.java

@@ -45,7 +45,7 @@ public static void load() {
                 sectors.add(new Sector(this, PlanetGrid.Ptile.empty));
                 ruleSetter = r -> {
                     r.loadout = ItemStack.list();
-                    r.defaultTeam = FOSTeam.corru;
+                    r.defaultTeam = FOSTeams.corru;
                 };
                 defaultEnv = Env.space | Env.scorching;
             }
@@ -85,7 +85,7 @@ public static void load() {
                 r.dragMultiplier = 0.2f;
                 r.borderDarkness = false;
                 r.waves = false;
-                r.defaultTeam = FOSTeam.corru;
+                r.defaultTeam = FOSTeams.corru;
                 r.waveTeam = Team.sharded;
                 r.bannedBlocks.addAll(container, injectorFactory);
                 r.hideBannedBlocks = true;
@@ -162,9 +162,8 @@ public static void load() {
             ruleSetter = r -> {
                 r.loadout = ItemStack.list();
                 r.fog = true;
-                r.defaultTeam = FOSTeam.corru;
-                r.waveTeam = r.attackMode ? Team.sharded : FOSTeam.bessin;
-                r.waves = true;
+                r.defaultTeam = FOSTeams.corru;
+                r.waveTeam = r.attackMode ? Team.sharded : FOSTeams.bessin;
                 r.enemyCoreBuildRadius = 300;
                 r.coreCapture = false;
                 WeatherEntry weather = new WeatherEntry(FOSWeathers.wind);

src/fos/content/FOSSectors.java

@@ -30,7 +30,7 @@ public static void load() {
 
         intruders = new SectorPreset("intruders", lumoni, 67){{
             difficulty = 5;
-            captureWave = 11;
+            captureWave = 31;
         }};
 
         citadel = new SectorPreset("citadel", lumoni, 44){{
@@ -44,6 +44,7 @@ public static void load() {
 
         conflict = new SectorPreset("conflict", lumoni, 18){{
             difficulty = 6;
+            rules = r -> r.waves = false;
         }};
     }
 }

src/fos/content/FOSTeam.java → src/fos/content/FOSTeams.java

@@ -9,7 +9,7 @@
 import mindustry.game.Team;
 import mindustry.ui.Fonts;
 
-public class FOSTeam {
+public class FOSTeams {
     public static Team corru, bessin;
 
     public static void load() {

src/fos/core/FOSMod.java

@@ -197,7 +197,7 @@ public void init() {
         });
 
         //init modded teams
-        FOSTeam.load();
+        FOSTeams.load();
     }
 
     public void clientLoaded() {

src/fos/maps/generators/CaldemoltStarGenerator.java

@@ -29,7 +29,7 @@ public void generate(Tiles tiles) {
                 Tile t = tiles.get(500 + x, 500 + y);
                 t.setFloor(Blocks.metalFloor.asFloor());
                 if (t.x == 500 && t.y == 500) {
-                    t.setBlock(FOSBlocks.coreCity, FOSTeam.corru);
+                    t.setBlock(FOSBlocks.coreCity, FOSTeams.corru);
                 }
             }
         }

src/fos/maps/generators/LumoniPlanetGenerator.java

@@ -6,7 +6,7 @@
 import arc.struct.*;
 import arc.util.Tmp;
 import arc.util.noise.*;
-import fos.content.FOSTeam;
+import fos.content.FOSTeams;
 import fos.maps.generators.bases.LumoniBaseGenerator;
 import mindustry.ai.Astar;
 import mindustry.content.Blocks;
@@ -393,7 +393,7 @@ void connect(Room to) {
 
         if (!sector.hasEnemyBase())
             enemies.each(espawn -> {
-                tiles.getn(espawn.x, espawn.y).setBlock(bugSpawn, FOSTeam.bessin);
+                tiles.getn(espawn.x, espawn.y).setBlock(bugSpawn, FOSTeams.bessin);
                 tiles.getn(espawn.x, espawn.y).circle(7, t -> t.setFloor(hiveFloor.asFloor()));
                 tiles.getn(espawn.x, espawn.y).circle(11, t -> {
                     if (rand.chance(0.35f)) t.setFloor(hiveFloor.asFloor());

src/fos/ui/menus/FOSMenus.java

@@ -4,7 +4,7 @@
 import arc.math.geom.Vec3;
 import arc.struct.Seq;
 import arc.util.noise.Simplex;
-import fos.content.FOSTeam;
+import fos.content.FOSTeams;
 import mindustry.Vars;
 import mindustry.content.*;
 import mindustry.graphics.g3d.PlanetParams;
@@ -117,7 +117,7 @@ public void generate(Tiles tiles) {
                 }
 
                 var center = tiles.get(tiles.width / 2, tiles.height / 2);
-                center.setBlock(coreFortress, FOSTeam.corru);
+                center.setBlock(coreFortress, FOSTeams.corru);
             }
         };
     }

src/fos/ui/menus/TerrainMenuBackground.java

@@ -6,7 +6,7 @@
 import arc.graphics.gl.FrameBuffer;
 import arc.math.*;
 import arc.scene.ui.layout.Scl;
-import fos.content.FOSTeam;
+import fos.content.FOSTeams;
 import mindustry.content.Blocks;
 import mindustry.world.*;
 
@@ -76,7 +76,7 @@ private void cache() {
         batch.beginCache();
         for (Tile tile : world.tiles) {
             if (tile.block().hasBuilding()) {
-                tile.build.init(tile.build.tile(), FOSTeam.corru, true, 0).draw();
+                tile.build.init(tile.build.tile(), FOSTeams.corru, true, 0).draw();
             }
         }
         cacheBuild = batch.endCache();