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

Author: Limiana

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

@@ -14,10 +14,10 @@ Projection settings
 https://github.com/PunishXIV/Splatoon/raw/refs/heads/main/SplatoonScripts/Duties/Dawntrail/M12S%20Bloodshed.cs
 ```
 
-# Act 1
 Puddle on the ground (beta)
 ```
-~Lv2~{"Name":"M12S P1 Act1 Puddle on the ground","Group":"M12S P1","ZoneLockH":[1327],"ConditionalAnd":true,"ElementsL":[{"Name":"Casting entity","type":1,"radius":12.0,"fillIntensity":0.237,"castAnimation":3,"animationColor":1660944384,"refActorNPCNameID":14378,"refActorRequireCast":true,"refActorCastId":[46239],"refActorComparisonType":6,"Conditional":true,"ConditionalInvert":true},{"Name":"Casting entity","type":1,"radius":12.0,"fillIntensity":0.259,"castAnimation":3,"animationColor":1660944384,"refActorNPCNameID":14378,"refActorRequireCast":true,"refActorCastId":[46239],"refActorUseCastTime":true,"refActorCastTimeMax":5.0,"refActorUseOvercast":true,"refActorComparisonType":6,"Conditional":true,"ConditionalInvert":true,"Nodraw":true},{"Name":"Event object","type":1,"radius":12.0,"color":3355506687,"fillIntensity":0.226,"refActorDataID":2015017,"refActorObjectLife":true,"refActorLifetimeMin":14.0,"refActorLifetimeMax":99.0,"refActorComparisonType":3}]}
+~Lv2~{"Name":"M12S P1 Act1 Puddle on the ground","Group":"M12S P1","ZoneLockH":[1327],"ConditionalAnd":true,"DCond":5,"UseTriggers":true,"Triggers":[{"Duration":300.0}],"ElementsL":[{"Name":"Casting entity","type":1,"radius":12.0,"fillIntensity":0.237,"castAnimation":3,"animationColor":1660944384,"refActorNPCNameID":14378,"refActorRequireCast":true,"refActorCastId":[46239],"refActorComparisonType":6,"Conditional":true,"ConditionalInvert":true},{"Name":"Casting entity","type":1,"radius":12.0,"fillIntensity":0.259,"castAnimation":3,"animationColor":1660944384,"refActorNPCNameID":14378,"refActorRequireCast":true,"refActorCastId":[46239],"refActorUseCastTime":true,"refActorCastTimeMax":5.0,"refActorUseOvercast":true,"refActorComparisonType":6,"Conditional":true,"ConditionalInvert":true,"Nodraw":true},{"Name":"Event object","type":1,"radius":12.0,"color":3355506687,"fillIntensity":0.226,"refActorDataID":2015017,"refActorObjectLife":true,"refActorLifetimeMin":14.0,"refActorLifetimeMax":99.0,"refActorComparisonType":3}]}
+~Lv2~{"Name":"M12S P1 Act5 Puddle on the ground","Group":"M12S P1","ZoneLockH":[1327],"ConditionalAnd":true,"DCond":5,"UseTriggers":true,"Triggers":[{"TimeBegin":300.0,"Duration":999.0}],"ElementsL":[{"Name":"Casting entity","type":1,"radius":12.0,"fillIntensity":0.237,"castAnimation":3,"animationColor":1660944384,"refActorNPCNameID":14378,"refActorRequireCast":true,"refActorCastId":[46239],"refActorComparisonType":6,"Conditional":true,"ConditionalInvert":true},{"Name":"Casting entity","type":1,"radius":12.0,"fillIntensity":0.259,"castAnimation":3,"animationColor":1660944384,"refActorNPCNameID":14378,"refActorRequireCast":true,"refActorCastId":[46239],"refActorUseCastTime":true,"refActorCastTimeMax":5.0,"refActorUseOvercast":true,"refActorComparisonType":6,"Conditional":true,"ConditionalInvert":true,"Nodraw":true},{"Name":"Event object","type":1,"radius":12.0,"color":3355506687,"fillIntensity":0.226,"refActorDataID":2015017,"refActorObjectLife":true,"refActorLifetimeMin":5.0,"refActorLifetimeMax":99.0,"refActorComparisonType":3}]}
 ```
 
 # Act 2

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

@@ -16,10 +16,21 @@ Replication 1 Debuff and aoe size highlight
 
 # 2
 [Script] [Beta] Clones 1 (Replication 1) script
+
+** KNOWN ISSUE: Tether position may not be valid, work in progress, look for your tether yourself **
+
 > [!Warning]
 >
 > Default configuration is for Banana Codex raidplan. You may reconfigure this script for ANY strat, however, it's not easy.
 
 ```
 https://github.com/PunishXIV/Splatoon/raw/refs/heads/main/SplatoonScripts/Duties/Dawntrail/M12S%20P2%20Clones%202.cs
 ```
+
+# 3
+
+Netherworld-far and Netherworld-near
+```
+~Lv2~{"Name":"三运 alpha 远近分摊","Group":"M12S P2","ZoneLockH":[1327],"ElementsL":[{"Name":"buff alpha1","type":1,"refActorRequireBuff":true,"refActorBuffId":[4769],"refActorType":1,"Conditional":true,"Nodraw":true},{"Name":"阴界远景","type":1,"radius":5.0,"color":3355508525,"Filled":false,"fillIntensity":0.5,"overlayFScale":3.0,"thicc":20.0,"overlayText":"靠近","overlayTextIntl":{"En":"In"},"refActorModelID":4659,"refActorRequireCast":true,"refActorCastId":[46380,46380],"refActorComparisonType":1,"onlyVisible":true},{"Name":"buff alpha2","type":1,"refActorRequireBuff":true,"refActorBuffId":[4769],"refActorType":1,"Conditional":true,"Nodraw":true},{"Name":"阴界近景","type":1,"radius":5.0,"color":3355508570,"Filled":false,"fillIntensity":0.5,"overlayFScale":3.0,"thicc":20.0,"overlayText":"远离","overlayTextIntl":{"En":"Out"},"refActorModelID":4659,"refActorRequireCast":true,"refActorCastId":[46379,46379],"refActorComparisonType":1,"onlyVisible":true}]}
+~Lv2~{"Name":"三运 beta 远近分摊","Group":"M12S P2","ZoneLockH":[1327],"ElementsL":[{"Name":"buff beta1","type":1,"refActorRequireBuff":true,"refActorBuffId":[4771],"refActorType":1,"Conditional":true,"Nodraw":true},{"Name":"阴界远景","type":1,"radius":5.0,"color":3372155132,"Filled":false,"fillIntensity":0.5,"overlayFScale":3.0,"thicc":20.0,"overlayText":"远离分摊","overlayTextIntl":{"En":"Out + Stack"},"refActorModelID":4659,"refActorRequireCast":true,"refActorCastId":[46380,46380],"refActorComparisonType":1,"onlyVisible":true},{"Name":"buff beta2","type":1,"refActorRequireBuff":true,"refActorBuffId":[4771],"refActorType":1,"Conditional":true,"Nodraw":true},{"Name":"阴界近景","type":1,"radius":5.0,"color":3371564800,"Filled":false,"fillIntensity":0.5,"overlayFScale":3.0,"thicc":20.0,"overlayText":"靠近分摊","overlayTextIntl":{"En":"In + Stack"},"refActorModelID":4659,"refActorRequireCast":true,"refActorCastId":[46379,46379],"refActorComparisonType":1,"onlyVisible":true}]}
+```

SplatoonScripts/update.csv

@@ -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,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/M12S P2 Clones 2.cs
+SplatoonScriptsOfficial.Duties.Dawntrail@M12S_P2_Clones_2,3,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