diff --git a/ui/oopsyraidsy/data/04-sb/trial/byakko-ex.ts b/ui/oopsyraidsy/data/04-sb/trial/byakko-ex.ts index cfb596a389..ec374c88cb 100644 --- a/ui/oopsyraidsy/data/04-sb/trial/byakko-ex.ts +++ b/ui/oopsyraidsy/data/04-sb/trial/byakko-ex.ts @@ -11,24 +11,24 @@ const triggerSet: OopsyTriggerSet = { zoneId: ZoneId.TheJadeStoaExtreme, damageWarn: { // Popping Unrelenting Anguish bubbles - 'ByaEx Aratama': '27F6', + 'ByakkoEx Aratama': '27F6', // Stepping in growing orb - 'ByaEx Vacuum Claw': '27E9', + 'ByakkoEx Vacuum Claw': '27E9', // Lightning Puddles - 'ByaEx Hunderfold Havoc 1': '27E5', - 'ByaEx Hunderfold Havoc 2': '27E6', + 'ByakkoEx Hunderfold Havoc 1': '27E5', + 'ByakkoEx Hunderfold Havoc 2': '27E6', }, damageFail: { - 'ByaEx Sweep The Leg': '27DB', - 'ByaEx Fire and Lightning': '27DE', - 'ByaEx Distant Clap': '27DD', + 'ByakkoEx Sweep The Leg': '27DB', + 'ByakkoEx Fire and Lightning': '27DE', + 'ByakkoEx Distant Clap': '27DD', // Midphase line attack - 'ByaEx Imperial Guard': '27F1', + 'ByakkoEx Imperial Guard': '27F1', }, triggers: [ { // Pink bubble collision - id: 'ByaEx Ominous Wind', + id: 'ByakkoEx Ominous Wind', type: 'Ability', netRegex: NetRegexes.ability({ id: '27EC', ...playerDamageFields }), mistake: (_data, matches) => { diff --git a/ui/oopsyraidsy/data/07-dt/trial/byakko-un.ts b/ui/oopsyraidsy/data/07-dt/trial/byakko-un.ts new file mode 100644 index 0000000000..e2663964fc --- /dev/null +++ b/ui/oopsyraidsy/data/07-dt/trial/byakko-un.ts @@ -0,0 +1,58 @@ +// This file was autogenerated from running npm run sync-files. +// DO NOT EDIT THIS FILE DIRECTLY. +// Edit the source file below and then run `npm run sync-files` +// Source: ui/oopsyraidsy/data/04-sb/trial/byakko-ex.ts + +import NetRegexes from '../../../../../resources/netregexes'; +import ZoneId from '../../../../../resources/zone_id'; +import { OopsyData } from '../../../../../types/data'; +import { OopsyTriggerSet } from '../../../../../types/oopsy'; +import { playerDamageFields } from '../../../oopsy_common'; + +export type Data = OopsyData; + +// Byakko Unreal +const triggerSet: OopsyTriggerSet = { + zoneId: ZoneId.TheJadeStoaUnreal, + damageWarn: { + // Popping Unrelenting Anguish bubbles + 'ByakkoUn Aratama': '9C16', + // Stepping in growing orb + 'ByakkoUn Vacuum Claw': '9C0A', + // Lightning Puddles + 'ByakkoUn Hunderfold Havoc 1': '9C06', + 'ByakkoUn Hunderfold Havoc 2': '9C07', + }, + damageFail: { + 'ByakkoUn Sweep The Leg': '9BFC', + 'ByakkoUn Fire and Lightning': '9BFF', + 'ByakkoUn Distant Clap': '9BFE', + // Midphase line attack + 'ByakkoUn Imperial Guard': '9C12', + }, + triggers: [ + { + // Pink bubble collision + id: 'ByakkoUn Ominous Wind', + type: 'Ability', + netRegex: NetRegexes.ability({ id: '9C0D', ...playerDamageFields }), + mistake: (_data, matches) => { + return { + type: 'warn', + blame: matches.target, + reportId: matches.targetId, + text: { + en: 'bubble collision', + de: 'Blasen sind zusammengestoßen', + fr: 'Collision avec une bulle', + ja: '衝突', + cn: '相撞', + ko: '장판 겹쳐서 터짐', + }, + }; + }, + }, + ], +}; + +export default triggerSet; diff --git a/ui/raidboss/data/04-sb/trial/byakko-ex.ts b/ui/raidboss/data/04-sb/trial/byakko-ex.ts index 46b121e5d5..84e34f0e2c 100644 --- a/ui/raidboss/data/04-sb/trial/byakko-ex.ts +++ b/ui/raidboss/data/04-sb/trial/byakko-ex.ts @@ -7,6 +7,7 @@ import { TriggerSet } from '../../../../../types/trigger'; export interface Data extends RaidbossData { roarCount?: number; stakeCount?: number; + flareMarker?: string; } // Byakko Extreme @@ -14,49 +15,49 @@ const triggerSet: TriggerSet = { id: 'TheJadeStoaExtreme', zoneId: ZoneId.TheJadeStoaExtreme, timelineFile: 'byakko-ex.txt', + timelineTriggers: [ + { + id: 'ByakkoEx Fell Swoop', + regex: /Fell Swoop/, + beforeSeconds: 5, + response: Responses.bigAoe('alert'), + }, + ], triggers: [ { - id: 'ByaEx Heavenly Strike', + id: 'ByakkoEx Heavenly Strike', type: 'StartsUsing', netRegex: { id: '27DA', source: 'Byakko' }, - response: Responses.tankBuster(), + response: Responses.tankCleave('alert'), }, { - id: 'ByaEx Flying Donut', + id: 'ByakkoEx Sweep The Leg Intermission', // Donut AoE, no outer safe spots type: 'StartsUsing', netRegex: { id: '27F4', source: 'Byakko', capture: false }, response: Responses.getIn(), }, { - id: 'ByaEx Sweep The Leg', + id: 'ByakkoEx Sweep The Leg Standard', // 270-degree frontal cleave type: 'StartsUsing', netRegex: { id: '27DB', source: 'Byakko', capture: false }, response: Responses.getBehind(), }, { - id: 'ByaEx Storm Pulse', + id: 'ByakkoEx Storm Pulse', type: 'StartsUsing', netRegex: { id: '27DC', source: 'Byakko', capture: false }, response: Responses.aoe(), }, { - id: 'ByaEx Distant Clap', + id: 'ByakkoEx Distant Clap', type: 'StartsUsing', netRegex: { id: '27DD', source: 'Byakko', target: 'Byakko', capture: false }, - alertText: (_data, _matches, output) => output.text!(), - outputStrings: { - text: { - en: 'Distant Clap', - de: 'Donnergrollen', - fr: 'Tonnerre lointain', - ja: '遠雷', - cn: '月环', - ko: '원뢰', - }, - }, + condition: (data) => data.flareMarker !== data.me, + delaySeconds: 0.1, + response: Responses.getUnder(), }, { - id: 'ByaEx State Of Shock Tank 1', + id: 'ByakkoEx State Of Shock Tank 1', type: 'StartsUsing', netRegex: { id: '27E0', source: 'Byakko' }, condition: (data, matches) => data.role === 'tank' && matches.target !== data.me, @@ -73,7 +74,7 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx State Of Shock Tank 2', + id: 'ByakkoEx State Of Shock Tank 2', type: 'StartsUsing', netRegex: { id: '27E0', source: 'Byakko' }, condition: (data, matches) => data.role === 'tank' && matches.target === data.me, @@ -91,7 +92,7 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx Roar Counter', + id: 'ByakkoEx Roar Counter', type: 'StartsUsing', netRegex: { id: '27F9', source: 'Hakutei', capture: false }, run: (data) => { @@ -99,7 +100,7 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx Roar of Thunder', + id: 'ByakkoEx Roar Of Thunder', type: 'StartsUsing', netRegex: { id: '27F9', source: 'Hakutei', capture: false }, delaySeconds: 14, @@ -122,11 +123,11 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx Bubble', + id: 'ByakkoEx Gale Force', // Role spreads + expanding hemispheres type: 'HeadMarker', netRegex: { id: '0065' }, condition: Conditions.targetIsYou(), - infoText: (_data, _matches, output) => output.text!(), + alertText: (_data, _matches, output) => output.text!(), outputStrings: { text: { en: 'Drop bubble outside', @@ -139,11 +140,11 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx Ominous Wind', + id: 'ByakkoEx Ominous Wind', type: 'GainsEffect', netRegex: { effectId: '5C9' }, condition: Conditions.targetIsYou(), - infoText: (_data, _matches, output) => output.text!(), + alertText: (_data, _matches, output) => output.text!(), outputStrings: { text: { en: 'Pink bubble', @@ -156,7 +157,7 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx Puddle Marker', + id: 'ByakkoEx Aratama', // Prey marker + 3x puddles type: 'HeadMarker', netRegex: { id: '0004' }, condition: Conditions.targetIsYou(), @@ -173,26 +174,23 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx G100', + id: 'ByakkoEx White Herald', // Tank flare marker type: 'HeadMarker', netRegex: { id: '0057' }, condition: Conditions.targetIsYou(), - infoText: (_data, _matches, output) => output.text!(), - outputStrings: { - text: { - en: 'Get away', - de: 'Weg da', - fr: 'Éloignez-vous', - ja: '離れる', - cn: '远离人群', - ko: '멀리가기', - }, - }, + response: Responses.awayFrom(), + run: (data, matches) => data.flareMarker = matches.target, + }, + { + id: 'ByakkoEx White Herald Cleanup', // Tank flare marker + type: 'Ability', + netRegex: { id: '9C1A', source: 'Hakutei', capture: false }, + run: (data) => delete data.flareMarker, }, // https://xivapi.com/InstanceContentTextData/18606 // en: Twofold is my wrath, twice-cursed my foes! { - id: 'ByaEx Tiger Add', + id: 'ByakkoEx Tiger Add', type: 'BattleTalk2', netRegex: { instanceContentTextId: '48AE', capture: false }, condition: (data) => data.role === 'tank' || data.job === 'BLU', @@ -209,7 +207,7 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx Stake Counter', + id: 'ByakkoEx Stake Counter', type: 'StartsUsing', netRegex: { id: '27E2', source: 'Byakko', capture: false }, run: (data) => { @@ -217,14 +215,14 @@ const triggerSet: TriggerSet = { }, }, { - id: 'ByaEx Stake Counter Cleanup', + id: 'ByakkoEx Stake Counter Cleanup', type: 'StartsUsing', netRegex: { id: '27E2', source: 'Byakko', capture: false }, delaySeconds: 20, run: (data) => delete data.stakeCount, }, { - id: 'ByaEx Highest Stakes', + id: 'ByakkoEx Highest Stakes', type: 'StartsUsing', netRegex: { id: '27E2', source: 'Byakko', capture: false }, infoText: (data, _matches, output) => output.text!({ num: data.stakeCount }), @@ -250,7 +248,6 @@ const triggerSet: TriggerSet = { }, 'replaceText': { '--Hakutei Add--': '--Hakutei Add--', - '--leap north--': '--Sprung nach Norden--', '--tiger targetable--': '--Tiger anvisierbar--', '--tiger untargetable--': '--Tiger nicht anvisierbar--', 'Answer On High': 'Himmlische Antwort', @@ -259,17 +256,17 @@ const triggerSet: TriggerSet = { 'Dance Of The Incomplete': 'Tanz der zwei Gesichter', 'Distant Clap': 'Donnergrollen', 'Fell Swoop': 'Auf einen Streich', - 'Fire and Lightning': 'Feuer und Blitz', + 'Fire And Lightning': 'Feuer und Blitz', 'Gale Force': 'Orkan', 'Heavenly Strike': 'Himmlischer Schlag', 'Highest Stakes': 'Höchstes Risiko', 'Hundredfold Havoc': 'Hundertfache Verwüstung', 'Imperial Guard': 'Herbststurm', 'Ominous Wind': 'Unheilvoller Wind', - 'State of Shock': 'Bannblitze', + 'State Of Shock': 'Bannblitze', 'Steel Claw': 'Stahlklaue', 'Storm Pulse': 'Gewitterwelle', - 'Sweep the Leg': 'Vertikalität', + 'Sweep The Leg': 'Vertikalität', 'The Roar Of Thunder': 'Brüllen des Donners', 'The Voice Of Thunder': 'Stimme des Donners', 'Unrelenting Anguish': 'Pandämonium', @@ -285,7 +282,6 @@ const triggerSet: TriggerSet = { }, 'replaceText': { '--Hakutei Add--': '--Add Hakutei--', - '--leap north--': '--saut au nord--', '--tiger targetable--': '--tigre ciblable--', '--tiger untargetable--': '--tigre non ciblable--', 'Answer On High': 'Foudre céleste', @@ -294,17 +290,17 @@ const triggerSet: TriggerSet = { 'Dance Of The Incomplete': 'Danse semi-bestiale', 'Distant Clap': 'Tonnerre lointain', 'Fell Swoop': 'Éléments déchaînés', - 'Fire and Lightning': 'Feu et foudre', + 'Fire And Lightning': 'Feu et foudre', 'Gale Force': 'Coup de rafale', 'Heavenly Strike': 'Frappe céleste', 'Highest Stakes': 'Tout pour le tout', 'Hundredfold Havoc': 'Ravages centuples', 'Imperial Guard': 'Garde impériale', 'Ominous Wind': 'Vent mauvais', - 'State of Shock': 'Foudroiement brutal', + 'State Of Shock': 'Foudroiement brutal', 'Steel Claw': 'Griffe d\'acier', 'Storm Pulse': 'Pulsion de tempête', - 'Sweep the Leg': 'Verticalité', + 'Sweep The Leg': 'Verticalité', 'The Roar Of Thunder': 'Rugissement du tonnerre', 'The Voice Of Thunder': 'Voix du tonnerre', 'Unrelenting Anguish': 'Douleur continuelle', @@ -320,7 +316,6 @@ const triggerSet: TriggerSet = { 'Twofold is my wrath, twice-cursed my foes!': '駆けろ、我が半身ッ!歯向かう者どもに、牙と爪を突き立ててやれ!', }, 'replaceText': { - '--leap north--': '--北に飛ぶ--', '--tiger untargetable--': '--白帝タゲ不可--', 'Answer On High': '天つ雷', 'Bombogenesis': '爆弾低気圧', @@ -328,17 +323,17 @@ const triggerSet: TriggerSet = { 'Dance Of The Incomplete': '半獣舞踏', 'Distant Clap': '遠雷', 'Fell Swoop': '迅雷風烈波', - 'Fire and Lightning': '雷火一閃', + 'Fire And Lightning': '雷火一閃', 'Gale Force': '暴風', 'Heavenly Strike': '天雷掌', 'Highest Stakes': '乾坤一擲', 'Hundredfold Havoc': '百雷繚乱', 'Imperial Guard': '白帝一陣', 'Ominous Wind': '祟り風', - 'State of Shock': '呪縛雷', + 'State Of Shock': '呪縛雷', 'Steel Claw': '鉄爪斬', 'Storm Pulse': '風雷波動', - 'Sweep the Leg': '旋体脚', + 'Sweep The Leg': '旋体脚', 'The Roar Of Thunder': '雷轟', 'The Voice Of Thunder': '雷声', 'Unrelenting Anguish': '無間地獄', @@ -354,7 +349,6 @@ const triggerSet: TriggerSet = { }, 'replaceText': { '--Hakutei Add--': '--白帝出现--', - '--leap north--': '--跳北--', '--tiger targetable--': '--白帝可选中--', '--tiger untargetable--': '--白帝无法选中--', 'Answer On High': '天雷', @@ -363,17 +357,17 @@ const triggerSet: TriggerSet = { 'Dance Of The Incomplete': '半兽舞蹈', 'Distant Clap': '远雷', 'Fell Swoop': '迅雷风烈波', - 'Fire and Lightning': '雷火一闪', + 'Fire And Lightning': '雷火一闪', 'Gale Force': '暴风', 'Heavenly Strike': '天雷掌', 'Highest Stakes': '乾坤一掷', 'Hundredfold Havoc': '百雷缭乱', 'Imperial Guard': '白帝降临', 'Ominous Wind': '妖风', - 'State of Shock': '咒缚雷', + 'State Of Shock': '咒缚雷', 'Steel Claw': '铁爪斩', 'Storm Pulse': '风雷波动', - 'Sweep the Leg': '旋体脚', + 'Sweep The Leg': '旋体脚', 'The Roar Of Thunder': '雷轰', 'The Voice Of Thunder': '雷声', 'Unrelenting Anguish': '无间地狱', @@ -389,7 +383,6 @@ const triggerSet: TriggerSet = { }, 'replaceText': { '--Hakutei Add--': '--하얀 제왕 등장--', - '--leap north--': '--보스 북쪽으로 이동--', '--tiger targetable--': '--호랑이 타겟가능--', '--tiger untargetable--': '--호랑이 타겟불가--', 'Answer On High': '하늘의 번개', @@ -398,17 +391,17 @@ const triggerSet: TriggerSet = { 'Dance Of The Incomplete': '반수의 춤', 'Distant Clap': '원뢰', 'Fell Swoop': '신뢰풍렬파', - 'Fire and Lightning': '뇌화일섬', + 'Fire And Lightning': '뇌화일섬', 'Gale Force': '폭풍', 'Heavenly Strike': '천뢰장', 'Highest Stakes': '건곤일척', 'Hundredfold Havoc': '백뢰요란', 'Imperial Guard': '제왕의 진격', 'Ominous Wind': '불길한 바람', - 'State of Shock': '주박뢰', + 'State Of Shock': '주박뢰', 'Steel Claw': '강철 발톱', 'Storm Pulse': '풍뢰파동', - 'Sweep the Leg': '돌려차기', + 'Sweep The Leg': '돌려차기', 'The Roar Of Thunder': '뇌굉', 'The Voice Of Thunder': '뇌성', 'Unrelenting Anguish': '무간지옥', diff --git a/ui/raidboss/data/04-sb/trial/byakko-ex.txt b/ui/raidboss/data/04-sb/trial/byakko-ex.txt index 1bc0e10f84..46a2dbeb09 100644 --- a/ui/raidboss/data/04-sb/trial/byakko-ex.txt +++ b/ui/raidboss/data/04-sb/trial/byakko-ex.txt @@ -12,19 +12,19 @@ hideall "Answer On High" 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1 10.9 "Storm Pulse" Ability { id: "27DC", source: "Byakko" } window 11,5 17.1 "Heavenly Strike" Ability { id: "27DA", source: "Byakko" } -27.3 "State of Shock 1" Ability { id: "27E0", source: "Byakko" } +27.3 "State Of Shock 1" Ability { id: "27E0", source: "Byakko" } 28.5 "Clutch" Ability { id: "27E1", source: "Byakko" } 34.7 "Highest Stakes" Ability { id: "27E2", source: "Byakko" } -37.5 "State of Shock 2" Ability { id: "2756", source: "Byakko" } +37.5 "State Of Shock 2" Ability { id: "2756", source: "Byakko" } 38.5 "Clutch" Ability { id: "27E1", source: "Byakko" } 44.7 "Highest Stakes" Ability { id: "27E2", source: "Byakko" } -55.5 "--middle--" Ability { id: "2757", source: "Byakko" } +55.5 "--center--" Ability { id: "2757", source: "Byakko" } 59.6 "Unrelenting Anguish" Ability { id: "27ED", source: "Byakko" } 65.8 "Storm Pulse" Ability { id: "27DC", source: "Byakko" } 68.0 "Ominous Wind" Ability { id: "27EB", source: "Byakko" } -77.4 "Fire and Lightning" Ability { id: "27D9", source: "Byakko" } -85.7 "--leap north--" Ability { id: "2757", source: "Byakko" } +77.4 "Fire And Lightning" Ability { id: "27D9", source: "Byakko" } +85.7 "--north--" Ability { id: "2757", source: "Byakko" } 87.3 "Dance Of The Incomplete" Ability { id: "25D1", source: "Byakko" } 92.2 "--Hakutei Add--" 103.4 "Storm Pulse" Ability { id: "27DC", source: "Byakko" } @@ -35,7 +35,7 @@ hideall "Answer On High" 122.4 "White Herald" Ability { id: "27FA", source: "Hakutei" } 124.4 "--tiger targetable--" 124.8 "Distant Clap" Ability { id: "27DD", source: "Byakko" } -128.6 "Fire and Lightning" Ability { id: "27DE", source: "Hakutei" } +128.6 "Fire And Lightning" Ability { id: "27DE", source: "Hakutei" } 133.0 "Storm Pulse" Ability { id: "27DC", source: "Byakko" } 135.1 "--untargetable--" 135.2 "--sync--" Ability { id: "265E", source: "Hakutei" } @@ -46,50 +46,51 @@ hideall "Answer On High" ### Phase 2: zzz x infinity 191.1 "--sync--" Ability { id: "27EE", source: "Byakko" } window 200,5 -197.2 "Sweep the Leg" Ability { id: "27F3", source: "Byakko" } +197.2 "Sweep The Leg" Ability { id: "27F3", source: "Byakko" } 208.1 "Imperial Guard" Ability { id: "27F1", source: "Hakutei" } 208.4 "--sync--" Ability { id: "27EE", source: "Byakko" } 220.2 "Imperial Guard" Ability { id: "27F1", source: "Hakutei" } 222.6 "--sync--" Ability { id: "27EE", source: "Byakko" } -228.7 "Sweep the Leg" Ability { id: "27F3", source: "Byakko" } +228.7 "Sweep The Leg" Ability { id: "27F3", source: "Byakko" } 237.3 "Imperial Guard" Ability { id: "27F1", source: "Hakutei" } ### Phase 3: More Bubbles 250.1 "--sync--" Ability { id: "2A2A", source: "Byakko" } 265.1 "Fell Swoop" Ability { id: "27FB", source: "Byakko" } window 300,10 +273.1 "--targetable--" 284.4 "Heavenly Strike" Ability { id: "27DA", source: "Byakko" } 290.5 "Answer On High" Ability { id: "27E4", source: "Byakko" } 295.6 "Hundredfold Havoc" Ability { id: "27E5", source: "Byakko" } duration 3.2 -296.6 "State of Shock 1" Ability { id: "27E0", source: "Byakko" } +296.6 "State Of Shock 1" Ability { id: "27E0", source: "Byakko" } 297.7 "Clutch" Ability { id: "27E1", source: "Byakko" } 298.6 "Hundredfold Havoc" Ability { id: "27E5", source: "Byakko" } duration 3.2 304.0 "Highest Stakes" Ability { id: "27E2", source: "Byakko" } -306.9 "State of Shock 2" Ability { id: "2756", source: "Byakko" } +306.9 "State Of Shock 2" Ability { id: "2756", source: "Byakko" } 307.9 "Clutch" Ability { id: "27E1", source: "Byakko" } 314.1 "Highest Stakes" Ability { id: "27E2", source: "Byakko" } -320.8 "Sweep the Leg" Ability { id: "27DB", source: "Byakko" } +320.8 "Sweep The Leg" Ability { id: "27DB", source: "Byakko" } -330.9 "--sync--" Ability { id: "2757", source: "Byakko" } window 10,10 +330.9 "--center--" Ability { id: "2757", source: "Byakko" } window 10,10 335.2 "Unrelenting Anguish" Ability { id: "27ED", source: "Byakko" } 341.4 "Storm Pulse x2" Ability { id: "27DC", source: "Byakko" } 345.6 "Bombogenesis" Ability { id: "27E7", source: "Byakko" } 351.6 "Ominous Wind" Ability { id: "27EB", source: "Byakko" } 353.6 "Gale Force" Ability { id: "27E8", source: "Byakko" } -361.0 "Fire and Lightning" Ability { id: "27D9", source: "Byakko" } +361.0 "Fire And Lightning" Ability { id: "27D9", source: "Byakko" } 364.1 "--north--" Ability { id: "2757", source: "Byakko" } -369.9 "Fire and Lightning" Ability { id: "27D9", source: "Byakko" } +369.9 "Fire And Lightning" Ability { id: "27D9", source: "Byakko" } -373.1 "--sync--" Ability { id: "2757", source: "Byakko" } +373.1 "--north--" Ability { id: "2757", source: "Byakko" } 374.5 "Dance Of The Incomplete" Ability { id: "25D1", source: "Byakko" } 379.5 "--tiger targetable--" 388.8 "--tiger untargetable--" 394.5 "White Herald" Ability { id: "27FA", source: "Hakutei" } 396.5 "--tiger targetable--" 396.8 "Distant Clap" Ability { id: "27DD", source: "Byakko" } -400.7 "Fire and Lightning" Ability { id: "27DE", source: "Hakutei" } +400.7 "Fire And Lightning" Ability { id: "27DE", source: "Hakutei" } 405.0 "Distant Clap" Ability { id: "27DD", source: "Byakko" } -408.9 "Fire and Lightning" Ability { id: "27DE", source: "Hakutei" } +408.9 "Fire And Lightning" Ability { id: "27DE", source: "Hakutei" } 416.1 "Steel Claw" Ability { id: "27DF", source: "Hakutei" } 416.4 "Heavenly Strike" Ability { id: "27DA", source: "Byakko" } 422.4 "--sync--" Ability { id: "265E", source: "Hakutei" } @@ -99,47 +100,47 @@ hideall "Answer On High" 450.6 "--sync--" Ability { id: "29E5", source: "Hakutei" } 451.5 "--sync--" Ability { id: "29E4", source: "Byakko" } -453.5 "--sync--" Ability { id: "2757", source: "Byakko" } -459.3 "Fire and Lightning" Ability { id: "27D9", source: "Byakko" } +453.5 "--jump--" Ability { id: "2757", source: "Byakko" } +459.3 "Fire And Lightning" Ability { id: "27D9", source: "Byakko" } 474.5 "Storm Pulse x2" Ability { id: "27DC", source: "Byakko" } 484.8 "Bombogenesis" Ability { id: "27E7", source: "Byakko" } 487.0 "Answer On High" Ability { id: "27E4", source: "Byakko" } 492.0 "Hundredfold Havoc" Ability { id: "27E5", source: "Byakko" } duration 3.2 492.9 "Gale Force" Ability { id: "27E8", source: "Byakko" } 495.1 "Hundredfold Havoc" Ability { id: "27E5", source: "Byakko" } duration 3.2 -495.8 "State of Shock 1" Ability { id: "27E0", source: "Byakko" } +495.8 "State Of Shock 1" Ability { id: "27E0", source: "Byakko" } 496.9 "Clutch" Ability { id: "27E1", source: "Byakko" } 503.2 "Highest Stakes" Ability { id: "27E2", source: "Byakko" } -505.8 "State of Shock 2" Ability { id: "2756", source: "Byakko" } +505.8 "State Of Shock 2" Ability { id: "2756", source: "Byakko" } 506.9 "Clutch" Ability { id: "27E1", source: "Byakko" } 513.2 "Highest Stakes" Ability { id: "27E2", source: "Byakko" } -519.7 "Sweep the Leg" Ability { id: "27DB", source: "Byakko" } +519.7 "Sweep The Leg" Ability { id: "27DB", source: "Byakko" } 534.2 "Heavenly Strike" Ability { id: "27DA", source: "Byakko" } 544.5 "Storm Pulse x2" Ability { id: "27DC", source: "Byakko" } 557.9 "Distant Clap" Ability { id: "27DD", source: "Byakko" } 564.1 "Heavenly Strike" Ability { id: "27DA", source: "Byakko" } -572.2 "--middle--" Ability { id: "2757", source: "Byakko" } +572.2 "--center--" Ability { id: "2757", source: "Byakko" } 576.3 "Unrelenting Anguish" Ability { id: "27ED", source: "Byakko" } 582.4 "Storm Pulse x2" Ability { id: "27DC", source: "Byakko" } 586.7 "Bombogenesis" Ability { id: "27E7", source: "Byakko" } 592.8 "Ominous Wind" Ability { id: "27EB", source: "Byakko" } 594.7 "Gale Force" Ability { id: "27E8", source: "Byakko" } -602.1 "Fire and Lightning" Ability { id: "27D9", source: "Byakko" } +602.1 "Fire And Lightning" Ability { id: "27D9", source: "Byakko" } 605.3 "--north--" Ability { id: "2757", source: "Byakko" } -611.0 "Fire and Lightning" Ability { id: "27D9", source: "Byakko" } +611.0 "Fire And Lightning" Ability { id: "27D9", source: "Byakko" } 626.2 "Storm Pulse x2" Ability { id: "27DC", source: "Byakko" } 634.4 "Answer On High" Ability { id: "27E4", source: "Byakko" } 639.4 "Hundredfold Havoc" Ability { id: "27E5", source: "Byakko" } -640.5 "State of Shock 1" Ability { id: "27E0", source: "Byakko" } +640.5 "State Of Shock 1" Ability { id: "27E0", source: "Byakko" } 641.6 "Clutch" Ability { id: "27E1", source: "Byakko" } 642.5 "Hundredfold Havoc" Ability { id: "27E5", source: "Byakko" } 647.9 "Highest Stakes" Ability { id: "27E2", source: "Byakko" } -650.8 "State of Shock 2" Ability { id: "2756", source: "Byakko" } +650.8 "State Of Shock 2" Ability { id: "2756", source: "Byakko" } 651.8 "Clutch" Ability { id: "27E1", source: "Byakko" } 658.1 "Highest Stakes" Ability { id: "27E2", source: "Byakko" } -664.8 "Sweep the Leg" Ability { id: "27DB", source: "Byakko" } +664.8 "Sweep The Leg" Ability { id: "27DB", source: "Byakko" } -674.9 "--middle--" Ability { id: "2757", source: "Byakko" } +674.9 "--center--" Ability { id: "2757", source: "Byakko" } 680.2 "Storm Pulse x4" Ability { id: "27DC", source: "Byakko" } 696.3 "Storm Pulse Enrage" Ability { id: "2A09", source: "Byakko" } diff --git a/ui/raidboss/data/07-dt/trial/byakko-un.ts b/ui/raidboss/data/07-dt/trial/byakko-un.ts new file mode 100644 index 0000000000..3b221a2a88 --- /dev/null +++ b/ui/raidboss/data/07-dt/trial/byakko-un.ts @@ -0,0 +1,419 @@ +// This file was autogenerated from running npm run sync-files. +// DO NOT EDIT THIS FILE DIRECTLY. +// Edit the source file below and then run `npm run sync-files` +// Source: ui/raidboss/data/04-sb/trial/byakko-ex.ts + +import Conditions from '../../../../../resources/conditions'; +import { Responses } from '../../../../../resources/responses'; +import ZoneId from '../../../../../resources/zone_id'; +import { RaidbossData } from '../../../../../types/data'; +import { TriggerSet } from '../../../../../types/trigger'; + +export interface Data extends RaidbossData { + roarCount?: number; + stakeCount?: number; + flareMarker?: string; +} + +// Byakko Unreal +const triggerSet: TriggerSet = { + id: 'TheJadeStoaUnreal', + zoneId: ZoneId.TheJadeStoaUnreal, + timelineFile: 'byakko-un.txt', + timelineTriggers: [ + { + id: 'ByakkoUn Fell Swoop', + regex: /Fell Swoop/, + beforeSeconds: 5, + response: Responses.bigAoe('alert'), + }, + ], + triggers: [ + { + id: 'ByakkoUn Heavenly Strike', + type: 'StartsUsing', + netRegex: { id: '9BFB', source: 'Byakko' }, + response: Responses.tankCleave('alert'), + }, + { + id: 'ByakkoUn Sweep The Leg Intermission', // Donut AoE, no outer safe spots + type: 'StartsUsing', + netRegex: { id: '9C15', source: 'Byakko', capture: false }, + response: Responses.getIn(), + }, + { + id: 'ByakkoUn Sweep The Leg Standard', // 270-degree frontal cleave + type: 'StartsUsing', + netRegex: { id: '9BFC', source: 'Byakko', capture: false }, + response: Responses.getBehind(), + }, + { + id: 'ByakkoUn Storm Pulse', + type: 'StartsUsing', + netRegex: { id: '9BFD', source: 'Byakko', capture: false }, + response: Responses.aoe(), + }, + { + id: 'ByakkoUn Distant Clap', + type: 'StartsUsing', + netRegex: { id: '9BFE', source: 'Byakko', target: 'Byakko', capture: false }, + condition: (data) => data.flareMarker !== data.me, + delaySeconds: 0.1, + response: Responses.getUnder(), + }, + { + id: 'ByakkoUn State Of Shock Tank 1', + type: 'StartsUsing', + netRegex: { id: '9C01', source: 'Byakko' }, + condition: (data, matches) => data.role === 'tank' && matches.target !== data.me, + alertText: (_data, _matches, output) => output.text!(), + outputStrings: { + text: { + en: 'Provoke Boss', + de: 'Boss abspotten', + fr: 'Provoquez le Boss', + ja: '挑発', + cn: '挑衅', + ko: '보스 도발', + }, + }, + }, + { + id: 'ByakkoUn State Of Shock Tank 2', + type: 'StartsUsing', + netRegex: { id: '9C01', source: 'Byakko' }, + condition: (data, matches) => data.role === 'tank' && matches.target === data.me, + delaySeconds: 12, + alertText: (_data, _matches, output) => output.text!(), + outputStrings: { + text: { + en: 'Provoke Boss', + de: 'Boss abspotten', + fr: 'Provoquez le Boss', + ja: '挑発', + cn: '挑衅', + ko: '보스 도발', + }, + }, + }, + { + id: 'ByakkoUn Roar Counter', + type: 'StartsUsing', + netRegex: { id: '9C19', source: 'Hakutei', capture: false }, + run: (data) => { + data.roarCount = (data.roarCount ?? 0) + 1; + }, + }, + { + id: 'ByakkoUn Roar Of Thunder', + type: 'StartsUsing', + netRegex: { id: '9C19', source: 'Hakutei', capture: false }, + delaySeconds: 14, + alarmText: (data, _matches, output) => { + if (data.roarCount !== 2) + return; + + if (data.role === 'tank' || data.job === 'BLU') + return output.text!(); + }, + outputStrings: { + text: { + en: 'Tank LB NOW', + de: 'JETZT Tank LB', + fr: 'Transcendance Tank maintenant !', + ja: '今タンクLB', + cn: '坦克LB', + ko: '탱리밋', + }, + }, + }, + { + id: 'ByakkoUn Gale Force', // Role spreads + expanding hemispheres + type: 'HeadMarker', + netRegex: { id: '0065' }, + condition: Conditions.targetIsYou(), + alertText: (_data, _matches, output) => output.text!(), + outputStrings: { + text: { + en: 'Drop bubble outside', + de: 'Blase außen ablegen', + fr: 'Déposez la bulle à l\'extérieur', + ja: '外にマーカーを置く', + cn: '边缘放点名', + ko: '장판 바깥에 깔기', + }, + }, + }, + { + id: 'ByakkoUn Ominous Wind', + type: 'GainsEffect', + netRegex: { effectId: '5C9' }, + condition: Conditions.targetIsYou(), + alertText: (_data, _matches, output) => output.text!(), + outputStrings: { + text: { + en: 'Pink bubble', + de: 'Pinke Blase', + fr: 'Bulle violette', + ja: '祟り目', + cn: '和其他泡泡散开', + ko: '핑크 구슬', + }, + }, + }, + { + id: 'ByakkoUn Aratama', // Prey marker + 3x puddles + type: 'HeadMarker', + netRegex: { id: '0004' }, + condition: Conditions.targetIsYou(), + alarmText: (_data, _matches, output) => output.text!(), + outputStrings: { + text: { + en: 'Puddles on YOU', + de: 'Pfützen auf DIR', + fr: 'Zones au sol sur VOUS', + ja: '自分に床範囲', + cn: '放圈点名', + ko: '장판 바깥에 깔기 (3번)', + }, + }, + }, + { + id: 'ByakkoUn White Herald', // Tank flare marker + type: 'HeadMarker', + netRegex: { id: '0057' }, + condition: Conditions.targetIsYou(), + response: Responses.awayFrom(), + run: (data, matches) => data.flareMarker = matches.target, + }, + { + id: 'ByakkoUn White Herald Cleanup', // Tank flare marker + type: 'Ability', + netRegex: { id: '9C1A', source: 'Hakutei', capture: false }, + run: (data) => delete data.flareMarker, + }, + // https://xivapi.com/InstanceContentTextData/18606 + // en: Twofold is my wrath, twice-cursed my foes! + { + id: 'ByakkoUn Tiger Add', + type: 'BattleTalk2', + netRegex: { instanceContentTextId: '48AE', capture: false }, + condition: (data) => data.role === 'tank' || data.job === 'BLU', + infoText: (_data, _matches, output) => output.text!(), + outputStrings: { + text: { + en: 'Tiger Add', + de: 'Tiger Add', + fr: 'Add Tigre', + ja: '虎分離', + cn: '小老虎出现', + ko: '호랑이 쫄', + }, + }, + }, + { + id: 'ByakkoUn Stake Counter', + type: 'StartsUsing', + netRegex: { id: '9C03', source: 'Byakko', capture: false }, + run: (data) => { + data.stakeCount = (data.stakeCount ?? 0) + 1; + }, + }, + { + id: 'ByakkoUn Stake Counter Cleanup', + type: 'StartsUsing', + netRegex: { id: '9C03', source: 'Byakko', capture: false }, + delaySeconds: 20, + run: (data) => delete data.stakeCount, + }, + { + id: 'ByakkoUn Highest Stakes', + type: 'StartsUsing', + netRegex: { id: '9C03', source: 'Byakko', capture: false }, + infoText: (data, _matches, output) => output.text!({ num: data.stakeCount }), + outputStrings: { + text: { + en: 'Stack #${num}', + de: 'Stack #${num}', + fr: 'Packez-vous #${num}', + ja: '頭割り #${num}', + cn: '分摊 #${num}', + ko: '쉐어 #${num}', + }, + }, + }, + ], + timelineReplace: [ + { + 'locale': 'de', + 'replaceSync': { + 'Byakko': 'Byakko', + 'Hakutei': 'Hakutei', + 'Twofold is my wrath, twice-cursed my foes!': 'Stürmt los, meine zwei Gesichter!', + }, + 'replaceText': { + '--Hakutei Add--': '--Hakutei Add--', + '--tiger targetable--': '--Tiger anvisierbar--', + '--tiger untargetable--': '--Tiger nicht anvisierbar--', + 'Answer On High': 'Himmlische Antwort', + 'Bombogenesis': 'Plötzliches Orkantief', + 'Clutch': 'Umklammerung', + 'Dance Of The Incomplete': 'Tanz der zwei Gesichter', + 'Distant Clap': 'Donnergrollen', + 'Fell Swoop': 'Auf einen Streich', + 'Fire And Lightning': 'Feuer und Blitz', + 'Gale Force': 'Orkan', + 'Heavenly Strike': 'Himmlischer Schlag', + 'Highest Stakes': 'Höchstes Risiko', + 'Hundredfold Havoc': 'Hundertfache Verwüstung', + 'Imperial Guard': 'Herbststurm', + 'Ominous Wind': 'Unheilvoller Wind', + 'State Of Shock': 'Bannblitze', + 'Steel Claw': 'Stahlklaue', + 'Storm Pulse': 'Gewitterwelle', + 'Sweep The Leg': 'Vertikalität', + 'The Roar Of Thunder': 'Brüllen des Donners', + 'The Voice Of Thunder': 'Stimme des Donners', + 'Unrelenting Anguish': 'Pandämonium', + 'White Herald': 'Herbstböe', + }, + }, + { + 'locale': 'fr', + 'replaceSync': { + 'Byakko': 'Byakko', + 'Hakutei': 'Hakutei', + 'Twofold is my wrath, twice-cursed my foes!': 'Ma colère devient double !', + }, + 'replaceText': { + '--Hakutei Add--': '--Add Hakutei--', + '--tiger targetable--': '--tigre ciblable--', + '--tiger untargetable--': '--tigre non ciblable--', + 'Answer On High': 'Foudre céleste', + 'Bombogenesis': 'Bombogénèse', + 'Clutch': 'Empoignement', + 'Dance Of The Incomplete': 'Danse semi-bestiale', + 'Distant Clap': 'Tonnerre lointain', + 'Fell Swoop': 'Éléments déchaînés', + 'Fire And Lightning': 'Feu et foudre', + 'Gale Force': 'Coup de rafale', + 'Heavenly Strike': 'Frappe céleste', + 'Highest Stakes': 'Tout pour le tout', + 'Hundredfold Havoc': 'Ravages centuples', + 'Imperial Guard': 'Garde impériale', + 'Ominous Wind': 'Vent mauvais', + 'State Of Shock': 'Foudroiement brutal', + 'Steel Claw': 'Griffe d\'acier', + 'Storm Pulse': 'Pulsion de tempête', + 'Sweep The Leg': 'Verticalité', + 'The Roar Of Thunder': 'Rugissement du tonnerre', + 'The Voice Of Thunder': 'Voix du tonnerre', + 'Unrelenting Anguish': 'Douleur continuelle', + 'White Herald': 'Héraut blanc', + }, + }, + { + 'locale': 'ja', + 'missingTranslations': true, + 'replaceSync': { + 'Byakko': '白虎', + 'Hakutei': '白帝', + 'Twofold is my wrath, twice-cursed my foes!': '駆けろ、我が半身ッ!歯向かう者どもに、牙と爪を突き立ててやれ!', + }, + 'replaceText': { + '--tiger untargetable--': '--白帝タゲ不可--', + 'Answer On High': '天つ雷', + 'Bombogenesis': '爆弾低気圧', + 'Clutch': '掌握', + 'Dance Of The Incomplete': '半獣舞踏', + 'Distant Clap': '遠雷', + 'Fell Swoop': '迅雷風烈波', + 'Fire And Lightning': '雷火一閃', + 'Gale Force': '暴風', + 'Heavenly Strike': '天雷掌', + 'Highest Stakes': '乾坤一擲', + 'Hundredfold Havoc': '百雷繚乱', + 'Imperial Guard': '白帝一陣', + 'Ominous Wind': '祟り風', + 'State Of Shock': '呪縛雷', + 'Steel Claw': '鉄爪斬', + 'Storm Pulse': '風雷波動', + 'Sweep The Leg': '旋体脚', + 'The Roar Of Thunder': '雷轟', + 'The Voice Of Thunder': '雷声', + 'Unrelenting Anguish': '無間地獄', + 'White Herald': '白帝衝', + }, + }, + { + 'locale': 'cn', + 'replaceSync': { + 'Byakko': '白虎', + 'Hakutei': '白帝', + 'Twofold is my wrath, twice-cursed my foes!': '半身分离,助我杀敌!向胆敢抵抗的家伙们露出你的爪牙!', + }, + 'replaceText': { + '--Hakutei Add--': '--白帝出现--', + '--tiger targetable--': '--白帝可选中--', + '--tiger untargetable--': '--白帝无法选中--', + 'Answer On High': '天雷', + 'Bombogenesis': '炸弹低气压', + 'Clutch': '紧握', + 'Dance Of The Incomplete': '半兽舞蹈', + 'Distant Clap': '远雷', + 'Fell Swoop': '迅雷风烈波', + 'Fire And Lightning': '雷火一闪', + 'Gale Force': '暴风', + 'Heavenly Strike': '天雷掌', + 'Highest Stakes': '乾坤一掷', + 'Hundredfold Havoc': '百雷缭乱', + 'Imperial Guard': '白帝降临', + 'Ominous Wind': '妖风', + 'State Of Shock': '咒缚雷', + 'Steel Claw': '铁爪斩', + 'Storm Pulse': '风雷波动', + 'Sweep The Leg': '旋体脚', + 'The Roar Of Thunder': '雷轰', + 'The Voice Of Thunder': '雷声', + 'Unrelenting Anguish': '无间地狱', + 'White Herald': '白帝冲', + }, + }, + { + 'locale': 'ko', + 'replaceSync': { + 'Byakko': '백호', + 'Hakutei': '하얀 제왕', + 'Twofold is my wrath, twice-cursed my foes!': '달려라! 나의 반신이여! 맞서는 자들에게 이빨과 발톱을 찔러넣어라!', + }, + 'replaceText': { + '--Hakutei Add--': '--하얀 제왕 등장--', + '--tiger targetable--': '--호랑이 타겟가능--', + '--tiger untargetable--': '--호랑이 타겟불가--', + 'Answer On High': '하늘의 번개', + 'Bombogenesis': '폭탄 저기압', + 'Clutch': '장악', + 'Dance Of The Incomplete': '반수의 춤', + 'Distant Clap': '원뢰', + 'Fell Swoop': '신뢰풍렬파', + 'Fire And Lightning': '뇌화일섬', + 'Gale Force': '폭풍', + 'Heavenly Strike': '천뢰장', + 'Highest Stakes': '건곤일척', + 'Hundredfold Havoc': '백뢰요란', + 'Imperial Guard': '제왕의 진격', + 'Ominous Wind': '불길한 바람', + 'State Of Shock': '주박뢰', + 'Steel Claw': '강철 발톱', + 'Storm Pulse': '풍뢰파동', + 'Sweep The Leg': '돌려차기', + 'The Roar Of Thunder': '뇌굉', + 'The Voice Of Thunder': '뇌성', + 'Unrelenting Anguish': '무간지옥', + 'White Herald': '제왕의 충격', + }, + }, + ], +}; + +export default triggerSet; diff --git a/ui/raidboss/data/07-dt/trial/byakko-un.txt b/ui/raidboss/data/07-dt/trial/byakko-un.txt new file mode 100644 index 0000000000..e90e02d4e4 --- /dev/null +++ b/ui/raidboss/data/07-dt/trial/byakko-un.txt @@ -0,0 +1,151 @@ +# This file was autogenerated from running npm run sync-files. +# DO NOT EDIT THIS FILE DIRECTLY. +# Edit the source file below and then run `npm run sync-files` +# Source: ui/raidboss/data/04-sb/trial/byakko-ex.txt + +### Byakko Unreal +# -p 9BFD:10.9 +# -it Hakutei / -it Byakko +# -ii 9C04 9C16 265D 29A3 27EF 27F0 25CF 9C15 9C07 2944 9C0A + +hideall "--sync--" +hideall "--Reset--" +# not useful to see +hideall "Answer On High" + +### Phase 1 +0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1 +10.9 "Storm Pulse" Ability { id: "9BFD", source: "Byakko" } window 11,5 +17.1 "Heavenly Strike" Ability { id: "9BFB", source: "Byakko" } +27.3 "State Of Shock 1" Ability { id: "9C01", source: "Byakko" } +28.5 "Clutch" Ability { id: "9C02", source: "Byakko" } +34.7 "Highest Stakes" Ability { id: "9C03", source: "Byakko" } +37.5 "State Of Shock 2" Ability { id: "9BF8", source: "Byakko" } +38.5 "Clutch" Ability { id: "9C02", source: "Byakko" } +44.7 "Highest Stakes" Ability { id: "9C03", source: "Byakko" } + +55.5 "--center--" Ability { id: "9BF9", source: "Byakko" } +59.6 "Unrelenting Anguish" Ability { id: "9C0E", source: "Byakko" } +65.8 "Storm Pulse" Ability { id: "9BFD", source: "Byakko" } +68.0 "Ominous Wind" Ability { id: "9C0C", source: "Byakko" } +77.4 "Fire And Lightning" Ability { id: "9BFA", source: "Byakko" } +85.7 "--north--" Ability { id: "9BF9", source: "Byakko" } +87.3 "Dance Of The Incomplete" Ability { id: "9BF4", source: "Byakko" } +92.2 "--Hakutei Add--" +103.4 "Storm Pulse" Ability { id: "9BFD", source: "Byakko" } +103.4 "Steel Claw" Ability { id: "9C00", source: "Hakutei" } +109.6 "Steel Claw" Ability { id: "9C00", source: "Hakutei" } +113.7 "Heavenly Strike" Ability { id: "9BFB", source: "Byakko" } +116.6 "--tiger untargetable--" +122.4 "White Herald" Ability { id: "9C1A", source: "Hakutei" } +124.4 "--tiger targetable--" +124.8 "Distant Clap" Ability { id: "9BFE", source: "Byakko" } +128.6 "Fire And Lightning" Ability { id: "9BFF", source: "Hakutei" } +133.0 "Storm Pulse" Ability { id: "9BFD", source: "Byakko" } +135.1 "--untargetable--" +135.2 "--sync--" Ability { id: "9BF7", source: "Hakutei" } +136.6 "The Voice Of Thunder" Ability { id: "9C17", source: "Hakutei" } +159.8 "The Roar Of Thunder" Ability { id: "9C19", source: "Hakutei" } +162.9 "--untargetable--" + + +### Phase 2: zzz x infinity +191.1 "--sync--" Ability { id: "9C0F", source: "Byakko" } window 200,5 +197.2 "Sweep The Leg" Ability { id: "9C14", source: "Byakko" } +208.1 "Imperial Guard" Ability { id: "9C12", source: "Hakutei" } +208.4 "--sync--" Ability { id: "9C0F", source: "Byakko" } +220.2 "Imperial Guard" Ability { id: "9C12", source: "Hakutei" } +222.6 "--sync--" Ability { id: "9C0F", source: "Byakko" } +228.7 "Sweep The Leg" Ability { id: "9C14", source: "Byakko" } +237.3 "Imperial Guard" Ability { id: "9C12", source: "Hakutei" } + + +### Phase 3: More Bubbles +250.1 "--sync--" Ability { id: "9C22", source: "Byakko" } +265.1 "Fell Swoop" Ability { id: "9C1B", source: "Byakko" } window 300,10 +273.1 "--targetable--" +284.4 "Heavenly Strike" Ability { id: "9BFB", source: "Byakko" } +290.5 "Answer On High" Ability { id: "9C05", source: "Byakko" } +295.6 "Hundredfold Havoc" Ability { id: "9C06", source: "Byakko" } duration 3.2 +296.6 "State Of Shock 1" Ability { id: "9C01", source: "Byakko" } +297.7 "Clutch" Ability { id: "9C02", source: "Byakko" } +298.6 "Hundredfold Havoc" Ability { id: "9C06", source: "Byakko" } duration 3.2 +304.0 "Highest Stakes" Ability { id: "9C03", source: "Byakko" } +306.9 "State Of Shock 2" Ability { id: "9BF8", source: "Byakko" } +307.9 "Clutch" Ability { id: "9C02", source: "Byakko" } +314.1 "Highest Stakes" Ability { id: "9C03", source: "Byakko" } +320.8 "Sweep The Leg" Ability { id: "9BFC", source: "Byakko" } + +330.9 "--center--" Ability { id: "9BF9", source: "Byakko" } window 10,10 +335.2 "Unrelenting Anguish" Ability { id: "9C0E", source: "Byakko" } +341.4 "Storm Pulse x2" Ability { id: "9BFD", source: "Byakko" } +345.6 "Bombogenesis" Ability { id: "9C08", source: "Byakko" } +351.6 "Ominous Wind" Ability { id: "9C0C", source: "Byakko" } +353.6 "Gale Force" Ability { id: "9C09", source: "Byakko" } +361.0 "Fire And Lightning" Ability { id: "9BFA", source: "Byakko" } +364.1 "--north--" Ability { id: "9BF9", source: "Byakko" } +369.9 "Fire And Lightning" Ability { id: "9BFA", source: "Byakko" } + +373.1 "--north--" Ability { id: "9BF9", source: "Byakko" } +374.5 "Dance Of The Incomplete" Ability { id: "9BF4", source: "Byakko" } +379.5 "--tiger targetable--" +388.8 "--tiger untargetable--" +394.5 "White Herald" Ability { id: "9C1A", source: "Hakutei" } +396.5 "--tiger targetable--" +396.8 "Distant Clap" Ability { id: "9BFE", source: "Byakko" } +400.7 "Fire And Lightning" Ability { id: "9BFF", source: "Hakutei" } +405.0 "Distant Clap" Ability { id: "9BFE", source: "Byakko" } +408.9 "Fire And Lightning" Ability { id: "9BFF", source: "Hakutei" } +416.1 "Steel Claw" Ability { id: "9C00", source: "Hakutei" } +416.4 "Heavenly Strike" Ability { id: "9BFB", source: "Byakko" } +422.4 "--sync--" Ability { id: "9BF7", source: "Hakutei" } +423.9 "The Voice Of Thunder" Ability { id: "9C17", source: "Hakutei" } +436.5 "Storm Pulse x2" Ability { id: "9BFD", source: "Byakko" } +447.1 "The Roar Of Thunder" Ability { id: "9C19", source: "Hakutei" } +450.6 "--sync--" Ability { id: "9C20", source: "Hakutei" } + +451.5 "--sync--" Ability { id: "9C1F", source: "Byakko" } +453.5 "--jump--" Ability { id: "9BF9", source: "Byakko" } +459.3 "Fire And Lightning" Ability { id: "9BFA", source: "Byakko" } +474.5 "Storm Pulse x2" Ability { id: "9BFD", source: "Byakko" } +484.8 "Bombogenesis" Ability { id: "9C08", source: "Byakko" } +487.0 "Answer On High" Ability { id: "9C05", source: "Byakko" } +492.0 "Hundredfold Havoc" Ability { id: "9C06", source: "Byakko" } duration 3.2 +492.9 "Gale Force" Ability { id: "9C09", source: "Byakko" } +495.1 "Hundredfold Havoc" Ability { id: "9C06", source: "Byakko" } duration 3.2 +495.8 "State Of Shock 1" Ability { id: "9C01", source: "Byakko" } +496.9 "Clutch" Ability { id: "9C02", source: "Byakko" } +503.2 "Highest Stakes" Ability { id: "9C03", source: "Byakko" } +505.8 "State Of Shock 2" Ability { id: "9BF8", source: "Byakko" } +506.9 "Clutch" Ability { id: "9C02", source: "Byakko" } +513.2 "Highest Stakes" Ability { id: "9C03", source: "Byakko" } +519.7 "Sweep The Leg" Ability { id: "9BFC", source: "Byakko" } +534.2 "Heavenly Strike" Ability { id: "9BFB", source: "Byakko" } +544.5 "Storm Pulse x2" Ability { id: "9BFD", source: "Byakko" } +557.9 "Distant Clap" Ability { id: "9BFE", source: "Byakko" } +564.1 "Heavenly Strike" Ability { id: "9BFB", source: "Byakko" } + +572.2 "--center--" Ability { id: "9BF9", source: "Byakko" } +576.3 "Unrelenting Anguish" Ability { id: "9C0E", source: "Byakko" } +582.4 "Storm Pulse x2" Ability { id: "9BFD", source: "Byakko" } +586.7 "Bombogenesis" Ability { id: "9C08", source: "Byakko" } +592.8 "Ominous Wind" Ability { id: "9C0C", source: "Byakko" } +594.7 "Gale Force" Ability { id: "9C09", source: "Byakko" } +602.1 "Fire And Lightning" Ability { id: "9BFA", source: "Byakko" } +605.3 "--north--" Ability { id: "9BF9", source: "Byakko" } +611.0 "Fire And Lightning" Ability { id: "9BFA", source: "Byakko" } +626.2 "Storm Pulse x2" Ability { id: "9BFD", source: "Byakko" } +634.4 "Answer On High" Ability { id: "9C05", source: "Byakko" } +639.4 "Hundredfold Havoc" Ability { id: "9C06", source: "Byakko" } +640.5 "State Of Shock 1" Ability { id: "9C01", source: "Byakko" } +641.6 "Clutch" Ability { id: "9C02", source: "Byakko" } +642.5 "Hundredfold Havoc" Ability { id: "9C06", source: "Byakko" } +647.9 "Highest Stakes" Ability { id: "9C03", source: "Byakko" } +650.8 "State Of Shock 2" Ability { id: "9BF8", source: "Byakko" } +651.8 "Clutch" Ability { id: "9C02", source: "Byakko" } +658.1 "Highest Stakes" Ability { id: "9C03", source: "Byakko" } +664.8 "Sweep The Leg" Ability { id: "9BFC", source: "Byakko" } + +674.9 "--center--" Ability { id: "9BF9", source: "Byakko" } +680.2 "Storm Pulse x4" Ability { id: "9BFD", source: "Byakko" } +696.3 "Storm Pulse Enrage" Ability { id: "9C21", source: "Byakko" } diff --git a/util/sync_files.ts b/util/sync_files.ts index 46ce9d97f8..6809c2c393 100644 --- a/util/sync_files.ts +++ b/util/sync_files.ts @@ -726,6 +726,59 @@ const zoneReplace: ZoneReplace[] = [ '8D2E': '8D2F', // Angular Addition self-targeted ability to give boss V }, }, + { + fileMap: { + 'ui/raidboss/data/04-sb/trial/byakko-ex.ts': 'ui/raidboss/data/07-dt/trial/byakko-un.ts', + 'ui/raidboss/data/04-sb/trial/byakko-ex.txt': 'ui/raidboss/data/07-dt/trial/byakko-un.txt', + 'ui/oopsyraidsy/data/04-sb/trial/byakko-ex.ts': + 'ui/oopsyraidsy/data/07-dt/trial/byakko-un.ts', + }, + prefix: { 'ByakkoEx': 'ByakkoUn' }, + other: { + 'TheJadeStoaExtreme': 'TheJadeStoaUnreal', + 'Byakko Extreme': 'Byakko Unreal', + 'byakko-ex.txt': 'byakko-un.txt', + }, + id: { + '25D1': '9BF4', // Dance Of The Incomplete + '265E': '9BF7', // --Hakutei sync-- + '2756': '9BF8', // State Of Shock 2 + '2757': '9BF9', // --reposition-- + '27D9': '9BFA', // Fire And Lightning + '27DA': '9BFB', // Heavenly Strike + '27DB': '9BFC', // Sweep The Leg + '27DC': '9BFD', // Storm Pulse + '27DD': '9BFE', // Distant Clap + '27DE': '9BFF', // Fire And Lightning + '27DF': '9C00', // Steel Claw + '27E0': '9C01', // State of Shock 1 + '27E1': '9C02', // Clutch + '27E2': '9C03', // Highest Stakes + '27E3': '9C04', // Highest Stakes + '27E4': '9C05', // Answer On High + '27E5': '9C06', // Hundredfold Havoc 1 + '27E6': '9C07', // Hundredfold Havoc 2 + '27E7': '9C08', // Bombogenesis + '27E8': '9C09', // Gale Force + '27E9': '9C0A', // Vacuum Claw + '27EB': '9C0C', // Ominous Wind + '27EC': '9C0D', // Ominous Wind Collision + '27ED': '9C0E', // Unrelenting Anguish + '27EE': '9C0F', // [Phase 2 opener] + '27F1': '9C12', // Imperial Guard + '27F3': '9C14', // Sweep The Leg + '27F4': '9C15', // Sweep The Leg + '27F6': '9C16', // Aratama + '27F7': '9C17', // The Voice Of Thunder + '27F9': '9C19', // The Roar Of Thunder + '27FA': '9C1A', // White Herald + '27FB': '9C1B', // Fell Swoop + '29E4': '9C1F', // --sync-- + '29E5': '9C20', // --Hakutei sync-- + '2A09': '9C21', // Storm Pulse Enrage + '2A2A': '9C22', // [Phase 3 opener] + }, + }, ]; const processFile = (filename: string, zone: ZoneReplace, inputText: string): string => {