1.4 dev

.gitignore

@@ -2,4 +2,5 @@ __pycache__/
 *.py[cod]
 $py.class
 *-objective.json
-*-flag.json
+*-flag.json
+wip/

README.md

@@ -6,8 +6,8 @@ Complete objectives while searching the worlds for characters, espers, and items
 
 ## Links
 
-###### Start playing: [ff6wc.com](https://www.ff6wc.com)
-###### More Info: [wiki.ff6wc.com](https://wiki.ff6wc.com)
+###### Start playing: [ff6worldscollide.com](https://www.ff6worldscollide.com)
+###### More Info: [wiki.ff6worldscollide.com](https://wiki.ff6worldscollide.com)
 ###### Community: [discord](https://discord.gg/5MPeng5)
 
 ## Usage

args/auction_house.py

@@ -31,10 +31,10 @@ def flags(args):
 
 def options(args):
     return [
-        ("Randomize Items", args.auction_random_items),
-        ("No Chocobo/Airship", args.auction_no_chocobo_airship),
-        ("Door Esper Hint", args.auction_door_esper_hint),
-        ("Max Espers", args.auction_max_espers),
+        ("Randomize Items", args.auction_random_items, "auction_random_items"),
+        ("No Chocobo/Airship", args.auction_no_chocobo_airship, "auction_no_chocobo_airship"),
+        ("Door Esper Hint", args.auction_door_esper_hint, "auction_door_esper_hint"),
+        ("Max Espers", args.auction_max_espers, "auction_max_espers"),
     ]
 
 def menu(args):

args/blitzes.py

@@ -24,8 +24,8 @@ def flags(args):
 
 def options(args):
     return [
-        ("Bum Rush Last", args.bum_rush_last),
-        ("Everyone Learns", args.blitzes_everyone_learns),
+        ("Bum Rush Last", args.bum_rush_last, "bum_rush_last"),
+        ("Everyone Learns", args.blitzes_everyone_learns, "blitzes_everyone_learns"),
     ]
 
 def menu(args):

args/boss_ai.py

@@ -31,10 +31,10 @@ def flags(args):
 
 def options(args):
     return [
-        ("Doom Gaze No Escape", args.doom_gaze_no_escape),
-        ("Wrexsoul No Zinger", args.wrexsoul_no_zinger),
-        ("MagiMaster No Ultima", args.magimaster_no_ultima),
-        ("Chadarnook More Demon", args.chadarnook_more_demon),
+        ("Doom Gaze No Escape", args.doom_gaze_no_escape, "doom_gaze_no_escape"),
+        ("Wrexsoul No Zinger", args.wrexsoul_no_zinger, "wrexsoul_no_zinger"),
+        ("MagiMaster No Ultima", args.magimaster_no_ultima, "magimaster_no_ultima"),
+        ("Chadarnook More Demon", args.chadarnook_more_demon, "chadarnook_more_demon"),
     ]
 
 def menu(args):

args/bosses.py

@@ -92,25 +92,25 @@ def options(args):
         statue_battles = args.statue_boss_location.capitalize()
 
     return [
-        ("Boss Battles", boss_battles),
-        ("Dragons", dragon_battles),
-        ("Statues", statue_battles),
-        ("Shuffle/Random Phunbaba 3", args.shuffle_random_phunbaba3),
-        ("Normalize & Distort Stats", args.boss_normalize_distort_stats),
-        ("Boss Experience", args.boss_experience),
-        ("No Undead", args.boss_no_undead),
-        ("Marshal Keep Lobos", args.boss_marshal_keep_lobos),
+        ("Boss Battles", boss_battles, "boss_battles"),
+        ("Dragons", dragon_battles, "dragon_battles"),
+        ("Statues", statue_battles, "statue_battles"),
+        ("Shuffle/Random Phunbaba 3", args.shuffle_random_phunbaba3, "shuffle_random_phunbaba3"),
+        ("Normalize & Distort Stats", args.boss_normalize_distort_stats, "boss_normalize_distort_stats"),
+        ("Boss Experience", args.boss_experience, "boss_experience"),
+        ("No Undead", args.boss_no_undead, "boss_no_undead"),
+        ("Marshal Keep Lobos", args.boss_marshal_keep_lobos, "boss_marshal_keep_lobos"),
     ]
 
 def menu(args):
     entries = options(args)
     for index, entry in enumerate(entries):
-        key, value = entry
+        key, value, unique_name = entry
 
         if key == "Shuffle/Random Phunbaba 3":
