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

Fixed sector gameover ghost bug

Browse Source
This commit is contained in:
Anuken
2020-11-20 12:38:16 -05:00
parent aa2783a885
commit 1372fc4079
8 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/GameState.java
View File

@@ -69,7 +69,7 @@ public class GameState{
}
public boolean isPaused(){
return (is(State.paused) && !net.active()) || (gameOver && !net.active()) || (serverPaused && !isMenu());
return (is(State.paused) && !net.active()) || (gameOver && (!net.active() || isCampaign())) || (serverPaused && !isMenu());
}
public boolean isPlaying(){

2
core/src/mindustry/type/Sector.java
View File

@@ -98,7 +98,7 @@ public class Sector{
/** @return whether the player has a base here. */
public boolean hasBase(){
return save != null && info.hasCore;
return save != null && info.hasCore && !(Vars.state.isGame() && Vars.state.rules.sector == this && state.gameOver);
}
/** @return whether the enemy has a generated base here. */

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

@@ -31,13 +31,13 @@ public class GameOverDialog extends BaseDialog{
}
void rebuild(){
title.setText("@gameover");
title.setText(state.isCampaign() ? "@sector.curlost" : "@gameover");
buttons.clear();
cont.clear();
buttons.margin(10);
if(state.rules.pvp){
if(state.rules.pvp && winner != null){
cont.add(Core.bundle.format("gameover.pvp", winner.localized())).pad(6);
buttons.button("@menu", () -> {
hide();

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

@@ -239,6 +239,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
}
Sector findLauncher(Sector to){
Sector launchSector = this.launchSector != null && this.launchSector.hasBase() ? this.launchSector : null;
//directly nearby.
if(to.near().contains(launchSector)) return launchSector;
@@ -711,7 +712,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, () -> {
if(state.rules.sector == sector && !state.isMenu()){
if(sector.isBeingPlayed()){
//already at this sector
hide();
return;

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -90,7 +90,7 @@ public class HudFragment extends Fragment{
parent.fill(t -> {
t.name = "paused";
t.top().visible(() -> state.isPaused() && shown).touchable = Touchable.disabled;
t.table(Styles.black5, top -> top.add("@paused").style(Styles.outlineLabel).pad(8f)).growX();
t.table(Styles.black5, top -> top.label(() -> state.gameOver && state.isCampaign() ? "@sector.curlost" : "@paused").style(Styles.outlineLabel).pad(8f)).growX();
});
//minimap + position