Skip to content

Commit 9bc96c0

Browse files
authored
resources: add partnerStack and healerGroups responses (#925)
1 parent b08ae93 commit 9bc96c0

23 files changed

Lines changed: 33 additions & 117 deletions

File tree

docs/RaidbossGuide.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -867,10 +867,7 @@ so that timelines and triggers will work in French:
867867
type: 'StartsUsing',
868868
- netRegex: { id: '816D', source: 'Kokytos', capture: false },
869869
+ netRegex: { id: '816D', source: 'Cocyte', capture: false },
870-
alertText: (_data, _matches, output) => output.healerGroups!(),
871-
outputStrings: {
872-
healerGroups: Outputs.healerGroups,
873-
},
870+
response: Responses.healerGroups('alert'),
874871
},
875872
```
876873

docs/zh-CN/RaidbossGuide.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,7 @@ cactbot 中许多代码使用了 `LocaleText` 类型取代需要翻译的字符
520520
type: 'StartsUsing',
521521
- netRegex: { id: '816D', source: 'Kokytos', capture: false },
522522
+ netRegex: { id: '816D', source: 'Cocyte', capture: false },
523-
alertText: (_data, _matches, output) => output.healerGroups!(),
524-
outputStrings: {
525-
healerGroups: Outputs.healerGroups,
526-
},
523+
response: Responses.healerGroups('alert'),
527524
},
528525
```
529526

resources/responses.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,10 @@ export const Responses = {
356356
stackInTower: (sev?: Severity) => staticResponse(defaultAlertText(sev), Outputs.stackInTower),
357357
stackMiddle: (sev?: Severity) => staticResponse(defaultInfoText(sev), Outputs.stackMiddle),
358358
doritoStack: (sev?: Severity) => staticResponse(defaultAlertText(sev), Outputs.doritoStack),
359+
// for mechanics where you stack with your partner
360+
stackPartner: (sev?: Severity) => staticResponse(defaultInfoText(sev), Outputs.stackPartner),
361+
// for light party stacks (usually targeting both healers)
362+
healerGroups: (sev?: Severity) => staticResponse(defaultInfoText(sev), Outputs.healerGroups),
359363
spreadThenStack: (sev?: Severity) => {
360364
return staticResponse(defaultAlertText(sev), Outputs.spreadThenStack);
361365
},

ui/raidboss/data/04-sb/trial/seiryu-ex.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ const triggerSet: TriggerSet<Data> = {
2020
id: 'SeiryuEx Split Group',
2121
regex: /Forbidden Arts 1/,
2222
beforeSeconds: 4,
23-
infoText: (_data, _matches, output) => output.text!(),
24-
outputStrings: {
25-
text: Outputs.healerGroups,
26-
},
23+
response: Responses.healerGroups(),
2724
},
2825
{
2926
id: 'SeiryuEx Line Stack',

ui/raidboss/data/06-ew/raid/p2s.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,7 @@ const triggerSet: TriggerSet<Data> = {
105105
type: 'StartsUsing',
106106
netRegex: { id: '682B', source: 'Hippokampos', capture: false },
107107
suppressSeconds: 1,
108-
infoText: (_data, _matches, output) => output.groups!(),
109-
outputStrings: {
110-
groups: Outputs.healerGroups,
111-
},
108+
response: Responses.healerGroups(),
112109
},
113110
{
114111
id: 'P2S Mark of the Tides Collect',

ui/raidboss/data/06-ew/raid/p4s.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,7 @@ const triggerSet: TriggerSet<Data> = {
542542
id: 'P4S Lava Pinax',
543543
type: 'StartsUsing',
544544
netRegex: { id: '69D5', source: 'Hesperos', capture: false },
545-
infoText: (_data, _matches, output) => output.groups!(),
546-
outputStrings: {
547-
groups: Outputs.healerGroups,
548-
},
545+
response: Responses.healerGroups(),
549546
},
550547
{
551548
id: 'P4S Northerly Shift Slash',

ui/raidboss/data/06-ew/raid/p6s.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -613,11 +613,8 @@ const triggerSet: TriggerSet<Data> = {
613613
type: 'StartsUsing',
614614
netRegex: { id: ['7869', '786B'], source: 'Hegemone', capture: false },
615615
condition: (data) => !data.secondExocleavers,
616-
alertText: (_data, _matches, output) => output.healerGroups!(),
616+
response: Responses.healerGroups('alert'),
617617
run: (data) => data.secondExocleavers = true,
618-
outputStrings: {
619-
healerGroups: Outputs.healerGroups,
620-
},
621618
},
622619
{
623620
id: 'P6S Exocleaver Move',
@@ -635,10 +632,7 @@ const triggerSet: TriggerSet<Data> = {
635632
// are handled by P6S Exocleaver Healer Groups.
636633
condition: (data) => data.polyInstance === 3,
637634
suppressSeconds: 1,
638-
alertText: (_data, _matches, output) => output.healerGroups!(),
639-
outputStrings: {
640-
healerGroups: Outputs.healerGroups,
641-
},
635+
response: Responses.healerGroups('alert'),
642636
},
643637
{
644638
id: 'P6S Choros Ixou Front Back',

ui/raidboss/data/06-ew/raid/p9n.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Conditions from '../../../../../resources/conditions';
2-
import Outputs from '../../../../../resources/outputs';
32
import { Responses } from '../../../../../resources/responses';
43
import ZoneId from '../../../../../resources/zone_id';
54
import { RaidbossData } from '../../../../../types/data';
@@ -77,10 +76,7 @@ const triggerSet: TriggerSet<Data> = {
7776
id: 'P9N Archaic Demolish',
7877
type: 'StartsUsing',
7978
netRegex: { id: '812F', source: 'Kokytos', capture: false },
80-
alertText: (_data, _matches, output) => output.healerGroups!(),
81-
outputStrings: {
82-
healerGroups: Outputs.healerGroups,
83-
},
79+
response: Responses.healerGroups('alert'),
8480
},
8581
{
8682
id: 'P9N Front Combination + Inside Roundhouse',

ui/raidboss/data/06-ew/raid/p9s.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,7 @@ const triggerSet: TriggerSet<Data> = {
316316
id: 'P9S Archaic Demolish',
317317
type: 'StartsUsing',
318318
netRegex: { id: '816D', source: 'Kokytos', capture: false },
319-
alertText: (_data, _matches, output) => output.healerGroups!(),
320-
outputStrings: {
321-
healerGroups: Outputs.healerGroups,
322-
},
319+
response: Responses.healerGroups('alert'),
323320
},
324321
{
325322
// Ball of Levin combatants are added ~0.3 seconds after Kokytos finishes using Levinstrike Summoning

ui/raidboss/data/06-ew/trial/golbez-ex.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,7 @@ const triggerSet: TriggerSet<Data> = {
371371
type: 'StartsUsing',
372372
netRegex: { id: '8485', source: 'Golbez', capture: false },
373373
suppressSeconds: 3,
374-
alertText: (_data, _matches, output) => output.healerGroups!(),
375-
outputStrings: {
376-
healerGroups: Outputs.healerGroups,
377-
},
374+
response: Responses.healerGroups('alert'),
378375
},
379376
{
380377
id: 'GolbezEx Azdaja\'s Shadow Out Tell',

0 commit comments

Comments
 (0)