From cf11d45ad549db84815eae72f870f56489fba800 Mon Sep 17 00:00:00 2001 From: Wexx Date: Tue, 16 Jan 2024 07:11:50 -0800 Subject: [PATCH] resources/raidboss/oopsy: 6.55 update + skeletons --- resources/content_list.ts | 1 + resources/content_type.ts | 5 ++++ resources/effect_id.ts | 4 +++ resources/zone_id.ts | 2 ++ resources/zone_info.ts | 31 ++++++++++++++++++++++++ ui/oopsyraidsy/data/06-ew/trial/asura.ts | 12 +++++++++ ui/raidboss/data/06-ew/trial/asura.ts | 14 +++++++++++ ui/raidboss/data/06-ew/trial/asura.txt | 8 ++++++ util/zone_overrides.ts | 1 + 9 files changed, 78 insertions(+) create mode 100644 ui/oopsyraidsy/data/06-ew/trial/asura.ts create mode 100644 ui/raidboss/data/06-ew/trial/asura.ts create mode 100644 ui/raidboss/data/06-ew/trial/asura.txt diff --git a/resources/content_list.ts b/resources/content_list.ts index b6b1e2a3721..1b122c24feb 100644 --- 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 index 6c6048f8100..259bfd97804 100644 --- 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 index ec7b4b3a44c..123bd1586fa 100644 --- 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 index d8db27dfbad..8a643fee453 100644 --- 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 index 58bc17de3ae..9d468da7165 100644 --- 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 new file mode 100644 index 00000000000..3dd717cfc7c --- /dev/null +++ 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 = { + 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 new file mode 100644 index 00000000000..810c0d3d8bc --- /dev/null +++ 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 = { + 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 new file mode 100644 index 00000000000..4f68eb60285 --- /dev/null +++ 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 index 26e97c49baa..2c18177a48b 100644 --- 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