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

PunishXIV · Dec 26, 2024 · d8ecaf0 · d8ecaf0
2 parents a5dd01c + c6c1f54
commit d8ecaf0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Presets/Dawntrail/Raids/Cloud of Darkness (Chaotic).md b/Presets/Dawntrail/Raids/Cloud of Darkness (Chaotic).md
@@ -31,8 +31,7 @@ Death IV
 
 Break IV
 ```
-~Lv2~{"Name":"Break IV","Group":"Cloud Of Darkness 
-(Chaotic)","ZoneLockH":[1241],"DCond":5,"ElementsL":[{"Name":"Cone","type":4,"radius":30.0,"coneAngleMin":-10,"coneAngleMax":10,"color":4278190335,"fillIntensity":0.35,"overlayBGColor":4278190080,"overlayTextColor":4294967295,"overlayVOffset":7.0,"overlayFScale":2.0,"overlayText":"Point Cone Away","refActorType":1,"includeRotation":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"Eye Tethers","type":1,"radius":0.0,"color":3355836259,"fillIntensity":0.5,"overlayBGColor":4278190080,"overlayTextColor":4294704125,"overlayVOffset":4.0,"overlayFScale":2.0,"thicc":10.0,"overlayText":"Eye Here","refActorNPCNameID":13632,"refActorComparisonType":6,"onlyVisible":true,"tether":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"Boss Tether","type":1,"radius":0.0,"color":3356818435,"fillIntensity":0.5,"overlayBGColor":4278190080,"overlayTextColor":4294375162,"overlayVOffset":4.0,"overlayFScale":2.0,"thicc":10.0,"overlayText":"Face Away","refActorNPCNameID":13624,"refActorComparisonType":6,"onlyVisible":true,"tether":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":7.0,"Match":"(13624>40528)"}]}
+~Lv2~{"Name":"Break IV","Group":"Cloud Of Darkness (Chaotic)","ZoneLockH":[1241],"DCond":5,"ElementsL":[{"Name":"Cone","type":4,"radius":30.0,"coneAngleMin":-10,"coneAngleMax":10,"color":4278190335,"fillIntensity":0.35,"overlayBGColor":4278190080,"overlayTextColor":4294967295,"overlayVOffset":7.0,"overlayFScale":2.0,"overlayText":"Point Cone Away","refActorType":1,"includeRotation":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"Eye Tethers","type":1,"radius":0.0,"color":3355836259,"fillIntensity":0.5,"overlayBGColor":4278190080,"overlayTextColor":4294704125,"overlayVOffset":4.0,"overlayFScale":2.0,"thicc":10.0,"overlayText":"Eye Here","refActorNPCNameID":13632,"refActorComparisonType":6,"onlyVisible":true,"tether":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"Boss Tether","type":1,"radius":0.0,"color":3356818435,"fillIntensity":0.5,"overlayBGColor":4278190080,"overlayTextColor":4294375162,"overlayVOffset":4.0,"overlayFScale":2.0,"thicc":10.0,"overlayText":"Face Away","refActorNPCNameID":13624,"refActorComparisonType":6,"onlyVisible":true,"tether":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":7.0,"Match":"(13624>40528)"}]}
 ```
 
 Enaero IV (draws a knockback stored message for reminder and draws a knockback circle + knockback helper line when mechanic resolves)

diff --git a/SplatoonScripts/update.csv b/SplatoonScripts/update.csv
@@ -74,7 +74,7 @@ SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P1_Fall_of_Faith_
 SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P2_Light_Rampant_JP,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/The Futures Rewritten/P2 Light Rampant JP.cs
 SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P4_Crystallize_Time,0,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/The Futures Rewritten/P4 Crystallize Time.cs
 SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P2_AutoTargetCrystal,1,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/The Futures Rewritten/P2 AutoTargetCrystal.cs
-SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P3_Apocalypse,4,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/The Futures Rewritten/P3 Apocalypse.cs
+SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P3_Apocalypse,5,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/The Futures Rewritten/P3 Apocalypse.cs
 SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P1_Turn_of_the_Heavens,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/The Futures Rewritten/P1 Turn of the Heavens.cs
 SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P2_Mirror_Mirror,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/The Futures Rewritten/P2 Mirror Mirror.cs
 SplatoonScriptsOfficial.Duties.Dawntrail.The_Futures_Rewritten@P1_Cyclonic_Break,2,https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Dawntrail/The Futures Rewritten/P1 Cyclonic Break.cs