diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a22227f927..a5ec755bf5 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -544,6 +544,7 @@ sectors.threat = Threat: sectors.wave = Wave: sectors.stored = Stored: sectors.resume = Resume +sectors. sectors.launch = Launch sectors.select = Select sectors.nonelaunch = [lightgray]none (sun) @@ -552,7 +553,7 @@ sectors.enemybase = [scarlet]Enemy Base sectors.vulnerable = [scarlet]Vulnerable sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged sectors.survives = [accent]Survives {0} waves - +sectors.go = Go sector.curcapture = Sector Captured sector.curlost = Sector Lost sector.missingresources = [scarlet]Insufficient Core Resources @@ -1240,7 +1241,6 @@ team.derelict.name = derelict team.green.name = green team.purple.name = purple -# DO NOT TRANSLATE ANY OF THESE YET! THEY ARE UNFINISHED! hint.skip = Skip hint.desktopMove = Use [accent][[WASD][] to move. hint.zoom = [accent]Scroll[] to zoom in or out. diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index fa39ad5492..8baf077073 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -252,7 +252,7 @@ public class MobileInput extends InputHandler implements GestureListener{ selectRequests.clear(); mode = none; block = null; - }).width(155f).margin(12f); + }).width(155f).height(50f).margin(12f); }); group.fill(t -> { diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index e0eb64904c..08a307c215 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -715,7 +715,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } if((sector.hasBase() && mode == look) || canSelect(sector) || (sector.preset != null && sector.preset.alwaysUnlocked) || debugSelect){ - stable.button(mode == select ? "@sectors.select" : sector.hasBase() ? "@sectors.resume" : "@sectors.launch", Icon.play, () -> { + stable.button(mode == select ? "@sectors.select" : sector.isBeingPlayed() ? "@sectors.resume" : sector.hasBase() ? "@sectors.go" : "@sectors.launch", Icon.play, () -> { if(sector.isBeingPlayed()){ //already at this sector hide(); diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java index 1bc8ad6f1e..69c8be7247 100644 --- a/core/src/mindustry/ui/fragments/HintsFragment.java +++ b/core/src/mindustry/ui/fragments/HintsFragment.java @@ -32,7 +32,6 @@ public class HintsFragment extends Fragment{ Group group = new WidgetGroup(); ObjectSet events = new ObjectSet<>(); ObjectSet placedBlocks = new ObjectSet<>(); - int checkIdx = 0; Table last; @Override @@ -50,9 +49,8 @@ public class HintsFragment extends Fragment{ } }else if(hints.size > 0){ //check one hint each frame to see if it should be shown. - checkIdx = (checkIdx + 1) % hints.size; - Hint hint = hints.get(checkIdx); - if(hint.show() && !hint.finished() & !hint.complete()){ + Hint hint = hints.find(Hint::show); + if(hint != null && !hint.finished() & !hint.complete()){ display(hint); } } @@ -99,7 +97,7 @@ public class HintsFragment extends Fragment{ t.left(); t.table(Styles.black5, cont -> { cont.actions(Actions.alpha(0f), Actions.alpha(1f, 1f, Interp.smooth)); - cont.margin(6f).add(hint.text()).width(Vars.mobile ? 300f : 400f).left().labelAlign(Align.left).wrap(); + cont.margin(6f).add(hint.text()).width(Vars.mobile ? 270f : 400f).left().labelAlign(Align.left).wrap(); }); t.row(); t.button("@hint.skip", Styles.nonet, () -> {