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.

Sign up for GitHub

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

raidboss: add Cenote Ja Ja Gural treasure dungeon #479

Merged
merged 7 commits into from
Nov 2, 2024
Merged

raidboss: add Cenote Ja Ja Gural treasure dungeon #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f654a5
Create cenote_ja_ja_gural.ts
xiashtra Oct 17, 2024
dae7d1a
Merge branch 'main' into cenote-ja-ja-gural
xiashtra Oct 18, 2024
0819f91
Merge remote-tracking branch 'upstream/main' into cenote-ja-ja-gural
xiashtra Oct 22, 2024
f58c8a7
Merge remote-tracking branch 'upstream/main' into cenote-ja-ja-gural
xiashtra Oct 28, 2024
581820e
Merge remote-tracking branch 'upstream/main' into cenote-ja-ja-gural
xiashtra Oct 30, 2024
fdbd9e8
Merge remote-tracking branch 'upstream/main' into cenote-ja-ja-gural
xiashtra Nov 2, 2024
6b64292
feedback changes
xiashtra Nov 2, 2024
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
8 changes: 2 additions & 6 deletions ui/raidboss/data/03-hw/map/the_aquapolis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '5058' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: aquapolisOutputStrings.spawn,
},
outputStrings: aquapolisOutputStrings,
},
{
id: 'Aquapolis Arges Spawn',
Expand All @@ -40,9 +38,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '5059' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: aquapolisOutputStrings.spawn,
},
outputStrings: aquapolisOutputStrings,
},
{
id: 'Aquapolis Arges 100-tonze Swipe',
Expand Down
23 changes: 11 additions & 12 deletions ui/raidboss/data/04-sb/map/the_hidden_canals_of_uznair.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ const uznairOutputStrings = {
},
} as const;

const canalCrewIds = [
'6847', // Canal Onion
'6848', // Canal Egg
'6849', // Canal Garlic
'6850', // Canal Tomato
'6851', // Canal Queen
] as const;

export type Data = RaidbossData;

const triggerSet: TriggerSet<Data> = {
Expand All @@ -29,9 +37,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '6567' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: uznairOutputStrings.spawn,
},
outputStrings: uznairOutputStrings,
},
{
id: 'Hidden Canals of Uznair Abharamu Spawn',
Expand All @@ -40,19 +46,12 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '6568' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: uznairOutputStrings.spawn,
},
outputStrings: uznairOutputStrings,
},
{
id: 'Hidden Canals of Uznair Canal Crew Spawn',
// 6847 = Canal Onion
// 6848 = Canal Egg
// 6849 = Canal Garlic
// 6850 = Canal Tomato
// 6851 = Canal Queen
type: 'AddedCombatant',
netRegex: { npcNameId: ['684[7-9]', '685[01]'], capture: false },
netRegex: { npcNameId: canalCrewIds, capture: false },
suppressSeconds: 1,
infoText: (_data, _matches, output) => output.text!(),
outputStrings: {
Expand Down
8 changes: 2 additions & 6 deletions ui/raidboss/data/04-sb/map/the_lost_canals_of_uznair.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '6567' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: uznairOutputStrings.spawn,
},
outputStrings: uznairOutputStrings,
},
{
id: 'Lost Canals of Uznair Abharamu Spawn',
Expand All @@ -42,9 +40,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '6568' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: uznairOutputStrings.spawn,
},
outputStrings: uznairOutputStrings,
},
// ---------------- cage mobs ----------------
{
Expand Down
35 changes: 14 additions & 21 deletions ui/raidboss/data/04-sb/map/the_shifting_altars_of_uznair.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ const uznairOutputStrings = {
},
} as const;

const altarAssemblyIds = [
'7604', // Altar Onion
'7605', // Altar Egg
'7606', // Altar Garlic
'7607', // Altar Tomato
'7608', // Altar Queen
] as const;

