From 4e279e3ec3f0a84cf827655e9a0ec0c7ca7c20ba Mon Sep 17 00:00:00 2001
From: xziino <lyokii.p@gmail.com>
Date: Thu, 3 Feb 2022 01:27:03 +0100
Subject: [PATCH] p2s healing cds

---
 p2s-override.txt | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 raidboss.js      | 23 +++++++++++++------
 2 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/p2s-override.txt b/p2s-override.txt
index 1b0d0c2..802b926 100644
--- a/p2s-override.txt
+++ b/p2s-override.txt
@@ -10,60 +10,96 @@ hideall "--sync--"
 
 0.0 "--sync--" sync /Engage!/ window 0,1
 11.0 "--sync--" sync / 14:[^:]*:Hippokampos:6833:/ window 15,15
+15.8 "sge_Physis"
+15.8 "ast_Collective
 16.0 "Murky Depths" sync / 1[56]:[^:]*:Hippokampos:6833:/
 26.3 "Doubled Impact" sync / 1[56]:[^:]*:Hippokampos:6832:/
 31.5 "--middle--" sync / 1[56]:[^:]*:Hippokampos:6836:/
+38.6 "sge_Kera_Holos
+38.6 "ast_Opposition"
 38.8 "Sewage Deluge" sync / 1[56]:[^:]*:Hippokampos:6810:/
+40.0 "ast_Horoscope_no_GCD"
+40.0 "sge_Ixo"
 48.0 "--middle--" sync / 1[56]:[^:]*:Hippokampos:6836:/
+45.0 "ast_Star"
 61.8 "Spoken Cataract/Winged Cataract" sync / 1[56]:[^:]*:Hippokampos:(6811|6812|6813|6814|6815|6816|6817|6818):/
 81.9 "Coherence" sync / 1[56]:[^:]*:Hippokampos:681B:/
 82.6 "Coherence Flare" sync / 1[56]:[^:]*:Hippokampos:681A:/
+84.5 "ast_Neutral_Collective_Macrocosmos"
+84.5 "sge_Physis_Pan"
 85.1 "Coherence Line" sync / 1[56]:[^:]*:Hippokampos:681C:/
+87.0 "sge_Kera_Ixo"
 87.2 "--sync--" sync / 1[56]:[^:]*:Hippokampos:681D:/
 98.4 "Murky Depths" sync / 1[56]:[^:]*:Hippokampos:6833:/
+102.0 "ast_Horoscope"
+105.0 "ast_Star"
 105.1 "Ominous Bubbling" sync / 1[56]:[^:]*:Hippokampos:682A:/
 115.9 "Shockwave" sync / 1[56]:[^:]*:Hippokampos:682F:/
+119.0 "sge_Kera"
+119.0 "ast_Pop_Star"
 119.7 "Ominous Bubbling Groups" sync / 1[56]:[^:]*:Hippokampos:682B:/
+123.0 "sge_Pneuma"
 
 # Predatory Avarice and Channeling Flow
 128.1 "--middle--" sync / 1[56]:[^:]*:Hippokampos:6836:/
 134.5 "Predatory Avarice" sync / 1[56]:[^:]*:Hippokampos:6827:/
 152.2 "Winged Cataract/Spoken Cataract" sync / 1[56]:[^:]*:Hippokampos:(6811|6812|6813|6814|6815|6816|6817|6818):/
+158.3 "sge_Kera_Ixo"
+158.3 "ast_Collective_Horoscope"
 158.5 "Hard Water" sync / 1[56]:[^:]*:Hippokampos:6828:/
 158.5 "Deadly Current" #sync sync / 1[56]:[^:]*:Hippokampos:6829:/
 171.9 "Channeling Flow" sync / 1[56]:[^:]*:Hippokampos:681E:/
+172.0 "ast_Star"
 187.2 "Great Typhoon" sync / 1[56]:[^:]*:Hippokampos:(6820|6822):/
+187.5 "sge_Kera"
+187.5 "ast_Opposition"
 187.7 "Crash" #sync / 1[56]:[^:]*:Hippokampos:6821:/
 202.2 "Doubled Impact" sync / 1[56]:[^:]*:Hippokampos:6832:/
+212.0 "sge_Holos_Physis"
 212.3 "Murky Depths" sync / 1[56]:[^:]*:Hippokampos:6833:/
 
 # Kampeos Harma
+218.3 "ast_Horoscope"
 221.5 "--middle--" sync / 1[56]:[^:]*:Hippokampos:6836:/
+228.7 "sge_Kera_Ixo"
+228.7 "ast_Collective"
 228.9 "Sewage Deluge" sync / 1[56]:[^:]*:Hippokampos:6810:/
+232.0 "ast_star"
 246.4 "Shockwave" sync / 1[56]:[^:]*:Hippokampos:682F:/
