Skip to content

1.4.2 - Check objective rework#120

Merged
asilverthorn merged 2 commits intoff6wc:mainfrom
asilverthorn:1.4.2
Jan 4, 2024
Merged

1.4.2 - Check objective rework#120
asilverthorn merged 2 commits intoff6wc:mainfrom
asilverthorn:1.4.2

Conversation

@asilverthorn
Copy link
Collaborator

@asilverthorn asilverthorn commented Jan 2, 2024

Overview

As found in the 1 Jan 2024 100% race, you are able to specify 65 "checks" as an objective. Unfortunately, there are only 62 checks actually available. The difference is that these 5 "checks" aren't real checks -- their event logic doesn't call FinishCheck() to increment the check counter:

    NameBit("Kefka's Tower Ambush", event_bit.DEFEATED_INFERNO),         # 59
    NameBit("Kefka's Tower Guardian", event_bit.DEFEATED_GUARDIAN),      # 60
    NameBit("KT Left Triad Statue", event_bit.DEFEATED_DOOM),            # 61
    NameBit("KT Mid Triad Statue", event_bit.DEFEATED_POLTERGEIST),      # 62
    NameBit("KT Right Triad Statue", event_bit.DEFEATED_GODDESS),        # 63

"but wait! that would mean there's only 60 checks, not 62" -- well, the 2 Auction House checks aren't in the check_bit list but do increment the check counter.

This PR resolves both of those discrepancies.

It also shrinks the menu output for "All 1 of" type objectives to only list the 1 required objective.

History

PR in which these "checks" were added: AtmaTek#35
Specific commit: AtmaTek@89a6157
merged here: #17

Impact on existing flag strings

Any flag string that includes 11.59 (Kefka's Tower Ambush) - 11.64 (Narshe Moogle Defense) will not have the originally intended effect (62 - 64 will get an error)

11.64 (Narshe Moogle Defense) should be changed to 11.59.
11.59 (Kefka's Tower Ambush) - 11.63 (KT Right Triad Statue) are replaced with 12.10 - 12.14

Testing

Tested a flag string with these objectives:

-oe 69.1.1.12.10 -of 70.1.1.12.11 -og 71.1.1.12.12 -oh 72.1.1.12.13 -oi 73.1.1.12.14 -oj 8.1.1.11.59 -ok 62.1.1.11.60 -ol 9.1.1.11.61

Throughout the testing, I used the auto tracker to confirm that the right event bits are getting set and the event counter is incrementing where appropriate.

Menu:

obj_efg
obj_hij
obj_jkl

Confirmed that defeating KT locations triggers the objective reward but doesn't increment the check counter:

inferno
guardian
left_statue
mid_statue
right_statue

Confirmed that Moogle Defense award still works (it did increment the check counter):

moogle_def

Confirmed that completing "All 1 of" objective still greys out the check:

obj_j_completed

Confirmed that auction house 10K ("Auction 1") and 20K ("Auction 2") awards trigger:

auction_10k
auction_20k

@asilverthorn asilverthorn mentioned this pull request Jan 2, 2024
@asilverthorn asilverthorn merged commit 4c25d67 into ff6wc:main Jan 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants