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

More control over wave sending (#7442)

Browse Source 
* Wave send rule

* Send natural wave command

* Use a boolean

* boolean selection

* Revert "boolean selection"

This reverts commit 01e7a8f0e0.

* Natural wave last

* I don't see why it wouldn't
This commit is contained in:
MEEPofFaith
2022-09-07 15:54:26 -07:00
committed by GitHub
parent 687bc11e54
commit 31149c08ea
7 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/mindustry/logic/LExecutor.java
View File

@@ -1409,6 +1409,7 @@ public class LExecutor{
case wave -> state.wave = exec.numi(value);
case currentWaveTime -> state.wavetime = exec.numf(value) * 60f;
case waves -> state.rules.waves = exec.bool(value);
case waveSending -> state.rules.waveSending = exec.bool(value);
case attackMode -> state.rules.attackMode = exec.bool(value);
case waveSpacing -> state.rules.waveSpacing = exec.numf(value) * 60f;
case enemyCoreBuildRadius -> state.rules.enemyCoreBuildRadius = exec.numf(value) * 8f;
@@ -1641,12 +1642,14 @@ public class LExecutor{
}
public static class SpawnWaveI implements LInstruction{
public int natural;
public int x, y;
public SpawnWaveI(){
}
public SpawnWaveI(int x, int y){
public SpawnWaveI(int natural, int x, int y){
this.natural = natural;
this.x = x;
this.y = y;
}
@@ -1655,9 +1658,14 @@ public class LExecutor{
public void run(LExecutor exec){
if(net.client()) return;
if(exec.bool(natural)){
logic.skipWave();
return;
}
float
spawnX = World.unconv(exec.numf(x)),
spawnY = World.unconv(exec.numf(y));
spawnX = World.unconv(exec.numf(x)),
spawnY = World.unconv(exec.numf(y));
int packed = Point2.pack(exec.numi(x), exec.numi(y));
for(SpawnGroup group : state.rules.spawns){