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

Author: Limiana

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

@@ -44,7 +44,7 @@ Netherworld-far and Netherworld-near
 # Idyllic Dream
 > [!Warning]
 >
-> Testing versions may fail
+> Do not install both scripts! Pick one.
 
 ### [Script] M12S Idyllic Dream
 > [!IMPORTANT]
@@ -65,7 +65,16 @@ https://youtu.be/GJApjyNryQo
 https://github.com/PunishXIV/Splatoon/raw/refs/heads/main/SplatoonScripts/Duties/Dawntrail/M12S%20Idyllic%20Dream.cs
 ```
 
-Stored AOEs:
+### [Script] [WIP] [Beta]
+Idyllic Dream - [based on Tired guide](https://www.youtube.com/watch?v=pL5NGwkaTFs).
+```
+https://github.com/PunishXIV/Splatoon/raw/refs/heads/main/SplatoonScripts/Duties/Dawntrail/M12S%20P2%20Idyllic%20Dream%20Tired.cs
+```
+- Can probably be reconfigured for other guides too
+- Will show: which tether to pick up, defamation and stack AOEs, stored clone AOEs
+- In progress: towers and precise positions for stacks/spreads
+
+Stored AOEs (don't need with either scripts):
 ```
 ~Lv2~{"Name":"M12S P2 Twisted Vision (1st set of stored aoes)","Group":"M12S P2","ZoneLockH":[1327],"ConditionalAnd":true,"Freezing":true,"FreezeFor":33.0,"IntervalBetweenFreezes":5.0,"FreezeDisplayDelay":28.0,"ElementsL":[{"Name":"","type":1,"refActorNPCNameID":14379,"refActorRequireCast":true,"refActorCastId":[48098],"refActorUseCastTime":true,"refActorCastTimeMin":1.0,"refActorCastTimeMax":2.0,"refActorComparisonType":6,"Conditional":true,"Nodraw":true},{"Name":"","type":4,"radius":40.0,"coneAngleMin":-45,"coneAngleMax":45,"fillIntensity":0.4,"refActorNPCNameID":14379,"refActorRequireCast":true,"refActorCastId":[46354],"refActorCastTimeMin":1.0,"refActorCastTimeMax":999.0,"refActorComparisonType":6,"includeRotation":true},{"Name":"","type":1,"radius":10.0,"fillIntensity":0.4,"refActorNPCNameID":14380,"refActorRequireCast":true,"refActorCastId":[46353],"refActorCastTimeMin":1.0,"refActorCastTimeMax":999.0,"refActorComparisonType":6}]}
 ~Lv2~{"Name":"M12S P2 Twisted Vision (2nd set of stored aoes)","Group":"M12S P2","ZoneLockH":[1327],"Freezing":true,"FreezeFor":25.0,"IntervalBetweenFreezes":5.0,"FreezeDisplayDelay":11.0,"ElementsL":[{"Name":"","type":1,"refActorNPCNameID":14379,"refActorRequireCast":true,"refActorCastId":[48098],"refActorUseCastTime":true,"refActorCastTimeMin":1.0,"refActorCastTimeMax":2.0,"refActorComparisonType":6,"Conditional":true,"Nodraw":true},{"Name":"","type":4,"radius":40.0,"coneAngleMin":-45,"coneAngleMax":45,"fillIntensity":0.4,"refActorNPCNameID":14380,"refActorRequireCast":true,"refActorCastId":[46352],"refActorCastTimeMin":1.0,"refActorCastTimeMax":999.0,"refActorComparisonType":6,"includeRotation":true},{"Name":"","type":1,"radius":10.0,"fillIntensity":0.4,"refActorNPCNameID":14380,"refActorRequireCast":true,"refActorCastId":[48303],"refActorCastTimeMin":1.0,"refActorCastTimeMax":999.0,"refActorComparisonType":6},{"Name":"","type":4,"radius":40.0,"coneAngleMin":-45,"coneAngleMax":45,"fillIntensity":0.4,"refActorNPCNameID":14380,"refActorRequireCast":true,"refActorCastId":[46352],"refActorCastTimeMin":1.0,"refActorCastTimeMax":999.0,"refActorComparisonType":6,"includeRotation":true,"AdditionalRotation":3.1415927},{"Name":"","type":1,"offY":28.0,"radius":10.0,"Donut":40.0,"color":3355506687,"fillIntensity":0.2,"thicc":4.0,"refActorNPCNameID":14380,"refActorRequireCast":true,"refActorCastId":[48303],"refActorCastTimeMin":1.0,"refActorCastTimeMax":999.0,"refActorComparisonType":6,"includeRotation":true,"RotationOverride":true,"RotationOverridePoint":{"X":100.0,"Y":100.0}},{"Name":"","type":4,"radius":40.0,"coneAngleMin":-45,"coneAngleMax":45,"fillIntensity":0.4,"refActorNPCNameID":14380,"refActorRequireCast":true,"refActorCastId":[46351],"refActorCastTimeMin":1.0,"refActorCastTimeMax":999.0,"refActorComparisonType":6,"includeRotation":true,"AdditionalRotation":1.5707964},{"Name":"","type":4,"radius":40.0,"coneAngleMin":-45,"coneAngleMax":45,"fillIntensity":0.4,"refActorNPCNameID":14380,"refActorRequireCast":true,"refActorCastId":[46351],"refActorCastTimeMin":1.0,"refActorCastTimeMax":999.0,"refActorComparisonType":6,"includeRotation":true,"AdditionalRotation":4.712389}],"ForcedProjectorActions":[48303]}

