Dev updates

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("-nre", "--no-random-encounters", action = "store_true",
+                            help="Turn off random encounters")
 
 def process(args):
     from constants.spells import black_magic_ids, white_magic_ids, gray_magic_ids, spell_id
@@ -86,6 +88,8 @@ def flags(args):
         flags += " -pd"
     if args.remove_learnable_spells:
         flags += f" -rls {args.remove_learnable_spells}"
+    if args.no_random_encounters:
+        flags += " -nre"
 
     return flags
 
@@ -106,6 +110,7 @@ def options(args):
         ("Permadeath", args.permadeath),
         ("Ultima", ultima),
         ("Remove Learnable Spells", args.remove_learnable_spell_ids),
+        ("No Random Encounters", args.no_random_encounters),
     ]
 
     return opts
@@ -116,6 +121,13 @@ def _format_spells_log_entries(spell_ids):
         spell_entries.append(("", id_spell[spell_id]))
     return spell_entries
 
+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]))
+    return spell_entries
+
 def menu(args):
     from menus.flags_remove_learnable_spells import FlagsRemoveLearnableSpells
 

args/chests.py

@@ -14,14 +14,27 @@ def parse(parser):
                                  help = "Chest contents randomized by tier. Probability of higher tiers begins low and increases as more chests are opened")
     chests_contents.add_argument("-cce", "--chest-contents-empty", action = "store_true",
                                  help = "Chest contents empty")
+    chests_contents.add_argument("-cam", "--chest-all-monsters", default = None, type = int,
+                                 metavar = "PERCENT", choices = range(101),
+                                 help="Chest contents all monster-in-a-boxes and given percent bosses")
 
     chests.add_argument("-cms", "--chest-monsters-shuffle", action = "store_true",
                         help = "Monsters-in-a-box shuffled but locations unchanged")
 
+    chests.add_argument("-ntc", "--no-trash-chests",  action = "store_true",
+                       help="Replace Low Tier Items with gold in chests")
+
+
+
+
 def process(args):
     if args.chest_contents_shuffle_random is not None:
         args.chest_contents_shuffle_random_percent = args.chest_contents_shuffle_random
         args.chest_contents_shuffle_random = True
+    if args.chest_all_monsters is not None:
+        args.chest_all_monsters_boss_percent = args.chest_all_monsters
+        args.chest_all_monsters = True
+        args.chest_mosters_shuffle = False  # Chest_all_monsters supercedes chest_monsters_shuffle
 
 def flags(args):
     flags = ""
@@ -34,9 +47,13 @@ def flags(args):
         flags += " -ccrs"
     elif args.chest_contents_empty:
         flags += " -cce"
+    elif args.chest_all_monsters:
+        flags += f" -cam {args.chest_all_monsters_boss_percent}"
 
     if args.chest_monsters_shuffle:
         flags += " -cms"
+    if args.no_trash_chests:
+        flags += " -ntc"
 
     return flags
 
@@ -52,11 +69,21 @@ def options(args):
         contents_value = "Random Scaled"
     elif args.chest_contents_empty:
         contents_value = "Empty"
+    elif args.chest_all_monsters:
+        contents_value = "All MiaB"
 
     result.append(("Contents", contents_value))
     if args.chest_contents_shuffle_random:
         result.append(("Random Percent", f"{args.chest_contents_shuffle_random_percent}%"))
-    result.append(("Monsters-In-A-Box Shuffled", args.chest_monsters_shuffle))
+    elif args.chest_all_monsters:
+        result.append(("Boss Percent", f"{args.chest_all_monsters_boss_percent}%"))
+
+    if not args.chest_all_monsters:
+        result.append(("MIAB Shuffled", args.chest_monsters_shuffle))
+
+    if args.no_trash_chests:
+        result.append(("No Trash Chests", args.no_trash_chests))
+
 
     return result
 
@@ -68,7 +95,7 @@ def menu(args):
         del entries[1]                                   # delete random percent line
     else:
         entries[0] = (entries[0][1], "")
-    entries[1] = ("MIAB Shuffled", entries[1][1])
+
     return (name(), entries)
 
 def log(args):

args/coliseum.py

@@ -7,16 +7,20 @@ def parse(parser):
     coliseum = parser.add_argument_group("Coliseum")
 
     coliseum_opponents = coliseum.add_mutually_exclusive_group()
-    coliseum_opponents.add_argument("-cos", "--coliseum-opponents-shuffle", action = "store_true",
-                                     help = "Coliseum opponents shuffled")
-    coliseum_opponents.add_argument("-cor", "--coliseum-opponents-random", action = "store_true",
-                                     help = "Coliseum opponents randomized")
+    coliseum_opponents.add_argument("-cor", "--coliseum-opponents-random", nargs='?', const=100, default = None, type = int,
+                                    metavar = "PERCENT", choices = range(101),
+                                    help = "Coliseum opponents original with a given percent randomized")
+    coliseum_opponents.add_argument("-cosr", "--coliseum-opponents-shuffle-random", default = None, type = int,
+                                    metavar = "PERCENT", choices = range(101),
+                                    help = "Coliseum opponents shuffled and then given percent randomized")
 
     coliseum_rewards = coliseum.add_mutually_exclusive_group()
