From b83853b2e5d5526721a8a3fcf700121e943da4d5 Mon Sep 17 00:00:00 2001 From: valarnin Date: Sun, 26 Jan 2025 17:36:49 -0500 Subject: [PATCH 1/3] Fix issues with asura timeline syncs --- ui/raidboss/data/06-ew/trial/asura.txt | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/ui/raidboss/data/06-ew/trial/asura.txt b/ui/raidboss/data/06-ew/trial/asura.txt index ccd4af0d73..aa55e845d7 100644 --- a/ui/raidboss/data/06-ew/trial/asura.txt +++ b/ui/raidboss/data/06-ew/trial/asura.txt @@ -67,17 +67,17 @@ hideall "--sync--" # but we just account for the possibilities within a single loop body. 236.0 "--center--" Ability { id: "8C7E", source: "Asura" } 238.4 "--sync--" Ability { id: "8C7F", source: "Asura" } window 100,10 #Divine Awakening -248.1 "Iconography: Pedestal Purge/Wheel Of Deincarnation/Bladewise 1" Ability { id: ["8C81", "8CB3", "8C85"], source: "Asura" } +248.1 "Iconography: Pedestal Purge/Wheel Of Deincarnation/Bladewise 1" Ability { id: ["8C81", "8C83", "8C85"], source: "Asura" } 254.3 "Iconic Execution (store)" Ability { id: "8CB2", source: "Asura" } 261.4 "Pedestal Purge/Wheel Of Deincarnation/Bladewise" Ability { id: ["8C82", "8C84", "8C86"], source: "Asura Image" } 261.4 "Iconic Execution (release)" Ability { id: "8CB1", source: "Asura" } -271.5 "Iconography: Pedestal Purge/Wheel Of Deincarnation/Bladewise 2" Ability { id: ["8C81", "8CB3", "8C85"], source: "Asura" } +271.5 "Iconography: Pedestal Purge/Wheel Of Deincarnation/Bladewise 2" Ability { id: ["8C81", "8C83", "8C85"], source: "Asura" } 277.6 "Iconic Execution (store)" Ability { id: "8CB2", source: "Asura" } 284.7 "Pedestal Purge/Wheel Of Deincarnation/Bladewise" Ability { id: ["8C82", "8C84", "8C86"], source: "Asura Image" } 284.7 "Iconic Execution (release)" Ability { id: "8CB1", source: "Asura" } -295.4 "Iconography: Pedestal Purge/Wheel Of Deincarnation/Bladewise 3" Ability { id: ["8C81", "8CB3", "8C85"], source: "Asura" } +295.4 "Iconography: Pedestal Purge/Wheel Of Deincarnation/Bladewise 3" Ability { id: ["8C81", "8C83", "8C85"], source: "Asura" } 301.5 "Iconic Execution (store)" Ability { id: "8CB2", source: "Asura" } 308.6 "Pedestal Purge/Wheel Of Deincarnation/Bladewise" Ability { id: ["8C82", "8C84", "8C86"], source: "Asura Image" } 308.6 "Iconic Execution (release)" Ability { id: "8CB1", source: "Asura" } @@ -85,19 +85,13 @@ hideall "--sync--" 313.7 "--sync--" Ability { id: "8CAA", source: "Asura Image" } 319.7 "--center--" Ability { id: "8C7E", source: "Asura" } 322.2 "Six-bladed Khadga (preview)" StartsUsing { id: "8C88", source: "Asura" } duration 12.7 -324.9 "--sync--" Ability { id: ["8CAB", "8CAC", "8CAD",], source: "Asura" } -326.9 "--sync--" Ability { id: ["8CAB", "8CAC", "8CAD",], source: "Asura" } -328.9 "--sync--" Ability { id: ["8CAB", "8CAC", "8CAD",], source: "Asura" } -330.9 "--sync--" Ability { id: ["8CAB", "8CAC", "8CAD",], source: "Asura" } -332.9 "--sync--" Ability { id: ["8CAB", "8CAC", "8CAD",], source: "Asura" } -334.9 "--sync--" Ability { id: ["8CAB", "8CAC", "8CAD",], source: "Asura" } 334.9 "Six-bladed Khadga (execute)" Ability { id: "8C88", source: "Asura" } 335.9 "Khadga 1" Ability { id: "8C89", source: "Asura" } -337.9 "Khadga 2" Ability { id: ["8C8C", "8C8D"], source: "Asura" } -339.9 "Khadga 3" Ability { id: ["8C8C", "8C8D"], source: "Asura" } +337.9 "Khadga 2" Ability { id: ["8C8C", "8C8D"], source: "Asura" } window 1.5,1.5 +339.9 "Khadga 3" Ability { id: ["8C8C", "8C8D"], source: "Asura" } window 1.5,1.5 341.9 "Khadga 4" Ability { id: "8C8A", source: "Asura" } -343.9 "Khadga 5" Ability { id: ["8C8B", "8C8E"], source: "Asura" } -345.9 "Khadga 6" Ability { id: ["8C8B", "8C8E"], source: "Asura" } +343.9 "Khadga 5" Ability { id: ["8C8B", "8C8E"], source: "Asura" } window 1.5,1.5 +345.9 "Khadga 6" Ability { id: ["8C8B", "8C8E"], source: "Asura" } window 1.5,1.5 # Many Faces + Myriad Aspects + Ordered Chaos. # The order is probably completely fixed, From 8b482b21b2a76046798984a36af01de8c980c90a Mon Sep 17 00:00:00 2001 From: valarnin Date: Sun, 26 Jan 2025 22:15:22 -0500 Subject: [PATCH 2/3] Add replaceText entry for Icon 1/2/3 --- ui/raidboss/data/06-ew/trial/asura.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/raidboss/data/06-ew/trial/asura.ts b/ui/raidboss/data/06-ew/trial/asura.ts index dd963bb984..92d087f89e 100644 --- a/ui/raidboss/data/06-ew/trial/asura.ts +++ b/ui/raidboss/data/06-ew/trial/asura.ts @@ -440,6 +440,7 @@ const triggerSet: TriggerSet = { { 'locale': 'en', 'replaceText': { + 'Iconography: Pedestal Purge/Wheel Of Deincarnation/Bladewise': 'Icon: Purge/Wheel/Blade', 'Pedestal Purge/Wheel Of Deincarnation/Bladewise': 'Purge/Wheel/Bladewise', }, }, From 423e48e30bf8023a937ce15c02a958401247823d Mon Sep 17 00:00:00 2001 From: valarnin Date: Sun, 26 Jan 2025 22:30:49 -0500 Subject: [PATCH 3/3] Fix ambiguous replaceText entries --- ui/raidboss/data/06-ew/trial/asura.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/raidboss/data/06-ew/trial/asura.ts b/ui/raidboss/data/06-ew/trial/asura.ts index 92d087f89e..2e9f33c0f1 100644 --- a/ui/raidboss/data/06-ew/trial/asura.ts +++ b/ui/raidboss/data/06-ew/trial/asura.ts @@ -440,8 +440,8 @@ const triggerSet: TriggerSet = { { 'locale': 'en', 'replaceText': { + '(?