From 2b0e891ee9e7f5b8490b1d0734e10cdb32b3500a Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 24 Feb 2022 10:04:59 -0700 Subject: [PATCH] Usestartinventory ignored --- CLI.py | 2 +- Main.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CLI.py b/CLI.py index 2549eb4b..888a13f3 100644 --- a/CLI.py +++ b/CLI.py @@ -100,7 +100,7 @@ def parse_cli(argv, no_defaults=False): for name in ['logic', 'mode', 'swords', 'goal', 'difficulty', 'item_functionality', 'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid', 'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory', - 'bombbag', 'overworld_map', 'restrict_boss_items', + 'usestartinventory', 'bombbag', 'overworld_map', 'restrict_boss_items', 'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max', 'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots', 'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters', diff --git a/Main.py b/Main.py index 817e2598..38d82b87 100644 --- a/Main.py +++ b/Main.py @@ -135,10 +135,11 @@ def main(args, seed=None, fish=None): if hasattr(world,"escape_assist") and player in world.escape_assist: world.escape_assist[player].append('bombs') # enemized escape assumes infinite bombs available and will likely be unbeatable without it - for tok in filter(None, args.startinventory[player].split(',')): - item = ItemFactory(tok.strip(), player) - if item: - world.push_precollected(item) + if args.usestartinventory[player]: + for tok in filter(None, args.startinventory[player].split(',')): + item = ItemFactory(tok.strip(), player) + if item: + world.push_precollected(item) if world.mode[player] != 'inverted': create_regions(world, player)