-            entries[index] = ("Mix Phunbaba 3", value)
+            entries[index] = ("Mix Phunbaba 3", value, unique_name)
         elif key == "Normalize & Distort Stats":
-            entries[index] = ("Normalize & Distort", value)
+            entries[index] = ("Normalize & Distort", value, unique_name)
     return (name(), entries)
 
 def log(args):

args/bug_fixes.py

@@ -47,14 +47,14 @@ def flags(args):
 
 def options(args):
     return [
-        ("Sketch", args.fix_sketch),
-        ("Evade", args.fix_evade),
-        ("Vanish/Doom", args.fix_vanish_doom),
-        ("Retort", args.fix_retort),
-        ("Jump", args.fix_jump),
-        ("Boss Skip", args.fix_boss_skip),
-        ("Enemy Damage Counter", args.fix_enemy_damage_counter),
-        ("Capture", args.fix_capture),
+        ("Sketch", args.fix_sketch, "fix_sketch"),
+        ("Evade", args.fix_evade, "fix_evade"),
+        ("Vanish/Doom", args.fix_vanish_doom, "fix_vanish_doom"),
+        ("Retort", args.fix_retort, "fix_retort"),
+        ("Jump", args.fix_jump, "fix_jump"),
+        ("Boss Skip", args.fix_boss_skip, "fix_boss_skip"),
+        ("Enemy Damage Counter", args.fix_enemy_damage_counter, "fix_enemy_damage_counter"),
+        ("Capture", args.fix_capture, "fix_capture"),
     ]
 
 def menu(args):

args/challenges.py

@@ -24,6 +24,8 @@ def parse(parser):
                             help = "Life spells cannot be learned. Fenix Downs unavailable (except from starting items). Buckets/inns/tents/events do not revive characters. Phoenix casts Life 3 on party instead of Life")
     challenges.add_argument("-rls", "--remove-learnable-spells", type = str,
                             help = "Remove spells from learnable sources: Items, Espers, Natural Magic, and Objectives")
+    challenges.add_argument("-nosaves", "--no-saves", action = "store_true",
+                            help = "Ironmog Mode: You cannot save (but save points still work for Tents/Sleeping Bags)")
 
 def process(args):
     from constants.spells import black_magic_ids, white_magic_ids, gray_magic_ids, spell_id
@@ -89,6 +91,8 @@ def flags(args):
         flags += " -pd"
     if args.remove_learnable_spells:
         flags += f" -rls {args.remove_learnable_spells}"
+    if args.no_saves:
+        flags += " -nosaves"
 
     return flags
 
@@ -100,23 +104,24 @@ def options(args):
         ultima = "254 MP"
 
     return [
-        ("No Moogle Charms", args.no_moogle_charms),
-        ("No Exp Eggs", args.no_exp_eggs),
-        ("No Illuminas", args.no_illuminas),
-        ("No Sprint Shoes", args.no_sprint_shoes),
-        ("No Free Paladin Shields", args.no_free_paladin_shields),
-        ("No Free Characters/Espers", args.no_free_characters_espers),
-        ("Permadeath", args.permadeath),
-        ("Ultima", ultima),
-        ("Remove Learnable Spells", args.remove_learnable_spell_ids),
+        ("No Moogle Charms", args.no_moogle_charms, "no_moogle_charms"),
+        ("No Exp Eggs", args.no_exp_eggs, "no_exp_eggs"),
+        ("No Illuminas", args.no_illuminas, "no_illuminas"),
+        ("No Sprint Shoes", args.no_sprint_shoes, "no_sprint_shoes"),
+        ("No Free Paladin Shields", args.no_free_paladin_shields, "no_free_paladin_shields"),
+        ("No Free Characters/Espers", args.no_free_characters_espers, "no_free_characters_espers"),
+        ("Permadeath", args.permadeath, "permadeath"),
+        ("Ultima", ultima, "ultima"),
+        ("Remove Learnable Spells", args.remove_learnable_spell_ids, "remove_learnable_spell_ids"),
+        ("No Saves", args.no_saves, "no_saves"),
     ]
 
     return opts
 def _format_spells_log_entries(spell_ids):
     from constants.spells import id_spell
     spell_entries = []
-    for spell_id in spell_ids:
-        spell_entries.append(("", id_spell[spell_id]))
+    for i, spell_id in enumerate(spell_ids):
+        spell_entries.append(("", id_spell[spell_id], f"rls_{i}"))
     return spell_entries
 
 def _format_spells_log_entries(spell_ids):