SplatoonScripts/Duties/Dawntrail/M12S P1 Mortal Slayer.cs

@@ -33,7 +33,7 @@ public enum Direction { East, West }
     private PlayerData[] _playerOrderForBalls = [];
     private List<(BallKind Kind, Direction Dir, int Wave)> _spawnedBalls = [];
     private int _waveState;
-    public override Metadata Metadata => new(1, "Garume");
+    public override Metadata Metadata => new(2, "Garume");
     public override HashSet<uint>? ValidTerritories => [1327];
 
     public Config C => Controller.GetConfig<Config>();
@@ -96,17 +96,105 @@ private bool BuildPlayerOrder()
     {
         var prio = C.PriorityData.GetPlayers(_ => true)?.ToList();
         if (prio?.Count < 8) { DuoLog.Warning($"PriorityData.GetPlayers() returned insufficient players. Count={prio?.Count ?? 0}"); return false; }
-        var ordered = _spawnedBalls.Chunk(2).SelectMany(chunk => chunk.OrderBy(b => b.Dir == Direction.West ? 0 : 1)).ToArray();
-        var ret = new PlayerData[ordered.Length];
-        var purpleSlot = 0; var greenSlot = 2;
-        for (var i = 0; i < ordered.Length; i++)
-        {
-            var b = ordered[i];
-            var idx = b.Kind == BallKind.Purple ? purpleSlot++ : greenSlot++;
-            if ((uint)idx >= (uint)prio.Count) { DuoLog.Warning($"Priority index out of range. idx={idx}, prioCount={prio.Count}"); return false; }
-            var p = prio[idx];
-            ret[i] = new PlayerData { Direction = b.Dir, Kind = b.Kind, ObjectId = p.IGameObject.EntityId, Name = p.IGameObject.Name.ToString() };
-        }
+
+           var westTank  = prio[0]; // MT
+   var westHealer= prio[1]; // H1
+   var westMelee = prio[2]; // D1
+   var westRanged= prio[3]; // D3
+   var eastTank  = prio[4]; // ST
+   var eastHealer= prio[5]; // H2
+   var eastMelee = prio[6]; // D2
+   var eastRanged= prio[7]; // D4
+
+   // Purple is always on one side (strategy assumption)
+   var purpleBalls = _spawnedBalls.Where(x => x.Kind == BallKind.Purple).ToList();
+   if (purpleBalls.Count != 2)
+   {
+       DuoLog.Warning($"Purple ball count is not 2. Count={purpleBalls.Count}");
+       return false;
+   }
+   var purpleSide = purpleBalls[0].Dir;
+
+   // Build per-side assignment queues (this is the key change)
+   List<(uint ObjectId, string Name)> westPurple = new();
+   List<(uint ObjectId, string Name)> eastPurple = new();
+   List<(uint ObjectId, string Name)> westGreen  = new();
+   List<(uint ObjectId, string Name)> eastGreen  = new();
+
+   if (purpleSide == Direction.West)
+   {
+       // West has 2 purples, East has 4 greens.
+       // Tank without purple (EastTank) swaps with ranged on purple side (WestRanged).
+       westPurple.Add((westTank.IGameObject.EntityId,  westTank.IGameObject.Name.ToString())); // 1st purple
+       westPurple.Add((eastTank.IGameObject.EntityId,  eastTank.IGameObject.Name.ToString())); // 2nd purple (swapped tank)
+
+       westGreen.Add((westHealer.IGameObject.EntityId, westHealer.IGameObject.Name.ToString())); // green #1
+       westGreen.Add((westMelee.IGameObject.EntityId,  westMelee.IGameObject.Name.ToString()));  // green #2
+
+       eastGreen.Add((eastHealer.IGameObject.EntityId, eastHealer.IGameObject.Name.ToString())); // green #1
+       eastGreen.Add((eastMelee.IGameObject.EntityId,  eastMelee.IGameObject.Name.ToString()));  // green #2
+       eastGreen.Add((eastRanged.IGameObject.EntityId, eastRanged.IGameObject.Name.ToString())); // green #3
+       eastGreen.Add((westRanged.IGameObject.EntityId, westRanged.IGameObject.Name.ToString())); // green #4 (swapped ranged)
+   }
+   else
+   {
+       // East has 2 purples, West has 4 greens.
+       // Tank without purple (WestTank) swaps with ranged on purple side (EastRanged).
+       eastPurple.Add((eastTank.IGameObject.EntityId,  eastTank.IGameObject.Name.ToString())); // 1st purple
+       eastPurple.Add((westTank.IGameObject.EntityId,  westTank.IGameObject.Name.ToString())); // 2nd purple (swapped tank)
+
+       eastGreen.Add((eastHealer.IGameObject.EntityId, eastHealer.IGameObject.Name.ToString())); // green #1
+       eastGreen.Add((eastMelee.IGameObject.EntityId,  eastMelee.IGameObject.Name.ToString()));  // green #2
+
+       westGreen.Add((westHealer.IGameObject.EntityId, westHealer.IGameObject.Name.ToString())); // green #1
+       westGreen.Add((westMelee.IGameObject.EntityId,  westMelee.IGameObject.Name.ToString()));  // green #2
+       westGreen.Add((westRanged.IGameObject.EntityId, westRanged.IGameObject.Name.ToString())); // green #3
+       westGreen.Add((eastRanged.IGameObject.EntityId, eastRanged.IGameObject.Name.ToString())); // green #4 (swapped ranged)
+   }
+
+   var ret = new PlayerData[_spawnedBalls.Count];
+   var wp = 0; var wg = 0; var ep = 0; var eg = 0;
+   for (var i = 0; i < _spawnedBalls.Count; i++)
+   {
+       var b = _spawnedBalls[i];
+       (uint ObjectId, string Name) pick;
+
+       if (b.Dir == Direction.West)
+       {
+           if (b.Kind == BallKind.Purple)
+           {
+               if (wp >= westPurple.Count) { DuoLog.Warning("West purple overflow"); return false; }
+               pick = westPurple[wp++];
+           }
+           else
+           {
+               if (wg >= westGreen.Count) { DuoLog.Warning("West green overflow"); return false; }
+               pick = westGreen[wg++];
+           }
+       }
+       else
+       {
+           if (b.Kind == BallKind.Purple)
+           {
+               if (ep >= eastPurple.Count) { DuoLog.Warning("East purple overflow"); return false; }
+               pick = eastPurple[ep++];
+           }
+           else
+           {
+               if (eg >= eastGreen.Count) { DuoLog.Warning("East green overflow"); return false; }
+               pick = eastGreen[eg++];
+           }
+       }
+
+       ret[i] = new PlayerData
+       {            Direction = b.Dir,
+           Kind = b.Kind,
+           ObjectId = pick.ObjectId,
+           Name = pick.Name
+       };
+   }
+
+        
         for (var i = 0; i < ret.Length; i += 2)
         {
             var a = ret[i]; var b = ret[i + 1]; var w = i / 2 + 1; var off = a.Direction == b.Direction ? 3f : 0f;
@@ -129,9 +217,7 @@ public override void OnObjectCreation(IntPtr newObjectPtr)
             if (_spawnedBalls.Count % 2 == 0) BuildPlayerOrder();
             if (_spawnedBalls.Count < 8) return;
             _waveState = 1;
-            _spawnedBalls = _spawnedBalls.Chunk(2)
-                .SelectMany(chunk => chunk.OrderBy(b => b.Dir == Direction.West ? 0 : 1)).ToList();
-        });
+          });
     }
 
     public override void OnActionEffectEvent(ActionEffectSet set)
