From 240584bf43f2128ee8b3e799f4509c55957671e5 Mon Sep 17 00:00:00 2001 From: 3mro777o <222668134+3mro777o@users.noreply.github.com> Date: Wed, 4 Nov 2026 15:31:41 +0100 Subject: [PATCH] Add separate settings for Impact and Eruption drills They used the Airblast drill settings, which capped Min Ores at 16 and shared Max Tiles with it. The Eruption drill (5x5) now goes up to 25. Defaults keep the current behaviour for the Impact drill. Fixes #6. --- assets/bundles/bundle.properties | 2 ++ assets/bundles/bundle_de.properties | 2 ++ assets/bundles/bundle_ru.properties | 2 ++ src/autodrill/AutoDrill.java | 9 +++++++++ src/autodrill/filler/OptimizationDrill.java | 6 ++---- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index b5f5350..8e9daee 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -9,6 +9,8 @@ auto-drill.settings.mechanical-drill = Mechanical Drill auto-drill.settings.pneumatic-drill = Pneumatic Drill auto-drill.settings.laser-drill = Laser Drill auto-drill.settings.airblast-drill = Airblast Drill +auto-drill.settings.impact-drill = Impact Drill +auto-drill.settings.eruption-drill = Eruption Drill auto-drill.settings.max-tiles = Max Tiles auto-drill.settings.min-ores = Min Ores diff --git a/assets/bundles/bundle_de.properties b/assets/bundles/bundle_de.properties index 023b615..32285c2 100644 --- a/assets/bundles/bundle_de.properties +++ b/assets/bundles/bundle_de.properties @@ -9,6 +9,8 @@ auto-drill.settings.mechanical-drill = Mechanischer Bohrer auto-drill.settings.pneumatic-drill = Pneumatischer Bohrer auto-drill.settings.laser-drill = Laserbohrer auto-drill.settings.airblast-drill = Luftstoßbohrer +auto-drill.settings.impact-drill = Schlagbohrer +auto-drill.settings.eruption-drill = Eruptionsbohrer auto-drill.settings.max-tiles = Max Felder auto-drill.settings.min-ores = Min Erze diff --git a/assets/bundles/bundle_ru.properties b/assets/bundles/bundle_ru.properties index aba2ba5..da27dc7 100644 --- a/assets/bundles/bundle_ru.properties +++ b/assets/bundles/bundle_ru.properties @@ -9,6 +9,8 @@ auto-drill.settings.mechanical-drill = Механический бур auto-drill.settings.pneumatic-drill = Пневматический бур auto-drill.settings.laser-drill = Лазерный бур auto-drill.settings.airblast-drill = Воздушная буровая установка +auto-drill.settings.impact-drill = Ударная дрель +auto-drill.settings.eruption-drill = Извергающая дрель auto-drill.settings.max-tiles = Макс. количество плиток auto-drill.settings.min-ores = Мин. Руды diff --git a/src/autodrill/AutoDrill.java b/src/autodrill/AutoDrill.java index d5df1a4..5771f68 100644 --- a/src/autodrill/AutoDrill.java +++ b/src/autodrill/AutoDrill.java @@ -22,6 +22,7 @@ import mindustry.content.Fx; import mindustry.game.EventType; import mindustry.gen.Icon; +import mindustry.gen.Iconc; import mindustry.graphics.Pal; import mindustry.mod.Mod; import mindustry.ui.Styles; @@ -117,6 +118,14 @@ public void init() { settings.sliderPref("airblast-drill-max-tiles", 100, 25, 500, 25, value -> value + "").title = bundle.get("auto-drill.settings.max-tiles"); settings.sliderPref("airblast-drill-min-ores", 9, 1, 16, 1, value -> value + "").title = bundle.get("auto-drill.settings.min-ores"); + settings.pref(new DescriptionSetting(Iconc.blockImpactDrill + " " + bundle.get("auto-drill.settings.impact-drill"))); + settings.sliderPref("impact-drill-max-tiles", 100, 25, 500, 25, value -> value + "").title = bundle.get("auto-drill.settings.max-tiles"); + settings.sliderPref("impact-drill-min-ores", 9, 1, 16, 1, value -> value + "").title = bundle.get("auto-drill.settings.min-ores"); + + settings.pref(new DescriptionSetting(Iconc.blockEruptionDrill + " " + bundle.get("auto-drill.settings.eruption-drill"))); + settings.sliderPref("eruption-drill-max-tiles", 100, 25, 500, 25, value -> value + "").title = bundle.get("auto-drill.settings.max-tiles"); + settings.sliderPref("eruption-drill-min-ores", 13, 1, 25, 1, value -> value + "").title = bundle.get("auto-drill.settings.min-ores"); + settings.pref(new DividerSetting()); settings.pref(new DescriptionSetting(bundle.get("auto-drill.settings.optimization-quality-desc"))); settings.sliderPref(bundle.get("auto-drill.settings.optimization-quality"), 2, 1, 10, 1, i -> i + ""); diff --git a/src/autodrill/filler/OptimizationDrill.java b/src/autodrill/filler/OptimizationDrill.java index f05c11a..fcfb900 100644 --- a/src/autodrill/filler/OptimizationDrill.java +++ b/src/autodrill/filler/OptimizationDrill.java @@ -195,10 +195,8 @@ private static String getDrillSettingsPrefix(Drill drill) { if (drill == Blocks.pneumaticDrill) return "pneumatic"; if (drill == Blocks.laserDrill) return "laser"; if (drill == Blocks.blastDrill) return "airblast"; - // Impact and eruption drills share the airblast settings in the original - // mod since they don't have dedicated settings entries. - if (drill == Blocks.impactDrill) return "airblast"; - if (drill == Blocks.eruptionDrill) return "airblast"; + if (drill == Blocks.impactDrill) return "impact"; + if (drill == Blocks.eruptionDrill) return "eruption"; return "airblast"; // fallback } }