From 22c4dcdfd393d19d9846d8ecc33386b4c9e2ba22 Mon Sep 17 00:00:00 2001 From: KrisDavie Date: Sun, 17 Dec 2023 14:03:04 +0100 Subject: [PATCH] More test updates + disable bunny check skip --- Rules.py | 12 ++++----- ..._sw.yaml => entrance_bunny_pocket_sw.yaml} | 2 +- .../hmg/inverted_inaccessible_desert.yaml | 26 ++++++++++++++++++ test/suite/hmg/inverted_moon_pearl_locs.yaml | 27 +++++++++++++++++++ test/suite/hmg/moon_pearl_locs.yaml | 6 ++++- test/suite/hmg/swamp_from_mire.yaml | 13 +++++++++ 6 files changed, 78 insertions(+), 8 deletions(-) rename test/suite/hmg/{bunny_pocket_sw.yaml => entrance_bunny_pocket_sw.yaml} (88%) create mode 100644 test/suite/hmg/inverted_inaccessible_desert.yaml create mode 100644 test/suite/hmg/inverted_moon_pearl_locs.yaml diff --git a/Rules.py b/Rules.py index 3e1aa061..03bcaba6 100644 --- a/Rules.py +++ b/Rules.py @@ -1964,12 +1964,12 @@ def set_bunny_rules(world, player, inverted): if new_region.type in (RegionType.Cave, RegionType.Dungeon) and new_region in seen: continue # We don't need to navigate through single entrance dungeons. HMG has more multi-entrance dungeons - if (region.type == RegionType.Dungeon and new_region.type == RegionType.Dungeon): - if ( - world.logic[player] == 'hybridglitches' and new_region.dungeon != None and new_region.dungeon.name in hmg_single_exit_dungeons) or ( - world.logic[player] not in ['hybridglitches', 'nologic'] and new_region.dungeon != None and new_region.dungeon.name in all_single_exit_dungeons - ): - continue + # if (region.type == RegionType.Dungeon and new_region.type == RegionType.Dungeon): + # if ( + # world.logic[player] == 'hybridglitches' and new_region.dungeon != None and new_region.dungeon.name in hmg_single_exit_dungeons) or ( + # world.logic[player] not in ['hybridglitches', 'nologic'] and new_region.dungeon != None and new_region.dungeon.name in all_single_exit_dungeons + # ): + # continue new_path = path + [entrance.access_rule] new_seen = seen.union({new_region}) if not is_link(new_region): diff --git a/test/suite/hmg/bunny_pocket_sw.yaml b/test/suite/hmg/entrance_bunny_pocket_sw.yaml similarity index 88% rename from test/suite/hmg/bunny_pocket_sw.yaml rename to test/suite/hmg/entrance_bunny_pocket_sw.yaml index 2b263db2..48f5021a 100644 --- a/test/suite/hmg/bunny_pocket_sw.yaml +++ b/test/suite/hmg/entrance_bunny_pocket_sw.yaml @@ -30,5 +30,5 @@ entrances: Skull Woods Final Section: Pyramid Fairy two-way: Thieves Town: Two Brothers House Exit (West) - Spectacle Rock Cave (Bottom): Two Brothers House Exit (East) + Skull Woods Second Section Door (West): Two Brothers House Exit (East) diff --git a/test/suite/hmg/inverted_inaccessible_desert.yaml b/test/suite/hmg/inverted_inaccessible_desert.yaml new file mode 100644 index 00000000..bb8ad8aa --- /dev/null +++ b/test/suite/hmg/inverted_inaccessible_desert.yaml @@ -0,0 +1,26 @@ +meta: + players: 1 +settings: + 1: + logic: hybridglitches + mode: inverted + shuffle: crossed + +start_inventory: + 1: + - Pegasus Boots + - Progressive Sword + - Hammer + - Fire Rod +placements: + 1: + Desert Palace - Boss: Moon Pearl +entrances: + 1: + two-way: + Skull Woods Final Section: Desert Palace Exit (West) + Skull Woods Second Section Door (West): Desert Palace Exit (East) + Thieves Town: Thieves Town Exit + Hyrule Castle Entrance (East): Desert Palace Exit (South) + Hyrule Castle Entrance (West): Desert Palace Exit (North) + diff --git a/test/suite/hmg/inverted_moon_pearl_locs.yaml b/test/suite/hmg/inverted_moon_pearl_locs.yaml new file mode 100644 index 00000000..65d23371 --- /dev/null +++ b/test/suite/hmg/inverted_moon_pearl_locs.yaml @@ -0,0 +1,27 @@ +meta: + players: 1 +settings: + 1: + logic: hybridglitches + mode: inverted +start_inventory: + 1: + - Flippers + - Progressive Sword + - Progressive Sword + - Lamp + - Magic Mirror + - Ether + - Quake + - Bombos +advanced_placements: + 1: + - type: Verification + item: Moon Pearl + locations: + Desert Palace - Big Chest: True + Eastern Palace - Big Chest: True + + + + diff --git a/test/suite/hmg/moon_pearl_locs.yaml b/test/suite/hmg/moon_pearl_locs.yaml index f5d06745..a18d53d1 100644 --- a/test/suite/hmg/moon_pearl_locs.yaml +++ b/test/suite/hmg/moon_pearl_locs.yaml @@ -5,8 +5,10 @@ settings: logic: hybridglitches start_inventory: 1: + - Pegasus Boots - Flippers - - Moon Pearl + - Fire Rod + - Book of Mudora - Progressive Sword - Progressive Sword - Lamp @@ -19,6 +21,8 @@ advanced_placements: - type: Verification item: Moon Pearl locations: + Skull Woods - Compass Chest: True + Skull Woods - Bridge Room: True Palace of Darkness - Shooter Room: True Palace of Darkness - The Arena - Bridge: True Palace of Darkness - Stalfos Basement: True diff --git a/test/suite/hmg/swamp_from_mire.yaml b/test/suite/hmg/swamp_from_mire.yaml index 5892f07c..f3873909 100644 --- a/test/suite/hmg/swamp_from_mire.yaml +++ b/test/suite/hmg/swamp_from_mire.yaml @@ -17,6 +17,19 @@ advanced_placements: 1: - type: Verification item: Small Key (Swamp Palace) + locations: + Swamp Palace - Entrance: True + Swamp Palace - Map Chest: True + Swamp Palace - Big Chest: True + Swamp Palace - Compass Chest: True + Swamp Palace - West Chest: True + Swamp Palace - Big Key Chest: True + Swamp Palace - Flooded Room - Left: True + Swamp Palace - Flooded Room - Right: True + Swamp Palace - Waterfall Room: True + Swamp Palace - Boss: True + - type: Verification + item: Big Key (Swamp Palace) locations: Swamp Palace - Entrance: True Swamp Palace - Map Chest: True