Merge branch 'DoorDevUnstable' into DoorDevVolatile

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",

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
 
 

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()]

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