Skip to content

Commit

Permalink
triggers build: raidboss: minor Eureka Orthos additions/fixes (quisqu…
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Jul 8, 2023
1 parent af6c1f9 commit b83fc1e
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 15 deletions.
10 changes: 5 additions & 5 deletions 06-ew/deepdungeon/eureka_orthos_floors_21-30.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ Options.Triggers.push({
{
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 @@ -73,7 +73,7 @@ Options.Triggers.push({
'Orthos Brobinyak': 'Orthos-Brobinyak',
'Orthos Vanara': 'Orthos-Vanara',
'Orthoshelled Dragon': 'Orthos-Panzerdrache',
'Tiamat Clone': 'Tiamat-Klon',
'Tiamat\'s Clone': 'Tiamat-Klon',
},
},
{
Expand All @@ -84,7 +84,7 @@ Options.Triggers.push({
'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 @@ -95,7 +95,7 @@ Options.Triggers.push({
'Orthos Brobinyak': 'オルト・ブロビニャク',
'Orthos Vanara': 'オルト・ヴァナラ',
'Orthoshelled Dragon': 'オルト・カラペスドラゴン',
'Tiamat Clone': 'ティアマット・クローン',
'Tiamat\'s Clone': 'ティアマット・クローン',
},
},
],
Expand Down
14 changes: 7 additions & 7 deletions 06-ew/deepdungeon/eureka_orthos_floors_31-40.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Options.Triggers.push({
{
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 @@ -85,7 +85,7 @@ Options.Triggers.push({
{
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 @@ -101,7 +101,7 @@ Options.Triggers.push({
{
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 @@ -117,7 +117,7 @@ Options.Triggers.push({
{
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 @@ -132,7 +132,7 @@ Options.Triggers.push({
'Orthospider': 'Orthos-Spinne',
'Orthotaur': 'Orthotaurus',
'Phantom Orthoray': 'Orthos-Phantomschimmer',
'Twintania Clone': 'Twintania-Klon',
'Twintania\'s Clone': 'Twintania-Klon',
},
},
{
Expand All @@ -145,7 +145,7 @@ Options.Triggers.push({
'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 @@ -158,7 +158,7 @@ Options.Triggers.push({
'Orthospider': 'オルト・スパイダー',
'Orthotaur': 'オルト・ミノタウロス',
'Phantom Orthoray': 'オルト・ファントムレイ',
'Twintania Clone': 'ツインタニア・クローン',
'Twintania\'s Clone': 'ツインタニア・クローン',
},
},
],
Expand Down
28 changes: 27 additions & 1 deletion 06-ew/deepdungeon/eureka_orthos_floors_71-80.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ Options.Triggers.push({
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 @@ -98,6 +105,22 @@ Options.Triggers.push({
},
},
},
{
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 @@ -207,6 +230,7 @@ Options.Triggers.push({
timelineReplace: [
{
'locale': 'de',
'missingTranslations': true,
'replaceSync': {
'Bird of Orthos': 'Orthos-Vogel',
'Orthos Coeurl': 'Orthos-Coeurl',
Expand All @@ -223,6 +247,7 @@ Options.Triggers.push({
},
{
'locale': 'fr',
'missingTranslations': true,
'replaceSync': {
'Bird of Orthos': 'oiseau d\'Eurêka Orthos',
'Orthos Coeurl': 'coeurl Orthos',
Expand All @@ -239,6 +264,7 @@ Options.Triggers.push({
},
{
'locale': 'ja',
'missingTranslations': true,
'replaceSync': {
'Bird of Orthos': 'バード・オブ・オルト',
'Orthos Coeurl': 'オルト・クァール',
Expand Down
4 changes: 2 additions & 2 deletions 06-ew/raid/p12s.js
Original file line number Diff line number Diff line change
Expand Up @@ -2417,8 +2417,8 @@ Options.Triggers.push({
netRegex: { id: ['8331', '8336'], source: 'Pallas Athena' },
delaySeconds: (_data, matches) => {
if (matches.id === '8331')
// for Classical Concepts, 6.7 cast time + 1.5 for debuff/headmarker data (some variability)
return 8.2;
// for Classical Concepts, 6.7 cast time + 1.8 for shape/debuff/headmarker data (some variability)
return 8.5;
return 0; // for Panta Rhei, fire immediately once cast starts
},
durationSeconds: (data, matches) => {
Expand Down

0 comments on commit b83fc1e

Please sign in to comment.