+248.4 "sge_Pan"
 259.3 "Kampeos Harma" sync / 1[56]:[^:]*:Hippokampos:6823:/
 259.3 "--untargetable--"
 259.7 "Kampeos Harma 1" #sync / 1[56]:[^:]*:Hippokampos:6824:/
 261.5 "Kampeos Harma 2" #sync / 1[56]:[^:]*:Hippokampos:6824:/
 263.3 "Kampeos Harma 3" #sync / 1[56]:[^:]*:Hippokampos:6824:/
 265.2 "Kampeos Harma 4" sync / 1[56]:[^:]*:Hippokampos:6824:/
+266.5 "ast_Opposition"
+266.5 "sge Ixo"
 266.7 "--targetable--"
 266.8 "--sync--" sync / 1[56]:[^:]*:Hippokampos:682D:/
 269.9 "--middle--" sync / 1[56]:[^:]*:Hippokampos:6836:/
 281.7 "Doubled Impact" sync / 1[56]:[^:]*:Hippokampos:6832:/
+282.0 "ast_Star"
+290.6 "ast_Collective"
+290.6 "sge_Kera_Physis"
 290.8 "Murky Depths" sync / 1[56]:[^:]*:Hippokampos:6833:/
+296.7 "sge_Ixo"
 
 # Timed Channeling Flow 1
 297.0 "--middle--" sync / 1[56]:[^:]*:Hippokampos:6836:/
 304.4 "Channeling Overflow" sync / 1[56]:[^:]*:Hippokampos:6DC2:/
 311.6 "--sync--" sync / 1[56]:[^:]*:Hippokampos:6837:/
 318.7 "Tainted Flood" sync / 1[56]:[^:]*:Hippokampos:6838:/
+318.7 "ast_Neutral_Horoscope"
 319.7 "Great Typhoon (short)" sync / 1[56]:[^:]*:Hippokampos:(6820|6822):/
+320.0 "sge_Pneuma"
 320.2 "Crash" #sync / 1[56]:[^:]*:Hippokampos:6821:/
 327.0 "--sync--" sync / 1[56]:[^:]*:Hippokampos:6837:/
 334.1 "Tainted Flood" sync / 1[56]:[^:]*:Hippokampos:6838:/
 334.7 "Great Typhoon (long)" sync / 1[56]:[^:]*:Hippokampos:(6820|6822):/
+335.0 "sge_Physis"
 335.2 "Crash" #sync / 1[56]:[^:]*:Hippokampos:6821:/
+342.0 "ast_Star"
 345.2 "Spoken Cataract/Winged Cataract" sync / 1[56]:[^:]*:Hippokampos:(6811|6812|6813|6814|6815|6816|6817|6818):/
 
 # Dissociation and Sewage Eruption 1
@@ -71,10 +107,13 @@ hideall "--sync--"
 364.4 "Predatory Avarice" sync / 1[56]:[^:]*:Hippokampos:6827:/
 370.8 "Dissociation" sync / 1[56]:[^:]*:Hippokampos:682C:/
 375.9 "--sync--" sync / 1[56]:[^:]*:Hippokampos:682D:/
+388.3 "ast_Opposition_Horoscope"
+388.3 "sge_Kera_Ixo"
 388.5 "Hard Water" sync / 1[56]:[^:]*:Hippokampos:6828:/
 388.5 "Deadly Current" #sync / 1[56]:[^:]*:Hippokampos:6829:/
 388.9 "Dissociation Dive" #sync / 1[56]:[^:]*:Hippokampos:682E:/
 388.9 "Winged Cataract/Spoken Cataract" #sync / 1[56]:[^:]*:Hippokampos:(6811|6812|6813|6814|6815|6816|6817|6818):/
+402.0 "ast_Star"
 402.6 "Dissociation" sync / 1[56]:[^:]*:Hippokampos:682C:/
 407.7 "--sync--" sync / 1[56]:[^:]*:Hippokampos:682D:/
 415.8 "Sewage Eruption" sync / 1[56]:[^:]*:Hippokampos:6830:/
@@ -83,27 +122,45 @@ hideall "--sync--"
 421.6 "Dissociation Dive" #sync / 1[56]:[^:]*:Hippokampos:682E:/
 421.6 "Sewage Eruption 2" #sync / 1[56]:[^:]*:Hippokampos:6831:/
 423.4 "Sewage Eruption 3" #sync / 1[56]:[^:]*:Hippokampos:6831:/
+428.0 "sge_Kera_Ixo"
 428.2 "Tainted Flood" sync / 1[56]:[^:]*:Hippokampos:6838:/
 437.8 "--sync--" sync / 1[56]:[^:]*:Hippokampos:681B:/
 438.5 "Coherence Flare" sync / 1[56]:[^:]*:Hippokampos:681A:/
+
+441.0 "sge_Holos"
+441.0 "ast_Collective
 441.1 "Coherence Line" sync / 1[56]:[^:]*:Hippokampos:681C:/
 443.1 "--sync--" sync / 1[56]:[^:]*:Hippokampos:681D:/
 453.4 "Doubled Impact" sync / 1[56]:[^:]*:Hippokampos:6832:/
+461.3 "sge_Kera_Physis_Ixo"
+461.3 "ast_Opposition"
 461.5 "Murky Depths" sync / 1[56]:[^:]*:Hippokampos:6833:/
