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: minor Eureka Orthos additions/fixes #5645

Merged
merged 2 commits into from
Jul 8, 2023
Merged

raidboss: minor Eureka Orthos additions/fixes #5645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95e6053
raidboss: minor Eureka Orthos additions/fixes
quisquous Jul 5, 2023
3d4ff52
twintania clone
quisquous Jul 5, 2023
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
10 changes: 5 additions & 5 deletions ui/raidboss/data/06-ew/deepdungeon/eureka_orthos_floors_21-30.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ const triggerSet: TriggerSet<Data> = {
{
id: 'EO 21-30 Tiamat Clone Dark Wyrmwing',
type: 'StartsUsing',
netRegex: { id: '7C65', source: 'Tiamat Clone', capture: false },
netRegex: { id: '7C65', source: 'Tiamat\'s Clone', capture: false },
response: Responses.goMiddle(),
},
{
id: 'EO 21-30 Tiamat Clone Dark Wyrmtail',
type: 'StartsUsing',
netRegex: { id: '7C63', source: 'Tiamat Clone', capture: false },
netRegex: { id: '7C63', source: 'Tiamat\'s Clone', capture: false },
response: Responses.goSides(),
},
{
Expand Down Expand Up @@ -84,7 +84,7 @@ const triggerSet: TriggerSet<Data> = {
'Orthos Brobinyak': 'Orthos-Brobinyak',
'Orthos Vanara': 'Orthos-Vanara',
'Orthoshelled Dragon': 'Orthos-Panzerdrache',
'Tiamat Clone': 'Tiamat-Klon',
'Tiamat\'s Clone': 'Tiamat-Klon',
},
},
{
Expand All @@ -95,7 +95,7 @@ const triggerSet: TriggerSet<Data> = {
'Orthos Brobinyak': 'brobinyak Orthos',
'Orthos Vanara': 'vanara Orthos',
'Orthoshelled Dragon': 'dragon Orthos à carapace',
'Tiamat Clone': 'clone de Tiamat',
'Tiamat\'s Clone': 'clone de Tiamat',
},
},
{
Expand All @@ -106,7 +106,7 @@ const triggerSet: TriggerSet<Data> = {
'Orthos Brobinyak': 'オルト・ブロビニャク',
'Orthos Vanara': 'オルト・ヴァナラ',
'Orthoshelled Dragon': 'オルト・カラペスドラゴン',
'Tiamat Clone': 'ティアマット・クローン',
'Tiamat\'s Clone': 'ティアマット・クローン',
},
},
],
Expand Down
14 changes: 7 additions & 7 deletions ui/raidboss/data/06-ew/deepdungeon/eureka_orthos_floors_31-40.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const triggerSet: TriggerSet<Data> = {
{
id: 'EO 31-40 Twintania Clone Twister',
type: 'StartsUsing',
netRegex: { id: '7AEC', source: 'Twintania Clone' },
netRegex: { id: '7AEC', source: 'Twintania\'s Clone' },
delaySeconds: (_data, matches) => parseFloat(matches.castTime) - 1,
alertText: (_data, _matches, output) => output.text!(),
outputStrings: {
Expand All @@ -96,7 +96,7 @@ const triggerSet: TriggerSet<Data> = {
{
id: 'EO 31-40 Twintania Clone Twisting Dive Divebomb',
type: 'StartsUsing',
netRegex: { id: '7AEF', source: 'Twintania Clone', capture: false },
netRegex: { id: '7AEF', source: 'Twintania\'s Clone', capture: false },
alertText: (_data, _matches, output) => output.text!(),
outputStrings: {
text: {
Expand All @@ -112,7 +112,7 @@ const triggerSet: TriggerSet<Data> = {
{
id: 'EO 31-40 Twintania Clone Twisting Dive Twisters',
type: 'Ability',
netRegex: { id: '7AEF', source: 'Twintania Clone', capture: false },
netRegex: { id: '7AEF', source: 'Twintania\'s Clone', capture: false },
alertText: (_data, _matches, output) => output.text!(),
outputStrings: {
text: {
Expand All @@ -128,7 +128,7 @@ const triggerSet: TriggerSet<Data> = {
{
id: 'EO 31-40 Twintania Clone Turbine',
type: 'StartsUsing',
netRegex: { id: '7AEB', source: 'Twintania Clone', capture: false },
netRegex: { id: '7AEB', source: 'Twintania\'s Clone', capture: false },
response: Responses.knockback(),
},
],
Expand All @@ -143,7 +143,7 @@ const triggerSet: TriggerSet<Data> = {
'Orthospider': 'Orthos-Spinne',
'Orthotaur': 'Orthotaurus',
'Phantom Orthoray': 'Orthos-Phantomschimmer',
'Twintania Clone': 'Twintania-Klon',
'Twintania\'s Clone': 'Twintania-Klon',
},
},
{
Expand All @@ -156,7 +156,7 @@ const triggerSet: TriggerSet<Data> = {
'Orthospider': 'araignée Orthos',
'Orthotaur': 'minotaure Orthos',
'Phantom Orthoray': 'rayon fantomatique Orthos',
'Twintania Clone': 'clone de Gémellia',
'Twintania\'s Clone': 'clone de Gémellia',
},
},
{
Expand All @@ -169,7 +169,7 @@ const triggerSet: TriggerSet<Data> = {
'Orthospider': 'オルト・スパイダー',
'Orthotaur': 'オルト・ミノタウロス',
'Phantom Orthoray': 'オルト・ファントムレイ',
'Twintania Clone': 'ツインタニア・クローン',
'Twintania\'s Clone': 'ツインタニア・クローン',
},
},
],
Expand Down
28 changes: 27 additions & 1 deletion ui/raidboss/data/06-ew/deepdungeon/eureka_orthos_floors_71-80.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,14 @@ const triggerSet: TriggerSet<Data> = {
id: 'EO 71-80 Orthos Gulo Gulo the Killing Paw',
type: 'StartsUsing',
netRegex: { id: '81A9', source: 'Orthos Gulo Gulo', capture: false },
response: Responses.getBehind(),
durationSeconds: 5,
alertText: (_data, _matches, output) => output.getBehind!(),
outputStrings: {
getBehind: {
// Telegraphed Killing Paw swipe (81A9) followed by untelegraphed Savage Swipe (7F8E).
en: 'Get Behind (Stay Behind)',
},
},
},
{
id: 'EO 71-80 Orthos Skatene Chirp',
Expand Down Expand Up @@ -113,6 +120,22 @@ const triggerSet: TriggerSet<Data> = {
},
},
},
{
id: 'EO 71-80 Orthos Sasquatch Ripe Banana',
type: 'StartsUsing',
// Sasquatch casts Ripe Banana (81AB) for 2s, then ~3s later casts Chest Thump (7FA8) for 0.1s.
// These can be hard to spot, so this gives a ~5s warning to hide even if you can't see it.
netRegex: { id: '81AB', source: 'Orthos Sasquatch' },
alertText: (_data, matches, output) => output.breakLOS!({ name: matches.source }),
outputStrings: {
breakLOS: {
en: 'Break line-of-sight to ${name}',
de: 'Unterbreche Sichtlinie zu ${name}',
ja: '${name}の視線から隠れる',
ko: '${name}의 시야 밖으로 숨기',
},
},
},
// ---------------- Floor 80 Boss: Proto-Kaliya ----------------
{
id: 'EO 71-80 Proto-Kaliya Resonance',
Expand Down Expand Up @@ -225,6 +248,7 @@ const triggerSet: TriggerSet<Data> = {
timelineReplace: [
{
'locale': 'de',
'missingTranslations': true,
'replaceSync': {
'Bird of Orthos': 'Orthos-Vogel',
'Orthos Coeurl': 'Orthos-Coeurl',
Expand All @@ -241,6 +265,7 @@ const triggerSet: TriggerSet<Data> = {
},
{
'locale': 'fr',
'missingTranslations': true,
'replaceSync': {
'Bird of Orthos': 'oiseau d\'Eurêka Orthos',
'Orthos Coeurl': 'coeurl Orthos',
Expand All @@ -257,6 +282,7 @@ const triggerSet: TriggerSet<Data> = {
},
{
'locale': 'ja',
'missingTranslations': true,
'replaceSync': {
'Bird of Orthos': 'バード・オブ・オルト',
'Orthos Coeurl': 'オルト・クァール',
Expand Down