Merge branch 'main' of https://github.com/PunishXIV/Splatoon

Author: Limiana

.gitignore

@@ -359,6 +359,9 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
+# JetBrains Rider
+.idea/
+
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /SplatoonScripts/Duties/Endwalker/The Omega Protocol/Dancer Auto Step.cs

Presets/Dawntrail/Raids/The Arcadion 12 Savage Phase 2.md

@@ -48,14 +48,32 @@ Netherworld-far and Netherworld-near
 
 Green Tower Knockback Position
 ```
-~Lv2~{"Name":"风塔击飞站位","Group":"M12S P2","ZoneLockH":[1327],"ElementsL":[{"Name":"FAR TOWER","type":1,"offX":2.5,"refActorDataID":2015013,"refActorComparisonType":3,"LimitDistance":true,"DistanceSourceX":100.0,"DistanceSourceY":100.0,"DistanceMin":15.0,"DistanceMax":25.0},{"Name":"CLOSE TOWER","type":1,"offX":-2.5,"refActorDataID":2015013,"refActorComparisonType":3,"LimitDistance":true,"DistanceSourceX":100.0,"DistanceSourceY":100.0,"DistanceMax":15.0}]}
+~Lv2~{"Name":"风塔击飞站位","Group":"M12S P2","ZoneLockH":[1327],"DCond":5,"UseTriggers":true,"Triggers":[{"TimeBegin":395.0,"Duration":20.0}],"ElementsL":[{"Name":"FAR TOWER","type":1,"offX":2.5,"refActorDataID":2015013,"refActorComparisonType":3,"LimitDistance":true,"DistanceSourceX":100.0,"DistanceSourceY":100.0,"DistanceMin":15.0,"DistanceMax":25.0},{"Name":"CLOSE TOWER","type":1,"offX":-2.5,"refActorDataID":2015013,"refActorComparisonType":3,"LimitDistance":true,"DistanceSourceX":100.0,"DistanceSourceY":100.0,"DistanceMax":15.0}]}
+```
+
+Green Knockback tower tether
+```
+~Lv2~{"Name":"风塔击飞预测","Group":"M12S P2","ZoneLockH":[1327],"MaxDistance":3.0,"UseDistanceLimit":true,"DistanceLimitType":1,"ElementsL":[{"Name":"击飞预测","type":1,"radius":0.0,"color":4288413440,"Filled":false,"fillIntensity":0.0,"overlayBGColor":4294914815,"overlayTextColor":4294967295,"overlayVOffset":2.0,"overlayFScale":1.4,"thicc":3.0,"refActorDataID":2015013,"refActorComparisonType":3,"tether":true,"ExtraTetherLength":25.0,"LineEndB":1,"DistanceSourceX":83.93563,"DistanceSourceY":96.76696,"DistanceSourceZ":-7.1526574E-07,"DistanceMax":10.0,"UseDistanceSourcePlaceholder":true,"mechanicType":5}]}
+```
+
+Brown Tower Reminder
+```
+~Lv2~{"Name":"土塔注意","Group":"M12S P2","ZoneLockH":[1327],"DCond":5,"UseTriggers":true,"Freezing":true,"FreezeFor":5.0,"IntervalBetweenFreezes":9999.0,"Triggers":[{"TimeBegin":400.0,"Duration":20.0}],"ElementsL":[{"Name":"土塔","type":1,"radius":3.0,"refActorDataID":2015015,"refActorComparisonType":3}]}
 ```
 
 Heat buff notify
 ```
 ~Lv2~{"Name":"热病","Group":"M12S P2","ZoneLockH":[1327],"ElementsL":[{"Name":"热病点名","type":1,"radius":1.0,"overlayVOffset":1.0,"overlayFScale":2.0,"overlayText":"Don't MOVE","overlayTextIntl":{"En":"Don't MOVE","Jp":"Don't MOVE","De":"Don't MOVE","Fr":"Don't MOVE","Other":"热病别动"},"refActorRequireBuff":true,"refActorBuffId":[4768],"refActorType":1}]}
 ```
 
