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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-06-18 16:07:08 -04:00
parent 031af7c432 b59e519e0d
commit 077ee978f6
38 changed files with 492 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1250,7 +1250,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
if(value instanceof UnitType) type = UnitType.class;
if(builder != null && builder.isPlayer()){
lastAccessed = builder.getPlayer().name;
lastAccessed = builder.getPlayer().coloredName();
}
if(block.configurations.containsKey(type)){

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

@@ -51,6 +51,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
//TODO could be better represented as a unit
transient @Nullable UnitType dockedType;
transient String lastCommanded;
transient float shadowAlpha = -1f, healTime;
transient int lastFogPos;
private transient float resupplyTime = Mathf.random(10f);

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

@@ -233,6 +233,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}else if(posTarget != null){
ai.commandPosition(posTarget);
}
unit.lastCommanded = player.coloredName();
}
}

15
core/src/mindustry/type/UnitType.java
View File

@@ -512,13 +512,24 @@ public class UnitType extends UnlockableContent{
}
}).growX();
if(unit.controller() instanceof LogicAI){
if(unit.controller() instanceof LogicAI ai){
table.row();
table.add(Blocks.microProcessor.emoji() + " " + Core.bundle.get("units.processorcontrol")).growX().wrap().left();
if(ai.controller != null && (Core.settings.getBool("mouseposition") || Core.settings.getBool("position"))){
table.row();
table.add("[lightgray](" + ai.controller.tileX() + ", " + ai.controller.tileY() + ")").growX().wrap().left();
}
table.row();
table.label(() -> Iconc.settings + " " + (long)unit.flag + "").color(Color.lightGray).growX().wrap().left();
if(net.active() && ai.controller != null && ai.controller.lastAccessed != null){
table.row();
table.add(Core.bundle.format("lastaccessed", ai.controller.lastAccessed)).growX().wrap().left();
}
}else if(net.active() && unit.lastCommanded != null){
table.row();
table.add(Core.bundle.format("lastcommanded", unit.lastCommanded)).growX().wrap().left();
}
table.row();
}