pathline done

assets/bundles/bundle.properties

@@ -20,8 +20,8 @@ shar-stat.waveStatus = [lightgray]Status:[]
 shar-stat.waveItem = [lightgray]Item:[]
 
 #Settings
-setting.spathfinder.name = Enable Pathfinder overdrawing
+setting.unitlinelimit.name = UnitLines limit
-setting.spathfinder.description = shift + q: on/off\n\nshift + 1: Dispslay ground unit path\n\nshift + 2: Dispslay leg unit path\n\nshift + 3: Dispslay naval unit path
+setting.unitlinelimit.description = lots of drawing unitlines drop fps. you need to set lines limit with your device environment.
 
 setting.wavesetting.name = Wave UI Setting
 setting.opacitysetting.name = Opacity Setting

assets/bundles/bundle_ko.properties

@@ -20,8 +20,8 @@ shar-stat.waveStatus = [lightgray]상태이상:[]
 shar-stat.waveItem = [lightgray]아이템:[]
 
 # Settings
-setting.spathfinder.name = 길찾기 활성화
+setting.unitlinelimit.name = 유닛선 제한
-setting.spathfinder.description = shift + q: on/off\n\nshift + 1: 지상유닛 경로 표시\n\nshift + 2: 다리유닛 경로 표시\n\nshift + 3: 해상유닛 경로 표시
+setting.unitlinelimit.description = 다수의 유닛선은 fps를 떨어트립니다. 기기 환경에 맞추어 조절해야 합니다.
 
 setting.wavesetting.name = 단계 UI 설정
 setting.opacitysetting.name = 투명도 설정

src/UnitInfo/SVars.java

@@ -20,6 +20,6 @@ public class SVars {
     public static TextureRegion clear = atlas.find("clear");
     public static TextureRegion error = atlas.find("error");
     public static float modUiScale = settings.getInt("infoUiScale") / 100f == 0 ? 1 : settings.getInt("infoUiScale") / 100f;
-
+    public static boolean pathLine = false, unitLine = false, logicLine = false;
     public static Seq<Tile> pathTiles = new Seq<>();
 }

src/UnitInfo/core/HudUi.java

@@ -424,6 +424,38 @@ public class HudUi {
                 }
             });
         });
+        Table pathlineTable = new Table(t -> {
+            t.right();
+
+            Button pathBtn = new ImageButton(new ScaledNinePatchDrawable(new NinePatch(Icon.grid.getRegion()), 0.5f), Styles.clearToggleTransi);
+            Button unitBtn = new ImageButton(new ScaledNinePatchDrawable(new NinePatch(Icon.grid.getRegion()), 0.5f), Styles.clearToggleTransi);
+            Button logicBtn = new ImageButton(new ScaledNinePatchDrawable(new NinePatch(Icon.grid.getRegion()), 0.5f), Styles.clearToggleTransi);
+
+            pathBtn.addListener(new Tooltip(l -> l.label(() -> "PathLine " + (pathLine ? "[accent]Enabled[]" : "[gray]Disabled[]"))){{allowMobile = true;}});
+            pathBtn.clicked(() -> {
+                pathLine = !pathLine;
+                pathBtn.setChecked(pathLine);
+            });
+
+            unitBtn.addListener(new Tooltip(l -> l.label(() -> "UnitLine " + (unitLine ? "[accent]Enabled[]" : "[gray]Disabled[]"))){{allowMobile = true;}});
+            unitBtn.clicked(() -> {
+                unitLine = !unitLine;
+                unitBtn.setChecked(unitLine);
+            });
+
+            logicBtn.addListener(new Tooltip(l -> l.label(() -> "LogicLine " + (logicLine ? "[accent]Enabled[]" : "[gray]Disabled[]"))){{allowMobile = true;}});
+            logicBtn.clicked(() -> {
+                logicLine = !logicLine;
+                logicBtn.setChecked(logicLine);
+            });
+
+            t.add(pathBtn).padLeft(16).size(24);
+            t.row();
+            t.add(unitBtn).padLeft(16).size(24);
+            t.row();
+            t.add(logicBtn).padLeft(16).size(24);
+        });
+
         Table waveTable = (Table)((Group)((Group)ui.hudGroup.getChildren().get(5)) //HudFragment#118, name: overlaymarker
                 .getChildren().get(mobile ? 2 : 0)) //HudFragment#192, name: wave/editor
                 .getChildren().get(0); //HudFragment#196, name: waves
