mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-11 07:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Logic unit control tweaks

Browse Source
This commit is contained in:
Anuken 2020-10-11 19:10:33 -04:00
parent ee50995dde
commit 6807b589a3
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/logic/LAssembler.java
View File

@ -52,6 +52,9 @@ public class LAssembler{
}
}
//used as a special value for any environmental solid block
putConst("@solid", Blocks.stoneWall);
putConst("@air", Blocks.air);
for(UnitType type : Vars.content.units()){

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

@ -6,6 +6,7 @@ import arc.util.*;
import arc.util.noise.*;
import mindustry.*;
import mindustry.ai.types.*;
import mindustry.content.*;
import mindustry.ctype.*;
import mindustry.entities.*;
import mindustry.game.*;
@ -251,6 +252,11 @@ public class LExecutor{
case spawn -> {
res = Geometry.findClosest(unit.x, unit.y, Vars.spawner.getSpawns());
}
case damaged -> {
Building b = Units.findDamagedTile(unit.team, unit.x, unit.y);
res = b == null ? null : b.tile;
build = true;
}
}
if(res != null && (!build || res.build != null)){
@ -435,12 +441,16 @@ public class LExecutor{
}
case getBlock -> {
float x = exec.numf(p1), y = exec.numf(p2);
if(unit.within(x, y, unit.range())){
float range = Math.max(unit.range(), buildingRange);
if(!unit.within(x, y, range)){
exec.setobj(p3, null);
exec.setnum(p4, 0);
}else{
Tile tile = world.tileWorld(x, y);
Block block = tile == null || !tile.synthetic() ? null : tile.block();
//any environmental solid block is returned as StoneWall, aka "@solid"
Block block = tile == null ? null : !tile.synthetic() ? (tile.solid() ? Blocks.stoneWall : Blocks.air) : tile.block();
exec.setobj(p3, block);
exec.setnum(p4, tile != null && tile.build != null ? tile.build.rotation : 0);
}
}
case itemDrop -> {

3
core/src/mindustry/logic/LLocate.java
View File

@ -3,7 +3,8 @@ package mindustry.logic;
public enum LLocate{
ore,
building,
spawn;
spawn,
damaged;
public static final LLocate[] all = values();
}

2
core/src/mindustry/logic/LStatements.java
View File

@ -889,7 +889,7 @@ public class LStatements{
table.row();
}
case spawn -> {
case spawn, damaged -> {
table.row();
}
}

2
core/src/mindustry/logic/LUnitControl.java
View File

@ -15,7 +15,7 @@ public enum LUnitControl{
mine("x", "y"),
flag("value"),
build("x", "y", "block", "rotation"),
getBlock("x", "y", "result"),
getBlock("x", "y", "result", "resRot"),
within("x", "y", "radius", "result");
public final String[] params;