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

Pathfinding bugfixes / Logic dialog hiding "unfixed"

Browse Source
This commit is contained in:
Anuken 2023-08-09 13:05:19 -04:00
parent 19f34c14a0
commit f1172d45eb
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/ControlPathfinder.java
View File

@ -233,7 +233,7 @@ public class ControlPathfinder{
req.curId = pathId;
//check for the unit getting stuck every N seconds
if((req.stuckTimer += Time.delta) >= 60f * 1.5f){
if(req.done && (req.stuckTimer += Time.delta) >= 60f * 1.5f){
req.stuckTimer = 0f;
//force recalculate
if(req.lastPos.within(unit, 1.5f)){

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

@ -220,6 +220,14 @@ public class LStatements{
row(s);
fields(s, "rotation", p3, v -> p3 = v);
}
//TODO
/*
case character -> {
fields(s, "x", x, v -> x = v);
fields(s, "y", y, v -> y = v);
row(s);
fields(s, "char", p1, v -> p1 = v);
}*/
}
}).expand().left();
}

9
core/src/mindustry/logic/LogicDialog.java
View File

@ -228,20 +228,11 @@ public class LogicDialog extends BaseDialog{
}
public void show(String code, LExecutor executor, boolean privileged, Cons<String> modified){
show(code, executor, privileged, null, modified);
}
public void show(String code, LExecutor executor, boolean privileged, @Nullable Building build, Cons<String> modified){
this.executor = executor;
this.privileged = privileged;
canvas.statements.clearChildren();
canvas.rebuild();
canvas.privileged = privileged;
update(() -> {
if(build != null && (!build.isValid() || !state.isGame())){
hide();
}
});
try{
canvas.load(code);
}catch(Throwable t){

2
core/src/mindustry/world/blocks/logic/LogicBlock.java
View File

@ -577,7 +577,7 @@ public class LogicBlock extends Block{
@Override
public void buildConfiguration(Table table){
table.button(Icon.pencil, Styles.cleari, () -> {
ui.logic.show(code, executor, privileged, this, code -> configure(compress(code, relativeConnections())));
ui.logic.show(code, executor, privileged, code -> configure(compress(code, relativeConnections())));
}).size(40);
}

9
core/src/mindustry/world/blocks/logic/LogicDisplay.java
View File

@ -27,7 +27,8 @@ public class LogicDisplay extends Block{
commandPoly = 7,
commandLinePoly = 8,
commandTriangle = 9,
commandImage = 10;
commandImage = 10,
commandCharacter = 11;
public int maxSides = 25;
@ -102,6 +103,9 @@ public class LogicDisplay extends Block{
var icon = Fonts.logicIcon(p1);
Draw.rect(Fonts.logicIcon(p1), x, y, p2, p2 / icon.ratio(), p3);
}
case commandCharacter -> {
//TODO
}
}
}
@ -146,7 +150,8 @@ public class LogicDisplay extends Block{
poly,
linePoly,
triangle,
image,;
image,
;//character;
public static final GraphicsType[] all = values();
}