resources/raidboss/oopsy: 6.55 update + skeletons

OverlayPlugin · Jan 16, 2024 · cf11d45 · cf11d45
1 parent 1d8470d
commit cf11d45
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 0 deletions.
diff --git a/resources/content_list.ts b/resources/content_list.ts
@@ -217,6 +217,7 @@ const contentList: (ZoneIdType)[] = [
   ZoneId.MountOrdeals,
   ZoneId.TheVoidcastDais,
   ZoneId.TheAbyssalFracture,
+  ZoneId.TheGildedAraya,
 
   // High-end Trials (Endwalker)
   ZoneId.TheMinstrelsBalladZodiarksFall,

diff --git a/resources/content_type.ts b/resources/content_type.ts
@@ -11,20 +11,25 @@ const data = {
   'DutyRoulette': 1,
   'Eureka': 26,
   'Fates': 8,
+  'Fishing': 34,
+  'Gate': 35,
   'GoldSaucer': 19,
   'GrandCompany': 11,
   'Guildhests': 3,
   'Levequests': 10,
   'MaskedCarnivale': 27,
+  'OceanFishing': 31,
   'OverallCompletion': 14,
   'PlayerCommendation': 15,
   'Pvp': 6,
   'QuestBattles': 7,
   'Raids': 5,
   'RetainerVentures': 18,
+  'TheHunt': 33,
   'TreasureHunt': 9,
   'Trials': 4,
   'TribalQuests': 13,
+  'TripleTriad': 32,
   'UltimateRaids': 28,
   'VCDungeonFinder': 30,
   'WondrousTails': 24,

diff --git a/resources/effect_id.ts b/resources/effect_id.ts
@@ -243,6 +243,7 @@ const data = {
   'BoundAndDetermined': 'AD9',
   'BountifulCatch': '492',
   'BowShock': '72E',
+  'BraaxPulse': 'EC8',
   'Braced': '8D8',
   'BrainRot': 'CD2',
   'BrandOfTheFallen': '429',
@@ -1042,6 +1043,7 @@ const data = {
   'LuminiferousAether': '34A',
   'LuminousAetheroplasm': '2C2',
   'LunarDefensive': '9FA',
+  'LuwatenaPulse': 'EC9',
   'Lype': 'C30',
   'MagesBallad': '8A9',
   'MagicBurst': '674',
@@ -1293,6 +1295,7 @@ const data = {
   'RadiantShield': '139',
   'RadiantVeil': 'DDA',
   'RageOfHalone': '55A',
+  'RagingRroneek': 'EAE',
   'RagingStrikes': '7D',
   'RaijuReady': 'A82',
   'RainOfDeath': 'F7',
@@ -1374,6 +1377,7 @@ const data = {
   'RoyalFavor': '9DC',
   'RoyalRoad': '33B',
   'RoyalRouse': '1DA',
+  'RroneekPulse': 'EC7',
   'Ruination': '50B',
   'RunningCold1': '8DC',
   'RunningCold2': '8E2',

diff --git a/resources/zone_id.ts b/resources/zone_id.ts
@@ -420,9 +420,11 @@ const data = {
   'TheFractalContinuum': 430,
   'TheFractalContinuumHard': 743,
   'TheFringes': 612,
+  'TheGameIsAfoot': 1177,
   'TheGhimlytDark': 1174,
   'TheGhimlytDark64': 793,
   'TheGiftOfMercy': 1019,
+  'TheGildedAraya': 1136,
   'TheGrandCosmos': 884,
   'TheGreatGubalLibrary': 1109,
   'TheGreatGubalLibrary62': 416,

diff --git a/resources/zone_info.ts b/resources/zone_info.ts
@@ -8978,6 +8978,20 @@ const data: ZoneInfoType = {
     'sizeFactor': 200,
     'weatherRate': 0,
   },
+  1136: {
+    'contentType': 4,
+    'exVersion': 4,
+    'name': {
+      'de': 'Prophetie - Asura',
+      'en': 'The Gilded Araya',
+      'fr': 'Le temple doré d\'Araya',
+      'ja': 'アスラ討滅戦',
+    },
+    'offsetX': -100,
+    'offsetY': -100,
+    'sizeFactor': 400,
+    'weatherRate': 114,
+  },
   1137: {
     'contentType': 30,
     'exVersion': 4,
@@ -8987,6 +9001,7 @@ const data: ZoneInfoType = {
       'en': 'Mount Rokkon',
       'fr': 'Le mont Rokkon - Donjon à embranchements',
       'ja': 'ヴァリアントダンジョン 六根山',
+      'ko': '변형 던전: 육근산',
     },
     'offsetX': -145,
     'offsetY': -820,
@@ -9270,6 +9285,7 @@ const data: ZoneInfoType = {
       'en': 'Another Mount Rokkon',
       'fr': 'Le mont Rokkon annexe - Donjon alternatif',
       'ja': 'アナザーダンジョン 異聞六根山',
+      'ko': '파생 던전: 번외 육근산',
     },
     'offsetX': 0,
     'offsetY': 40,
@@ -9285,6 +9301,7 @@ const data: ZoneInfoType = {
       'en': 'Another Mount Rokkon (Savage)',
       'fr': 'Le mont Rokkon annexe - Donjon alternatif (sadique)',
       'ja': 'アナザーダンジョン 異聞六根山 零式',
+      'ko': '파생 던전: 번외 육근산(영웅)',
     },
     'offsetX': 0,
     'offsetY': 40,
@@ -9422,6 +9439,20 @@ const data: ZoneInfoType = {
     'sizeFactor': 200,
     'weatherRate': 0,
   },
+  1177: {
+    'contentType': 7,
+    'exVersion': 4,
+    'name': {
+      'de': 'Die Jagd ist eröffnet',
+      'en': 'The Game Is Afoot',
+      'fr': 'Par-delà l\'horizon',
+      'ja': 'その瞳が見据えるもの',
+    },
+    'offsetX': 368,
+    'offsetY': -277,
+    'sizeFactor': 200,
+    'weatherRate': 0,
+  },
   1178: {
     'contentType': 5,
     'exVersion': 4,

diff --git a/ui/oopsyraidsy/data/06-ew/trial/asura.ts b/ui/oopsyraidsy/data/06-ew/trial/asura.ts
@@ -0,0 +1,12 @@
+import ZoneId from '../../../../../resources/zone_id';
+import { OopsyData } from '../../../../../types/data';
+import { OopsyTriggerSet } from '../../../../../types/oopsy';
+
+export type Data = OopsyData;
+
+const triggerSet: OopsyTriggerSet<Data> = {
+  zoneId: ZoneId.TheGildedAraya,
+  damageWarn: {},
+};
+
+export default triggerSet;
diff --git a/ui/raidboss/data/06-ew/trial/asura.ts b/ui/raidboss/data/06-ew/trial/asura.ts
@@ -0,0 +1,14 @@
+import ZoneId from '../../../../../resources/zone_id';
+import { RaidbossData } from '../../../../../types/data';
+import { TriggerSet } from '../../../../../types/trigger';
+
+export type Data = RaidbossData;
+
+const triggerSet: TriggerSet<Data> = {
+  id: 'TheGildedAraya',
+  zoneId: ZoneId.TheGildedAraya,
+  timelineFile: 'asura.txt',
+  triggers: [],
+};
+
+export default triggerSet;
diff --git a/ui/raidboss/data/06-ew/trial/asura.txt b/ui/raidboss/data/06-ew/trial/asura.txt
@@ -0,0 +1,8 @@
+### The Gilded Araya
+
+hideall "--Reset--"
+hideall "--sync--"
+
+0.0 "--Reset--" ActorControl { command: "4000000F" } window 100000 jump 0
+
+0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
diff --git a/util/zone_overrides.ts b/util/zone_overrides.ts
@@ -43,6 +43,7 @@ type OverrideContainer = {
 // errors if not found.
 const _KNOWN_IDS: NameKeyToTerritoryId = {
   'TheDiadem': 929,
+  'TheGildedAraya': 1136, // TT 509 is a duplicate conflict, possibly due to separate entry for FanFest trial
 };
 
 // name to territory id mappings for locations that no longer exist