@@ -148,12 +234,12 @@ public override void OnSettingsDraw()
         if (ImGui.CollapsingHeader("Guide (JP)"))
         {
             ImGui.TextWrapped("西側をMT組、東側をST組と見ます。優先順位の1・2番は紫球を受け、それ以降は順番に緑球を受けます。");
-            ImGui.TextWrapped("例：紫球が MT → OT、緑球の優先が H→近接→遠隔 の場合は「MT OT H1 H2 M1 M2 R1 R2」と入力してください。");
+            ImGui.TextWrapped("例：紫球が MT → OT、緑球の優先が H→近接→遠隔 の場合は「MT H1 M1 R1 OT H2 M2 R2」と入力してください。");
         }
         if (ImGui.CollapsingHeader("Guide (EN)"))
         {
             ImGui.TextWrapped("West = MT, East = OT. Priority 1–2 take purple orbs; everyone after that takes green orbs in order.");
-            ImGui.TextWrapped("Example: if purple is MT → OT and green priority is H → Melee → Ranged, enter: \"MT OT H1 H2 M1 M2 R1 R2\".");
+            ImGui.TextWrapped("Example: if purple is MT → OT and green priority is H → Melee → Ranged, enter: \"MT H1 M1 R1 OT H2 M2 R2\".");
         }
         if (ImGuiEx.CollapsingHeader("Debug"))
         {
@@ -177,6 +263,13 @@ public override void OnSettingsDraw()
             ImGui.Text($"My index: {Array.FindIndex(_playerOrderForBalls, x => x.ObjectId == Controller.BasePlayer.EntityId)}");
         }
     }