+462.0 "ast_Star"
 
 # Timed Channeling Flow 2
 471.7 "--middle--" sync / 1[56]:[^:]*:Hippokampos:6836:/
+479.0 "ast_Neutral_Horoscope_with_GCD"
 479.2 "Sewage Deluge" sync / 1[56]:[^:]*:Hippokampos:6810:/
+483.0 "sge_Ixo"
 488.4 "--middle--" sync / 1[56]:[^:]*:Hippokampos:6836:/
 496.1 "Channeling Overflow" sync / 1[56]:[^:]*:Hippokampos:6DC2:/
+508.0 "ast_Macrocosmos"
+508.0 "sge_Kera"
 511.3 "Great Typhoon (short)" sync / 1[56]:[^:]*:Hippokampos:(6820|6822):/
 511.8 "Crash" #sync / 1[56]:[^:]*:Hippokampos:6821:/
+513.3 "ast_Pop_Macrocosmos"
+513.3 "sge_Pneuma_Holos"
 513.5 "Coherence" sync / 1[56]:[^:]*:Hippokampos:681B:/
 514.2 "Coherence Flare" sync / 1[56]:[^:]*:Hippokampos:681A:/
+515.5 "ast_Collective"
 516.6 "Coherence Line" sync / 1[56]:[^:]*:Hippokampos:681C:/
+518.0 "sge_Physis_Ixo"
+
 518.6 "--sync--" sync / 1[56]:[^:]*:Hippokampos:681D:/
+522.0 "ast_Star"
 526.2 "Great Typhoon (long)" sync / 1[56]:[^:]*:Hippokampos:(6820|6822):/
 526.7 "Crash" #sync / 1[56]:[^:]*:Hippokampos:6821:/
+530.0 "ast_Opposition"
 
 # Dissociation and Sewage Eruption 2
 538.8 "Dissociation" sync / 1[56]:[^:]*:Hippokampos:682C:/
diff --git a/raidboss.js b/raidboss.js
index 2265f8b..3c73561 100644
--- a/raidboss.js
+++ b/raidboss.js
@@ -71,13 +71,13 @@ Options.Triggers.push({
 const healCallout = (data, matches, _output) => {
   console.log(data, matches);
   const spells = matches[0].split('_');
-  let res = 'USE ';
+  let res = 'use ';
   for (let i = 1; i < spells.length; ++i)
     res += ' ' + spells[i];
   return res;
 };
 
-// Astro
+// Healer
 Options.Triggers.push({
   zoneId: ZoneId.MatchAll,
   timelineTriggers: [
@@ -88,7 +88,7 @@ Options.Triggers.push({
         return data.job === 'AST';
       },
       beforeSeconds: 4,
-      alarmText: healCallout,
+      alertText: healCallout,
     },
     {
       id: 'SCH Healer Callouts',
@@ -97,7 +97,7 @@ Options.Triggers.push({
         return data.job === 'SCH';
       },
       beforeSeconds: 4,
-      alarmText: healCallout,
+      alertText: healCallout,
     },
     {
       id: 'SGE Healer Callouts',
@@ -106,7 +106,7 @@ Options.Triggers.push({
         return data.job === 'SGE';
       },
       beforeSeconds: 4,
-      alarmText: healCallout,
+      alertText: healCallout,
     },
     {
       id: 'WHM Healer Callouts',
@@ -115,7 +115,7 @@ Options.Triggers.push({
         return data.job === 'WHM';
       },
       beforeSeconds: 4,
-      alarmText: healCallout,
+      alertText: healCallout,
     },
   ],
 });
@@ -123,6 +123,7 @@ Options.Triggers.push({
 // Here's an example of overriding a timeline.
 // This overrides the test timeline that you normally play with a `/countdown 5` in Middle La Noscea
 // with an updated one from `user/test-override.txt`.
+//Testtrigger
 Options.Triggers.push({
   zoneId: ZoneId.MiddleLaNoscea,
   // This flag is required to clear any previously specified timelines.
@@ -130,6 +131,7 @@ Options.Triggers.push({
   // This file is in the same directory as this JavaScript file.
   timelineFile: 'test-override.txt',
 });
+// P1S
 Options.Triggers.push({
   zoneId: ZoneId.AsphodelosTheFirstCircleSavage,
   // This flag is required to clear any previously specified timelines.
@@ -137,7 +139,14 @@ Options.Triggers.push({
   // This file is in the same directory as this JavaScript file.
   timelineFile: 'p1s-override.txt',
 });
-
+// P2S
+Options.Triggers.push({
+  zoneId: ZoneId.AsphodelosTheSecondCircleSavage,
+  // This flag is required to clear any previously specified timelines.
+  overrideTimelineFile: true,
+  // This file is in the same directory as this JavaScript file.
+  timelineFile: 'p2s-override.txt',
+});
 // Here's an example of a adding a custom regen trigger.
 // It reminds you to use regen again when you are in Sastasha (unsynced).
 Options.Triggers.push({