From bf1268bb6e626833a9244f3782274da78c8c795d Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 23 Oct 2020 10:39:01 -0400 Subject: [PATCH] Shooting -> Function category / Dialog cleanup --- core/assets/bundles/bundle.properties | 4 +-- core/assets/bundles/bundle_da.properties | 2 +- core/assets/bundles/bundle_hu.properties | 2 +- core/assets/bundles/bundle_nl_BE.properties | 2 +- core/assets/bundles/bundle_sv.properties | 2 +- core/assets/bundles/bundle_tk.properties | 2 +- core/src/mindustry/editor/WaveInfoDialog.java | 7 +---- core/src/mindustry/ui/dialogs/BaseDialog.java | 14 ++++++---- .../src/mindustry/ui/dialogs/FileChooser.java | 6 +--- .../ui/dialogs/LaunchLoadoutDialog.java | 7 +---- core/src/mindustry/ui/dialogs/MapsDialog.java | 7 +---- .../mindustry/ui/dialogs/PaletteDialog.java | 3 +- .../mindustry/ui/dialogs/PausedDialog.java | 7 +---- .../mindustry/ui/dialogs/PlanetDialog.java | 15 +++++----- core/src/mindustry/world/meta/Stat.java | 28 +++++++++---------- core/src/mindustry/world/meta/StatCat.java | 2 +- 16 files changed, 44 insertions(+), 66 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f492a6f473..6800771f80 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -719,7 +719,7 @@ category.power = Power category.liquids = Liquids category.items = Items category.crafting = Input/Output -category.shooting = Shooting +category.function = Function category.optional = Optional Enhancements setting.landscape.name = Lock Landscape setting.shadows.name = Shadows @@ -728,7 +728,7 @@ setting.linear.name = Linear Filtering setting.hints.name = Hints setting.flow.name = Display Resource Flow Rate setting.buildautopause.name = Auto-Pause Building -setting.animatedwater.name = Animated Fluids +setting.animatedwater.name = Animated Surfaces setting.animatedshields.name = Animated Shields setting.antialias.name = Antialias[lightgray] (requires restart)[] setting.playerindicators.name = Player Indicators diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index b65afebcd3..acc9e5fc13 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -691,7 +691,7 @@ setting.touchscreen.name = Touchscreen Controls setting.fpscap.name = Max FPS setting.fpscap.none = None setting.fpscap.text = {0} FPS -setting.uiscale.name = UI Scaling[lightgray] (require restart)[] +setting.uiscale.name = UI Scaling[lightgray] (requires restart)[] setting.swapdiagonal.name = Always Diagonal Placement setting.difficulty.training = Training setting.difficulty.easy = Easy diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index c24c9a24ee..b59dca7d75 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -691,7 +691,7 @@ setting.touchscreen.name = Touchscreen Controls setting.fpscap.name = Max FPS setting.fpscap.none = None setting.fpscap.text = {0} FPS -setting.uiscale.name = UI Scaling[lightgray] (require restart)[] +setting.uiscale.name = UI Scaling[lightgray] (requires restart)[] setting.swapdiagonal.name = Always Diagonal Placement setting.difficulty.training = Training setting.difficulty.easy = Easy diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 4f2ed1fdcd..6280987286 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -691,7 +691,7 @@ setting.touchscreen.name = Touchscreen Controls setting.fpscap.name = Max FPS setting.fpscap.none = None setting.fpscap.text = {0} FPS -setting.uiscale.name = UI Scaling[lightgray] (require restart)[] +setting.uiscale.name = UI Scaling[lightgray] (requires restart)[] setting.swapdiagonal.name = Always Diagonal Placement setting.difficulty.training = training setting.difficulty.easy = easy diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 8d3942eccb..c4e3ec4eaa 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -691,7 +691,7 @@ setting.touchscreen.name = Touchscreen Controls setting.fpscap.name = Begränsade FPS setting.fpscap.none = Inga setting.fpscap.text = {0} FPS -setting.uiscale.name = UI Scaling[lightgray] (require restart)[] +setting.uiscale.name = UI Scaling[lightgray] (requires restart)[] setting.swapdiagonal.name = Always Diagonal Placement setting.difficulty.training = Träning setting.difficulty.easy = Lätt diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index cfac48c897..c5be49ea94 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -691,7 +691,7 @@ setting.touchscreen.name = Touchscreen Controls setting.fpscap.name = Max FPS setting.fpscap.none = Yok setting.fpscap.text = {0} FPS -setting.uiscale.name = UI Scaling[lightgray] (require restart)[] +setting.uiscale.name = UI Scaling[lightgray] (requires restart)[] setting.swapdiagonal.name = Always Diagonal Placement setting.difficulty.training = training setting.difficulty.easy = kolay diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java index ae5f985766..591c9c5220 100644 --- a/core/src/mindustry/editor/WaveInfoDialog.java +++ b/core/src/mindustry/editor/WaveInfoDialog.java @@ -1,7 +1,6 @@ package mindustry.editor; import arc.*; -import arc.input.*; import arc.math.*; import arc.scene.event.*; import arc.scene.ui.*; @@ -39,11 +38,7 @@ public class WaveInfoDialog extends BaseDialog{ state.rules.spawns = groups; }); - keyDown(key -> { - if(key == KeyCode.escape || key == KeyCode.back){ - Core.app.post(this::hide); - } - }); + addCloseListener(); onResize(this::setup); addCloseButton(); diff --git a/core/src/mindustry/ui/dialogs/BaseDialog.java b/core/src/mindustry/ui/dialogs/BaseDialog.java index b180763f86..09539939de 100644 --- a/core/src/mindustry/ui/dialogs/BaseDialog.java +++ b/core/src/mindustry/ui/dialogs/BaseDialog.java @@ -53,15 +53,19 @@ public class BaseDialog extends Dialog{ }); } - @Override - public void addCloseButton(){ - buttons.defaults().size(210f, 64f); - buttons.button("@back", Icon.left, this::hide).size(210f, 64f); - + public void addCloseListener(){ keyDown(key -> { if(key == KeyCode.escape || key == KeyCode.back){ Core.app.post(this::hide); } }); } + + @Override + public void addCloseButton(){ + buttons.defaults().size(210f, 64f); + buttons.button("@back", Icon.left, this::hide).size(210f, 64f); + + addCloseListener(); + } } diff --git a/core/src/mindustry/ui/dialogs/FileChooser.java b/core/src/mindustry/ui/dialogs/FileChooser.java index 555df63e33..c755585b12 100644 --- a/core/src/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/mindustry/ui/dialogs/FileChooser.java @@ -51,11 +51,7 @@ public class FileChooser extends BaseDialog{ ok.fireClick(); }); - keyDown(key -> { - if(key == KeyCode.escape || key == KeyCode.back){ - Core.app.post(this::hide); - } - }); + addCloseListener(); } private void setupWidgets(){ diff --git a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java index 6cb50dbf36..324c0be7b3 100644 --- a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java +++ b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java @@ -2,7 +2,6 @@ package mindustry.ui.dialogs; import arc.*; import arc.func.*; -import arc.input.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; @@ -37,11 +36,7 @@ public class LaunchLoadoutDialog extends BaseDialog{ buttons.defaults().size(160f, 64f); buttons.button("@back", Icon.left, this::hide); - keyDown(key -> { - if(key == KeyCode.escape || key == KeyCode.back){ - Core.app.post(this::hide); - } - }); + addCloseListener(); ItemSeq sitems = sector.getItems(); diff --git a/core/src/mindustry/ui/dialogs/MapsDialog.java b/core/src/mindustry/ui/dialogs/MapsDialog.java index c03c01e799..790f036efa 100644 --- a/core/src/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/mindustry/ui/dialogs/MapsDialog.java @@ -2,7 +2,6 @@ package mindustry.ui.dialogs; import arc.*; import arc.graphics.*; -import arc.input.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.util.*; @@ -24,11 +23,7 @@ public class MapsDialog extends BaseDialog{ buttons.remove(); - keyDown(key -> { - if(key == KeyCode.escape || key == KeyCode.back){ - Core.app.post(this::hide); - } - }); + addCloseListener(); shown(this::setup); onResize(() -> { diff --git a/core/src/mindustry/ui/dialogs/PaletteDialog.java b/core/src/mindustry/ui/dialogs/PaletteDialog.java index 6453a2284e..6a6a666226 100644 --- a/core/src/mindustry/ui/dialogs/PaletteDialog.java +++ b/core/src/mindustry/ui/dialogs/PaletteDialog.java @@ -38,8 +38,7 @@ public class PaletteDialog extends Dialog{ } keyDown(key -> { - if(key == KeyCode.escape || key == KeyCode.back) - hide(); + if(key == KeyCode.escape || key == KeyCode.back) hide(); }); } diff --git a/core/src/mindustry/ui/dialogs/PausedDialog.java b/core/src/mindustry/ui/dialogs/PausedDialog.java index fce68f3044..a1feb73457 100644 --- a/core/src/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/mindustry/ui/dialogs/PausedDialog.java @@ -1,7 +1,6 @@ package mindustry.ui.dialogs; import arc.*; -import arc.input.*; import mindustry.gen.*; import static mindustry.Vars.*; @@ -17,11 +16,7 @@ public class PausedDialog extends BaseDialog{ shown(this::rebuild); - keyDown(key -> { - if(key == KeyCode.escape || key == KeyCode.back){ - hide(); - } - }); + addCloseListener(); } void rebuild(){ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 00c68b4a0e..66552ed936 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -49,14 +49,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ shouldPause = true; - getCell(buttons).padBottom(-4); - buttons.background(Styles.black).defaults().growX().height(64f).pad(0); - - keyDown(key -> { - if(key == KeyCode.escape || key == KeyCode.back){ - Core.app.post(this::hide); - } - }); + buttons.defaults().size(200f, 56f).pad(2); + buttons.button("@back", Icon.left, this::hide); + buttons.button("@techtree", Icon.tree, () -> ui.research.show()); + buttons.bottom().margin(0).marginBottom(-8); dragged((cx, cy) -> { Vec3 pos = planets.camPos; @@ -263,11 +259,14 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ Core.scene.setScrollFocus(PlanetDialog.this); } }, + //info text new Table(t -> { t.touchable = Touchable.disabled; t.top(); t.label(() -> mode == select ? "@sectors.select" : "").style(Styles.outlineLabel).color(Pal.accent); }), + buttons, + //planet selection new Table(t -> { t.right(); if(content.planets().count(p -> p.accessible) > 1) { diff --git a/core/src/mindustry/world/meta/Stat.java b/core/src/mindustry/world/meta/Stat.java index 2a8d88a7d1..21ad80c675 100644 --- a/core/src/mindustry/world/meta/Stat.java +++ b/core/src/mindustry/world/meta/Stat.java @@ -53,20 +53,20 @@ public enum Stat{ linkRange(StatCat.crafting), instructions(StatCat.crafting), - speedIncrease(StatCat.shooting), - repairTime(StatCat.shooting), - range(StatCat.shooting), - shootRange(StatCat.shooting), - inaccuracy(StatCat.shooting), - shots(StatCat.shooting), - reload(StatCat.shooting), - powerShot(StatCat.shooting), - targetsAir(StatCat.shooting), - targetsGround(StatCat.shooting), - damage(StatCat.shooting), - ammo(StatCat.shooting), - shieldHealth(StatCat.shooting), - cooldownTime(StatCat.shooting), + speedIncrease(StatCat.function), + repairTime(StatCat.function), + range(StatCat.function), + shootRange(StatCat.function), + inaccuracy(StatCat.function), + shots(StatCat.function), + reload(StatCat.function), + powerShot(StatCat.function), + targetsAir(StatCat.function), + targetsGround(StatCat.function), + damage(StatCat.function), + ammo(StatCat.function), + shieldHealth(StatCat.function), + cooldownTime(StatCat.function), booster(StatCat.optional), boostEffect(StatCat.optional), diff --git a/core/src/mindustry/world/meta/StatCat.java b/core/src/mindustry/world/meta/StatCat.java index 8dfd42d3c5..0398ff7b5d 100644 --- a/core/src/mindustry/world/meta/StatCat.java +++ b/core/src/mindustry/world/meta/StatCat.java @@ -9,7 +9,7 @@ public enum StatCat{ liquids, items, crafting, - shooting, + function, optional; public String localized(){