Merge remote-tracking branch 'upstream/main'

Author: xiashtra

docs/RaidbossGuide.md

@@ -867,10 +867,7 @@ so that timelines and triggers will work in French:
        type: 'StartsUsing',
 -      netRegex: { id: '816D', source: 'Kokytos', capture: false },
 +      netRegex: { id: '816D', source: 'Cocyte', capture: false },
-       alertText: (_data, _matches, output) => output.healerGroups!(),
-       outputStrings: {
-         healerGroups: Outputs.healerGroups,
-       },
+       response: Responses.healerGroups('alert'),
      },
 ```
 

docs/zh-CN/RaidbossGuide.md

@@ -520,10 +520,7 @@ cactbot 中许多代码使用了 `LocaleText` 类型取代需要翻译的字符
        type: 'StartsUsing',
 -      netRegex: { id: '816D', source: 'Kokytos', capture: false },
 +      netRegex: { id: '816D', source: 'Cocyte', capture: false },
-       alertText: (_data, _matches, output) => output.healerGroups!(),
-       outputStrings: {
-         healerGroups: Outputs.healerGroups,
-       },
+       response: Responses.healerGroups('alert'),
      },
 ```
 

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "cactbot",
-  "version": "0.36.1",
-  "releaseSummary": "Doomtrain EX, M9N, M11N, M12N, Tsukuyomi Unreal, Mistwake, i18n",
+  "version": "0.36.2",
+  "releaseSummary": "Doomtrain normal, m10n, i18n",
   "releaseInDraft": "true",
   "license": "Apache-2.0",
   "type": "module",

package.json

@@ -21,5 +21,5 @@
 // - Revision
 // GitHub has only 3 version components, so Revision should always be 0.
 // CactbotOverlay and CactbotEventSource version should match.
-[assembly: AssemblyVersion("0.36.1.0")]
-[assembly: AssemblyFileVersion("0.36.1.0")]
+[assembly: AssemblyVersion("0.36.2.0")]
+[assembly: AssemblyFileVersion("0.36.2.0")]

plugin/CactbotEventSource/Properties/AssemblyInfo.cs

@@ -20,5 +20,5 @@
 // - Build Number
 // - Revision
 // GitHub has only 3 version components, so Revision should always be 0.
-[assembly: AssemblyVersion("0.36.1.0")]
-[assembly: AssemblyFileVersion("0.36.1.0")]
+[assembly: AssemblyVersion("0.36.2.0")]
+[assembly: AssemblyFileVersion("0.36.2.0")]

plugin/CactbotOverlay/Properties/AssemblyInfo.cs

@@ -356,6 +356,10 @@ export const Responses = {
   stackInTower: (sev?: Severity) => staticResponse(defaultAlertText(sev), Outputs.stackInTower),
   stackMiddle: (sev?: Severity) => staticResponse(defaultInfoText(sev), Outputs.stackMiddle),
   doritoStack: (sev?: Severity) => staticResponse(defaultAlertText(sev), Outputs.doritoStack),
+  // for mechanics where you stack with your partner
+  stackPartner: (sev?: Severity) => staticResponse(defaultInfoText(sev), Outputs.stackPartner),
+  // for light party stacks (usually targeting both healers)
+  healerGroups: (sev?: Severity) => staticResponse(defaultInfoText(sev), Outputs.healerGroups),
   spreadThenStack: (sev?: Severity) => {
     return staticResponse(defaultAlertText(sev), Outputs.spreadThenStack);
   },

resources/responses.ts

@@ -20,10 +20,7 @@ const triggerSet: TriggerSet<Data> = {
       id: 'SeiryuEx Split Group',
       regex: /Forbidden Arts 1/,
       beforeSeconds: 4,
-      infoText: (_data, _matches, output) => output.text!(),
-      outputStrings: {
-        text: Outputs.healerGroups,
-      },
+      response: Responses.healerGroups(),
     },
     {
       id: 'SeiryuEx Line Stack',

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

@@ -105,10 +105,7 @@ const triggerSet: TriggerSet<Data> = {
       type: 'StartsUsing',
       netRegex: { id: '682B', source: 'Hippokampos', capture: false },
       suppressSeconds: 1,
-      infoText: (_data, _matches, output) => output.groups!(),
-      outputStrings: {
-        groups: Outputs.healerGroups,
-      },
+      response: Responses.healerGroups(),
     },
     {
       id: 'P2S Mark of the Tides Collect',

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

@@ -542,10 +542,7 @@ const triggerSet: TriggerSet<Data> = {
       id: 'P4S Lava Pinax',
       type: 'StartsUsing',
       netRegex: { id: '69D5', source: 'Hesperos', capture: false },
-      infoText: (_data, _matches, output) => output.groups!(),
-      outputStrings: {
-        groups: Outputs.healerGroups,
-      },
+      response: Responses.healerGroups(),
     },
     {
       id: 'P4S Northerly Shift Slash',