Merged in DR v1.4.5

BaseClasses.py

@@ -642,7 +642,7 @@ class CollectionState(object):
         queue = deque(old_state.blocked_connections[player].items())
 
         old_state.traverse_world(queue, rrp, bc, player)
-        if old_state.world.key_logic_algorithm[player] == 'default':
+        if old_state.world.key_logic_algorithm[player] == 'dangerous':
             unresolved_events = [x for y in old_state.reachable_regions[player] for x in y.locations
                                  if x.event and x.item and (x.item.smallkey or x.item.bigkey or x.item.advancement)
                                  and x not in old_state.locations_checked and x.can_reach(old_state)]
@@ -670,7 +670,7 @@ class CollectionState(object):
         queue = deque(self.blocked_connections[player].items())
 
         self.traverse_world(queue, rrp, bc, player)
-        if self.world.key_logic_algorithm[player] == 'default':
+        if self.world.key_logic_algorithm[player] == 'dangerous':
             unresolved_events = [x for y in self.reachable_regions[player] for x in y.locations
                                  if x.event and x.item and (x.item.smallkey or x.item.bigkey or x.item.advancement)
                                  and x not in self.locations_checked and x.can_reach(self)]
@@ -2989,6 +2989,8 @@ class Spoiler(object):
                          'shuffleganon': self.world.shuffle_ganon,
                          'shufflelinks': self.world.shufflelinks,
                          'shuffletavern': self.world.shuffletavern,
+                         'skullwoods': self.world.skullwoods,
+                         'linked_drops': self.world.linked_drops,
                          'take_any': self.world.take_any,
                          'overworld_map': self.world.overworld_map,
                          'door_shuffle': self.world.doorShuffle,
@@ -3242,6 +3244,9 @@ class Spoiler(object):
                     if self.metadata['shuffle'][player] != 'vanilla':
                         outfile.write('Shuffle Link\'s House:'.ljust(line_width) + '%s\n' % yn(self.metadata['shufflelinks'][player]))
                         outfile.write('Shuffle Back of Tavern:'.ljust(line_width) + '%s\n' % yn(self.metadata['shuffletavern'][player]))
+                        outfile.write('Skull Woods Shuffle:'.ljust(line_width) + '%s\n' % self.metadata['skullwoods'][player])
+                        if self.metadata['linked_drops'] != "unset":
+                            outfile.write('Linked Drops Override:'.ljust(line_width) + '%s\n' % self.metadata['linked_drops'][player])
                         outfile.write('Shuffle GT/Ganon:'.ljust(line_width) + '%s\n' % yn(self.metadata['shuffleganon'][player]))
                     outfile.write('Pyramid Hole Pre-opened:'.ljust(line_width) + '%s\n' % self.metadata['open_pyramid'][player])
                     outfile.write('Overworld Map:'.ljust(line_width) + '%s\n' % self.metadata['overworld_map'][player])
@@ -3641,7 +3646,11 @@ keyshuffle_mode = {'none': 0, 'off': 0, 'wild': 1, 'on': 1, 'universal': 2}
 # byte 14: POOT TKKK (pseudoboots, overworld_map, trap_door_mode, key_logic_algo)
 overworld_map_mode = {'default': 0, 'compass': 1, 'map': 2}
 trap_door_mode = {'vanilla': 0, 'optional': 1, 'boss': 2, 'oneway': 3}
-key_logic_algo = {'default': 0, 'partial': 1, 'strict': 2}
+key_logic_algo = {'dangerous': 0, 'partial': 1, 'strict': 2}
+
+# byte 15: SSDD ???? (skullwoods, linked_drops, 4 free bytes)
+skullwoods_mode = {'original': 0, 'restricted': 1, 'loose': 2, 'followlinked': 3}
+linked_drops_mode = {'unset': 0, 'linked': 1, 'independent': 2}
 
 # sfx_shuffle and other adjust items does not affect settings code
 
@@ -3698,6 +3707,8 @@ class Settings(object):
 
             ((0x80 if w.pseudoboots[p] else 0) | overworld_map_mode[w.overworld_map[p]] << 5
              | trap_door_mode[w.trap_door_mode[p]] << 3 | key_logic_algo[w.key_logic_algorithm[p]]),
+
+            (skullwoods_mode[w.skullwoods[p]] << 6 | linked_drops_mode[w.linked_drops[p]] << 4),
         ])
         return base64.b64encode(code, "+-".encode()).decode()
 
@@ -3705,7 +3716,7 @@ class Settings(object):
     def adjust_args_from_code(code, player, args):
         settings, p = base64.b64decode(code.encode(), "+-".encode()), player
 
-        if len(settings) < 14:
+        if len(settings) < 15:
             raise Exception('Provided code is incompatible with this version')
         if settings[10] != settings_version:
             raise Exception('Provided code is incompatible with this version')
@@ -3788,6 +3799,10 @@ class Settings(object):
             args.trap_door_mode[p] = r(trap_door_mode)[(settings[14] & 0x18) >> 3]
             args.key_logic_algorithm[p] = r(key_logic_algo)[settings[14] & 0x07]
 
+        if len(settings) > 15:
+            args.skullwoods[p] = r(skullwoods_mode)[(settings[15] & 0xc0) >> 6]
+            args.linked_drops[p] = r(linked_drops_mode)[(settings[15] & 0x30) >> 4]
+
 
 class KeyRuleType(FastEnum):
     WorstCase = 0