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

Force projector heat sense

Browse Source
This commit is contained in:
Anuken
2021-02-10 14:42:30 -05:00
parent 949f5eccd7
commit ea2b57ec4b
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,17 +338,19 @@ public class LExecutor{
@Nullable @Nullable
public static LogicAI checkLogicAI(LExecutor exec, Object unitObj){ public static LogicAI checkLogicAI(LExecutor exec, Object unitObj){
if(unitObj instanceof Unit unit && exec.obj(varUnit) == unit && unit.team == exec.team && !unit.isPlayer() && !(unit.controller() instanceof FormationAI)){ if(unitObj instanceof Unit unit && exec.obj(varUnit) == unit && unit.team == exec.team && !unit.isPlayer() && !(unit.controller() instanceof FormationAI)){
if(!(unit.controller() instanceof LogicAI)){ if(unit.controller() instanceof LogicAI la){
unit.controller(new LogicAI()); return la;
((LogicAI)unit.controller()).controller = exec.building(varThis); }else{
var la = new LogicAI();
la.controller = exec.building(varThis);
unit.controller(la);
//clear old state //clear old state
unit.mineTile = null; unit.mineTile = null;
unit.clearBuilding(); unit.clearBuilding();
return (LogicAI)unit.controller(); return la;
} }
return (LogicAI)unit.controller();
} }
return null; return null;
} }

6
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -178,6 +178,12 @@ public class ForceProjector extends Block{
return (radius + phaseHeat * phaseRadiusBoost) * radscl; return (radius + phaseHeat * phaseRadiusBoost) * radscl;
} }
@Override
public double sense(LAccess sensor){
if(sensor == LAccess.heat) return buildup;
return super.sense(sensor);
}
@Override @Override
public void draw(){ public void draw(){
super.draw(); super.draw();