raidboss: tsukuyomi unreal timeline improvements (OverlayPlugin#910)

Adjust the Tsukuyomi extreme and unreal timelines to better line up with
the unreal fight logs that I have. In particular there are a few larger
changes besides just adjusting the time values:

1) Use labeled jumps for the gun and spear nightfall groupings
2) Use StartsUsing instead of Ability to sync these jumps, so that the
   timeline corrects earlier.
3) Adjust the timing for when the E/W add appears by a significant
   amount to line up with the unreal fight.
4) Add StartsUsing syncs for the Bright Blade / Dark blade move in
   phase 3.

Besides this, I also adjusted most of the timeline entries slightly so
they better line up with my existing logs. I did try to unroll the loop
for phase 3 to make the times line up, but that didn't seem to produce
better results.

Note that this is entirely untested on the extreme fight, as it is
difficult to get far in the fight without multiple people due to the
nature of the meteor mechanic at the start of p2.

Fixes OverlayPlugin#897

Author: jacob-keller

ui/raidboss/data/04-sb/trial/tsukuyomi-ex.txt

@@ -10,50 +10,54 @@ hideall "--Reset--"
 
 # Timings get slightly off if there's lead or steel first, so do a split.
 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
-10.8 "--sync--" StartsUsing { id: "2BBA", source: "Tsukuyomi" } window 30,30
-14.8 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
-25.0 "Nightfall (gun/spear)" Ability { id: ["2BBC", "2BBD"], source: "Tsukuyomi" }
-25.0 "--sync--" Ability { id: "2BBC", source: "Tsukuyomi" } window 30,30 jump 225
-25.0 "--sync--" Ability { id: "2BBD", source: "Tsukuyomi" } window 30,30 jump 525
-31.1 "Lead Of The Underworld?" Ability { id: "2BBE", source: "Tsukuyomi" }
-31.8 "Steel Of The Underworld 1?" Ability { id: "2BBF", source: "Tsukuyomi" }
-33.6 "Steel Of The Underworld 2?" Ability { id: "2BBF", source: "Tsukuyomi" }
-35.4 "Steel Of The Underworld 3?" Ability { id: "2BBF", source: "Tsukuyomi" }
+11.4 "--sync--" StartsUsing { id: "2BBA", source: "Tsukuyomi" } window 30,30
+15.4 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+
+21.9 "--sync--" StartsUsing { id: "2BBC", source: "Tsukuyomi" } window 30,30 jump "lead-first"
+21.9 "--sync--" StartsUsing { id: "2BBD", source: "Tsukuyomi" } window 30,30 jump "steel-first"
+25.6 "Nightfall (gun/spear)" Ability { id: ["2BBC", "2BBD"], source: "Tsukuyomi" }
+31.7 "Lead Of The Underworld?" Ability { id: "2BBE", source: "Tsukuyomi" }
+32.4 "Steel Of The Underworld 1?" Ability { id: "2BBF", source: "Tsukuyomi" }
+34.2 "Steel Of The Underworld 2?" Ability { id: "2BBF", source: "Tsukuyomi" }
+36.0 "Steel Of The Underworld 3?" Ability { id: "2BBF", source: "Tsukuyomi" }
 
 # Lead first
