Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

oopsy: fix Aloalo tornado mistake #6015

Merged
merged 1 commit into from
Dec 15, 2023
Merged

oopsy: fix Aloalo tornado mistake #6015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island-savage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions ui/oopsyraidsy/data/06-ew/dungeon/another_aloalo_island.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ui/oopsyraidsy/oopsy_common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const damageFields = {
};

export const playerTargetFields = {
targetId: '[^4].......',
targetId: '1.......',
};

export const playerDamageFields = {
Expand Down