Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resources/raidboss/oopsy: 6.55 update + skeletons #46

Merged
merged 1 commit into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions resources/content_list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ const contentList: (ZoneIdType)[] = [
ZoneId.MountOrdeals,
ZoneId.TheVoidcastDais,
ZoneId.TheAbyssalFracture,
ZoneId.TheGildedAraya,

// High-end Trials (Endwalker)
ZoneId.TheMinstrelsBalladZodiarksFall,
Expand Down
5 changes: 5 additions & 0 deletions resources/content_type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions resources/effect_id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ const data = {
'BoundAndDetermined': 'AD9',
'BountifulCatch': '492',
'BowShock': '72E',
'BraaxPulse': 'EC8',
'Braced': '8D8',
'BrainRot': 'CD2',
'BrandOfTheFallen': '429',
Expand Down Expand Up @@ -1042,6 +1043,7 @@ const data = {
'LuminiferousAether': '34A',
'LuminousAetheroplasm': '2C2',
'LunarDefensive': '9FA',
'LuwatenaPulse': 'EC9',
'Lype': 'C30',
'MagesBallad': '8A9',
'MagicBurst': '674',
Expand Down Expand Up @@ -1293,6 +1295,7 @@ const data = {
'RadiantShield': '139',
'RadiantVeil': 'DDA',
'RageOfHalone': '55A',
'RagingRroneek': 'EAE',
'RagingStrikes': '7D',
'RaijuReady': 'A82',
'RainOfDeath': 'F7',
Expand Down Expand Up @@ -1374,6 +1377,7 @@ const data = {
'RoyalFavor': '9DC',
'RoyalRoad': '33B',
'RoyalRouse': '1DA',
'RroneekPulse': 'EC7',
'Ruination': '50B',
'RunningCold1': '8DC',
'RunningCold2': '8E2',
Expand Down
2 changes: 2 additions & 0 deletions resources/zone_id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
31 changes: 31 additions & 0 deletions resources/zone_info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -8987,6 +9001,7 @@ const data: ZoneInfoType = {
'en': 'Mount Rokkon',
'fr': 'Le mont Rokkon - Donjon à embranchements',
'ja': 'ヴァリアントダンジョン 六根山',
'ko': '변형 던전: 육근산',
},
'offsetX': -145,
'offsetY': -820,
Expand Down Expand Up @@ -9270,6 +9285,7 @@ const data: ZoneInfoType = {
'en': 'Another Mount Rokkon',
'fr': 'Le mont Rokkon annexe - Donjon alternatif',
'ja': 'アナザーダンジョン 異聞六根山',
'ko': '파생 던전: 번외 육근산',
},
'offsetX': 0,
'offsetY': 40,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
12 changes: 12 additions & 0 deletions ui/oopsyraidsy/data/06-ew/trial/asura.ts
Original file line number Diff line number Diff line change
@@ -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;
14 changes: 14 additions & 0 deletions ui/raidboss/data/06-ew/trial/asura.ts
Original file line number Diff line number Diff line change
@@ -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;
8 changes: 8 additions & 0 deletions ui/raidboss/data/06-ew/trial/asura.txt
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions util/zone_overrides.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down