From 369704f88dcfdb3e3f0698d504f9ac6711046568 Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Thu, 14 Dec 2023 22:59:49 -0800 Subject: [PATCH] oopsy: fix Aloalo tornado mistake (#6015) --- .../data/06-ew/dungeon/another_aloalo_island-savage.ts | 5 ++--- ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island.ts | 5 ++--- ui/oopsyraidsy/oopsy_common.ts | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island-savage.ts b/ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island-savage.ts index 09811c911f..3e7f67273f 100644 --- a/ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island-savage.ts +++ b/ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island-savage.ts @@ -8,7 +8,7 @@ import ZoneId from '../../../../../resources/zone_id'; import { OopsyData } from '../../../../../types/data'; import { OopsyMistakeType, OopsyTrigger, OopsyTriggerSet } from '../../../../../types/oopsy'; import { LocaleText } from '../../../../../types/trigger'; -import { playerDamageFields } from '../../../oopsy_common'; +import { playerDamageFields, playerTargetFields } from '../../../oopsy_common'; // TODO: people who missed their 8AE2 Burst tower // TODO: failing 8BEB Radiance orb damage during Analysis @@ -29,8 +29,7 @@ const renameMistake = ( return { id: triggerId, type: 'Ability', - netRegex: NetRegexes.ability({ id: abilityId, ...playerDamageFields }), - condition: (data, matches) => data.DamageFromMatches(matches) > 0, + netRegex: NetRegexes.ability({ id: abilityId, ...playerTargetFields }), mistake: (_data, matches) => { return { type: type, diff --git a/ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island.ts b/ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island.ts index 5b14bd7848..0b8154e1b4 100644 --- a/ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island.ts +++ b/ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island.ts @@ -3,7 +3,7 @@ import ZoneId from '../../../../../resources/zone_id'; import { OopsyData } from '../../../../../types/data'; import { OopsyMistakeType, OopsyTrigger, OopsyTriggerSet } from '../../../../../types/oopsy'; import { LocaleText } from '../../../../../types/trigger'; -import { playerDamageFields } from '../../../oopsy_common'; +import { playerDamageFields, playerTargetFields } from '../../../oopsy_common'; // TODO: people who missed their 8AC2 Burst tower // TODO: failing 8894 Radiance orb damage during Analysis @@ -24,8 +24,7 @@ const renameMistake = ( return { id: triggerId, type: 'Ability', - netRegex: NetRegexes.ability({ id: abilityId, ...playerDamageFields }), - condition: (data, matches) => data.DamageFromMatches(matches) > 0, + netRegex: NetRegexes.ability({ id: abilityId, ...playerTargetFields }), mistake: (_data, matches) => { return { type: type, diff --git a/ui/oopsyraidsy/oopsy_common.ts b/ui/oopsyraidsy/oopsy_common.ts index ca34099c18..4691e9a2cb 100644 --- a/ui/oopsyraidsy/oopsy_common.ts +++ b/ui/oopsyraidsy/oopsy_common.ts @@ -22,7 +22,7 @@ export const damageFields = { }; export const playerTargetFields = { - targetId: '[^4].......', + targetId: '1.......', }; export const playerDamageFields = {