oopsy: fix Aloalo tornado mistake (#6015)

quisquous · Dec 15, 2023 · 369704f · 369704f
1 parent 5034217
commit 369704f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -22,7 +22,7 @@ export const damageFields = {
 };
 
 export const playerTargetFields = {
- targetId: '[^4].......',
+ targetId: '1.......',
 };
 
 export const playerDamageFields = {