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

Unit spawn instruction

Browse Source
This commit is contained in:
Anuken
2022-02-08 13:20:55 -05:00
parent 38c0284bbe
commit ec8952ed46
8 changed files with 103 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ public class LExecutor{
//no units of this type found
exec.setconst(varUnit, null);
}
}else if(exec.obj(type) instanceof Unit u && u.team == exec.team && u.type.logicControllable){
}else if(exec.obj(type) instanceof Unit u && (u.team == exec.team || exec.privileged) && u.type.logicControllable){
//bind to specific unit object
exec.setconst(varUnit, u);
}else{
@@ -966,6 +966,7 @@ public class LExecutor{
obj instanceof Building build ? build.block.name :
obj instanceof Unit unit ? unit.type.name :
obj instanceof Enum<?> e ? e.name() :
obj instanceof Team team ? team.name :
"[object]";
}
}
@@ -1156,5 +1157,36 @@ public class LExecutor{
}
}
public static class SpawnUniI implements LInstruction{
public int type, x, y, rotation, team, result;
public boolean effect;
public SpawnUniI(int type, int x, int y, int rotation, int team, boolean effect, int result){
this.type = type;
this.x = x;
this.y = y;
this.rotation = rotation;
this.team = team;
this.effect = effect;
this.result = result;
}
public SpawnUniI(){
}
@Override
public void run(LExecutor exec){
if(exec.obj(type) instanceof UnitType type && !type.hidden && exec.obj(team) instanceof Team team && Units.canCreate(team, type)){
//random offset to prevent stacking
var unit = type.spawn(team, World.unconv(exec.numf(x)) + Mathf.range(0.01f), World.unconv(exec.numf(y)) + Mathf.range(0.01f));
unit.rotation = exec.numf(rotation);
if(effect){
spawner.spawnEffect(unit);
}
exec.setobj(result, unit);
}
}
}
//endregion
}