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

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){
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();

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

@@ -32,7 +32,6 @@ public class HintsFragment extends Fragment{
Group group = new WidgetGroup();
ObjectSet<String> events = new ObjectSet<>();
ObjectSet<Block> 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, () -> {