Add zoneId to raidboss/oopsy

quisquous · Jul 2, 2020 · c3d7491 · c3d7491
1 parent 1583e4c
commit c3d7491
Show file tree

Hide file tree

Showing 185 changed files with 207 additions and 0 deletions.
diff --git a/resources/fights.js b/resources/fights.js
@@ -4,141 +4,164 @@ let gBossFightTriggers = [
  {
  id: 'test',
  zoneRegex: /^Middle La Noscea$/,
+ zoneId: ZoneId.MiddleLaNoscea,
  startRegex: /:You bow courteously to the striking dummy/,
  endRegex: /:You bid farewell to the striking dummy/,
  countdownStarts: true,
  },
  {
  id: 'o1s',
  zoneRegex: /^Deltascape V1.0 \(Savage\)$/,
+ zoneId: ZoneId.DeltascapeV10Savage,
  startRegex: /:Alte Roite uses Wyrm Tail/,
  countdownStarts: true,
  },
  {
  id: 'o2s',
  zoneRegex: /^Deltascape V2.0 \(Savage\)$/,
+ zoneId: ZoneId.DeltascapeV20Savage,
  startRegex: /:Catastrophe uses Earthquake/,
  countdownStarts: true,
  },
  {
  id: 'o3s',
  zoneRegex: /^Deltascape V3.0 \(Savage\)$/,
+ zoneId: ZoneId.DeltascapeV30Savage,
  startRegex: /:Halicarnassus uses Critical Hit/,
  countdownStarts: true,
  },
  {
  id: 'o4s-exdeath',
  zoneRegex: /^Deltascape V4.0 \(Savage\)$/,
+ zoneId: ZoneId.DeltascapeV40Savage,
  startRegex: /:Exdeath uses Dualcast/,
  endRegex: /:The limit gauge resets!/,
  countdownStarts: false,
  },
  {
  id: 'o4s-neo',
  zoneRegex: /^Deltascape V4.0 \(Savage\)$/,
+ zoneId: ZoneId.DeltascapeV40Savage,
  startRegex: /:Neo Exdeath uses Almagest/,
  countdownStarts: false,
  },
  {
  id: 'Unending Coil',
  zoneRegex: /^The Unending Coil Of Bahamut \(Ultimate\)$/,
+ zoneId: ZoneId.TheUnendingCoilOfBahamutUltimate,
  startRegex: /:Twintania:26A7:/,
  countdownStarts: true,
  },
  {
  id: 'Shinryu Ex',
  zoneRegex: /^The Minstrel's Ballad: Shinryu's Domain$/,
+ zoneId: ZoneId.TheMinstrelsBalladShinryusDomain,
  startRegex: /:Shinryu starts using Earthen Fury/,
  countdownStarts: true,
  },
  {
  id: 'o5s',
  zoneRegex: /Sigmascape V1\.0 \(Savage\)/,
+ zoneId: ZoneId.SigmascapeV10Savage,
  startRegex: /:Wroth Ghost:28B6:/,
  countdownStarts: true,
  },
  {
  id: 'o6s',
  zoneRegex: /Sigmascape V2\.0 \(Savage\)/,
+ zoneId: ZoneId.SigmascapeV20Savage,
  startRegex: /14:2829:Demon Chadarnook starts using Demonic Shear/,
  countdownStarts: true,
  },
  {
  id: 'o7s',
  zoneRegex: /Sigmascape V3\.0 \(Savage\)/,
+ zoneId: ZoneId.SigmascapeV30Savage,
  startRegex: /00:0044:[^:]*:WEAPON SYSTEMS ONLINE/,
  countdownStarts: true,
  },
  {
  id: 'o8s-kefka',
  zoneRegex: /Sigmascape V4\.0 \(Savage\)/,
+ zoneId: ZoneId.SigmascapeV40Savage,
  startRegex: / 15:........:Kefka:28C2:/,
  endRegex: /:Kekfa was defeated by/,
  countdownStarts: false,
  },
  {
  id: 'o8s-god kefka',
  zoneRegex: /Sigmascape V4\.0 \(Savage\)/,
+ zoneId: ZoneId.SigmascapeV40Savage,
  startRegex: / 15:........:Kefka:28EC:/,
  countdownStarts: false,
  },
  {
  id: 'Byakko Ex',
  zoneRegex: /^The Jade Stoa \(Extreme\)$/,
+ zoneId: ZoneId.TheJadeStoaExtreme,
  startRegex: /:Byakko starts using Storm Pulse/,
  countdownStarts: true,
  },
  {
  id: 'Tsukuyomi Ex',
  zoneRegex: /The Minstrel's Ballad: Tsukuyomi's Pain/,
+ zoneId: ZoneId.TheMinstrelsBalladTsukuyomisPain,
  startRegex: /:Tsukuyomi:2BBA:/,
  countdownStarts: true,
  },
  {
  id: 'UwU',
  zoneRegex: /^The Weapon's Refrain \(Ultimate\)$/,
+ zoneId: ZoneId.TheWeaponsRefrainUltimate,
  startRegex: /:Garuda:2B53:/,
  countdownStarts: true,
  },
  {
  id: 'Suzaku Ex',
  zoneRegex: /^Hells\' Kier \(Extreme\)$/,
+ zoneId: ZoneId.HellsKierExtreme,
  startRegex: /:Suzaku:367:/,
  countdownStarts: true,
  },
  {
  id: 'Seiryu Ex',
  zoneRegex: /^The Wreath Of Snakes \(Extreme\)$/,
+ zoneId: ZoneId.TheWreathOfSnakesExtreme,
  startRegex: /:Seiryu:366:/,
  countdownStarts: true,
  },
  {
  id: 'o9s',
  zoneRegex: /Alphascape V1\.0 \(Savage\)/,
+ zoneId: ZoneId.AlphascapeV10Savage,
  startRegex: /:Chaos:316F:/,
  countdownStarts: true,
  },
  {
  id: 'o10s',
  zoneRegex: /Alphascape V2\.0 \(Savage\)/,
+ zoneId: ZoneId.AlphascapeV20Savage,
  startRegex: /:Midgardsormr:31F9:/,
  countdownStarts: true,
  },
  {
  id: 'o11s',
  zoneRegex: /Alphascape V3\.0 \(Savage\)/,
+ zoneId: ZoneId.AlphascapeV30Savage,
  startRegex: /:Omega:368:/,
  countdownStarts: true,
  },
  {
  id: 'o12s-door',
  zoneRegex: /Alphascape V4\.0 \(Savage\)/,
+ zoneId: ZoneId.AlphascapeV40Savage,
  startRegex: /:Omega-M:337D:/,
  countdownStarts: false,
  },
  {
  id: 'o12s-final',
  zoneRegex: /Alphascape V4\.0 \(Savage\)/,
+ zoneId: ZoneId.AlphascapeV40Savage,
  startRegex: /:Omega:336C:/,
  countdownStarts: false,
  },

diff --git a/ui/oopsyraidsy/data/00-misc/general.js b/ui/oopsyraidsy/data/00-misc/general.js
@@ -3,6 +3,7 @@
 // General mistakes; these apply everywhere.
 [{
  zoneRegex: /.*/,
+ zoneId: ZoneId.MatchAll,
  triggers: [
  {
  // Trigger id for internally generated early pull warning.

diff --git a/ui/oopsyraidsy/data/00-misc/test.js b/ui/oopsyraidsy/data/00-misc/test.js
@@ -7,6 +7,7 @@
  cn: /^中拉诺西亚$/,
  ko: /^중부 라노시아$/,
  },
+ zoneId: ZoneId.MiddleLaNoscea,
  triggers: [
  {
  id: 'Test Bow',

diff --git a/ui/oopsyraidsy/data/02-arr/trial/ifrit_nm.js b/ui/oopsyraidsy/data/02-arr/trial/ifrit_nm.js
@@ -6,6 +6,7 @@
  en: /^The Bowl Of Embers$/,
  ko: /^이프리트 토벌전$/,
  },
+ zoneId: ZoneId.TheBowlOfEmbers,
  damageWarn: {
  'Ifrit NM Radiant Plume': '2DE',
  },

diff --git a/ui/oopsyraidsy/data/02-arr/trial/titan_ex.js b/ui/oopsyraidsy/data/02-arr/trial/titan_ex.js
@@ -6,6 +6,7 @@
  en: /^The Navel \(Extreme\)$/,
  ko: /^극 타이탄 토벌전$/,
  },
+ zoneId: ZoneId.TheNavelExtreme,
  damageWarn: {
  'TitanEx Weight Of The Land': '5BE',
  'TitanEx Burst': '5BF',

diff --git a/ui/oopsyraidsy/data/02-arr/trial/titan_hm.js b/ui/oopsyraidsy/data/02-arr/trial/titan_hm.js
@@ -5,6 +5,7 @@
  zoneRegex: {
  en: /^The Navel \(Hard\)$/,
  },
+ zoneId: ZoneId.TheNavelHard,
  damageWarn: {
  'TitanHm Weight Of The Land': '553',
  'TitanHm Burst': '41C',

diff --git a/ui/oopsyraidsy/data/03-hw/dungeon/aetherochemical_research_facility.js b/ui/oopsyraidsy/data/03-hw/dungeon/aetherochemical_research_facility.js
@@ -6,6 +6,7 @@
  en: /Aetherochemical Research Facility/,
  ko: /^마과학 연구소$/,
  },
+ zoneId: ZoneId.TheAetherochemicalResearchFacility,
  damageWarn: {
  'Facility Grand Sword': '216', // Conal AoE, Scrambled Iron Giant trash
  'Facility Cermet Drill': '20E', // Line AoE, 6th Legion Magitek Vanguard trash

diff --git a/ui/oopsyraidsy/data/03-hw/dungeon/fractal_continuum.js b/ui/oopsyraidsy/data/03-hw/dungeon/fractal_continuum.js
@@ -6,6 +6,7 @@
  en: /^The Fractal Continuum$/,
  ko: /^무한연속 박물함$/,
  },
+ zoneId: ZoneId.TheFractalContinuum,
  damageWarn: {
  'Fractal Double Sever': 'F7D', // Conals, boss 1
  'Fractal Aetheric Compression': 'F80', // Ground AoE circles, boss 1

diff --git a/ui/oopsyraidsy/data/03-hw/dungeon/gubal_library_hard.js b/ui/oopsyraidsy/data/03-hw/dungeon/gubal_library_hard.js
@@ -6,6 +6,7 @@
  en: /Great Gubal Library \(Hard\)/,
  ko: /^구브라 환상도서관\(어려움\)$/,
  },
+ zoneId: ZoneId.TheGreatGubalLibraryHard,
  damageWarn: {
  'Gubal Hard Terror Eye': '930', // Circle AoE, Spine Breaker trash
  'Gubal Hard Batter': '198A', // Circle AoE, trash before boss 1

diff --git a/ui/oopsyraidsy/data/04-sb/dungeon/ala_mhigo.js b/ui/oopsyraidsy/data/04-sb/dungeon/ala_mhigo.js
@@ -6,6 +6,7 @@
  en: /Ala Mhigo/,
  ko: /^알라미고$/,
  },
+ zoneId: ZoneId.AlaMhigo,
  damageWarn: {
  'Ala Mhigo Magitek Ray': '24CE', // Line AoE, Legion Predator trash, before boss 1
  'Ala Mhigo Lock On': '2047', // Homing circles, boss 1

diff --git a/ui/oopsyraidsy/data/04-sb/dungeon/temple_of_the_fist.js b/ui/oopsyraidsy/data/04-sb/dungeon/temple_of_the_fist.js
@@ -6,6 +6,7 @@
  en: /Temple Of The Fist/,
  ko: /^성도산 사원$/,
  },
+ zoneId: ZoneId.TheTempleOfTheFist,
  damageWarn: {
  'Temple Fire Break': '21ED', // Conal AoE, Bloodglider Monk trash
  'Temple Radial Blaster': '1FD3', // Circle AoE, boss 1

diff --git a/ui/oopsyraidsy/data/04-sb/raid/o1n.js b/ui/oopsyraidsy/data/04-sb/raid/o1n.js
@@ -5,6 +5,7 @@
  zoneRegex: {
  en: /^Deltascape V1\.0$/,
  },
+ zoneId: ZoneId.DeltascapeV10,
  damageWarn: {
  'O1N Burn': '23D5', // Fireball explosion circle AoEs
  'O1N Clamp': '23E2', // Frontal rectangle knockback AoE, Alte Roite

diff --git a/ui/oopsyraidsy/data/04-sb/raid/o2n.js b/ui/oopsyraidsy/data/04-sb/raid/o2n.js
@@ -5,6 +5,7 @@
  zoneRegex: {
  en: /^Deltascape \(V2\.0\)$/,
  },
+ zoneId: ZoneId.DeltascapeV20,
  damageWarn: {
  'O2N Main Quake': '24A5', // Non-telegraphed circle AoE, Fleshy Member
  'O2N Erosion': '2590', // Small circle AoEs, Fleshy Member

diff --git a/ui/oopsyraidsy/data/04-sb/raid/o3n.js b/ui/oopsyraidsy/data/04-sb/raid/o3n.js
@@ -5,6 +5,7 @@
  zoneRegex: {
  en: /^Deltascape \(V3\.0\)$/,
  },
+ zoneId: ZoneId.DeltascapeV30,
  damageWarn: {
  'Spellblade Fire III': '2460', // Donut AoE, Halicarnassus
  'Spellblade Blizzard III': '2461', // Circle AoE, Halicarnassus

diff --git a/ui/oopsyraidsy/data/04-sb/raid/o4n.js b/ui/oopsyraidsy/data/04-sb/raid/o4n.js
@@ -5,6 +5,7 @@
  zoneRegex: {
  en: /^Deltascape \(V4\.0\)$/,
  },
+ zoneId: ZoneId.DeltascapeV40,
  damageWarn: {
  'Blizzard III': '24BC', // Targeted circle AoEs, Exdeath
  'Empowered Thunder III': '24C1', // Untelegraphed large circle AoE, Exdeath

diff --git a/ui/oopsyraidsy/data/04-sb/raid/o4s.js b/ui/oopsyraidsy/data/04-sb/raid/o4s.js
@@ -6,6 +6,7 @@
  en: /^Deltascape V4\.0 \(Savage\)$/,
  ko: /^차원의 틈 오메가: 델타편\(영웅\) \(4\)$/,
  },
+ zoneId: ZoneId.DeltascapeV40Savage,
  damageWarn: {
  'O4S2 Neo Vacuum Wave': '241D',
  'O4S2 Acceleration Bomb': '2431',

diff --git a/ui/oopsyraidsy/data/04-sb/raid/o5s.js b/ui/oopsyraidsy/data/04-sb/raid/o5s.js
@@ -6,4 +6,5 @@
  en: /^Sigmascape V1\.0 \(Savage\)$/,
  ko: /^차원의 틈 오메가: 시그마편\(영웅\) \(1\)$/,
  },
+ zoneId: ZoneId.SigmascapeV10Savage,
 }];
diff --git a/ui/oopsyraidsy/data/04-sb/raid/o6s.js b/ui/oopsyraidsy/data/04-sb/raid/o6s.js
@@ -6,4 +6,5 @@
  en: /^Sigmascape V2\.0 \(Savage\)$/,
  ko: /^차원의 틈 오메가: 시그마편\(영웅\) \(2\)$/,
  },
+ zoneId: ZoneId.SigmascapeV20Savage,
 }];
diff --git a/ui/oopsyraidsy/data/04-sb/raid/o7s.js b/ui/oopsyraidsy/data/04-sb/raid/o7s.js
@@ -6,6 +6,7 @@
  en: /^Sigmascape V3\.0 \(Savage\)$/,
  ko: /^차원의 틈 오메가: 시그마편\(영웅\) \(3\)$/,
  },
+ zoneId: ZoneId.SigmascapeV30Savage,
  damageFail: {
  'O7S Missile': '2782',
  'O7S Chain Cannon': '278F',

diff --git a/ui/oopsyraidsy/data/04-sb/raid/o8s.js b/ui/oopsyraidsy/data/04-sb/raid/o8s.js
@@ -6,4 +6,5 @@
  en: /^Sigmascape V4\.0 \(Savage\)$/,
  ko: /^차원의 틈 오메가: 시그마편\(영웅\) \(4\)$/,
  },
+ zoneId: ZoneId.SigmascapeV40Savage,
 }];
diff --git a/ui/oopsyraidsy/data/04-sb/trial/byakko-ex.js b/ui/oopsyraidsy/data/04-sb/trial/byakko-ex.js
@@ -6,6 +6,7 @@
  en: /^The Jade Stoa \(Extreme\)$/,
  ko: /^극 백호 토벌전$/,
  },