export interface Data extends RaidbossData {
altarTotem?: boolean;
}
Expand All @@ -41,9 +49,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '7602' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: uznairOutputStrings.spawn,
},
outputStrings: uznairOutputStrings,
},
{
id: 'Shifting Altars of Uznair Altar Matanga Spawn',
Expand All @@ -52,19 +58,12 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '7603' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: uznairOutputStrings.spawn,
},
outputStrings: uznairOutputStrings,
},
{
id: 'Shifting Altars of Uznair Altar Assembly Spawn',
// 7604 = Altar Onion
// 7605 = Altar Egg
// 7606 = Altar Garlic
// 7607 = Altar Tomato
// 7608 = Altar Queen
type: 'AddedCombatant',
netRegex: { npcNameId: '760[4-8]', capture: false },
netRegex: { npcNameId: altarAssemblyIds, capture: false },
suppressSeconds: 1,
infoText: (_data, _matches, output) => output.text!(),
outputStrings: {
Expand Down Expand Up @@ -101,9 +100,7 @@ const triggerSet: TriggerSet<Data> = {
type: 'StartsUsing',
netRegex: { id: '3400', source: 'Altar Skatene', capture: false },
infoText: (_data, _matches, output) => output.adds!(),
outputStrings: {
adds: uznairOutputStrings.adds,
},
outputStrings: uznairOutputStrings,
},
{
id: 'Shifting Altars of Uznair Altar Totem Flames of Fury Collect',
Expand Down Expand Up @@ -253,9 +250,7 @@ const triggerSet: TriggerSet<Data> = {
type: 'StartsUsing',
netRegex: { id: '343A', source: 'Altar Mandragora', capture: false },
infoText: (_data, _matches, output) => output.adds!(),
outputStrings: {
adds: uznairOutputStrings.adds,
},
outputStrings: uznairOutputStrings,
},
{
id: 'Shifting Altars of Uznair Altar Airavata Huff',
Expand All @@ -281,9 +276,7 @@ const triggerSet: TriggerSet<Data> = {
type: 'StartsUsing',
netRegex: { id: '3436', source: 'The Great Gold Whisker', capture: false },
infoText: (_data, _matches, output) => output.adds!(),
outputStrings: {
adds: uznairOutputStrings.adds,
},
outputStrings: uznairOutputStrings,
},
// ---------------- final summon: Altar Apanda ----------------
{
Expand Down
23 changes: 11 additions & 12 deletions ui/raidboss/data/05-shb/map/the_dungeons_of_lyhe_ghiah.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ const lyheGhiahOutputStrings = {
},
} as const;

const dungeonCrewIds = [
'8684', // Dungeon Onion
'8685', // Dungeon Egg
'8686', // Dungeon Garlic
'8687', // Dungeon Tomato
'8688', // Dungeon Queen
] as const;

export type Data = RaidbossData;

const triggerSet: TriggerSet<Data> = {
Expand All @@ -32,9 +40,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '9774' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: lyheGhiahOutputStrings.spawn,
},
outputStrings: lyheGhiahOutputStrings,
},
{
id: 'Dungeons of Lyhe Ghiah The Keeper of the Keys Spawn',
Expand All @@ -43,19 +49,12 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '9773' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: lyheGhiahOutputStrings.spawn,
},
outputStrings: lyheGhiahOutputStrings,
},
{
id: 'Dungeons of Lyhe Ghiah Dungeon Crew Spawn',
// 8684 = Dungeon Onion
// 8685 = Dungeon Egg
// 8686 = Dungeon Garlic
// 8687 = Dungeon Tomato
// 8688 = Dungeon Queen
type: 'AddedCombatant',
netRegex: { npcNameId: '868[4-8]', capture: false },
netRegex: { npcNameId: dungeonCrewIds, capture: false },
suppressSeconds: 1,
infoText: (_data, _matches, output) => output.text!(),
outputStrings: {
Expand Down
31 changes: 13 additions & 18 deletions ui/raidboss/data/05-shb/map/the_shifting_oubliettes_of_lyhe_ghiah.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ const lyheGhiahOutputStrings = {
},
} as const;

const dungeonCrewIds = [
'9801', // Secret Onion
'9802', // Secret Egg
'9803', // Secret Garlic
'9804', // Secret Tomato
'9805', // Secret Queen
] as const;

export type Data = RaidbossData;

const triggerSet: TriggerSet<Data> = {
Expand All @@ -40,9 +48,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '9774' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: lyheGhiahOutputStrings.spawn,
},
outputStrings: lyheGhiahOutputStrings,
},
{
id: 'Shifting Oubliettes of Lyhe Ghiah The Keeper of the Keys Spawn',
Expand All @@ -51,19 +57,12 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '9773' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: lyheGhiahOutputStrings.spawn,
},
outputStrings: lyheGhiahOutputStrings,
},
{
id: 'Shifting Oubliettes of Lyhe Ghiah Dungeon Crew Spawn',
// 9801 = Secret Onion
// 9802 = Secret Egg
// 9803 = Secret Garlic
// 9804 = Secret Tomato
// 9805 = Secret Queen
type: 'AddedCombatant',
netRegex: { npcNameId: '980[1-5]', capture: false },
netRegex: { npcNameId: dungeonCrewIds, capture: false },
suppressSeconds: 1,
infoText: (_data, _matches, output) => output.text!(),
outputStrings: {
Expand Down Expand Up @@ -183,9 +182,7 @@ const triggerSet: TriggerSet<Data> = {
type: 'StartsUsing',
netRegex: { id: '54EA', source: 'Fuath Troublemaker', capture: false },
infoText: (_data, _matches, output) => output.adds!(),
outputStrings: {
adds: lyheGhiahOutputStrings.adds,
},
outputStrings: lyheGhiahOutputStrings,
},
{
id: 'Shifting Oubliettes of Lyhe Ghiah Secret Korrigan Ram',
Expand All @@ -204,9 +201,7 @@ const triggerSet: TriggerSet<Data> = {
type: 'StartsUsing',
netRegex: { id: '54AC', source: 'Secret Korrigan', capture: false },
infoText: (_data, _matches, output) => output.adds!(),
outputStrings: {
adds: lyheGhiahOutputStrings.adds,
},
outputStrings: lyheGhiahOutputStrings,
},
{
id: 'Shifting Oubliettes of Lyhe Ghiah Secret Keeper Heavy Scrapline',
Expand Down
23 changes: 11 additions & 12 deletions ui/raidboss/data/06-ew/map/the_excitatron_6000.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ const excitatronOutputStrings = {
},
} as const;

const excitingMandragorasIds = [
'10835', // Exciting Onion
'10836', // Exciting Egg
'10837', // Exciting Garlic
'10838', // Exciting Tomato
'10839', // Exciting Queen
] as const;

export type Data = RaidbossData;

const triggerSet: TriggerSet<Data> = {
Expand All @@ -32,9 +40,7 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '10834' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: excitatronOutputStrings.spawn,
},
outputStrings: excitatronOutputStrings,
},
{
id: 'Excitatron Golden Supporter Spawn',
Expand All @@ -43,19 +49,12 @@ const triggerSet: TriggerSet<Data> = {
netRegex: { npcNameId: '10833' },
suppressSeconds: 1,
infoText: (_data, matches, output) => output.spawn!({ name: matches.name }),
outputStrings: {
spawn: excitatronOutputStrings.spawn,
},
outputStrings: excitatronOutputStrings,
},
{
id: 'Excitatron Exciting Mandragoras Spawn',
// 10835 = Exciting Onion
// 10836 = Exciting Egg
// 10837 = Exciting Garlic
// 10838 = Exciting Tomato
// 10839 = Exciting Queen
type: 'AddedCombatant',
netRegex: { npcNameId: '1083[5-9]', capture: false },
netRegex: { npcNameId: excitingMandragorasIds, capture: false },
suppressSeconds: 1,
infoText: (_data, _matches, output) => output.text!(),
outputStrings: {
Expand Down
Loading
Loading