@@ -432,7 +464,7 @@ public class HudUi {
         waveTable.removeChild(statusTable);
         table.row();
         statusTable.top();
-        table.stack(waveInfoTable, statusTable);
+        table.stack(waveInfoTable, statusTable, pathlineTable);
     }
 
     public void addTable(){
@@ -735,7 +767,7 @@ public class HudUi {
                             for(StatusEffect effect : content.statusEffects()){
                                 if(applied.get(effect.id) && !effect.isHidden()){
                                     t.image(effect.uiIcon).size(iconSmall).get().addListener(new Tooltip(l -> l.label(() ->
-                                        effect.localizedName + " [lightgray]" + UI.formatTime(st.getDuration(effect))).style(Styles.outlineLabel)));
+                                        effect.localizedName + " [lightgray]" + UI.formatTime(st.getDuration(effect))).style(Styles.outlineLabel)){{allowMobile = true;}});
                                 }
                             }
                             statuses.set(applied);
@@ -843,7 +875,7 @@ public class HudUi {
                         Label label2 = new Label(()->getTarget() == null ? "(" + 0 + ", " + 0 + ")" : "(" + Strings.fixed(getTarget().x() / tilesize, 2) + ", " + Strings.fixed(getTarget().y() / tilesize, 2) + ")");
                         label2.setFontScale(modUiScale);
                         to.add(label2);
-                    })));
+                    })){{allowMobile = true;}});
                     tt.update(()->tt.setBackground(((NinePatchDrawable)Tex.underline2).tint(getTarget().isNull() ? Color.gray : getTarget().team().color)));
                 });
                 t.row();
@@ -1011,7 +1043,7 @@ public class HudUi {
                                 }).size(iconMed * Scl.scl(modUiScale));
                                 to.row();
                             }
-                        })));
+                        })){{allowMobile = true;}});
                     });
                     if(++row % 4 == 0) tx.row();
                 }

src/UnitInfo/core/Main.java

@@ -12,6 +12,7 @@ import mindustry.*;
 import mindustry.ai.Pathfinder;
 import mindustry.ai.types.*;
 import mindustry.content.*;
+import mindustry.core.Logic;
 import mindustry.entities.units.AIController;
 import mindustry.entities.units.UnitCommand;
 import mindustry.entities.units.UnitController;
@@ -19,11 +20,14 @@ import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.LUnitControl;
 import mindustry.mod.*;
 import mindustry.ui.*;
 import mindustry.world.*;
 import mindustry.world.blocks.defense.turrets.*;
 import mindustry.world.blocks.storage.CoreBlock;
+import mindustry.world.blocks.units.CommandCenter;
+
 import java.util.Objects;
 
 import static UnitInfo.SVars.*;
@@ -32,14 +36,14 @@ import static mindustry.Vars.*;
 
 public class Main extends Mod {
     int otherCores;
-    boolean groundValid = false, legValid = false, navalValid = false;
 
     public Tile getNextTile(Tile tile, int cost, Team team, int finder) {
-        Pathfinder.Flowfield field = pathfinder.getField(team, cost, finder);
+        Pathfinder.Flowfield field = pathfinder.getField(team, cost, Mathf.clamp(finder, 0, 1));
         Tile tile1 = pathfinder.getTargetTile(tile, field);
         pathTiles.add(tile1);
-        if(otherCores != Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != team)
+        if(tile1 == tile || tile1 == null ||
-                || tile1 == tile || tile1 == null || tile1.build instanceof CoreBlock.CoreBuild) //so many ififififififif.
+            (finder == 0 && (otherCores != Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != team) || tile1.build instanceof CoreBlock.CoreBuild)) ||
+            (finder == 1 && tile1.build instanceof CommandCenter.CommandBuild)) //so many ififififififif.
             return tile1;
         return getNextTile(tile1, cost, team, finder);
     }
