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

Merging changes from private branch

Browse Source
This commit is contained in:
Anuken
2025-04-04 11:47:35 -04:00
parent cf5c6d0905
commit b7dbe54d76
161 changed files with 2484 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1434,7 +1434,7 @@ public class LExecutor{
if(type.obj() instanceof UnitType type && !type.internal && !type.hidden && t != null && Units.canCreate(t, type)){
//random offset to prevent stacking
var unit = type.spawn(t, World.unconv(x.numf()) + Mathf.range(0.01f), World.unconv(y.numf()) + Mathf.range(0.01f));
spawner.spawnEffect(unit, rotation.numf());
spawner.spawnEffect(unit);
result.setobj(unit);
}
}
@@ -1603,11 +1603,12 @@ public class LExecutor{
}else if(full){
//disable the rule, covers the whole map
if(set){
int prevX = state.rules.limitX, prevY = state.rules.limitY, prevW = state.rules.limitWidth, prevH = state.rules.limitHeight;
state.rules.limitMapArea = false;
if(!headless){
renderer.updateAllDarkness();
}
world.checkMapArea();
world.checkMapArea(prevX, prevY, prevW, prevH);
return false;
}
}
@@ -1616,12 +1617,20 @@ public class LExecutor{
}
if(set){
int prevX = state.rules.limitX, prevY = state.rules.limitY, prevW = state.rules.limitWidth, prevH = state.rules.limitHeight;
if(!state.rules.limitMapArea){
//it was never on in the first place, so the old bounds don't apply
prevW = 0;
prevH = 0;
prevX = -1;
prevY = -1;
}
state.rules.limitMapArea = true;
state.rules.limitX = x;
state.rules.limitY = y;
state.rules.limitWidth = w;
state.rules.limitHeight = h;
world.checkMapArea();
world.checkMapArea(prevX, prevY, prevW, prevH);
if(!headless){
renderer.updateAllDarkness();
@@ -1933,9 +1942,7 @@ public class LExecutor{
for(int i = 0; i < spawned; i++){
Tmp.v1.rnd(spread);
Unit unit = group.createUnit(state.rules.waveTeam, state.wave - 1);
unit.set(spawnX + Tmp.v1.x, spawnY + Tmp.v1.y);
Vars.spawner.spawnEffect(unit);
spawner.spawnUnit(group, spawnX + Tmp.v1.x, spawnY + Tmp.v1.y);
}
}
}