-    coliseum_rewards.add_argument("-crs", "--coliseum-rewards-shuffle", action = "store_true",
-                                   help = "Coliseum rewards shuffled")
-    coliseum_rewards.add_argument("-crr", "--coliseum-rewards-random", action = "store_true",
-                                   help = "Coliseum rewards randomized")
+    coliseum_rewards.add_argument("-crr", "--coliseum-rewards-random", default = None, type = int,
+                                    metavar = "PERCENT", choices = range(101),
+                                    help = "Coliseum rewards original with a given percent randomized")
+    coliseum_rewards.add_argument("-crsr", "--coliseum-rewards-shuffle-random", default = None, type = int,
+                                    metavar = "PERCENT", choices = range(101),
+                                    help = "Coliseum rewards shuffled and then a given percent randomized")
 
     coliseum.add_argument("-crvr", "--coliseum-rewards-visible-random", default = None, type = int,
                           nargs = 2, metavar = ("MIN", "MAX"), choices = range(ITEM_COUNT),
@@ -34,16 +38,15 @@ def process(args):
 
 def flags(args):
     flags = ""
+    if args.coliseum_opponents_random:
+        flags += f" -cor {args.coliseum_opponents_random}"
+    elif args.coliseum_opponents_shuffle_random:
+        flags += f" -cor {args.coliseum_opponents_shuffle_random}"
 
-    if args.coliseum_opponents_shuffle:
-        flags += " -cos"
-    elif args.coliseum_opponents_random:
-        flags += " -cor"
-
-    if args.coliseum_rewards_shuffle:
-        flags += " -crs"
-    elif args.coliseum_rewards_random:
-        flags += " -crr"
+    if args.coliseum_rewards_random:
+        flags += f" -crr {args.coliseum_rewards_random}"
+    elif args.coliseum_rewards_shuffle_random:
+        flags += f" -crr {args.coliseum_rewards_shuffle_random}"
 
     if args.coliseum_rewards_visible_random:
         flags += f" -crvr {args.coliseum_rewards_visible_random_min} {args.coliseum_rewards_visible_random_max}"
@@ -62,15 +65,11 @@ def options(args):
     result = []
 
     opponents = "Original"
-    if args.coliseum_opponents_shuffle:
-        opponents = "Shuffle"
-    elif args.coliseum_opponents_random:
+    if args.coliseum_opponents_random:
         opponents = "Random"
 
     rewards = "Original"
-    if args.coliseum_rewards_shuffle:
-        rewards = "Shuffle"
-    elif args.coliseum_rewards_random:
+    if args.coliseum_rewards_random:
         rewards = "Random"
 
     rewards_visible = "Original"

args/items.py

@@ -49,6 +49,8 @@ def parse(parser):
     items.add_argument("-saw", "--stronger-atma-weapon", action = "store_true",
                        help = "Atma Weapon moved to higher tier and divisor reduced from 64 to 32")
 
+
+
 def process(args):
     args._process_min_max("item_equipable_random")
     if args.item_equipable_balanced_random is not None:
@@ -108,6 +110,7 @@ def flags(args):
     if args.stronger_atma_weapon:
         flags += " -saw"
 
+
     return flags
 
 def options(args):

args/misc.py

@@ -16,7 +16,6 @@ def parse(parser):
                       help = "All enemies scannable. All characters start with scan learned. Scan costs 0 MP. Useful for testing/debugging")
     misc.add_argument("-warp", "--warp-all", action = "store_true",
                       help = "All characters start with Warp learned. Warp costs 0 MP. Useful for seeds that limit Warp Stone access")
-
     misc.add_argument("-npctips", "--npc-dialog-tips", action = "store_true",
                       help = "NPC provide general game tips")
 
@@ -82,7 +81,10 @@ def flags(args):
         flags += " -scan"
     if args.warp_all:
         flags += " -warp"
+    if args.npc_dialog_tips:
+        flags += " -npctips"
 
+    ### NPC tips
     if args.npc_dialog_tips:
         flags += " -npctips"
 

args/shops.py

@@ -53,6 +53,9 @@ def parse(parser):
     shops.add_argument("-snil", "--shops-no-illuminas", action = "store_true",
                        help = "Illuminas not sold in shops")
 
+    shops.add_argument("-nts", "--no-trash-shops",  action = "store_true",
+                       help="Omit Low tier items in shops")
+
 def process(args):
     if args.shop_inventory_shuffle_random is not None:
         args.shop_inventory_shuffle_random_percent = args.shop_inventory_shuffle_random
@@ -106,6 +109,9 @@ def flags(args):
     if args.shops_no_illuminas:
         flags += " -snil"
 
+    if args.no_trash_shops:
+        flags += " -nts"
+
     return flags
 
 def options(args):