@@ -77,32 +81,54 @@ public class Main extends Mod {
         });
 
         Events.run(Trigger.draw, () -> {
-            if((input.keyDown(KeyCode.shiftRight) || input.keyDown(KeyCode.shiftLeft))) {
+            int[] units = {0};
-                if(input.keyTap(KeyCode.q)) settings.put("spathfinder", !settings.getBool("spathfinder"));
+            Groups.unit.each(u -> {
-                if(input.keyTap(KeyCode.num1)) groundValid = !groundValid;
+                Team team = u.team;
-                if(input.keyTap(KeyCode.num2)) legValid = !legValid;
+                otherCores = Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != team);
-                if(input.keyTap(KeyCode.num3)) navalValid = !navalValid;
+                UnitController c = u.controller();
-            }
+                UnitCommand com = team.data().command;
 
-            if(settings.getBool("spathfinder")) {
+                if(c instanceof LogicAI ai){
-                Groups.unit.each(u -> {
+                    if(logicLine && (ai.control == LUnitControl.approach || ai.control == LUnitControl.move)) {
-                    Team enemyTeam = u.team;
+                        Lines.stroke(1, team.color);
+                        Lines.line(u.x(), u.y(), ai.moveX, ai.moveY);
+                        Lines.stroke(0.5f + Mathf.absin(6f, 0.5f), Tmp.c1.set(Pal.logicOperations).lerp(Pal.sap, Mathf.absin(6f, 0.5f)));
+                        Lines.line(u.x(), u.y(), ai.controller.x, ai.controller.y);
+                    }
+                    return;
+                }
+
+                if(++units[0] > settings.getInt("unitlinelimit") || //prevent lag
+                    !unitLine || //disabled
+                    u.type.flying || //not flying
+                    c instanceof MinerAI || //not mono
+                    c instanceof BuilderAI || //not poly
+                    c instanceof RepairAI || //not mega
+                    c instanceof DefenderAI || //not oct
+                    c instanceof FormationAI || //not commanded unit by player
+                    c instanceof FlyingAI || //not flying anyway
+                    com == UnitCommand.idle) return; //not idle
+
+                getNextTile(u.tileOn(), u.pathType(), team, com.ordinal());
+                pathTiles.filter(Objects::nonNull);
+                for(int i = 1; i < pathTiles.size; i++) {
+                    if(i + 1 >= pathTiles.size) continue; //prevent IndexOutException
+                    Tile tile1 = pathTiles.get(i);
+                    Tile tile2 = pathTiles.get(i + 1);
+                    Draw.z(Layer.overlayUI);
+                    Lines.stroke(1, team.color);
+                    Lines.line(tile1.worldx(), tile1.worldy(), tile2.worldx(), tile2.worldy());
+                }
+                pathTiles.clear();
+            });
+
+            if(pathLine) spawner.getSpawns().each(t -> {
+                Team enemyTeam = state.rules.waveTeam;
+                for(int p = 0; p < 3; p++) {
                     otherCores = Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != enemyTeam);
                     if(otherCores == 0) return; //must have target core
 
-                    UnitController c = u.controller();
+                    getNextTile(t, p, enemyTeam, Pathfinder.fieldCore);
-                    UnitCommand com = enemyTeam.data().command;
-                    if(u.type.flying || //not flying
-                        c instanceof MinerAI || //not mono
-                        c instanceof BuilderAI || //not poly
-                        c instanceof RepairAI || //not mega
-                        c instanceof DefenderAI || //not oct
-                        c instanceof FormationAI || //not commanded unit by player
-                        c instanceof LogicAI || //not controlled unit by logic
-                        c instanceof FlyingAI ||
-                        com == UnitCommand.idle) return;
-
-                    getNextTile(u.tileOn(), u.pathType(), enemyTeam, com == UnitCommand.attack ? Pathfinder.fieldCore : Pathfinder.fieldRally);
                     pathTiles.filter(Objects::nonNull);
                     for(int i = 1; i < pathTiles.size; i++) {
                         if(i + 1 >= pathTiles.size) continue; //prevent IndexOutException
@@ -113,29 +139,9 @@ public class Main extends Mod {
                         Lines.line(tile1.worldx(), tile1.worldy(), tile2.worldx(), tile2.worldy());
                     }
                     pathTiles.clear();
-                });
+                }
-
+            });
-                spawner.getSpawns().each(t -> {
+            Draw.reset();
-                    Team enemyTeam = state.rules.waveTeam;
-                    for(int p = 0; p < 3; p++) {
-                        otherCores = Groups.build.count(b -> b instanceof CoreBlock.CoreBuild && b.team != enemyTeam);
-                        if(otherCores == 0) return; //must have target core
-
-                        getNextTile(t, p, enemyTeam, Pathfinder.fieldCore);
-                        pathTiles.filter(Objects::nonNull);
-                        for(int i = 1; i < pathTiles.size; i++) {
-                            if(i + 1 >= pathTiles.size) continue; //prevent IndexOutException
-                            Tile tile1 = pathTiles.get(i);
-                            Tile tile2 = pathTiles.get(i + 1);
-                            Draw.z(Layer.overlayUI);
-                            Lines.stroke(1, enemyTeam.color);
-                            Lines.line(tile1.worldx(), tile1.worldy(), tile2.worldx(), tile2.worldy());
-                        }
-                        pathTiles.clear();
-                    }
-                });
-                Draw.reset();
-            }
 
             if(settings.getBool("blockstatus")) Groups.build.each(build -> {
                 if(Vars.player != null && Vars.player.team() == build.team) return;

src/UnitInfo/core/SettingS.java

@@ -289,7 +289,7 @@ public class SettingS {
         addGraphicDialogSetting("opacitysetting", opacitySeq, opacityTable);
         */
 
-        addGraphicCheckSetting("spathfinder", true);
+        addGraphicSlideSetting("unitlinelimit", 50, 50, 250, 10, s -> s + "units");
         addGraphicSlideSetting("infoUiScale", 100, 50, 100, 5, s -> s + "%");
         addGraphicSlideSetting("coreItemCheckRate", 60, 6, 180, 6, s -> Strings.fixed(s/60f,1) + "sec");
         addGraphicCheckSetting("pastwave", false);