-214.8 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
-225.0 "Nightfall (gun)" Ability { id: "2BBC", source: "Tsukuyomi" }
-231.1 "Lead Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" }
-236.2 "--sync--" Ability { id: "2CCF", source: "Tsukuyomi" }
-242.3 "Nightfall (spear)" Ability { id: "2BBD", source: "Tsukuyomi" }
-249.1 "Steel Of The Underworld 1" #Ability { id: "2BBF", source: "Tsukuyomi" }
-250.9 "Steel Of The Underworld 2" #Ability { id: "2BBF", source: "Tsukuyomi" }
-252.7 "Steel Of The Underworld 3" #Ability { id: "2BBF", source: "Tsukuyomi" }
-255.9 "--sync--" Ability { id: "2BC0", source: "Tsukuyomi" }
-267.0 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
-281.0 "Nightbloom" #Ability { id: "2BC7", source: "Tsukuyomi" }
-281.8 "--untargetable--"
+200.0 label "lead-first"
+200.0 "--sync--" StartsUsing { id: "2BBC", source: "Tsukuyomi" }
+204.0 "Nightfall (gun)" Ability { id: "2BBC", source: "Tsukuyomi" }
+210.4 "Lead Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" }
+215.5 "--sync--" Ability { id: "2CCF", source: "Tsukuyomi" }
+221.6 "Nightfall (spear)" Ability { id: "2BBD", source: "Tsukuyomi" }
+228.4 "Steel Of The Underworld 1" #Ability { id: "2BBF", source: "Tsukuyomi" }
+230.2 "Steel Of The Underworld 2" #Ability { id: "2BBF", source: "Tsukuyomi" }
+232.0 "Steel Of The Underworld 3" #Ability { id: "2BBF", source: "Tsukuyomi" }
+235.7 "--sync--" Ability { id: "2BC0", source: "Tsukuyomi" }
+246.8 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+260.8 "Nightbloom" #Ability { id: "2BC7", source: "Tsukuyomi" }
+261.6 "--untargetable--"
 
 # Steel first
-514.8 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
-525.0 "Nightfall (spear)" Ability { id: "2BBD", source: "Tsukuyomi" }
-531.8 "Steel Of The Underworld 1" #Ability { id: "2BBF", source: "Tsukuyomi" }
-533.6 "Steel Of The Underworld 2" #Ability { id: "2BBF", source: "Tsukuyomi" }
-535.4 "Steel Of The Underworld 3" #Ability { id: "2BBF", source: "Tsukuyomi" }
-538.5 "--sync--" Ability { id: "2BC0", source: "Tsukuyomi" }
-545.6 "Nightfall (gun)" Ability { id: "2BBC", source: "Tsukuyomi" }
-551.8 "Lead Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" }
-556.9 "--sync--" Ability { id: "2CCF", source: "Tsukuyomi" }
-567.0 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
-581.0 "Nightbloom" #Ability { id: "2BC7", source: "Tsukuyomi" }
-581.8 "--untargetable--"
+500.0 label "steel-first"
+500.0 "--sync--" StartsUsing { id: "2BBD", source: "Tsukuyomi" }
+504.0 "Nightfall (spear)" Ability { id: "2BBD", source: "Tsukuyomi" }
+510.8 "Steel Of The Underworld 1" #Ability { id: "2BBF", source: "Tsukuyomi" }
+512.8 "Steel Of The Underworld 2" #Ability { id: "2BBF", source: "Tsukuyomi" }
+514.6 "Steel Of The Underworld 3" #Ability { id: "2BBF", source: "Tsukuyomi" }
+517.8 "--sync--" Ability { id: "2BC0", source: "Tsukuyomi" }
+524.9 "Nightfall (gun)" Ability { id: "2BBC", source: "Tsukuyomi" }
+531.3 "Lead Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" }
+536.4 "--sync--" Ability { id: "2CCF", source: "Tsukuyomi" }
+546.5 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+560.5 "Nightbloom" #Ability { id: "2BC7", source: "Tsukuyomi" }
+561.3 "--untargetable--"
 
 # Add phase
-781.0 "Nightbloom" Ability { id: "2BC7", source: "Tsukuyomi" } window 800,0
-781.8 "--untargetable--"
-792.3 "Homeland adds (E->W)" AddedCombatant { name: "Specter Of The Patriarch" } window 40,20
-852.3 "Empire adds (SW->NW)" AddedCombatant { name: "Specter Of Asahi" } window 160,20
-886.3 "Enrage"
+800.0 "--sync--" StartsUsing { id: "2BC7", source: "Tsukuyomi" } window 800,0
+805.9 "Nightbloom" Ability { id: "2BC7", source: "Tsukuyomi" }
+806.7 "--untargetable--"
+827.2 "Homeland adds (E->W)" AddedCombatant { name: "Specter Of The Patriarch" } window 40,20
+887.2 "Empire adds (SW->NW)" AddedCombatant { name: "Specter Of Asahi" } window 160,20
+921.2 "Enrage"
 
 1000.0 "Concentrativity" Ability { id: "2BC8", source: "Specter of Zenos" } window 1000,0
 1006.7 "Unmoving Troika" Ability { id: "2CA8", source: "Specter Of Zenos" }
