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

Do not command select logic controlled units by default

Browse Source
This commit is contained in:
Anuken
2025-05-01 10:27:47 -04:00
parent 5615182bc5
commit 1a07efd80b
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/ai/types/LogicAI.java
View File

@@ -20,8 +20,7 @@ public class LogicAI extends AIController{
public LUnitControl control = LUnitControl.idle;
public float moveX, moveY, moveRad;
public float controlTimer = logicControlTimeout, targetTimer;
@Nullable
public Building controller;
public @Nullable Building controller;
public BuildPlan plan = new BuildPlan();
//special cache for instruction to store data

4
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -475,7 +475,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
/** @return whether the unit *can* be commanded, even if its controller is not currently CommandAI. */
public boolean allowCommand(){
return controller instanceof CommandAI || (controller instanceof LogicAI && type.allowChangeCommands);
return controller instanceof CommandAI || (controller instanceof LogicAI ai && (ai.controller == null || !ai.controller.block.privileged) && type.allowChangeCommands);
}
/** @return whether the unit has a CommandAI controller */
@@ -525,7 +525,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
}
public boolean playerControllable(){
return type.playerControllable;
return type.playerControllable && !(controller instanceof LogicAI ai && ai.controller != null && ai.controller.block.privileged);
}
public boolean targetable(Team targeter){

2
core/src/mindustry/graphics/OverlayRenderer.java
View File

@@ -225,7 +225,7 @@ public class OverlayRenderer{
input.drawOverSelect();
if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller != null && ai.controller.isValid()){
if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller != null && ai.controller.isValid() && (state.isEditor() || !ai.controller.block.privileged)){
var build = ai.controller;
Drawf.square(build.x, build.y, build.block.size * tilesize/2f + 2f);
if(!unit.within(build, unit.hitSize * 2f)){

4
core/src/mindustry/input/DesktopInput.java
View File

@@ -299,7 +299,7 @@ public class DesktopInput extends InputHandler{
selectedUnits.set(selectedCommandUnits(Tmp.r1.x, Tmp.r1.y, Tmp.r1.width, Tmp.r1.height));
}else {
for(var unit : player.team().data().units){
if(unit.allowCommand()){
if(unit.isCommandable()){
selectedUnits.add(unit);
}
}
@@ -315,7 +315,7 @@ public class DesktopInput extends InputHandler{
selectedUnits.set(selectedCommandUnits(Tmp.r1.x, Tmp.r1.y, Tmp.r1.width, Tmp.r1.height, u -> u instanceof Payloadc));
}else {
for(var unit : player.team().data().units){
if(unit.allowCommand() && unit instanceof Payloadc){
if(unit.isCommandable() && unit instanceof Payloadc){
selectedUnits.add(unit);
}
}

9
core/src/mindustry/input/InputHandler.java
View File

@@ -265,7 +265,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Unit unit = Groups.unit.getByID(id);
if(unit != null && unit.team == player.team()){
if(unit.controller() instanceof LogicAI){
//Units with logic AI can still be controlled, but there currently aren't any mechanisms to do so on the client end unless the processor "steals" units that are already selected (control issue)
if(unit.controller() instanceof LogicAI ai && !(ai.controller != null && ai.controller.block.privileged)){
//reset to commandAI if applicable
unit.resetController();
}
@@ -1114,7 +1115,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
if(commandMode){
//happens sometimes
selectedUnits.removeAll(u -> !u.allowCommand());
selectedUnits.removeAll(u -> !u.isCommandable());
//draw command overlay UI
for(Unit unit : selectedUnits){
@@ -1943,7 +1944,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
tmpUnits.clear();
float rad = 4f;
tree.intersect(x - rad/2f, y - rad/2f, rad, rad, tmpUnits);
return tmpUnits.min(u -> u.allowCommand(), u -> u.dst(x, y) - u.hitSize/2f);
return tmpUnits.min(u -> u.isCommandable(), u -> u.dst(x, y) - u.hitSize/2f);
}
public @Nullable Unit selectedEnemyUnit(float x, float y){
@@ -1965,7 +1966,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
tmpUnits.clear();
float rad = 4f;
tree.intersect(Tmp.r1.set(x - rad/2f, y - rad/2f, rad*2f + w, rad*2f + h).normalize(), tmpUnits);
tmpUnits.removeAll(u -> !u.allowCommand() || !predicate.get(u));
tmpUnits.removeAll(u -> !u.isCommandable() || !predicate.get(u));
return tmpUnits;
}