Merge branch 'OverworldShuffleDev' into OverworldShuffle

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.6.0.2
+- Fixed issue with item pool placing items on Zelda Drop Off
+- Fix issue with infinite purple chest item get
+- Fix issue with Kiki running away on i-frame ledge hops
+- Fix issue with bad follower gfx on screens with followers
+- Fix issue with Zelda appearing in conditional follower locations
+
 ## 0.6.0.1
 - Emergency fix for generation errors
 

ItemList.py

@@ -272,14 +272,6 @@ def generate_itempool(world, player):
             item = None
         set_event_item(world, player, loc, item)
 
-    zelda_pickup, zelda_dropoff = None, None
-    if world.mode[player] == 'standard':
-        if not world.shuffle_followers[player]:
-            zelda_pickup = 'Zelda Herself'
-        zelda_dropoff = 'Zelda Delivered'
-    set_event_item(world, player, 'Zelda Pickup', zelda_pickup)
-    set_event_item(world, player, 'Zelda Drop Off', zelda_dropoff)
-
     # set up item pool
     skip_pool_adjustments = False
     if world.customizer and world.customizer.get_item_pool() and player in world.customizer.get_item_pool():

OverworldShuffle.py

@@ -8,7 +8,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType
 from OverworldGlitchRules import create_owg_connections
 from Utils import bidict
 
-version_number = '0.6.0.1'
+version_number = '0.6.0.2'
 # branch indicator is intentionally different across branches
 version_branch = ''
 

Regions.py

@@ -1250,7 +1250,7 @@ def adjust_locations(world, player):
             location.prize = prize_on_boss
             location.real = not prize_on_boss
     # unreal events:
-    for l in ['Ganon', 'Zelda Pickup', 'Zelda Drop Off'] + list(location_events):
+    for l in ['Ganon'] + list(location_events):
         location = world.get_location_unsafe(l, player)
         if location:
             location.type = LocationType.Logical
@@ -1437,8 +1437,8 @@ location_events = {
     'Revealing Light': 'Maiden Unmasked',
     'Ice Block Drop': 'Convenient Block',
     'Skull Star Tile': 'Hidden Pits',
-    'Zelda Pickup': None,
+    'Zelda Pickup': 'Zelda Herself',
-    'Zelda Drop Off': None
+    'Zelda Drop Off': 'Zelda Delivered'
 }
 
 

Rom.py

@@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '1143daca64a1dbdb151339830dca37df'
+RANDOMIZERBASEHASH = 'a1d6e5902d2e33a3c440aca3983897a3'
 
 
 class JsonRom(object):