From 0b01644d772039428786797baf258a7891ea13fa Mon Sep 17 00:00:00 2001
From: zirwin <tronical@gmail.com>
Date: Wed, 7 Feb 2018 11:37:28 -0800
Subject: [PATCH 1/2] O5N Timeline

---
 ui/raidboss/data/manifest.txt      |  1 +
 ui/raidboss/data/timelines/o5n.txt | 72 ++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 ui/raidboss/data/timelines/o5n.txt

diff --git a/ui/raidboss/data/manifest.txt b/ui/raidboss/data/manifest.txt
index ec217337a4..bf53dbf6b7 100644
--- a/ui/raidboss/data/manifest.txt
+++ b/ui/raidboss/data/manifest.txt
@@ -22,6 +22,7 @@ timelines/o1s.txt
 timelines/o2s.txt
 timelines/o3s.txt
 timelines/o4s.txt
+timelines/o5n.txt
 timelines/o5s.txt
 timelines/o6s.txt
 timelines/o7s.txt
diff --git a/ui/raidboss/data/timelines/o5n.txt b/ui/raidboss/data/timelines/o5n.txt
new file mode 100644
index 0000000000..e452ec22e4
--- /dev/null
+++ b/ui/raidboss/data/timelines/o5n.txt
@@ -0,0 +1,72 @@
+# Omega - Sigmascape V1.0 - O5N
+
+hideall "--Reset--"
+hideall "--sync--"
+
+# Saintly Beam: 0 light appears, 5 target, 12 hit
+# Diabolic Light: 0 target appears, 8 target, 13 hit
+
+##############################################################
+0 "--Reset--" sync /Removing combatant Phantom Train\.  Max HP: 12860067\./ window 10000 jump 0
+
+0 "Start" sync /:Engage!:/ window 1,0
+8 "--sync--" sync /:28AE:Wroth Ghost/ window 8,3
+13 "Encumber" sync /:Wroth Ghost:28AE:/ 
+27 "Head On" sync /:Phantom Train:28AF:/
+38 "Ghost Beams" sync /:Phantom Train:28AA:/
+47 "Saintly Beam" duration 12
+63 "Diabolic Headlamp" sync /:Phantom Train:28B0:/ window 5,5
+73 "Diabolic Whistle (tethers)" sync /:Phantom Train:28A5:/
+80 "Saintly Beam" duration 12
+102 "Doom Strike" sync /:Phantom Train:28A3:/
+116 "Diabolic Wind" sync /:Phantom Train:28B9:/
+119 "Diabolic Whistle (dives)" sync /:Phantom Train:28A5:/
+139 "Diabolic Light" duration 13
+162 "Acid Rain" sync /:Phantom Train:28AB:/
+
+# add phase start
+163 "--untargetable--" sync /:Phantom Train:28A7:/
+178 "Adds spawn"
+193 "Diabolic Wind" sync /:Phantom Train:28B9:/
+250 "Diabolic Chimney" sync /:Phantom Train:28A9:/ window 100,100
+260 "Ghosts active"
+
+# add phase end
+320 "--sync--" sync /:Phantom Train:28A8:/ window 320,320 # boss reappears
+324 "--targetable--"
+338 "Diabolic Whistle (tethers)" sync /:Phantom Train:28A5:/
+342 "Saintly Beam" duration 12
+346 "Acid Rain" sync /:Phantom Train:28AB:/
+366 "Doom Strike" sync /:Phantom Train:28A3:/
+376 "Diabolic Whistle (dives)" sync /:Phantom Train:28A5:/
+386 "Head On" sync /:Phantom Train:28AF:/
+391 "Acid Rain" sync /:Phantom Train:28AB:/
+398 "Diabolic Light" duration 13
+403 "Diabolic Headlamp" sync /:Phantom Train:28B0:/
+425 "Doom Strike" sync /:Phantom Train:28A3:/
+
+# Loop starts here
+433 "Diabolic Whistle (tethers)" sync /:Phantom Train:28A5:/
+437 "Saintly Beam" duration 12
+441 "Acid Rain" sync /:Phantom Train:28AB:/
+463 "Head On" sync /:Phantom Train:28AF:/
+465 "Diabolic Wind" sync /:Phantom Train:28B9:/
+470 "Acid Rain" sync /:Phantom Train:28AB:/
+477 "Diabolic Whistle (dives)" sync /:Phantom Train:28A5:/
+483 "Encumber" sync /:Wroth Ghost:28AE:/
+491 "Diabolic Wind" sync /:Phantom Train:28B9:/
+498 "Diabolic Headlamp" sync /:Phantom Train:28B0:/
+504 "Acid Rain" sync /:Phantom Train:28AB:/
+509 "Diabolic Light" duration 13
+513 "Doom Strike" sync /:Phantom Train:28A3:/
+527 "Saintly Beam" duration 12
+528 "Acid Rain" sync /:Phantom Train:28AB:/
+544 "Diabolic Wind" sync /:Phantom Train:28B9:/
+559 "Doom Strike" sync /:Phantom Train:28A3:/
+
+567 "Diabolic Whistle (tethers)" sync /:Phantom Train:28A5:/ jump 433 # repeats after this?
+
+# Visual continuity
+571 "Saintly Beam" duration 12
+575 "Acid Rain"
+597 "Head On"
\ No newline at end of file

From 653942b4e4d28a1fbef4fd788add302a6a7732f2 Mon Sep 17 00:00:00 2001
From: zirwin <tronical@gmail.com>
Date: Wed, 7 Feb 2018 22:48:06 -0800
Subject: [PATCH 2/2] Adding O5N timelineFile to triggers

---
 ui/raidboss/data/triggers/o5n.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/raidboss/data/triggers/o5n.js b/ui/raidboss/data/triggers/o5n.js
index 1c417c6969..cdde44658a 100644
--- a/ui/raidboss/data/triggers/o5n.js
+++ b/ui/raidboss/data/triggers/o5n.js
@@ -1,6 +1,7 @@
 // O5N - Sigmascape 1.0 Normal
 [{
   zoneRegex: /^(Sigmascape \(V1\.0\)|Sigmascape V1\.0)$/,
+  timelineFile: 'o5n.txt',
   triggers: [
     {
       id: 'O5N Doom Strike',