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

Barely functional IO

Browse Source
This commit is contained in:
Anuken
2020-02-13 19:26:36 -05:00
parent ad248e2e20
commit e3621f44da
68 changed files with 323 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@ public class HudFragment extends Fragment{
}else{
ui.chatfrag.toggle();
}
}else if(world.isZone()){
}else if(world.isCampaign()){
ui.tech.show();
}else{
ui.database.show();
@@ -497,10 +497,10 @@ public class HudFragment extends Fragment{
}
private boolean inLaunchWave(){
return world.isZone() &&
world.getZone().metCondition() &&
return world.isCampaign() &&
world.getSector().metCondition() &&
!net.client() &&
state.wave % world.getZone().launchPeriod == 0 && !spawner.isSpawning();
state.wave % world.getSector().launchPeriod == 0 && !spawner.isSpawning();
}
private boolean canLaunch(){
@@ -559,7 +559,7 @@ public class HudFragment extends Fragment{
}else{
builder.append(Core.bundle.get("launch"));
builder.append("\n");
builder.append(Core.bundle.format("launch.next", state.wave + world.getZone().launchPeriod));
builder.append(Core.bundle.format("launch.next", state.wave + world.getSector().launchPeriod));
builder.append("\n");
}
builder.append("[]\n");