+ zoneId: ZoneId.TheJadeStoaExtreme,
  damageWarn: {
  // Popping Unrelenting Anguish bubbles
  'ByaEx Aratama': '27F6',

diff --git a/ui/oopsyraidsy/data/04-sb/trial/shinryu.js b/ui/oopsyraidsy/data/04-sb/trial/shinryu.js
@@ -8,6 +8,7 @@
  cn: /^阿拉米格王宫屋顶庭园$/,
  ko: /^알라미고 왕궁 옥상정원$/,
  },
+ zoneId: ZoneId.TheRoyalMenagerie,
  damageWarn: {
  'Akh Rhai': '1FA6', // Sky lasers alongside Akh Morn.
  'Blazing Trail': '221A', // Rectangle AoEs, intermission adds.

diff --git a/ui/oopsyraidsy/data/04-sb/trial/susano-ex.js b/ui/oopsyraidsy/data/04-sb/trial/susano-ex.js
@@ -6,6 +6,7 @@
  en: /^The Pool Of Tribute \(Extreme\)$/,
  ko: /^극 스사노오 토벌전$/,
  },
+ zoneId: ZoneId.ThePoolOfTributeExtreme,
  damageWarn: {
  'SusEx Churning': '203F',
  },

diff --git a/ui/oopsyraidsy/data/04-sb/ultimate/ultima_weapon_ultimate.js b/ui/oopsyraidsy/data/04-sb/ultimate/ultima_weapon_ultimate.js
@@ -6,6 +6,7 @@
  en: /^The Weapon's Refrain \(Ultimate\)$/,
  ko: /^절 알테마 웨폰 파괴작전$/,
  },