@@ -131,13 +136,13 @@ def menu(args):
 
     entries = options(args)
     for index, entry in enumerate(entries):
-        key, value = entry
+        key, value, unique_name = entry
         if key == "No Free Paladin Shields":
-            entries[index] = ("No Free Paladin Shlds", entry[1])
+            entries[index] = ("No Free Paladin Shlds", entry[1], unique_name)
         elif key == "No Free Characters/Espers":
-            entries[index] = ("No Free Chars/Espers", entry[1])
+            entries[index] = ("No Free Chars/Espers", entry[1], unique_name)
         elif key == "Remove Learnable Spells":
-            entries[index] = ("Remove L. Spells", FlagsRemoveLearnableSpells(value)) # flags sub-menu
+            entries[index] = ("Remove L. Spells", FlagsRemoveLearnableSpells(value), unique_name) # flags sub-menu
 
     return (name(), entries)
 
@@ -147,12 +152,12 @@ def log(args):
 
     entries = options(args)
     for entry in entries:
-        key, value = entry
+        key, value, unique_name = entry
         if key == "Remove Learnable Spells":
             if len(value) == 0:
-                entry = (key, "None")
+                entry = (key, "None", unique_name)
             else:
-                entry = (key, "") # The entries will show up on subsequent lines
+                entry = (key, "", unique_name) # The entries will show up on subsequent lines
             log.append(format_option(*entry))
             for spell_entry in _format_spells_log_entries(value):
                 log.append(format_option(*spell_entry))

args/characters.py

@@ -39,19 +39,19 @@ def options(args):
     character_stats = f"{args.character_stat_random_percent_min}-{args.character_stat_random_percent_max}%"
 
     return [
-        ("Start Average Level", args.start_average_level),
-        ("Start Level", args.start_level),
-        ("Start Naked", args.start_naked),
-        ("Equipable Umaro", args.equipable_umaro),
-        ("Character Stats", character_stats),
+        ("Start Average Level", args.start_average_level, "start_average_level"),
+        ("Start Level", args.start_level, "start_level"),
+        ("Start Naked", args.start_naked, "start_naked"),
+        ("Equipable Umaro", args.equipable_umaro, "equipable_umaro"),
+        ("Character Stats", character_stats, "character_stats"),
     ]
 
 def menu(args):
     entries = options(args)
     for index, entry in enumerate(entries):
-        key, value = entry
+        key, value, unique_name = entry
         if key == "Character Stats":
-            entries[index] = ("Stats", entry[1])
+            entries[index] = ("Stats", entry[1], unique_name)
     return (name(), entries)
 
 def log(args):

args/chests.py

@@ -63,15 +63,15 @@ def options(args):
     elif args.chest_contents_empty:
         contents_value = "Empty"
 
-    result.append(("Contents", contents_value))
+    result.append(("Contents", contents_value, "contents_value"))
     if args.chest_contents_shuffle_random:
-        result.append(("Random Percent", f"{args.chest_contents_shuffle_random_percent}%"))
+        result.append(("Random Percent", f"{args.chest_contents_shuffle_random_percent}%", "chest_contents_shuffle_random_percent"))
 
     if args.chest_random_monsters:
-        result.append(("MIAB Percent", f"{args.chest_random_monsters_enemy}%"))
-        result.append(("  Boss Percent", f"{args.chest_random_monsters_boss}%"))
+        result.append(("MIAB Percent", f"{args.chest_random_monsters_enemy}%", "chest_random_monsters_enemy"))
+        result.append(("  Boss Percent", f"{args.chest_random_monsters_boss}%", "chest_random_monsters_boss"))
 
-    result.append(("MIAB Shuffled", args.chest_monsters_shuffle))
+    result.append(("MIAB Shuffled", args.chest_monsters_shuffle, "chest_monsters_shuffle"))
 
     return result
 

args/coliseum.py

@@ -80,11 +80,11 @@ def options(args):
             rewards_visible = f"{args.coliseum_rewards_visible_random_min}-{args.coliseum_rewards_visible_random_max}"
 
     return [
-        ("Opponents", opponents),
-        ("Rewards", rewards),
-        ("Rewards Visible", rewards_visible),
-        ("No Exp. Eggs", args.coliseum_no_exp_eggs),
-        ("No Illuminas", args.coliseum_no_illuminas),
+        ("Opponents", opponents, "opponents"),
+        ("Rewards", rewards, "rewards"),
+        ("Rewards Visible", rewards_visible, "rewards_visible"),
+        ("No Exp. Eggs", args.coliseum_no_exp_eggs, "coliseum_no_exp_eggs"),
+        ("No Illuminas", args.coliseum_no_illuminas, "coliseum_no_illuminas"),
     ]
 
 def menu(args):

