From 9928b0f788492bb82e58190adc0bd58419b485a7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 15 Nov 2020 15:29:31 -0500 Subject: [PATCH] #3412 but not broken --- core/assets/bundles/bundle.properties | 1 + core/assets/maps/fungalPass.msav | Bin 10618 -> 10664 bytes core/src/mindustry/Vars.java | 1 - core/src/mindustry/content/SectorPresets.java | 1 + core/src/mindustry/core/Logic.java | 7 +++++-- core/src/mindustry/type/SectorPreset.java | 1 + .../mindustry/ui/fragments/HudFragment.java | 3 +++ 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index caa42eb78e..1ee30c7c21 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -290,6 +290,7 @@ cancelbuilding = [accent][[{0}][] to clear plan selectschematic = [accent][[{0}][] to select+copy pausebuilding = [accent][[{0}][] to pause building resumebuilding = [scarlet][[{0}][] to resume building +showui = UI hidden.\nPress [accent][[{0}][] to show UI. wave = [accent]Wave {0} wave.cap = [accent]Wave {0}/{1} wave.waiting = [lightgray]Wave in {0} diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index a97ca7706d7146cf7969b56b0aeaaa034bebd66e..f0edb0987b194fa4d8699fa50ed682d210cd2532 100644 GIT binary patch delta 10647 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 Rte5YmKF|8k|E)lu9{`V^>9+s? diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 6d94538c3f..c62c621d45 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -389,7 +389,6 @@ public class Vars implements Loadable{ } Locale.setDefault(locale); - Core.bundle = I18NBundle.createBundle(handle, locale); //router diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 808905f967..cacb98406c 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -58,6 +58,7 @@ public class SectorPresets implements ContentList{ fungalPass = new SectorPreset("fungalPass", serpulo, 21){{ difficulty = 4; + useAI = false; }}; overgrowth = new SectorPreset("overgrowth", serpulo, 134){{ diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 85cb166237..4a5d7175af 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -101,9 +101,12 @@ public class Logic implements ApplicationListener{ Events.on(WorldLoadEvent.class, e -> { //enable infinite ammo for wave team by default state.rules.waveTeam.rules().infiniteAmmo = true; + if(state.isCampaign()){ - //enable building AI - state.rules.waveTeam.rules().ai = true; + //enable building AI on campaign unless the preset disables it + if(!(state.getSector().preset != null && !state.getSector().preset.useAI)){ + state.rules.waveTeam.rules().ai = true; + } state.rules.waveTeam.rules().infiniteResources = true; } diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java index ab7f9b234b..997e014c63 100644 --- a/core/src/mindustry/type/SectorPreset.java +++ b/core/src/mindustry/type/SectorPreset.java @@ -15,6 +15,7 @@ public class SectorPreset extends UnlockableContent{ public int captureWave = 0; public Cons rules = rules -> rules.winWave = captureWave; + public boolean useAI = true; /** Difficulty, 0-10. */ public float difficulty; public boolean addStartingItems = false; diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 2a6717cde4..01589c3c37 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -180,6 +180,9 @@ public class HudFragment extends Fragment{ cont.update(() -> { if(Core.input.keyTap(Binding.toggle_menus) && !ui.chatfrag.shown() && !Core.scene.hasDialog() && !(Core.scene.getKeyboardFocus() instanceof TextField)){ + Core.settings.getBoolOnce("ui-hidden", () -> { + ui.announce(Core.bundle.format("showui", Core.keybinds.get(Binding.toggle_menus).key.toString(), 10)); + }); toggleMenus(); } });