+ zoneId: ZoneId.TheWeaponsRefrainUltimate,
  damageWarn: {
  'UWU Searing Wind': '2B5C',
  'UWU Eruption': '2B5A',

diff --git a/ui/oopsyraidsy/data/04-sb/ultimate/unending_coil_ultimate.js b/ui/oopsyraidsy/data/04-sb/ultimate/unending_coil_ultimate.js
@@ -6,6 +6,7 @@
  en: /^The Unending Coil Of Bahamut \(Ultimate\)$/,
  ko: /^절 바하무트 토벌전$/,
  },
+ zoneId: ZoneId.TheUnendingCoilOfBahamutUltimate,
  damageFail: {
  'UCU Lunar Dynamo': '26BC',
  'UCU Iron Chariot': '26BB',

diff --git a/ui/oopsyraidsy/data/05-shb/alliance/the_copied_factory.js b/ui/oopsyraidsy/data/05-shb/alliance/the_copied_factory.js
@@ -6,6 +6,7 @@
  en: /^The Copied Factory$/,
  ko: /^복제된 공장 폐허$/,
  },
+ zoneId: ZoneId.TheCopiedFactory,
  damageWarn: {
  'Copied Serial Energy Bomb': '48B4',
  // Make sure enemies are ignored on these

diff --git a/ui/oopsyraidsy/data/05-shb/dungeon/akadaemia_anyder.js b/ui/oopsyraidsy/data/05-shb/dungeon/akadaemia_anyder.js
@@ -5,6 +5,7 @@
  en: /^Akadaemia Anyder$/,
  ko: /^애나이더 아카데미아$/,
  },
