From 681fc6de3ddbeb80bbaf7adba3870ed5a607792c Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 13 Aug 2021 19:41:14 -0400 Subject: [PATCH] Misc bugfixes --- core/src/mindustry/ui/dialogs/PlanetDialog.java | 4 ++-- core/src/mindustry/ui/fragments/HintsFragment.java | 6 +++--- gradle.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index cc71280e44..c0cf02795d 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -531,7 +531,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ }), 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); //sector notifications & search @@ -557,7 +558,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ })).grow(); } - //TODO void rebuildList(){ notifs.clear(); diff --git a/core/src/mindustry/ui/fragments/HintsFragment.java b/core/src/mindustry/ui/fragments/HintsFragment.java index 059af19994..45230f2d3a 100644 --- a/core/src/mindustry/ui/fragments/HintsFragment.java +++ b/core/src/mindustry/ui/fragments/HintsFragment.java @@ -48,12 +48,12 @@ public class HintsFragment extends Fragment{ }else if(!current.show()){ //current became hidden 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. Hint hint = hints.find(Hint::show); if(hint != null && hint.complete()){ hints.remove(hint); - }else if(hint != null){ + }else if(hint != null && !renderer.isCutscene() && state.isGame() && control.saves.getTotalPlaytime() > 8000){ display(hint); }else{ //moused over a derelict structure @@ -92,7 +92,7 @@ public class HintsFragment extends Fragment{ hints.sort(Hint::order); Hint first = hints.find(Hint::show); - if(first != null){ + if(first != null && !renderer.isCutscene() && state.isGame()){ hints.remove(first); display(first); } diff --git a/gradle.properties b/gradle.properties index a8a10d7568..9bb15d466d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=5a334f46162cdc6a29212a0eb9e34d1e666bf535 +archash=4c1533ad063b0e91b9536e9aa6ff0c998e2489e2