Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-11-22 16:53:50 -05:00
parent b42e5c3b66
commit ea377c6f16
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/bundles/bundle.properties
View File

@@ -544,6 +544,7 @@ sectors.threat = Threat:
sectors.wave = Wave: sectors.wave = Wave:
sectors.stored = Stored: sectors.stored = Stored:
sectors.resume = Resume sectors.resume = Resume
sectors.
sectors.launch = Launch sectors.launch = Launch
sectors.select = Select sectors.select = Select
sectors.nonelaunch = [lightgray]none (sun) sectors.nonelaunch = [lightgray]none (sun)
@@ -552,7 +553,7 @@ sectors.enemybase = [scarlet]Enemy Base
sectors.vulnerable = [scarlet]Vulnerable sectors.vulnerable = [scarlet]Vulnerable
sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged sectors.underattack = [scarlet]Under attack! [accent]{0}% damaged
sectors.survives = [accent]Survives {0} waves sectors.survives = [accent]Survives {0} waves
sectors.go = Go
sector.curcapture = Sector Captured sector.curcapture = Sector Captured
sector.curlost = Sector Lost sector.curlost = Sector Lost
sector.missingresources = [scarlet]Insufficient Core Resources sector.missingresources = [scarlet]Insufficient Core Resources
@@ -1240,7 +1241,6 @@ team.derelict.name = derelict
team.green.name = green team.green.name = green
team.purple.name = purple team.purple.name = purple
# DO NOT TRANSLATE ANY OF THESE YET! THEY ARE UNFINISHED!
hint.skip = Skip hint.skip = Skip
hint.desktopMove = Use [accent][[WASD][] to move. hint.desktopMove = Use [accent][[WASD][] to move.
hint.zoom = [accent]Scroll[] to zoom in or out. hint.zoom = [accent]Scroll[] to zoom in or out.

2
core/src/mindustry/input/MobileInput.java
View File

@@ -252,7 +252,7 @@ public class MobileInput extends InputHandler implements GestureListener{
selectRequests.clear(); selectRequests.clear();
mode = none; mode = none;
block = null; block = null;
}).width(155f).margin(12f); }).width(155f).height(50f).margin(12f);
}); });
group.fill(t -> { group.fill(t -> {

2
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -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){ 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()){ if(sector.isBeingPlayed()){
//already at this sector //already at this sector
hide(); hide();

8
core/src/mindustry/ui/fragments/HintsFragment.java
View File

@@ -32,7 +32,6 @@ public class HintsFragment extends Fragment{
Group group = new WidgetGroup(); Group group = new WidgetGroup();
ObjectSet<String> events = new ObjectSet<>(); ObjectSet<String> events = new ObjectSet<>();
ObjectSet<Block> placedBlocks = new ObjectSet<>(); ObjectSet<Block> placedBlocks = new ObjectSet<>();
int checkIdx = 0;
Table last; Table last;
@Override @Override
@@ -50,9 +49,8 @@ public class HintsFragment extends Fragment{
} }
}else if(hints.size > 0){ }else if(hints.size > 0){
//check one hint each frame to see if it should be shown. //check one hint each frame to see if it should be shown.
checkIdx = (checkIdx + 1) % hints.size; Hint hint = hints.find(Hint::show);
Hint hint = hints.get(checkIdx); if(hint != null && !hint.finished() & !hint.complete()){
if(hint.show() && !hint.finished() & !hint.complete()){
display(hint); display(hint);
} }
} }
@@ -99,7 +97,7 @@ public class HintsFragment extends Fragment{
t.left(); t.left();
t.table(Styles.black5, cont -> { t.table(Styles.black5, cont -> {
cont.actions(Actions.alpha(0f), Actions.alpha(1f, 1f, Interp.smooth)); 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.row();
t.button("@hint.skip", Styles.nonet, () -> { t.button("@hint.skip", Styles.nonet, () -> {