+ zoneId: ZoneId.AkadaemiaAnyder,
  damageWarn: {
  'Anyder Acrid Stream': '4304',
  'Anyder Waterspout': '4306',

diff --git a/ui/oopsyraidsy/data/05-shb/dungeon/amaurot.js b/ui/oopsyraidsy/data/05-shb/dungeon/amaurot.js
@@ -5,6 +5,7 @@
  en: /^Amaurot$/,
  ko: /^아모로트$/,
  },
+ zoneId: ZoneId.Amaurot,
  damageWarn: {
  'Amaurot Burning Sky': '354A',
  'Amaurot Whack': '353C',

diff --git a/ui/oopsyraidsy/data/05-shb/dungeon/anamnesis_anyder.js b/ui/oopsyraidsy/data/05-shb/dungeon/anamnesis_anyder.js
@@ -4,6 +4,7 @@
  zoneRegex: {
  en: /^Anamnesis Anyder$/,
  },
+ zoneId: ZoneId.AnamnesisAnyder,
  damageWarn: {
  },
  damageFail: {

diff --git a/ui/oopsyraidsy/data/05-shb/dungeon/dohn_mheg.js b/ui/oopsyraidsy/data/05-shb/dungeon/dohn_mheg.js
@@ -10,6 +10,7 @@
  en: /^Dohn Mheg$/,
  ko: /^도느 메그$/,
  },
+ zoneId: ZoneId.DohnMheg,
  damageWarn: {
  'Dohn Mheg Geyser': '2260', // Water eruptions, boss 1
  'Dohn Mheg Hydrofall': '22BD', // Ground AoE marker, boss 1

diff --git a/ui/oopsyraidsy/data/05-shb/dungeon/holminster_switch.js b/ui/oopsyraidsy/data/05-shb/dungeon/holminster_switch.js
@@ -5,6 +5,7 @@
  en: /^Holminster Switch$/,
  ko: /^홀민스터$/,
  },
+ zoneId: ZoneId.HolminsterSwitch,
  damageWarn: {
  'Holminster Thumbscrew': '3DC6',
  'Holminster Wooden horse': '3DC7',