+
+    public override Dictionary<int, string>? Changelog => new()
+    {
+        { 2, "プレイヤーの選出ロジックを修正しました。それに伴い優先順位の設定方法が変わったので一度確認してください。\n" +
+             "I’ve fixed the player selection logic. Because of that, the way you set the priority order has changed, so please review it once.\n" }
+    };
+
     public class PlayerData { public Direction Direction; public bool First; public BallKind Kind; public string Name = ""; public uint ObjectId; public float Offset; public string Text = ""; public int Wave, Order; }
 
     public class Config : IEzConfig

SplatoonScripts/Duties/Dawntrail/M12S P1 Snake.cs

@@ -20,7 +20,7 @@ namespace SplatoonScriptsOfficial.Duties.Dawntrail;
 
 public class M12S_P1_Snake : SplatoonScript
 {
-    public override Metadata Metadata { get; } = new(3, "NightmareXIV, Garume");
+    public override Metadata Metadata { get; } = new(4, "NightmareXIV, Garume");
     public override HashSet<uint>? ValidTerritories { get; } = [1327];
 
     public enum Debuff
@@ -31,6 +31,7 @@ public enum Debuff
         Pos4 = 3451,
         Alpha = 4752,
         Beta = 4754,
+        AfterBeta = 4755,
     }
 
     public enum DebuffGroup
@@ -301,9 +302,13 @@ public override void OnUpdate()
             }
             else if(me.Group == DebuffGroup.Beta)
             {
-                var bt = GetBlackTowerInfo(me.TowerOrder);
-                var soakDone = (bt != null && bt.Removed) || (me.SoakRotation != null && RotationCount > me.SoakRotation);
-                if(soakDone)
+                // var bt = GetBlackTowerInfo(me.TowerOrder);
+                // var soakDone = (bt != null && bt.Removed) || (me.SoakRotation != null && RotationCount > me.SoakRotation);
+                // var allowCut = soakDone || me.SoakRotation == null || me.CutRotation <= me.SoakRotation;
+                // var hasBetaNow = BasePlayer != null && HasStatus(Debuff.Beta);
+                // if(allowCut && hasBetaNow)
+                var betaRemaining = GetRemainingTime(Debuff.Beta);
+                if ((betaRemaining < 3f && betaRemaining != 0f) || HasStatus(Debuff.AfterBeta))
                 {
                     ShowCutIfDue(me, cutGuide, nextColor, nowColor);
                 }

SplatoonScripts/update.csv

@@ -54,7 +54,7 @@ SplatoonScriptsOfficial.Duties.Dawntrail@M8S_Lone_Wolfs_Lament,2,https://github.
 SplatoonScriptsOfficial.Duties.Dawntrail@M5S_Lets_Dance,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M5S Lets Dance.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Sunrise_Sabbath,5,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Sunrise Sabbath.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@EX2_Projection_of_Triumph,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/EX2 Projection of Triumph.cs
-SplatoonScriptsOfficial.Duties.Dawntrail@M12S_P1_Mortal_Slayer,1,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S P1 Mortal Slayer.cs
+SplatoonScriptsOfficial.Duties.Dawntrail@M12S_P1_Mortal_Slayer,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S P1 Mortal Slayer.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M10S_Insane_Air,4,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M10S Insane Air.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@EX6_Arcane_Revelation,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/EX6_Arcane_Revelation.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M8S_Ultraviolent_Ray,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M8S Ultraviolent Ray.cs
@@ -63,7 +63,7 @@ SplatoonScriptsOfficial.Duties.Dawntrail@M6S_Target_Enforcer,6,https://github.co
 SplatoonScriptsOfficial.Duties.Dawntrail@M8S_Tactical_Pack,4,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M8S Tactical Pack.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Midnight_Sabbath,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Midnight Sabbath.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M8S_Rise_of_the_Howling_Wind,6,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M8S Rise of the Howling Wind.cs
-SplatoonScriptsOfficial.Duties.Dawntrail@M12S_P1_Snake,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S P1 Snake.cs
+SplatoonScriptsOfficial.Duties.Dawntrail@M12S_P1_Snake,4,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S P1 Snake.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M8S_Quad_Beckon_Moonlight,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M8S Quad Beckon Moonlight.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@Underkeep_ValiaPira,1,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/Underkeep_ValiaPira.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M6S_Lava_Towers,6,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M6S Lava Towers.cs