args/commands.py

@@ -79,22 +79,22 @@ def options(args):
     result = []
     if args.commands is not None:
         for index, command_string in enumerate(args.command_strings):
-            result.append((COMMAND_OPTIONS[index], command_string))
+            result.append((COMMAND_OPTIONS[index], command_string, COMMAND_OPTIONS[index]))
     else:
         for option in COMMAND_OPTIONS:
-            result.append((option, option))
+            result.append((option, option, option))
 
-    result.append(("", ""))
-    result.append(("Shuffle Commands", args.shuffle_commands))
+    result.append(("", "", ""))
+    result.append(("Shuffle Commands", args.shuffle_commands, "shuffle_commands"))
 
-    add_exclude_command = lambda command : result.append(("Random Exclude", "None" if command == NONE_COMMAND else id_name[command]))
+    add_exclude_command = lambda command, i : result.append(("Random Exclude", "None" if command == NONE_COMMAND else id_name[command], f"random_exclude_command{i}"))
 
-    add_exclude_command(args.random_exclude_command1)
-    add_exclude_command(args.random_exclude_command2)
-    add_exclude_command(args.random_exclude_command3)
-    add_exclude_command(args.random_exclude_command4)
-    add_exclude_command(args.random_exclude_command5)
-    add_exclude_command(args.random_exclude_command6)
+    add_exclude_command(args.random_exclude_command1, 1)
+    add_exclude_command(args.random_exclude_command2, 2)
+    add_exclude_command(args.random_exclude_command3, 3)
+    add_exclude_command(args.random_exclude_command4, 4)
+    add_exclude_command(args.random_exclude_command5, 5)
+    add_exclude_command(args.random_exclude_command6, 6)
 
     return result
 

args/dances.py

@@ -48,11 +48,11 @@ def options(args):
         start_dances = f"Random {args.start_dances_random_min}-{args.start_dances_random_max}"
 
     return [
-        ("Start Dances", start_dances),
-        ("Shuffle Abilities", args.dances_shuffle),
-        ("Display Abilities", args.dances_display_abilities),
-        ("No Stumble", args.dances_no_stumble),
-        ("Everyone Learns", args.dances_everyone_learns),
+        ("Start Dances", start_dances, "start_dances"),
+        ("Shuffle Abilities", args.dances_shuffle, "dances_shuffle"),
+        ("Display Abilities", args.dances_display_abilities, "dances_display_abilities"),
+        ("No Stumble", args.dances_no_stumble, "dances_no_stumble"),
+        ("Everyone Learns", args.dances_everyone_learns, "dances_everyone_learns"),
     ]
 
 def menu(args):

args/encounters.py

@@ -57,33 +57,33 @@ def options(args):
     elif args.random_encounters_chupon:
         random_encounters = "Chupon"
 
-    result.append(("Random Encounters", random_encounters))
+    result.append(("Random Encounters", random_encounters, "random_encounters"))
     if args.random_encounters_random is not None:
-        result.append(("Boss Percent", f"{args.random_encounters_random}%"))
+        result.append(("Boss Percent", f"{args.random_encounters_random}%", "random_encounters_random"))
 
     fixed_encounters = "Original"
     if args.fixed_encounters_random is not None:
         fixed_encounters = "Random"
 
-    result.append(("Fixed Encounters", fixed_encounters))
+    result.append(("Fixed Encounters", fixed_encounters, "fixed_encounters"))
     if args.fixed_encounters_random is not None:
-        result.append(("Boss Percent", f"{args.fixed_encounters_random}%"))
+        result.append(("Boss Percent", f"{args.fixed_encounters_random}%", "fixed_encounters_random"))
 
     escapable = "Original"
     if args.encounters_escapable_random is not None:
         escapable = f"{args.encounters_escapable_random}%"
 
-    result.append(("Escapable", escapable))
+    result.append(("Escapable", escapable, "escapable"))
     return result
 
 def menu(args):
     entries = options(args)
     for index, entry in enumerate(entries):
-        key, value = entry
+        key, value, unique_name = entry
         if key == "Random Encounters":
-            entries[index] = ("Random", value)
+            entries[index] = ("Random", value, unique_name)
         elif key == "Fixed Encounters":
-            entries[index] = ("Fixed", value)
+            entries[index] = ("Fixed", value, unique_name)
     return (name(), entries)
 
 def log(args):