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

Unit commands/stances changed to Seq

Browse Source
This commit is contained in:
Anuken
2024-10-11 22:00:07 -04:00
parent d6073201bb
commit 0e83b60aac
5 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -168,7 +168,7 @@ public class Reconstructor extends UnitBlock{
public boolean canSetCommand(){
var output = unit();
return output != null && output.commands.length > 1 && output.allowChangeCommands;
return output != null && output.commands.size > 1 && output.allowChangeCommands;
}
@Override

12
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -54,7 +54,7 @@ public class UnitFactory extends UnitBlock{
if(build.currentPlan == i) return;
build.currentPlan = i < 0 || i >= plans.size ? -1 : i;
build.progress = 0;
if(build.command != null && !Structs.contains(build.unit().commands, build.command)){
if(build.command != null && !build.unit().commands.contains(build.command)){
build.command = null;
}
});
@@ -66,7 +66,7 @@ public class UnitFactory extends UnitBlock{
if(build.currentPlan == next) return;
build.currentPlan = next;
build.progress = 0;
if(build.command != null && !Structs.contains(val.commands, build.command)){
if(build.command != null && !val.commands.contains(build.command)){
build.command = null;
}
});
@@ -197,9 +197,9 @@ public class UnitFactory extends UnitBlock{
public boolean canSetCommand(){
var output = unit();
return output != null && output.commands.length > 1 && output.allowChangeCommands &&
return output != null && output.commands.size > 1 && output.allowChangeCommands &&
//to avoid cluttering UI, don't show command selection for "standard" units that only have two commands.
!(output.commands.length == 2 && output.commands[1] == UnitCommand.enterPayloadCommand);
!(output.commands.size == 2 && output.commands.get(1) == UnitCommand.enterPayloadCommand);
}
@Override
@@ -275,8 +275,8 @@ public class UnitFactory extends UnitBlock{
}
}
if(list.length < columns){
for(int j = 0; j < (columns - list.length); j++){
if(list.size < columns){
for(int j = 0; j < (columns - list.size); j++){
commands.add().size(40f);
}
}