1.4.2 - Check objective rework#120
Merged
Merged
Conversation
…ist; eliminating lines for 'All 1 of' objectives
Merged
dbldown11
approved these changes
Jan 2, 2024
ff6wc
added a commit
that referenced
this pull request
May 5, 2026
* Small Aesthetic Additions Palettes Added (10): - Alice-HoxNorf-Touhou - Alphys-LoneRedMage-Undertale - Amy-HoxNorf-Sonic - Frisk-LoneRedMage-Undertale - Gryz-HoxNorf-PS4 - Raja-HoxNorf-PS4 - Reimu (Blue)-HoxNorf-Touhou - Rune-HoxNorf-PS4 - Toriel-LoneRedMage-Undertale - Yuyuko-HoxNorf-Touhou Portraits Added (20): - Alice-HoxNorf-Touhou - Alma-Unknown-FFT - Alphys-LoneRedMage-Undertale - Amy-HoxNorf-Sonic - Cloud-JamesWhite89-FF7 - Fighter-CtrlxZ-FF1 - Frisk-LoneRedMage-Undertale - Gryz-HoxNorf-PS4 - Jessie-JamesWhite89-FF7 - Lenna (White Mage)-JamesWhite89-FF5 - Lenna-JamesWhite89-FF5 - Orlandeau-Unknown-FFT - Porom (Devout)-HoxNorf-FF4 - Raja-HoxNorf-PS4 - Ramza-Unknown-FFT - Reimu (Blue)-HoxNorf-Touhou - Rune-HoxNorf-PS4 - Sarisa-JamesWhite89-FF5 - Toriel-LoneRedMage-Undertale - Yuyuko-HoxNorf-Touhou Sprites Added (9): - Alice-HoxNorf-Touhou - Alphys-LoneRedMage-Undertale - Amy-HoxNorf-Sonic - Frisk-LoneRedMage-Undertale - Gryz-HoxNorf-PS4 - Raja-HoxNorf-PS4 - Rune-HoxNorf-PS4 - Toriel-LoneRedMage-Undertale - Yuyuko-HoxNorf-Touhou * Renamed Pirahna Plant-JamesWhite89-Mario to Piranha Plant-JamesWhite89-Mario * Sprite Additions and "Restorations" - New Sprites/Palettes (11): Arthur-JamesWhite89-GnG Cait Sith-HoxNorf-FF7 Donkey Kong-Badass-Mario Gilius-JamesWhite89-GoldenAxe Kain (Holy Dragoon)-CtrlxZ-FF4TAY Lugae-Astaroth-FF4 Nitori-HoxNorf-Touhou Sanae-HoxNorf-Touhou Sherlotta-HoxNorf_ScarabEnigma-FFCC Wren-HoxNorf-PS4 X-Badass-Megaman - New Portraits (30): Arthur-JamesWhite89-GnG Banon-Laurel_Gens-FF6PR Cait Sith-HoxNorf-FF7 Celes-Laurel_Gens-FF6PR Cyan-Laurel_Gens-FF6PR Donkey Kong-Badass-Mario Edgar-Laurel_Gens-FF6PR Gau-Laurel_Gens-FF6PR General Leo-Laurel_Gens-FF6PR Gilius-JamesWhite89-GoldenAxe Ghost-Laurel_Gens-FF6PR Gogo-Laurel_Gens-FF6PR Imp-Laurel_Gens-FF6PR Kain (Holy Dragoon)-Unknown-FF4TAY Locke-Laurel_Gens-FF6PR Lugae-HoxNorf-FF4 Mog-Laurel_Gens-FF6PR Nitori-HoxNorf-Touhou Relm-Laurel_Gens-FF6PR Sabin-Laurel_Gens-FF6PR Sanae-HoxNorf-Touhou Setzer-Laurel_Gens-FF6PR Shadow-Laurel_Gens-FF6PR Sherlotta-HoxNorf-FFCC Strago-Laurel_Gens-FF6PR Terra-Laurel_Gens-FF6PR Umaro-Laurel_Gens-FF6PR WedgeVicks-Laurel_Gens-FF6PR Wren-HoxNorf-PS4 X-Unknown-Megaman - "Restored" Sprites/Palettes (32): Antlion-Astaroth-FF4 Atma-Astaroth-FF6 Boy-Zozma-FF6 Cagnazzo-Astaroth-FF4 Celes (Amano)-Astaroth-FF6 Celes (Opera)-Astaroth-FF6 Clyde-PocoLoco-FF6 Cultist-PocoLoco-FF6 Dancer-PocoLoco-FF6 Dark Elf-Astaroth-FF4 Draco-PocoLoco-FF6 Elena-Astaroth-FF7 Figaro Guard-PocoLoco-FF6 Interceptor-JamesWhite89-FF6 Katarin-Zozma-FF6 Link-FEOK-LegendOfZelda LoneWolf-PocoLoco-FF6 Lucca-FEOK-CT Lufia-JamesWhite89-Lufia Maduin-PocoLoco-FF6 Mini-JamesWhite89-FF NarsheGuard-PocoLoco-FF6 Peach-Halkel-SMRPG Rubicante-Astaroth-FF4 Scholar-PocoLoco-FF6 Siegfried-PocoLoco-FF6 Squall (Uniform)-SApprentice-FF8 Squall-PocoLoco-FF8 Tifa-Astaroth-FF7 Ultros-PocoLoco-FF6 Vargas-PocoLoco-FF6 Vincent-FEOK-FF7 - "Restored" Portraits (3): Golbez_TAY-HoxNorf-FF4 Link-JamesWhite89-LegendOfZelda Vincent-Xeblon-FF7 * Removed Duplicate Entries in Python Files * Gave proper credit to the Lufia and Vincent portraits * New Aesthetic Additions New Sprites/Palettes (11): - Aria-HoxNorf-FF3 - Arle-HoxNorf-Madou - Marle-CtrlxZ-CT - Nakoruru-HoxNorf-SamSho - Noire-HoxNorf-Neptunia - Purple Sister-HoxNorf-Neptunia - Rash-JamesWhite89-Battletoads - Refia-HoxNorf-FF3 - Relm-HoxNorf-FF6PR - Simon-JamesWhite89-Castlevania - Tina-CtrlxZ-FF6 New Portraits (14): - Aria-JamesWhite89-FF3 - Arle-HoxNorf-Madou - Magus-asilverthorn-CT - Marle-CtrlxZ-CT - Nakoruru-HoxNorf-SamSho - Noire-JamesWhite89-Neptunia - Purple Sister-HoxNorf-Neptunia - Rash-JamesWhite89-Battletoads - Refia-JamesWhite89-FF3 - Santa_Olaf-asilverthorn-AW - Simon-JamesWhite89-Castlevania - Tina-CtrlxZ-FF6 - Vivi-asilverthorn-FF9 - Zidane-asilverthorn-FF9 * New Portraits by asilverthorn New Portraits (2): - Cloud-asilverthorn-Dissidia - Sephiroth-asilverthorn-Dissidia * Restorations and Additions New Sprites/Palettes (2): - Luneth-HoxNorf-FF3 - Malin-HoxNorf-KOF New Portraits (8): - Barret-HoxNorf-FF7 - Garnet (Long Hair)-HoxNorf-FF9 - Garnet (Short Hair)-HoxNorf-FF9 - Lightning-asilverthorn-Dissidia - Luneth-JamesWhite89-FF3 - Malin-HoxNorf-KOF - Steiner-HoxNorf-FF9 - Yuffie-CtrlxZ-KH "Restored" Portraits (3): - Figaro Guard-JamesWhite89-FF6 - Simon-JamesWhite89-Castlevania - Vincent-Xeblon-FF7 * New Portraits by Jones and Gens New Portraits (14): - Bartz-metalliguy_Gens-FF5 - Celes-Jones-FF6 - Chocobo-metalliguy_Gens-FF5 - Edgar-Jones-FF6 - Faris-metalliguy_Gens-FF5 - Galuf-metalliguy_Gens-FF5 - Gau-Jones-FF6 - Krile-metalliguy_Gens-FF5 - Lenna-metalliguy_Gens-FF5 - Locke-Jones-FF6 - Relm-Jones-FF6 - Sabin-Jones-FF6 - Terra-Jones-FF6 - Umaro-Jones-FF6 * New Sprites and Filling in Portraits New Sprites/Palettes (3): - Blaze-HoxNorf-Sonic - Toadette (Explorer)-HoxNorf-Mario - Xion-Kzinssie-KH New Portraits (6): - Blaze-HoxNorf-Sonic - Gau (Suit)-Tsushiy_Gens-FF6 - Gerad-Tsushiy_Gens-FF6 - Toadette (Explorer)-HoxNorf-Mario - Tohka-HoxNorf-DAL - Xion-Kzinssie-KH * 1.3.0 (#64) * New Aesthetic Additions New Palettes (10): - Cleon (Player 1)-HoxNorf-PB4 - Cleon (Player 2)-HoxNorf-PB4 - Doom Guy-JamesWhite89-Doom - Koishi-HoxNorf-Touhou - Lenna (Dancer)-HoxNorf-FF5 - Lenna (Ranger)-HoxNorf-FF5 - Lenna (Time Mage)-HoxNorf-FF5 - Ness-Badass-Mother - Satori-HoxNorf-Touhou - Tohka (Spirit)-HoxNorf-DAL New Portraits (11): - Bubble Dragon-Peebs-BB - Cleon-HoxNorf-PB4 - Doom Guy-JamesWhite89-Doom - Koishi-HoxNorf-Touhou - Lenna (Dancer)-JamesWhite89-FF5 - Lenna (Ranger)-JamesWhite89-FF5 - Lenna (Time Mage)-JamesWhite89-FF5 - Ness-Unknown-Mother - Reimu3-HoxNorf-Touhou - Satori-HoxNorf-Touhou - Tohka (Spirit)-HoxNorf-DAL New Sprites (9): - Cleon-HoxNorf-PB4 - Doom Guy-JamesWhite89-Doom - Koishi-HoxNorf-Touhou - Lenna (Dancer)-HoxNorf-FF5 - Lenna (Ranger)-HoxNorf-FF5 - Lenna (Time Mage)-HoxNorf-FF5 - Ness-Badass-Mother - Satori-HoxNorf-Touhou - Tohka (Spirit)-HoxNorf-DAL * 1.3.1 (#99) - Chest Random Monster bug has been fixed (there was one buggy event encounter that was missed in 1.3.0 and is now removed from the random possibilities) - New "Auto" status objective results: Dark, Clear, and Imp. Like the others, these get applied at the start of each battle. - New sprites & portraits Co-authored-by: HoxNorf <45671870+HoxNorf@users.noreply.github.com> * add Lone Wolf & Tzen checks to NFP * remove Tzen Thief, add Mt Zozo to NFP setting * New Aesthetic Additions * New Portraits (6) - Daryl-IvaarForkbeard-FF6 - Eirin-HoxNorf-Touhou - Riku-HoxNorf-KH - Suika-HoxNorf-Touhou - Umaro (Morph)-CDude-FF6 - Yamame-HoxNorf-Touhou * New Sprites/Palettes (5): - Daryl-IvaarForkbeard_Odbarc-FF6 - Eirin-HoxNorf-Touhou] - Riku-HoxNorf-KH - Suika-HoxNorf-Touhou - Yamame-HoxNorf-Touhou * Last Few Aesthetic Additions New Sprites/Palettes (8): - Samus-Badass-Metroid - Ridley-JamesWhite89-Metroid - Marth-HoxNorf-FE - Bartz (Knight)-HoxNorf-FF5 - Lenna (Knight)-HoxNorf-FF5 - Lenna (Thief)-HoxNorf-FF5 - Lenna (Summoner)-HoxNorf-FF5 - Lenna (Beastmaster)-HoxNorf-FF5 New Portraits (7): - Samus-Unknown-Metroid - Ridley-JamesWhite89-Metroid - Marth-HoxNorf-FE - Lenna (Knight)-JamesWhite89-FF5 - Lenna (Thief)-JamesWhite89-FF5 - Lenna (Summoner)-JamesWhite89-FF5 - Lenna (Beastmaster)-JamesWhite89-FF5 * 1.4.0 (#116) Feature: Added flags for tiered equipable equipment and tiered equipable relics (doubledown) Feature: Added flag to customize list of potential item rewards from checks (doubledown) Feature: Split esper spells flags into separate flags for spells and learn rate (doubledown) Feature: Throwable and Restoratives objectives (doubledown) Feature: IronMog Mode flag to prevent saving in seeds (asilverthorn) Feature: Added High Tier Weapon, High Tier Armor, High Tier Shld, High Tier Helm, and High Tier Relic as objective results (asilverthorn) QoL: Eliminated in-game RNG with fixed encounter - every runner will encounter the same enemies at the same fixed encounters (asilverthorn) QoL: Eliminated random fixed encounters on Lete River - now, Left/Right will always be 4 encounters, Straight will be 5. Going Up will add 2 encounters. (asilverthorn). Ref: Eliminating in-game RNG in fixed encounters #114 QoL: Reduced Poison pixelation (franklin) QoL: Add Mt. Zozo and Lone Wolf to No Free Characters/Espers (TheShwantz27) Bugfix: Fixed Relm's theme playing at the Owzer's Mansion if it's a different character (asilverthorn) Other: Removed the L. from "Remove L. Spells" in the flags menu to avoid confusion (asilverthorn) Other: Deprecated Random RNG (-rr) flag - it's always on (doubledown) Other: Deprecated Randomize Clock (-rc) flag - it's always on (doubledown) Other: Made Lone Wolf character reward play the character's theme and Updated Terra's theme to "Terra's Theme" from "Awakening" (asilverthorn) Other: Locke's Theme will continue to play through Narshe Moogle Defense non-boss battles (asilverthorn) Other: New Sprites and Portraits (HoxNorf) * fix bug with Phoenix Cave & KT skip for mid path * fix bug with Phoenix Cave & KT skip for mid path * 1.4.1 (#118) * fix bug with Phoenix Cave & KT skip for mid path --------- Co-authored-by: Brian - TheShwantz27 <briguy7727@yahoo.com> * 1.4.2 - Check objective rework (#120) * moving KT non-checks to quests; adding AH checks to check objective list; eliminating lines for 'All 1 of' objectives * Update arguments.py allow for -o to handle directories. (gives the default filename at the specified directory if no filename is given) * New Aesthetic Update New Sprites/Palettes (9): - Flowey-pomariin-Undertale - Kirby-HoxNorf-Kirby - Miko-HoxNorf-Touhou - Mokou-HoxNorf-Touhou - Purple Heart-HoxNorf-Touhou - Reimu (PC98)-HoxNorf-Touhou - Shulk-HoxNorf-Xenoblade - Toadette (Sailor)-HoxNorf-Mario - Youmu-HoxNorf-Touhou Updated Sprites (4): - Hotaru-HoxNorf-MOTW - Peach-Halkel-SMRPG - Toadette (Explorer)-HoxNorf-Mario - Toadette-HoxNoed-Mario New Portraits (9): - Flowey-pomariin-Undertale - Kirby-Unknown-Kirby - Miko-HoxNorf-Touhou - Mokou-HoxNorf-Touhou - Purple Heart-HoxNorf-Touhou - Reimu (PC98)-HoxNorf-Touhou - Shulk-HoxNorf-Xenoblade - Toadette (Sailor)-HoxNorf-Mario - Youmu-HoxNorf-Touhou Removed Portraits (1): - Wolf-JamesWhite89-Startfox (unneeded duplicate due to a typo of Wolf-JamesWhite89-Starfox) * New Additions * New Sprites/Palettes (2): - Meiling-HoxNorf-Touhou - Olimar-HoxNorf-Pikmin * New Portraits (2): - Meiling-HoxNorf-Touhou - Olimar-HoxNorf-Pikmin * update Coliseum display for shuffle+random * update Coliseum display for shuffle+random, include %s * update display for Coliseum opponents & rewards * More Additions * New Sprites/Palettes (4): - Alys-HoxNorf-PS4 - Chaz-HoxNorf-PS4 - Tao-HoxNorf-Shining - Tycoon-HoxNorf-FF5 * New Portraits (4): - Alys-HoxNorf-PS4 - Chaz-HoxNorf-PS4 - Tao-HoxNorf-Shining - Tycoon-metalliguy_Gens-FF5 * More Additions for Graphics * New Sprites/Palettes (5): - Demi-HoxNorf-PS4 - Falco-Badass-Starfox - Fox-CtrlxZ-Starfox - Lutz-HoxNorf-PS1 - Yukari-HoxNorf-Touhou * New Portraits (5): - Demi-HoxNorf-PS4 - Falco-JamesWhite89-Starfox - Fox-JamesWhite89-Starfox - Lutz-HoxNorf-PS1 - Yukari-HoxNorf-Touhou * Fixing bug where multiple items can be received from PT reward * Removing Mt. Zozo from No Free Characters/Espers (reverting 1.4.0) due to it breaking 100% seeds * Adding -scan to output logs when set * Removing debug output and increasing version * Removed chance of Dried Meat being placed in Figaro Castle WOR shops * Removed reference to depreciated code from Phantom Train check and expanded -sdm input range * Supporting newer versions of python * switching from list to sorted to ensure deterministic behavior. Thanks beauxq * New Aesthetic Additions (1.4.3) New Sprites/Palettes (6): - Bartz (Dancer)-HoxNorf-FF5 - Bow-HoxNorf-Mario - Ike (Ranger)-HoxNorf-FE - Marisa2-HoxNorf-Touhou - Megumin-HoxNorf-Konosuba - Tewi-HoxNorf-Touhou Updated Sprites/Palettes (1): - Iffy-HoxNorf-Neptunia New Portraits (4): - Bow-HoxNorf-Mario - Ike (Ranger)-HoxNorf-FE - Megumin-HoxNorf-Konosuba - Tewi-HoxNorf-Touhou * prevent random boss + Unlock Kefka requirements from softlocks * prevent random boss + Unlock Kefka requirements from softlocks * prevent random boss + Unlock Kefka requirements from softlocks * prevent random boss + Unlock Kefka requirements from softlocks --------- Co-authored-by: HoxNorf <45671870+HoxNorf@users.noreply.github.com> Co-authored-by: Brian - TheShwantz27 <briguy7727@yahoo.com> Co-authored-by: Brian - TheShwantz27 <106110257+BriGuy7727@users.noreply.github.com> Co-authored-by: rblakedavis <48291641+rblakedavis@users.noreply.github.com> Co-authored-by: dbldown11 <45882117+dbldown11@users.noreply.github.com> Co-authored-by: FF6 Worlds Collide <115676184+ff6wc@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
"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 to11.59.11.59(Kefka's Tower Ambush) -11.63(KT Right Triad Statue) are replaced with12.10-12.14Testing
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.61Throughout 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:
Confirmed that defeating KT locations triggers the objective reward but doesn't increment the check counter:
Confirmed that Moogle Defense award still works (it did increment the check counter):
Confirmed that completing "All 1 of" objective still greys out the check:
Confirmed that auction house 10K ("Auction 1") and 20K ("Auction 2") awards trigger: