Removed Drill Bases

I really feel like they're redundant now.
TeamOct · Nov 29, 2023 · bba9516 · bba9516
1 parent d008861
commit bba9516
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 81 deletions.
diff --git a/core/src/fos/content/FOSBlocks.java b/core/src/fos/content/FOSBlocks.java
@@ -51,7 +51,7 @@ public class FOSBlocks {
 
     //production
     crudeDrill, improvedDrill, proficientDrill,
-    rockCrusher, drillBase, drillBaseLarge, tinDrill, silverDrill, diamondDrill, vanadiumDrill,
+    rockCrusher, tinDrill, silverDrill, diamondDrill, vanadiumDrill,
     oreDetectorSmall, oreDetector, oreDetectorReinforced, oreDetectorOverclocked,
 
     //distribution
@@ -304,48 +304,36 @@ public static void load() {
             researchCost = with(rawNethratium, 150);
             envRequired = envEnabled = Env.space;
         }};
-        drillBase = new DrillBase("drill-base"){{
-            scaledHealth = 30;
-            size = 2;
-            envEnabled |= Env.space;
-            requirements(Category.production, with(tin, 10));
-            researchCost = with(tin, 100);
-        }};
-        drillBaseLarge = new DrillBase("drill-base-large"){{
-            scaledHealth = 30;
-            size = 3;
-            requirements(Category.production, with(silver, 45, silicon, 50));
-        }};
         tinDrill = new UndergroundDrill("tin-drill"){{
             size = 2;
             tier = 3;
             drillTime = 360f;
             envEnabled |= Env.space;
-            requirements(Category.production, with(tin, 5));
+            requirements(Category.production, with(tin, 15));
             researchCost = with(tin, 50);
             consumeLiquid(water, 0.08f).boost();
         }};
         silverDrill = new UndergroundDrill("silver-drill"){{
             size = 2;
             tier = 4;
             drillTime = 300f;
-            requirements(Category.production, with(silver, 10));
+            requirements(Category.production, with(tin, 10, silver, 10));
             consumeLiquid(water, 0.1f).boost();
         }};
         diamondDrill = new UndergroundDrill("diamond-drill"){{
             size = 3;
             tier = 5;
             drillTime = 255f;
             consumePower(2f);
-            requirements(Category.production, with(silicon, 25, diamond, 40));
+            requirements(Category.production, with(silver, 45, silicon, 75, diamond, 40));
             consumeLiquid(tokicite, 0.2f).boost();
         }};
         vanadiumDrill = new UndergroundDrill("vanadium-drill"){{
             size = 3;
             tier = 6;
             drillTime = 210f;
             consumePower(3f);
-            requirements(Category.production, with(tin, 30, silver, 50, vanadium, 50));
+            requirements(Category.production, with(tin, 30, silver, 95, silicon, 50, vanadium, 50));
             consumeLiquid(tokicite, 0.25f).boost();
         }};
         oreDetectorSmall = new OreDetector("ore-detector-small"){{

diff --git a/core/src/fos/content/LumoniTechTree.java b/core/src/fos/content/LumoniTechTree.java
@@ -72,18 +72,15 @@ public static void load() {
             });
 
             // UNDERGROUND DRILLS
-            node(drillBase, () -> {
-                node(tinDrill, () ->
-                    node(silverDrill, () ->
-                        {} //TODO: T2 drill base
-                    )
-                );
-
-                // ORE DETECTORS
-                node(oreDetector, () -> {
-                    node(oreDetectorOverclocked);
-                    node(oreDetectorReinforced);
-                });
+            node(tinDrill, () ->
+                node(silverDrill, () ->
+                    {} //TODO: T2 drill base
+                )
+            );
+            // ORE DETECTORS
+            node(oreDetector, () -> {
+                node(oreDetectorOverclocked);
+                node(oreDetectorReinforced);
             });
 
             // FACTORIES. TODO

diff --git a/core/src/fos/content/UxerdTechTree.java b/core/src/fos/content/UxerdTechTree.java
@@ -3,12 +3,12 @@
 import arc.struct.*;
 import mindustry.content.Liquids;
 import mindustry.game.Objectives.*;
-import mindustry.type.*;
+import mindustry.type.Item;
 
 import static fos.content.FOSBlocks.*;
 import static fos.content.FOSItems.*;
-import static mindustry.content.Blocks.*;
-import static mindustry.content.Items.*;
+import static mindustry.content.Blocks.coreNucleus;
+import static mindustry.content.Items.titanium;
 import static mindustry.content.TechTree.*;
 
 public class UxerdTechTree {
@@ -56,8 +56,8 @@ public static void load() {
                 });
                 node(plasmaLauncher);
                 node(oreDetectorSmall, () ->
-                    node(drillBase, () ->
-                        node(tinDrill)));
+                    node(tinDrill)
+                );
             }));
         });
         FOSPlanets.uxerd.unlockedOnLand = Seq.with(spaceDuct, rockCrusher, heatGenerator);

diff --git a/core/src/fos/type/blocks/production/DrillBase.java b/core/src/fos/type/blocks/production/DrillBase.java
diff --git a/core/src/fos/type/blocks/production/UndergroundDrill.java b/core/src/fos/type/blocks/production/UndergroundDrill.java
@@ -30,12 +30,13 @@ public boolean canPlaceOn(Tile tile, Team team, int rotation) {
         if (isMultiblock()) {
             for(Tile other : tile.getLinkedTilesAs(this, tempTiles)) {
                 Building block = other.build;
-                if (block != null && (block.block() instanceof DrillBase || block.block() instanceof UndergroundDrill) && block.team == team) return true;
+                if (block != null && block.block() instanceof UndergroundDrill && block.team == team) return true;
             }
-            return false;
+            return nearestDetector(team, tile.worldx(), tile.worldy()) != null;
         } else {
             Building block = tile.build;
-            return (block != null && (block.block() instanceof DrillBase || block.block() instanceof UndergroundDrill) && block.team == team);
+            return (block != null && block.block() instanceof UndergroundDrill && block.team == team) ||
+                nearestDetector(team, tile.worldx(), tile.worldy()) != null;
         }
     }