+Idyllic Dream Tower Guider MMW
+> See the strat [Here](https://github.com/user-attachments/assets/b98cb467-78ef-4563-bd21-f8dd9f47df04)
+```
+~Lv2~{"Name":"Buffed Far Close Guide MMW","InternationalName":{"Other":"引导远近点名站位 MMW"},"Group":"M12S P2","ZoneLockH":[1327],"ConditionalAnd":true,"ElementsL":[{"Name":"左近点名检查","type":1,"refActorRequireBuff":true,"refActorBuffId":[4767],"refActorType":1,"DistanceSourceX":86.0,"DistanceSourceY":100.0,"DistanceMax":1.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"左近点名距离检查","type":1,"refActorPlaceholder":["<me>"],"refActorComparisonType":5,"LimitDistance":true,"DistanceSourceX":86.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"Nodraw":true},{"Name":"左近点名","refX":94.74917,"refY":99.63798,"fillIntensity":0.5,"tether":true},{"Name":"左远点名检查","type":1,"radius":0.0,"refActorRequireBuff":true,"refActorBuffId":[4766],"refActorType":1,"DistanceSourceX":86.0,"DistanceSourceY":100.0,"DistanceSourceZ":-7.152657E-07,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"左远点名距离检查","type":1,"radius":0.0,"refActorPlaceholder":["<me>"],"refActorComparisonType":5,"LimitDistance":true,"DistanceSourceX":86.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"Nodraw":true},{"Name":"左远点名","refX":91.38865,"refY":107.42661,"fillIntensity":0.5,"tether":true},{"Name":"右近点名检查","type":1,"refActorRequireBuff":true,"refActorBuffId":[4767],"refActorType":1,"DistanceSourceX":86.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"右近点名距离检查","type":1,"refActorPlaceholder":["<me>"],"refActorComparisonType":5,"LimitDistance":true,"DistanceSourceX":114.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"Nodraw":true},{"Name":"右近点名","refX":105.03054,"refY":99.80684,"refZ":-3.8146973E-06,"tether":true},{"Name":"右远点名检查","type":1,"refActorRequireBuff":true,"refActorBuffId":[4766],"refActorType":1,"DistanceSourceX":86.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"右远点名距离检查","type":1,"refActorPlaceholder":["<me>"],"refActorComparisonType":5,"LimitDistance":true,"DistanceSourceX":114.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"Nodraw":true},{"Name":"右远点名","refX":108.805916,"refY":92.572624,"tether":true}]}
+~Lv2~{"Name":"Non buffed Ranged MMW","InternationalName":{"Other":"引导远近非点名远程站位 MMW"},"Group":"M12S P2","ZoneLockH":[1327],"ConditionalAnd":true,"DCond":5,"JobLockH":[24,28,33,40,5,7,23,25,26,27,31,35,36,38,42,6],"UseTriggers":true,"Triggers":[{"TimeBegin":403.0,"Duration":5.0}],"ElementsL":[{"Name":"非点名检查","type":1,"refActorRequireBuff":true,"refActorBuffId":[4766,4767],"refActorType":1,"Conditional":true,"ConditionalInvert":true,"ConditionalReset":true,"Nodraw":true},{"Name":"左半场检查","type":1,"refActorPlaceholder":["<me>"],"refActorComparisonType":5,"LimitDistance":true,"DistanceSourceX":86.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"Nodraw":true},{"Name":"Left Ranged Pos 左远程位置","refX":86.06062,"refY":90.88095,"refZ":-3.8146973E-06,"fillIntensity":0.5,"tether":true},{"Name":"非点名检查","type":1,"refActorRequireBuff":true,"refActorBuffId":[4766,4767],"refActorType":1,"Conditional":true,"ConditionalInvert":true,"ConditionalReset":true,"Nodraw":true},{"Name":"右半场检查","type":1,"refActorPlaceholder":["<me>"],"refActorComparisonType":5,"LimitDistance":true,"DistanceSourceX":114.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"Nodraw":true},{"Name":"Right Ranged Pos 右远程位置","refX":114.308,"refY":108.91028,"refZ":-3.8146973E-06,"fillIntensity":0.5,"tether":true}]}
+~Lv2~{"Name":"No buff Melee MMW","InternationalName":{"Other":"引导远近非点名近战站位 MMW"},"Group":"M12S P2","ZoneLockH":[1327],"ConditionalAnd":true,"DCond":5,"JobLockH":[37,29,39,34,20,21,3,41,30,22,4,2,32,19,1],"UseTriggers":true,"Triggers":[{"TimeBegin":403.0,"Duration":5.0}],"ElementsL":[{"Name":"非点名检查","type":1,"refActorRequireBuff":true,"refActorBuffId":[4766,4767],"refActorType":1,"Conditional":true,"ConditionalInvert":true,"ConditionalReset":true,"Nodraw":true},{"Name":"左半场检查","type":1,"refActorPlaceholder":["<me>"],"refActorComparisonType":5,"LimitDistance":true,"DistanceSourceX":86.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"Nodraw":true},{"Name":"Left Mele Pos 左近战位置","refX":90.62298,"refY":100.51265,"refZ":7.6293945E-06,"tether":true},{"Name":"非点名检查","type":1,"refActorRequireBuff":true,"refActorBuffId":[4766,4767],"refActorType":1,"Conditional":true,"ConditionalInvert":true,"ConditionalReset":true,"Nodraw":true},{"Name":"右半场检查","type":1,"refActorPlaceholder":["<me>"],"refActorComparisonType":5,"LimitDistance":true,"DistanceSourceX":114.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"Nodraw":true},{"Name":"Right Mele Pos 右近战位置","refX":108.81294,"refY":100.22826,"fillIntensity":0.5,"tether":true}]}
+```
+
 ### [Script] M12S Idyllic Dream CN
 > [!IMPORTANT]
 >

SplatoonScripts/Duties/Dawntrail/M12S Idyllic Dream.cs

@@ -23,7 +23,7 @@ public class M12S_Idyllic_Dream : SplatoonScript
 {
     public override HashSet<uint>? ValidTerritories => [1327];
 
-    public override Metadata? Metadata => new(1, "Errer");
+    public override Metadata? Metadata => new(3, "Errer");
 
     #region 常量 (Constants)
 
@@ -135,6 +135,18 @@ private record struct PlayerTetherInfo(string PlayerName, string Role, string Te
     private static readonly Vector3 WaymarkD = new(89.11f, 0f, 99.93f);   // 西 (West)
     private static readonly Vector3 Waymark1 = new(108.28f, 0f, 91.70f);  // 东北 (Northeast)
     private static readonly Vector3 Waymark2 = new(108.43f, 0f, 108.10f); // 东南 (Southeast)
+    private static readonly Vector3 Waymark3 = new(91.80f, 0f, 108.17f);  // 西南 (Southwest)
+    private static readonly Vector3 Waymark4 = new(91.62f, 0f, 91.75f);   // 西北 (Northwest)
+
+    // 19210 固定坐标 (19210 Fixed Positions)
+    private static readonly Vector3 Spawn19210_A = new(100.00f, 0f, 86.00f);   // A点 (北)
+    private static readonly Vector3 Spawn19210_B = new(114.00f, 0f, 100.00f);  // B点 (东)
+    private static readonly Vector3 Spawn19210_C = new(100.00f, 0f, 114.00f);  // C点 (南)
+    private static readonly Vector3 Spawn19210_D = new(86.00f, 0f, 100.00f);   // D点 (西)
+    private static readonly Vector3 Spawn19210_1 = new(109.90f, 0f, 90.10f);   // 1点 (东北)
+    private static readonly Vector3 Spawn19210_2 = new(109.90f, 0f, 109.90f);  // 2点 (东南)
+    private static readonly Vector3 Spawn19210_3 = new(90.10f, 0f, 109.90f);   // 3点 (西南)
+    private static readonly Vector3 Spawn19210_4 = new(90.10f, 0f, 90.10f);    // 4点 (西北)
 
     #endregion
 
@@ -398,26 +410,29 @@ public override void OnStartingCast(uint source, uint castId)
             }
 
             // 时空重现 - 触发第6次大圈绘制 (Time Warp - Triggers 6th circle drawing)
+            // 正点先刷影子：第一次大圈 C/D，斜点先刷影子：第一次大圈 1/2
             if(baseId == BossDataId && castId == TimeWarpCastId && _waitingForTimeWarp)
             {
                 _waitingForTimeWarp = false;
                 _sixthRoundCirclePositions.Clear();
-                Vector3[] targetWaymarks = _firstSpawnType == "正点"
-                    ? new[] { WaymarkC, WaymarkD }
-                    : new[] { Waymark1, Waymark2 };
 
-                foreach(var waymark in targetWaymarks)
+                // 使用固定坐标
+                if(_firstSpawnType == "正点")
                 {
-                    var nearby = Svc.Objects.OfType<IBattleNpc>()
-                        .FirstOrDefault(x => x.BaseId == FirstSpawnId && x.IsCharacterVisible()
-                            && Vector3.Distance(x.Position, waymark) < 6f);
-                    if(nearby != null)
-                        _sixthRoundCirclePositions.Add(nearby.Position);
+                    // 正点先: 第一次大圈是C/D
+                    _sixthRoundCirclePositions.Add(Spawn19210_C);
+                    _sixthRoundCirclePositions.Add(Spawn19210_D);
+                }
+                else
+                {
+                    // 斜点先: 第一次大圈是1/2
+                    _sixthRoundCirclePositions.Add(Spawn19210_1);
+                    _sixthRoundCirclePositions.Add(Spawn19210_2);
                 }
 
                 _sixthRoundDrawTime = Environment.TickCount64;
                 var waymarkNames = _firstSpawnType == "正点" ? "C/D" : "1/2";
-                AddLog($"  -> 时空重现 (Time Warp)! 立即绘制第6次大圈 (Immediately draw 6th circles) {waymarkNames}附近 (nearby) (找到 (found){_sixthRoundCirclePositions.Count}个)");
+                AddLog($"  -> 时空重现 (Time Warp)! 立即绘制第6次大圈 (Immediately draw 6th circles) {waymarkNames} (使用固定坐标)");
             }
 
             // Boss心象投影读条 - 第4次触发引导，第5次开始记录第二轮，第7次绘制 (Boss Mental Projection cast - 4th triggers guidance, 5th starts recording second round, 7th draws)
@@ -475,24 +490,28 @@ public override void OnStartingCast(uint source, uint castId)
                     _thirdRoundDrawTime = Environment.TickCount64 + C.MissingBladeDelayMs;
                     AddLog($"  -> 第8次心象投影 (8th Mental Projection)! {C.MissingBladeDelayMs / 1000f}秒后绘制缺少的刀 (sec until missing cleave drawing)");
 
-                    // 第8次：根据正点先/斜点先绘制19210大圈 (8th: Draw 19210 circles based on cardinal first/intercardinal first)
+                    // 第8次：根据正点先/斜点先绘制19210大圈 (使用固定坐标)
+                    // 正点先刷影子：第二次大圈 1/2
+                    // 斜点先刷影子：第二次大圈 C/D
                     _eighthRoundCirclePositions.Clear();
-                    Vector3[] targetWaymarks = _firstSpawnType == "正点"
-                        ? new[] { Waymark1, Waymark2 }  // 正点先 (Cardinal first): 1/2
-                        : new[] { WaymarkA, WaymarkB }; // 斜点先 (Intercardinal first): A/B
 
-                    foreach(var waymark in targetWaymarks)
+                    // 使用固定坐标，不再搜索
+                    if(_firstSpawnType == "正点")
+                    {
+                        // 正点先: 第二次大圈是1/2
+                        _eighthRoundCirclePositions.Add(Spawn19210_1);
+                        _eighthRoundCirclePositions.Add(Spawn19210_2);
+                    }
+                    else
                     {
-                        var nearby = Svc.Objects.OfType<IBattleNpc>()
-                            .FirstOrDefault(x => x.BaseId == FirstSpawnId && x.IsCharacterVisible()
-                                && Vector3.Distance(x.Position, waymark) < 6f);
-                        if(nearby != null)
-                            _eighthRoundCirclePositions.Add(nearby.Position);
+                        // 斜点先: 第二次大圈是C/D
+                        _eighthRoundCirclePositions.Add(Spawn19210_C);
+                        _eighthRoundCirclePositions.Add(Spawn19210_D);
                     }
 
                     _eighthRoundDrawTime = Environment.TickCount64 + C.EighthCircleDelayMs;
-                    var waymarkNames = _firstSpawnType == "正点" ? "1/2" : "A/B";
-                    AddLog($"  -> 第8次心象投影 (8th Mental Projection)! {C.EighthCircleDelayMs / 1000f}秒后绘制 (sec until drawing) {waymarkNames}附近 (nearby) 19210大圈 (large circles) (找到 (found){_eighthRoundCirclePositions.Count}个)");
+                    var waymarkNames = _firstSpawnType == "正点" ? "1/2" : "C/D";
+                    AddLog($"  -> 第8次心象投影 (8th Mental Projection)! {C.EighthCircleDelayMs / 1000f}秒后绘制 (sec until drawing) {waymarkNames} 19210大圈 (使用固定坐标)");
                 }
             }
         }
@@ -1690,6 +1709,21 @@ public override void OnSettingsDraw()
         ImGui.SameLine();
         if(ImGui.Button("重置状态 (Reset State)"))
             OnReset();
+        ImGui.SameLine();
+        if(ImGui.Button("打印19210位置 (Print 19210 Positions)"))
+        {
+            var spawns = Svc.Objects.OfType<IBattleNpc>()
+                .Where(x => x.BaseId == FirstSpawnId && x.IsCharacterVisible())
+                .ToList();
+            AddLog($"[Debug] === 当前可见19210列表 (Current Visible 19210 List) ({spawns.Count}个) ===");
+            foreach(var spawn in spawns)
+            {
+                var pointName = GetPointName(spawn.Position);
+                AddLog($"  [{pointName}] Pos:({spawn.Position.X:F2}, {spawn.Position.Z:F2}) EntityId:{spawn.EntityId}");
+            }
+            if(spawns.Count == 0)
+                AddLog("  (未找到任何可见的19210)");
+        }
 
         ImGui.Separator();
         ImGui.Text("测试功能 (Test Functions):");