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

Wave limit game rule in custom maps (#8550)

Browse Source 
* custom maps wave limit

* whoopsies
This commit is contained in:
JniTrRny
2023-05-07 10:04:31 +07:00
committed by GitHub
parent 72c67f6c9b
commit bb06c3f1e9
7 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ public class HudFragment{
//warn about guardian/boss waves
Events.on(WaveEvent.class, e -> {
int max = 10;
int winWave = state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
int winWave = state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
outer:
for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave - 2); i++){
for(SpawnGroup group : state.rules.spawns){
@@ -822,7 +822,7 @@ public class HudFragment{
return builder;
}
if(state.rules.winWave > 1 && state.rules.winWave >= state.wave && state.isCampaign()){
if(state.rules.winWave > 1 && state.rules.winWave >= state.wave){
builder.append(wavefc.get(state.wave, state.rules.winWave));
}else{
builder.append(wavef.get(state.wave));