#3412 but not broken

This commit is contained in:
Anuken 2020-11-15 15:29:31 -05:00
parent c95872e992
commit 9928b0f788
7 changed files with 11 additions and 3 deletions

View File

@ -290,6 +290,7 @@ cancelbuilding = [accent][[{0}][] to clear plan
selectschematic = [accent][[{0}][] to select+copy selectschematic = [accent][[{0}][] to select+copy
pausebuilding = [accent][[{0}][] to pause building pausebuilding = [accent][[{0}][] to pause building
resumebuilding = [scarlet][[{0}][] to resume building resumebuilding = [scarlet][[{0}][] to resume building
showui = UI hidden.\nPress [accent][[{0}][] to show UI.
wave = [accent]Wave {0} wave = [accent]Wave {0}
wave.cap = [accent]Wave {0}/{1} wave.cap = [accent]Wave {0}/{1}
wave.waiting = [lightgray]Wave in {0} wave.waiting = [lightgray]Wave in {0}

Binary file not shown.

View File

@ -389,7 +389,6 @@ public class Vars implements Loadable{
} }
Locale.setDefault(locale); Locale.setDefault(locale);
Core.bundle = I18NBundle.createBundle(handle, locale); Core.bundle = I18NBundle.createBundle(handle, locale);
//router //router

View File

@ -58,6 +58,7 @@ public class SectorPresets implements ContentList{
fungalPass = new SectorPreset("fungalPass", serpulo, 21){{ fungalPass = new SectorPreset("fungalPass", serpulo, 21){{
difficulty = 4; difficulty = 4;
useAI = false;
}}; }};
overgrowth = new SectorPreset("overgrowth", serpulo, 134){{ overgrowth = new SectorPreset("overgrowth", serpulo, 134){{

View File

@ -101,9 +101,12 @@ public class Logic implements ApplicationListener{
Events.on(WorldLoadEvent.class, e -> { Events.on(WorldLoadEvent.class, e -> {
//enable infinite ammo for wave team by default //enable infinite ammo for wave team by default
state.rules.waveTeam.rules().infiniteAmmo = true; state.rules.waveTeam.rules().infiniteAmmo = true;
if(state.isCampaign()){ if(state.isCampaign()){
//enable building AI //enable building AI on campaign unless the preset disables it
state.rules.waveTeam.rules().ai = true; if(!(state.getSector().preset != null && !state.getSector().preset.useAI)){
state.rules.waveTeam.rules().ai = true;
}
state.rules.waveTeam.rules().infiniteResources = true; state.rules.waveTeam.rules().infiniteResources = true;
} }

View File

@ -15,6 +15,7 @@ public class SectorPreset extends UnlockableContent{
public int captureWave = 0; public int captureWave = 0;
public Cons<Rules> rules = rules -> rules.winWave = captureWave; public Cons<Rules> rules = rules -> rules.winWave = captureWave;
public boolean useAI = true;
/** Difficulty, 0-10. */ /** Difficulty, 0-10. */
public float difficulty; public float difficulty;
public boolean addStartingItems = false; public boolean addStartingItems = false;

View File

@ -180,6 +180,9 @@ public class HudFragment extends Fragment{
cont.update(() -> { cont.update(() -> {
if(Core.input.keyTap(Binding.toggle_menus) && !ui.chatfrag.shown() && !Core.scene.hasDialog() && !(Core.scene.getKeyboardFocus() instanceof TextField)){ 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(); toggleMenus();
} }
}); });