diff --git a/ui/raidboss/data/07-dt/raid/r2s.ts b/ui/raidboss/data/07-dt/raid/r2s.ts index 048ca7f11b..8258747de9 100644 --- a/ui/raidboss/data/07-dt/raid/r2s.ts +++ b/ui/raidboss/data/07-dt/raid/r2s.ts @@ -11,6 +11,7 @@ export interface Data extends RaidbossData { beat?: 1 | 2 | 3; beatTwoOneStart?: boolean; beatTwoSpreadCollect: string[]; + tankLaserCollect: string[]; } const headMarkerData = { @@ -33,6 +34,7 @@ const triggerSet: TriggerSet = { initData: () => ({ partnersSpreadCounter: 0, beatTwoSpreadCollect: [], + tankLaserCollect: [], }), triggers: [ { @@ -107,10 +109,28 @@ const triggerSet: TriggerSet = { response: Responses.sharedTankBuster(), }, { - id: 'R2S Headmarker Cone Tankbuster', + id: 'R2S Headmarker Cone Tankbuster Collect', type: 'HeadMarker', netRegex: { id: headMarkerData.tankLaser, capture: true }, - response: Responses.tankCleave(), + run: (data, matches) => data.tankLaserCollect.push(matches.target), + }, + { + id: 'R2S Headmarker Cone Tankbuster', + type: 'HeadMarker', + netRegex: { id: headMarkerData.tankLaser, capture: false }, + delaySeconds: 0.1, + suppressSeconds: 5, + alertText: (data, _matches, output) => { + if (data.tankLaserCollect.includes(data.me)) + return output.cleaveOnYou!(); + + return output.avoidCleave!(); + }, + run: (data) => data.tankLaserCollect = [], + outputStrings: { + cleaveOnYou: Outputs.tankCleaveOnYou, + avoidCleave: Outputs.avoidTankCleave, + }, }, { id: 'R2S Headmarker Spread Collect',