@@ -67,92 +71,127 @@ hideall "--Reset--"
 
 # Adds complete, crescent phase
 1100.0 "--sync--" Ability { id: "2CD6", source: "Specter Of Gosetsu" } window 1200,0
-1114.3 "Nightbloom" Ability { id: "2CAF", source: "Tsukuyomi" } window 1200,0
-1120.1 "--targetable--"
-1134.5 "Supreme Selenomancy" Ability { id: "2EB0", source: "Tsukuyomi" }
-1143.5 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
-1153.8 "Tsuki-No-Kakera" Ability { id: "2BD0", source: "Tsukuyomi" }
-1159.9 "Nightfall (gun)" Ability { id: "2BBC", source: "Tsukuyomi" }
-1166.4 "Lead Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" }
-1179.0 "Moonfall" Ability { id: "2BD1", source: "Moondust" }
-1180.8 "Midnight Rain" Ability { id: "2BCE", source: "Tsukuyomi" }
-1189.7 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
-1195.2 "Lunar Rays" Ability { id: "2BD3", source: "Tsukuyomi" }
-1196.8 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
-1197.2 "Crater" Ability { id: "2CD7", source: "Moondust" }
-1197.2 "Moonbeam" Ability { id: "2BD4", source: "Moondust" }
-1208.3 "Antitwilight/Perilune" Ability { id: ["2BD7", "2BD8"], source: "Tsukuyomi" }
-
-1223.4 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
-1230.6 "Zashiki-Asobi" Ability { id: "2BC5", source: "Tsukuyomi" }
-1239.8 "Nightfall (gun/spear)" Ability { id: ["2BBC", "2BBD"], source: "Tsukuyomi" }
-1241.7 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
-1244.7 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
+1114.1 "Nightbloom" Ability { id: "2CAF", source: "Tsukuyomi" } window 1200,0
+1119.9 "--targetable--"
+1134.7 "Supreme Selenomancy" Ability { id: "2EB0", source: "Tsukuyomi" }
+1143.7 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
+1154.0 "Tsuki-No-Kakera" Ability { id: "2BD0", source: "Tsukuyomi" }
+1160.1 "Nightfall (gun)" Ability { id: "2BBC", source: "Tsukuyomi" }
+1166.3 "Lead Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" }
+1179.1 "Moonfall" Ability { id: "2BD1", source: "Moondust" }
+1180.5 "Midnight Rain" Ability { id: "2BCE", source: "Tsukuyomi" }
+1189.4 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
+1194.7 "Lunar Rays" Ability { id: "2BD3", source: "Tsukuyomi" }
+1196.3 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
+1196.7 "Crater" Ability { id: "2CD7", source: "Moondust" }
+1196.7 "Moonbeam" Ability { id: "2BD4", source: "Moondust" }
+1207.8 "Antitwilight/Perilune" Ability { id: ["2BD7", "2BD8"], source: "Tsukuyomi" }
+
+1222.9 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+1230.1 "Zashiki-Asobi" Ability { id: "2BC5", source: "Tsukuyomi" }
+1239.3 "Nightfall (gun/spear)" Ability { id: ["2BBC", "2BBD"], source: "Tsukuyomi" }
+1241.2 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
+1244.2 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
 # don't match 2BBF here because there's three of them, close in time.
-1246.3 "Lead Of The Underworld/Steel Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" }
+1245.8 "Lead Of The Underworld/Steel Of The Underworld" Ability { id: "2BBE", source: "Tsukuyomi" }
 
 # Torment Unto Death can be delayed by ~2s if it's Steel
