diff --git a/CLI.py b/CLI.py index 2dcbd809..29dce609 100644 --- a/CLI.py +++ b/CLI.py @@ -185,7 +185,7 @@ def parse_settings(): "quickswap": False, "heartcolor": "red", "heartbeep": "normal", - "sprite": os.path.join(".", "data", "sprites", "official", "001.link.1.zspr"), + "sprite": None, "fastmenu": "normal", "ow_palettes": "default", "uw_palettes": "default", diff --git a/DoorShuffle.py b/DoorShuffle.py index cfeab8ac..4e4d4d3b 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -555,7 +555,7 @@ def find_portal_candidates(door_list, dungeon, need_passage=False, dead_end_allo if not dead_end_allowed: ret = [x for x in ret if not x.deadEnd] if standard: - ret = [x for x in ret if not x.standard_restrict] + ret = [x for x in ret if not x.standard_restricted] return ret diff --git a/DungeonGenerator.py b/DungeonGenerator.py index e320bbaf..37f77e7d 100644 --- a/DungeonGenerator.py +++ b/DungeonGenerator.py @@ -1249,7 +1249,6 @@ def create_dungeon_builders(all_sectors, connections_tuple, world, player, for r_name in ['Hyrule Dungeon Cellblock', 'Sanctuary']: # need to deliver zelda assign_sector(find_sector(r_name, candidate_sectors), current_dungeon, candidate_sectors, global_pole) - standard_stair_check(dungeon_map, current_dungeon, candidate_sectors, global_pole) entrances_map, potentials, connections = connections_tuple accessible_sectors, reverse_d_map = set(), {} for key in dungeon_entrances.keys(): @@ -1265,6 +1264,9 @@ def create_dungeon_builders(all_sectors, connections_tuple, world, player, if not sector: sector = find_sector(r_name, all_sectors) reverse_d_map[sector] = key + if world.mode[player] == 'standard': + current_dungeon = dungeon_map['Hyrule Castle'] + standard_stair_check(world, dungeon_map, current_dungeon, candidate_sectors, global_pole) complete_dungeons = {x: y for x, y in dungeon_map.items() if sum(len(sector.outstanding_doors) for sector in y.sectors) <= 0} [dungeon_map.pop(key) for key in complete_dungeons.keys()] diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 214d470d..2bc21111 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -150,6 +150,9 @@ New item counter modified to show total # Bug Fixes and Notes. +* 0.3.1.9-u + * Generation improvements for standard + * Removed link sprite from repo * 0.3.1.8-u * Fix for retro generation * Shopsanity - rebalance pricing - later prices can be are higher diff --git a/data/sprites/official/001.link.1.zspr b/data/sprites/official/001.link.1.zspr deleted file mode 100644 index 4537afa8..00000000 Binary files a/data/sprites/official/001.link.1.zspr and /dev/null differ diff --git a/data/sprites/official/bob.1.zspr b/data/sprites/official/bob.2.zspr similarity index 81% rename from data/sprites/official/bob.1.zspr rename to data/sprites/official/bob.2.zspr index 25fc0410..5731ba7e 100644 Binary files a/data/sprites/official/bob.1.zspr and b/data/sprites/official/bob.2.zspr differ