From 6017165875f315d03888247d9b8c93b1d011b641 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 10 Jan 2020 16:42:20 -0700 Subject: [PATCH] Cross mode compass additions --Added compasses for escape/aga tower --Removed maps for escape/gt --- DoorShuffle.py | 8 ++++++++ DungeonGenerator.py | 7 +++++-- Items.py | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 4de8b9a9..3bdda753 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -640,6 +640,14 @@ def cross_dungeon(world, player): paths = determine_required_paths(world) check_required_paths(paths, world, player) + hc = world.get_dungeon('Hyrule Castle', player) + del hc.dungeon_items[0] # removes map + hc.dungeon_items.append(ItemFactory('Compass (Escape)', player)) + at = world.get_dungeon('Agahnims Tower', player) + at.dungeon_items.append(ItemFactory('Compass (Agahnims Tower)', player)) + gt = world.get_dungeon('Ganons Tower', player) + del gt.dungeon_items[0] # removes map + start = time.process_time() total_keys = remaining = 29 total_candidates = 0 diff --git a/DungeonGenerator.py b/DungeonGenerator.py index 48403150..bfe235cb 100644 --- a/DungeonGenerator.py +++ b/DungeonGenerator.py @@ -1105,10 +1105,13 @@ def weighted_random_locations(dungeon_map, free_location_sectors): def minimal_locations(dungeon_name): + # bump to 5 if maps do something useful for all these dungeons if dungeon_name == 'Hyrule Castle': - return 3 + return 4 # bk + compass + 2 others if dungeon_name == 'Agahnims Tower': - return 2 # bump to 3 once compasses work + return 4 + if dungeon_name == 'Ganons Tower': + return 4 # reduce gt to 4 once compasses work return 5 diff --git a/Items.py b/Items.py index 81ca6b14..9a3c5c50 100644 --- a/Items.py +++ b/Items.py @@ -124,10 +124,11 @@ item_table = {'Bow': (True, False, None, 0x0B, 'You have\nchosen the\narcher cla 'Map (Tower of Hera)': (False, True, 'Map', 0x75, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Tower of Hera'), 'Small Key (Escape)': (False, False, 'SmallKey', 0xA0, 'A small key to the castle', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Hyrule Castle'), 'Big Key (Escape)': (False, False, 'BigKey', 0x9F, 'A big key to the castle', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Hyrule Castle'), - 'Compass (Escape)': (False, True, 'Compass', 0x8F, 'Now you can find no boss!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Hyrule Castle'), + 'Compass (Escape)': (False, True, 'Compass', 0x8F, 'Now you can find no boss!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Hyrule Castle'), 'Map (Escape)': (False, True, 'Map', 0x7F, 'A tightly folded map rests here', 'and the map', 'cartography kid', 'map for sale', 'a map to shrooms', 'map boy navigates again', 'a map to Hyrule Castle'), 'Small Key (Agahnims Tower)': (False, False, 'SmallKey', 0xA4, 'A small key to Agahnim', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Castle Tower'), 'Big Key (Agahnims Tower)': (False, False, 'BigKey', 0x9B, 'A big key to Agahnim', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Castle Tower'), + 'Compass (Agahnims Tower)': (False, True, 'Compass', 0x8B, 'Now you can find Aga1!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds null again', 'a compass to Castle Tower'), 'Small Key (Palace of Darkness)': (False, False, 'SmallKey', 0xA6, 'A small key to darkness', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key to Palace of Darkness'), 'Big Key (Palace of Darkness)': (False, False, 'BigKey', 0x99, 'A big key to darkness', 'and the big key', 'the big-unlock kid', 'big key for sale', 'face key fungus', 'key boy opens chest again', 'a big key to Palace of Darkness'), 'Compass (Palace of Darkness)': (False, True, 'Compass', 0x89, 'Now you can find Helmasaur King!', 'and the compass', 'the magnetic kid', 'compass for sale', 'magnetic fungus', 'compass boy finds boss again', 'a compass to Palace of Darkness'),