-1257.5 "--sync--" StartsUsing { id: "2BBB", source: "Tsukuyomi" } window 10,10
-1262.5 "Torment Unto Death" Ability { id: "2BBB", source: "Tsukuyomi" }
-1273.8 "Supreme Selenomancy" Ability { id: "2EB0", source: "Tsukuyomi" }
-1282.8 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
-1292.8 "Tsuki-No-Kakera" Ability { id: "2BD0", source: "Tsukuyomi" }
-1298.8 "Nightfall (spear)" Ability { id: "2BBD", source: "Tsukuyomi" }
-1305.4 "Steel Of The Underworld 1" #Ability { id: "2BBF", source: "Tsukuyomi" }
-1307.2 "Steel Of The Underworld 2" #Ability { id: "2BBF", source: "Tsukuyomi" }
-1308.8 "Steel Of The Underworld 3" #Ability { id: "2BBF", source: "Tsukuyomi" }
-1317.8 "Moonfall" Ability { id: "2BD1", source: "Moondust" }
-1318.9 "Midnight Rain" Ability { id: "2BCE", source: "Tsukuyomi" }
-1328.9 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
-1332.9 "Lunar Rays" Ability { id: "2BD3", source: "Tsukuyomi" }
-1334.9 "Moonbeam" Ability { id: "2BD4", source: "Moondust" }
-1334.9 "Crater" Ability { id: "2CD7", source: "Moondust" }
-1335.9 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
-1346.0 "Antitwilight/Perilune" Ability { id: ["2BD7", "2BD8"], source: "Tsukuyomi" }
+1257.0 "--sync--" StartsUsing { id: "2BBB", source: "Tsukuyomi" } window 10,10
+1262.0 "Torment Unto Death" Ability { id: "2BBB", source: "Tsukuyomi" }
+1273.6 "Supreme Selenomancy" Ability { id: "2EB0", source: "Tsukuyomi" }
+1282.6 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
+1292.6 "Tsuki-No-Kakera" Ability { id: "2BD0", source: "Tsukuyomi" }
+1298.6 "Nightfall (spear)" Ability { id: "2BBD", source: "Tsukuyomi" }
+1305.2 "Steel Of The Underworld 1" #Ability { id: "2BBF", source: "Tsukuyomi" }
+1307.0 "Steel Of The Underworld 2" #Ability { id: "2BBF", source: "Tsukuyomi" }
+1308.6 "Steel Of The Underworld 3" #Ability { id: "2BBF", source: "Tsukuyomi" }
+1317.6 "Moonfall" Ability { id: "2BD1", source: "Moondust" }
+1319.3 "Midnight Rain" Ability { id: "2BCE", source: "Tsukuyomi" }
+1329.3 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
+1333.6 "Lunar Rays" Ability { id: "2BD3", source: "Tsukuyomi" }
+1335.6 "Moonbeam" Ability { id: "2BD4", source: "Moondust" }
+1335.6 "Crater" Ability { id: "2CD7", source: "Moondust" }
+1336.3 "Lunar Halo" Ability { id: "2BD6", source: "Moonlight" }
+1346.7 "Antitwilight/Perilune" Ability { id: ["2BD7", "2BD8"], source: "Tsukuyomi" }
 
 # 35% push
