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

Misc bugfixes

Browse Source
This commit is contained in:
Anuken
2021-08-13 19:41:14 -04:00
parent 9640acfb74
commit 681fc6de3d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -531,7 +531,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
}), }),
new Table(c -> { new Table(c -> {
if(!(graphics.isPortrait() && mobile) && planets.planet.sectors.contains(Sector::hasBase)){ c.visible(() -> !(graphics.isPortrait() && mobile));
if(planets.planet.sectors.contains(Sector::hasBase)){
int attacked = planets.planet.sectors.count(Sector::isAttacked); int attacked = planets.planet.sectors.count(Sector::isAttacked);
//sector notifications & search //sector notifications & search
@@ -557,7 +558,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
})).grow(); })).grow();
} }
//TODO
void rebuildList(){ void rebuildList(){
notifs.clear(); notifs.clear();

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

@@ -48,12 +48,12 @@ public class HintsFragment extends Fragment{
}else if(!current.show()){ //current became hidden }else if(!current.show()){ //current became hidden
hide(); hide();
} }
}else if(hints.size > 0 && !renderer.isCutscene()){ }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.
Hint hint = hints.find(Hint::show); Hint hint = hints.find(Hint::show);
if(hint != null && hint.complete()){ if(hint != null && hint.complete()){
hints.remove(hint); hints.remove(hint);
}else if(hint != null){ }else if(hint != null && !renderer.isCutscene() && state.isGame() && control.saves.getTotalPlaytime() > 8000){
display(hint); display(hint);
}else{ }else{
//moused over a derelict structure //moused over a derelict structure
@@ -92,7 +92,7 @@ public class HintsFragment extends Fragment{
hints.sort(Hint::order); hints.sort(Hint::order);
Hint first = hints.find(Hint::show); Hint first = hints.find(Hint::show);
if(first != null){ if(first != null && !renderer.isCutscene() && state.isGame()){
hints.remove(first); hints.remove(first);
display(first); display(first);
} }

2
gradle.properties
View File

@@ -11,4 +11,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
http.socketTimeout=80000 http.socketTimeout=80000
http.connectionTimeout=80000 http.connectionTimeout=80000
archash=5a334f46162cdc6a29212a0eb9e34d1e666bf535 archash=4c1533ad063b0e91b9536e9aa6ff0c998e2489e2