@@ -159,6 +165,7 @@ def options(args):
         ("Expensive Balls", args.shops_expensive_super_balls),
         ("No Exp. Eggs", args.shops_no_exp_eggs),
         ("No Illuminas", args.shops_no_illuminas),
+        ("No Trash Shops", args.no_trash_shops)
     ])
     return result
 

args/starting_gold_items.py

@@ -52,6 +52,7 @@ def options(args):
         ("Start Warp Stones", args.start_warp_stones),
         ("Start Fenix Downs", args.start_fenix_downs),
         ("Start Tools", args.start_tools),
+        ("Start Junk", args.start_junk),
     ]
 
     if args.start_junk != 0:

args/steal.py

@@ -10,7 +10,14 @@ def parse(parser):
     steal_chances.add_argument("-sca", "--steal-chances-always", action = "store_true",
                          help = "Steal will always succeed if enemy has an item")
 
+    steal.add_argument("-ssd", "--shuffle-steals-drops", default = None, type = int,
+                          metavar = "PERCENT", choices = range(101),
+                          help="Shuffle items stolen and dropped with randomized percent")
+
 def process(args):
+    if args.shuffle_steals_drops is not None:
+        args.shuffle_steals_drops_random_percent = args.shuffle_steals_drops
+        args.shuffle_steals_drops = True
     pass
 
 def flags(args):
@@ -20,19 +27,27 @@ def flags(args):
         flags += " -sch"
     if args.steal_chances_always:
         flags += " -sca"
+    if args.shuffle_steals_drops:
+        flags += f" -ssd {args.shuffle_steals_drops_random_percent}"
 
     return flags
 
 def options(args):
+    result = []
+
     steal_chances = "Original"
     if args.steal_chances_higher:
         steal_chances = "Higher"
     if args.steal_chances_always:
         steal_chances = "Always"
 
-    return [
-        ("Chances", steal_chances),
-    ]
+    result.append(("Chances", steal_chances))
+
+    result.append(("Shuffle steals & drops", args.shuffle_steals_drops))
+    if args.shuffle_steals_drops:
+        result.append(("Random Percent:", f"{args.shuffle_steals_drops_random_percent}%"))
+
+    return result
 
 def menu(args):
     return (name(), options(args))

constants/items.py

@@ -295,3 +295,25 @@
     "Marvel Shoes",
     "Exp. Egg",
 ]
+
+## TRASH LIST https://docs.google.com/spreadsheets/d/1Cit5Xl_TCBPFI4q1NEVQhSYGH1wKY9st_1yee3lzCP8/edit#gid=0
+
+TRASH_WEAPONS = [
+    "Dirk", "MithrilKnife", "Guardian", "MithrilBlade", "RegalCutlass", "Crystal", "Mithril Pike",
+    "Stout Spear",  "Imperial", "Kodachi", "Hardened", "Ashura", "Kotetsu", "Forged",
+    "Aura", "Strato", "Punisher", "MetalKnuckle", "Mithril Claw", "Kaiser",
+    "Flail", "Morning Star", "Full Moon", "Boomerang", "Rising Sun", "Cards", "Darts", "Chocobo Brsh",
+    ]
+
+TRASH_ARMOR = ["Buckler", "Mithril Shld", "Heavy Shld", "Gold Shld", "Leather Hat", "Plumed Hat", "Bandana",
+               "Iron Helmet", "Mithril Helm", "Gold Helmet", "LeatherArmor", "Kung Fu Suit", "Mithril Vest",
+               "Diamond Vest", "Cotton Robe", "Silk Robe", "Iron Armor",
+               "DiamondArmor", "Crystal Mail", "Gold Armor",
+               "Mithril Mail"
+]
+TRASH_RElICS = ["Charm Bangle", "Coin Toss", "FakeMustache"]
+
+
+TRASH_ITEMS = TRASH_WEAPONS + TRASH_ARMOR + TRASH_RElICS
+
+TRASH_IDS = [name_id.get(value) for value in TRASH_ITEMS]

data/character.py

@@ -25,8 +25,8 @@ def __init__(self, id, init_data, name_data):
         self.init_magic_evasion = init_data[14]
         self.init_right_hand    = init_data[15]
         self.init_left_hand     = init_data[16]
-        self.init_body          = init_data[17]
-        self.init_head          = init_data[18]
+        self.init_body          = init_data[18] # https://discord.com/channels/666661907628949504/931737764205047858/1069220818300698675
+        self.init_head          = init_data[17]
         self.init_relic1        = init_data[19]
         self.init_relic2        = init_data[20]
         self._init_run_success  = init_data[21] & 0x03
@@ -51,8 +51,8 @@ def init_data(self):
         init_data[14]    = self.init_magic_evasion
         init_data[15]    = self.init_right_hand
         init_data[16]    = self.init_left_hand
-        init_data[17]    = self.init_body
-        init_data[18]    = self.init_head
+        init_data[18]    = self.init_body
+        init_data[17]    = self.init_head
         init_data[19]    = self.init_relic1
         init_data[20]    = self.init_relic2
         init_data[21]    = self._init_run_success