Skip to content

Add separate settings for Impact and Eruption drills #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
3mro777o wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add separate settings for Impact and Eruption drills #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions assets/bundles/bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions assets/bundles/bundle_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions assets/bundles/bundle_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Мин. Руды

Expand Down
9 changes: 9 additions & 0 deletions src/autodrill/AutoDrill.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 + "");
Expand Down
6 changes: 2 additions & 4 deletions src/autodrill/filler/OptimizationDrill.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Loading