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

Author: Limiana

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

@@ -22,12 +22,18 @@ Version 4 should have tether fixed and now both tethers are highlighted, but sti
 > [!Warning]
 >
 > Configuration required. You may reconfigure this script for ANY strat, however, it's not easy.
+> Supports only strats that autoresolve near/far (such as banana codex)
 
 ```
 https://github.com/PunishXIV/Splatoon/raw/refs/heads/main/SplatoonScripts/Duties/Dawntrail/M12S%20P2%20Clones%202.cs
 ```
 
-# 3
+# 3 Blood Mana
+
+Will highlight which orbs have to be picked. There are million strats, so it will not resolve which one exactly is for you or if you are alpha/beta. You can add extra conditional elements for that, if you want. 
+```
+~Lv2~{"Name":"M12S P2 Mana highlighter","Group":"M12S P2","ZoneLockH":[1327],"DCond":5,"UseTriggers":true,"Freezing":true,"FreezeFor":10.0,"Triggers":[{"Type":2,"Duration":1.0,"Match":"ActionEffect|46333","MatchDelay":1.0}],"ElementsL":[{"Name":"AOE close 1","type":1,"refActorDataID":19206,"refActorComparisonType":3,"onlyVisible":true,"LimitDistance":true,"DistanceSourceX":110.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"AOE far 1","type":1,"offY":3.0,"radius":4.0,"Filled":false,"fillIntensity":0.5,"overlayVOffset":2.0,"overlayText":"Pick me!","refActorDataID":19206,"refActorComparisonType":3,"includeRotation":true,"onlyVisible":true,"tether":true,"LimitDistance":true,"LimitDistanceInvert":true,"DistanceSourceX":110.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"RotationOverride":true,"RotationOverridePoint":{"X":90.0,"Y":100.0}},{"Name":"Donut close 1","type":1,"refActorDataID":19207,"refActorComparisonType":3,"onlyVisible":true,"LimitDistance":true,"DistanceSourceX":110.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"Donut far 1","type":1,"offY":3.0,"radius":4.0,"Filled":false,"fillIntensity":0.5,"overlayVOffset":2.0,"overlayText":"Pick me!","refActorDataID":19207,"refActorComparisonType":3,"includeRotation":true,"onlyVisible":true,"tether":true,"LimitDistance":true,"LimitDistanceInvert":true,"DistanceSourceX":110.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"RotationOverride":true,"RotationOverridePoint":{"X":90.0,"Y":100.0}},{"Name":"Blue fan close 1","type":1,"refActorDataID":19208,"refActorComparisonType":3,"onlyVisible":true,"LimitDistance":true,"DistanceSourceX":110.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"Blue fan far 1","type":1,"offY":3.0,"radius":4.0,"Filled":false,"fillIntensity":0.5,"overlayVOffset":2.0,"overlayText":"Pick me!","refActorDataID":19208,"refActorComparisonType":3,"includeRotation":true,"onlyVisible":true,"tether":true,"LimitDistance":true,"LimitDistanceInvert":true,"DistanceSourceX":110.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"RotationOverride":true,"RotationOverridePoint":{"X":90.0,"Y":100.0}},{"Name":"red fan close 1","type":1,"refActorDataID":19209,"refActorComparisonType":3,"onlyVisible":true,"LimitDistance":true,"DistanceSourceX":110.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"red fan far 1","type":1,"offY":3.0,"radius":4.0,"Filled":false,"fillIntensity":0.5,"overlayVOffset":2.0,"overlayText":"Pick me!","refActorDataID":19209,"refActorComparisonType":3,"includeRotation":true,"onlyVisible":true,"tether":true,"LimitDistance":true,"LimitDistanceInvert":true,"DistanceSourceX":110.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"RotationOverride":true,"RotationOverridePoint":{"X":90.0,"Y":100.0}},{"Name":"","Enabled":false},{"Name":"AOE close 1","type":1,"refActorDataID":19206,"refActorComparisonType":3,"onlyVisible":true,"LimitDistance":true,"DistanceSourceX":90.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"AOE far 1","type":1,"offY":3.0,"radius":4.0,"Filled":false,"fillIntensity":0.5,"overlayVOffset":2.0,"overlayText":"Pick me!","refActorDataID":19206,"refActorComparisonType":3,"includeRotation":true,"onlyVisible":true,"tether":true,"LimitDistance":true,"LimitDistanceInvert":true,"DistanceSourceX":90.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"RotationOverride":true,"RotationOverridePoint":{"X":110.0,"Y":100.0}},{"Name":"Donut close 1","type":1,"refActorDataID":19207,"refActorComparisonType":3,"onlyVisible":true,"LimitDistance":true,"DistanceSourceX":90.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"Donut far 1","type":1,"offY":3.0,"radius":4.0,"Filled":false,"fillIntensity":0.5,"overlayVOffset":2.0,"overlayText":"Pick me!","refActorDataID":19207,"refActorComparisonType":3,"includeRotation":true,"onlyVisible":true,"tether":true,"LimitDistance":true,"LimitDistanceInvert":true,"DistanceSourceX":90.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"RotationOverride":true,"RotationOverridePoint":{"X":110.0,"Y":100.0}},{"Name":"Blue fan close 1","type":1,"refActorDataID":19208,"refActorComparisonType":3,"onlyVisible":true,"LimitDistance":true,"DistanceSourceX":90.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"Blue fan far 1","type":1,"offY":3.0,"radius":4.0,"Filled":false,"fillIntensity":0.5,"overlayVOffset":2.0,"overlayText":"Pick me!","refActorDataID":19208,"refActorComparisonType":3,"includeRotation":true,"onlyVisible":true,"tether":true,"LimitDistance":true,"LimitDistanceInvert":true,"DistanceSourceX":90.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"RotationOverride":true,"RotationOverridePoint":{"X":110.0,"Y":100.0}},{"Name":"red fan close 1","type":1,"refActorDataID":19209,"refActorComparisonType":3,"onlyVisible":true,"LimitDistance":true,"DistanceSourceX":90.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"Conditional":true,"ConditionalReset":true,"Nodraw":true},{"Name":"red fan far 1","type":1,"offY":3.0,"radius":4.0,"Filled":false,"fillIntensity":0.5,"overlayVOffset":2.0,"overlayText":"Pick me!","refActorDataID":19209,"refActorComparisonType":3,"includeRotation":true,"onlyVisible":true,"tether":true,"LimitDistance":true,"LimitDistanceInvert":true,"DistanceSourceX":90.0,"DistanceSourceY":100.0,"DistanceMax":10.0,"RotationOverride":true,"RotationOverridePoint":{"X":110.0,"Y":100.0}}]}
+```
 
 Netherworld-far and Netherworld-near
 ```

SplatoonScripts/Duties/Dawntrail/M11S Majestic Meteor.cs

@@ -65,7 +65,7 @@ public class M11S_Majestic_Meteor : SplatoonScript
     private readonly List<Vector2> _mapEffectPositions = new();
 
     private State _state = State.Idle;
-    public override Metadata Metadata => new(5, "Garume");
+    public override Metadata Metadata => new(6, "Garume");
     public override HashSet<uint>? ValidTerritories { get; } = [1325];
     private Config C => Controller.GetConfig<Config>();
 
@@ -263,10 +263,45 @@ public override void OnUpdate()
         if (_state == State.TowerBait)
         {
             if (!isLine && !isNoLine) return;
+            
             var originalSideIsEast =
                 _linePlayers.FirstOrDefault(x => x.Item1 == myId).Item2 == Direction.NorthEast ||
                 _linePlayers.FirstOrDefault(x => x.Item1 == myId).Item2 == Direction.SouthEast;
             var same = isEast == originalSideIsEast;
+            
+            if (C.RealtimeTowerBaitSecond && _gimmicCount == 1)
+            {
+                var dir = GetDirectionFromWorld(BasePlayer.Position);
+                var tower = dir switch
+                {
+                    Direction.NorthEast => TowerNE(),
+                    Direction.SouthEast => TowerSE(),
+                    Direction.SouthWest => TowerSW(),
+                    _ => TowerNW()
+                };
+
+                var isNorthTower = dir is Direction.NorthEast or Direction.NorthWest;
+                Vector2 stand;
+                if (isLine)
+                {
+                    if (same)
+                    {
+                        var offset = (tower.X > _center.X) ? -_towerStandOff : _towerStandOff;
+                        stand = tower with { X = tower.X + offset };
+                    }
+                    else
+                    {
+                        stand = tower with { Y = tower.Y + (isNorthTower ? _towerStandOff : -_towerStandOff) };
+                    }
+                }
+                else
+                {
+                    stand = tower with { Y = tower.Y + (isNorthTower ? _towerStandOff : -_towerStandOff) };
+                }
+
+                SetGuide(stand);
+                return;
+            }
 
             if (C.TetherShouldGoNorth)
             {
@@ -554,6 +589,16 @@ private Vector2 MirrorXZ(Vector2 p)
     {
         return new Vector2(2f * _center.X - p.X, 2f * _center.Y - p.Y);
     }
+    
+    private Direction GetDirectionFromWorld(Vector3 pos)
+    {
+        var isEast = pos.X > _center.X;
+        var isSouth = pos.Z > _center.Y;
+        if (isEast && !isSouth) return Direction.NorthEast;
+        if (isEast && isSouth) return Direction.SouthEast;
+        if (!isEast && isSouth) return Direction.SouthWest;
+        return Direction.NorthWest;
+    }
 
     private Direction GetDirectionFromPosition(Vector2 pos)
     {
@@ -570,6 +615,17 @@ public override void OnSettingsDraw()
     {
         ImGuiEx.Text("■ 設定 / Settings");
         ImGui.Checkbox("Tether should go North", ref C.TetherShouldGoNorth);
+        ImGui.Checkbox("2nd TowerBait: Realtime by direction", ref C.RealtimeTowerBaitSecond);
+        ImGui.SameLine();
+        ImGuiEx.HelpMarker("""
+            2回目のTowerBaitのみ
+            自分が今立っている方角（北東/南東/南西/北西）に応じて、ガイド先の塔をリアルタイムで切り替えます。
+            1回目のTowerBaitは従来どおり（優先順位）です。
+
+            Second TowerBait only
+            Switches the guided tower in real time based on your current direction (NE/SE/SW/NW).
+            The first TowerBait remains unchanged (priority).
+        """);
         ImGui.Checkbox("Show Final Tower bait (after Arcadian Crash cast)", ref C.ShowFinalTowerBait);
         ImGui.SameLine();
         ImGuiEx.HelpMarker("""
@@ -650,6 +706,7 @@ public class Config : IEzConfig
         public PriorityData PlayerData = new();
         public bool TetherShouldGoNorth;
         public bool ShowFinalTowerBait = true;
+        public bool RealtimeTowerBaitSecond = false;
     }
 
 

SplatoonScripts/update.csv

@@ -30,7 +30,7 @@ SplatoonScriptsOfficial.Duties.Dawntrail@M6S_Taste_of_Thunder,1,https://github.c
 SplatoonScriptsOfficial.Duties.Dawntrail@R1S_Protean_Highlight,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R1S Protean Highlight.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M9S_Vamp_Stomp,1,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M9S Vamp Stomp.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M12S_Bloodshed,7,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S Bloodshed.cs
-SplatoonScriptsOfficial.Duties.Dawntrail@M11S_Majestic_Meteor,5,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M11S Majestic Meteor.cs
+SplatoonScriptsOfficial.Duties.Dawntrail@M11S_Majestic_Meteor,6,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M11S Majestic Meteor.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M7S_Scatter_Seeds,1,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M7S Scatter Seeds.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@R2S_Venom_Love_Pair_Split,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R2S Venom Love Pair Split.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@R4S_Chain_Lightning,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R4S Chain Lightning.cs
@@ -44,7 +44,7 @@ SplatoonScriptsOfficial.Duties.Dawntrail@M7S_Blow_Seeds,2,https://github.com/Pun
 SplatoonScriptsOfficial.Duties.Dawntrail@M12S_P2_Clones_1,1,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S P2 Clones 1.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@EX4_Roseblood_4,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/EX4 Roseblood 4.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@R1S_Multiscript,3,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/R1S Multiscript.cs
-SplatoonScriptsOfficial.Duties.Dawntrail@M12S_P2_Clones_2,4,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S P2 Clones 2.cs
+SplatoonScriptsOfficial.Duties.Dawntrail@M12S_P2_Clones_2,5,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S P2 Clones 2.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M11S_Weapons,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M11S Weapons.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M5S_Disco_Infernal,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M5S Disco Infernal.cs
 SplatoonScriptsOfficial.Duties.Dawntrail@M8S_Lone_Wolfs_Lament,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M8S Lone Wolfs Lament.cs