-1361.3 "Dance Of The Dead" Ability { id: "2CD0", source: "Tsukuyomi" } window 1400,20
-1378.6 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
-1379.5 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
-1392.0 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
-1393.0 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
-
-# loop begins
-1403.1 label "phase-3-loop"
-1403.1 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
-1415.3 "Lunacy" Ability { id: "2BDC", source: "Tsukuyomi" }
-1416.1 "Tsuki-No-Maiogi" duration 4 #Ability { id: "2BC6", source: "Dancing Fan" }
-1417.4 "Lunacy x3" #Ability { id: "2BDD", source: "Tsukuyomi" }
-#1418.4 "Lunacy" Ability { id: "2BDD", source: "Tsukuyomi" }
-#1419.4 "Lunacy" Ability { id: "2BDD", source: "Tsukuyomi" }
-
-1427.4 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
-1428.4 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
-1437.5 "Torment Unto Death" Ability { id: "2EB2", source: "Tsukuyomi" }
-
-1450.7 "Hagetsu" Ability { id: "2D1C", source: "Tsukuyomi" }
-1452.5 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
-1455.5 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
-
-1460.9 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
-1461.9 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
-1469.9 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
-
-# loop end
-1476.9 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" } forcejump "phase-3-loop"
+1362.2 "Dance Of The Dead" Ability { id: "2CD0", source: "Tsukuyomi" } window 1400,20
+1379.5 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
+1380.4 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
+1392.9 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
+1393.9 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
+
+# First loop - Lunacy x4
+1404.0 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+1416.2 "Lunacy x4" Ability { id: "2BDC", source: "Tsukuyomi" } duration 4.1
+1417.0 "Tsuki-No-Maiogi" duration 4 #Ability { id: "2BC6", source: "Dancing Fan" }
+1418.3 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1419.3 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1420.3 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+
+1423.6 "--sync--" StartsUsing { id: ["2BDA", "2BDB"], source: "Tsukuyomi" } window 4,4
+1428.6 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
+1429.6 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
+1439.0 "Torment Unto Death" Ability { id: "2EB2", source: "Tsukuyomi" }
+
+1452.2 "Hagetsu" Ability { id: "2D1C", source: "Tsukuyomi" }
+1454.0 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
+1457.0 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
+
+1457.9 "--sync--" StartsUsing { id: ["2BDA", "2BDB"], source: "Tsukuyomi" } window 4,4
+1462.7 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
+1463.7 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
+1471.7 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+
+# Second Loop - Lunacy x5
+1478.7 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+1490.9 "Lunacy x5" Ability { id: "2BDC", source: "Tsukuyomi" } duration 5.1
+1491.7 "Tsuki-No-Maiogi" duration 4 #Ability { id: "2BC6", source: "Dancing Fan" }
+1493.0 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1494.0 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1495.0 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1496.0 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+
+1499.3 "--sync--" StartsUsing { id: ["2BDA", "2BDB"], source: "Tsukuyomi" } window 4,4
+1504.3 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
+1505.3 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
+1514.7 "Torment Unto Death" Ability { id: "2EB2", source: "Tsukuyomi" }
+
+1527.9 "Hagetsu" Ability { id: "2D1C", source: "Tsukuyomi" }
+1529.7 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
+1532.7 "Tsuki-No-Maiogi" Ability { id: "2BC6", source: "Dancing Fan" }
+
+1533.2 "--sync--" StartsUsing { id: ["2BDA", "2BDB"], source: "Tsukuyomi" } window 4,4
+1538.0 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
+1539.0 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
+1547.2 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+
+# Third Loop - Lunacy x6
+1554.4 "Reprimand" Ability { id: "2BBA", source: "Tsukuyomi" }
+1566.6 "Lunacy x6" Ability { id: "2BDC", source: "Tsukuyomi" } duration 6.1
+1567.4 "Tsuki-No-Maiogi" duration 4 #Ability { id: "2BC6", source: "Dancing Fan" }
+1568.7 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1569.7 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1570.7 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1571.7 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+1572.7 "Lunacy" #Ability { id: "2BDD", source: "Tsukuyomi" }
+
+1575.9 "--sync--" StartsUsing { id: ["2BDA", "2BDB"], source: "Tsukuyomi" } window 4,4
+1580.9 "Bright Blade/Dark Blade" Ability { id: ["2BDA", "2BDB"], source: "Tsukuyomi" }
+1581.9 "Waning Grudge/Waxing Grudge" Ability { id: ["2BDE", "2BDF"], source: "Tsukuyomi" }
 
 # Lunacy Enrage
-2000.0 "--sync--" StartsUsing { id: "2BE0", source: "Tsukuyomi" } window 2000,0
-2004.7 "Lunacy" Ability { id: "2BE0", source: "Tsukuyomi" }
-2006.7 label "enrage-loop"
-2006.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2007.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2008.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2009.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2010.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2011.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2012.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2013.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2014.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2015.7 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
-2016.7 "Lunacy" Ability { id: "2BE1", source: "Tsukuyomi" } window 0.5,0.5 forcejump "enrage-loop"
+1588.4 "--sync--" StartsUsing { id: "2BE0", source: "Tsukuyomi" } window 2000,2
+1593.4 "Lunacy" Ability { id: "2BE0", source: "Tsukuyomi" }
+1595.4 label "enrage-loop"
+1595.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1596.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1597.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1598.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1599.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1600.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1601.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1602.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1603.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1604.4 "Lunacy" #Ability { id: "2BE1", source: "Tsukuyomi" }
+1605.4 "Lunacy" Ability { id: "2BE1", source: "Tsukuyomi" } window 0.5,0.5 forcejump "enrage-loop"