From acd54cbbff68c0ab717b073865336870f394efd0 Mon Sep 17 00:00:00 2001
From: LLCoolDave <llcooldave@gmail.com>
Date: Sat, 24 Jun 2017 11:11:56 +0200
Subject: [PATCH] Turn preplaced items into events to avoid double dipping on
 them when checking if game is beatable.

---
 BaseClasses.py |  4 ++--
 Main.py        | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 3e1b8584..c300a784 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -113,7 +113,7 @@ class World(object):
     def find_items(self, item):
         return [location for location in self.get_locations() if location.item is not None and location.item.name == item]
 
-    def push_item(self, location, item, collect=True, do_not_sweep=False):
+    def push_item(self, location, item, collect=True):
         if not isinstance(location, Location):
             location = self.get_location(location)
 
@@ -121,7 +121,7 @@ class World(object):
             location.item = item
             item.location = location
             if collect:
-                self.state.collect(item, True if do_not_sweep else location.event)
+                self.state.collect(item, location.event)
 
             logging.getLogger('').debug('Placed %s at %s' % (item, location))
         else:
diff --git a/Main.py b/Main.py
index 6c3b10d7..f49a268b 100644
--- a/Main.py
+++ b/Main.py
@@ -120,6 +120,9 @@ def distribute_items_cutoff(world, cutoffrate=0.33):
     progress_done = False
     advancement_placed = False
 
+    # sweep once to pick up preplaced items
+    world.state.sweep_for_events()
+
     while itempool and fill_locations:
         candidate_item_to_place = None
         item_to_place = None
@@ -187,6 +190,9 @@ def distribute_items_staleness(world):
     progress_done = False
     advancement_placed = False
 
+    # sweep once to pick up preplaced items
+    world.state.sweep_for_events()
+
     while itempool and fill_locations:
         candidate_item_to_place = None
         item_to_place = None
@@ -339,6 +345,9 @@ def flood_items(world):
     itempool = world.itempool
     progress_done = False
 
+    # sweep once to pick up preplaced items
+    world.state.sweep_for_events()
+
     # fill world from top of itempool while we can
     while not progress_done:
         location_list = world.get_unfilled_locations()
@@ -435,14 +444,17 @@ def generate_itempool(world):
                                      ['Arrows (10)'] * 4 + ['Bombs (3)'] * 10)
 
     if world.mode == 'standard':
-        world.push_item('Uncle', ItemFactory('Progressive Sword'), do_not_sweep=True)
+        world.push_item('Uncle', ItemFactory('Progressive Sword'), False)
+        world.get_location('Uncle').event = True
     else:
         world.itempool.append(ItemFactory('Progressive Sword'))
 
     # provide mirror and pearl so you can avoid fake DW/LW and do dark world exploration as intended by algorithm, for now
     if world.shuffle == 'insanity':
-        world.push_item('[cave-040] Links House', ItemFactory('Magic Mirror'), do_not_sweep=True)
-        world.push_item('[dungeon-C-1F] Sanctuary', ItemFactory('Moon Pearl'), do_not_sweep=True)
+        world.push_item('[cave-040] Links House', ItemFactory('Magic Mirror'), False)
+        world.get_location('[cave-040] Links House').event = True
+        world.push_item('[dungeon-C-1F] Sanctuary', ItemFactory('Moon Pearl'), False)
+        world.get_location('[dungeon-C-1F] Sanctuary').event = True
     else:
         world.itempool.extend(ItemFactory(['Magic Mirror', 'Moon Pearl']))
 
@@ -540,6 +552,8 @@ def create_playthrough(world):
     sphere_candidates = list(prog_locations)
     logging.getLogger('').debug('Building up collection spheres.')
     while sphere_candidates:
+        state.sweep_for_events(key_only=True)
+
         sphere = []
         # build up spheres of collection radius. Everything in each sphere is independent from each other in dependencies and only depends on lower spheres
         for location in sphere_candidates:
@@ -550,8 +564,6 @@ def create_playthrough(world):
             sphere_candidates.remove(location)
             state.collect(location.item, True)
 
-        state.sweep_for_events(key_only=True)
-
         collection_spheres.append(sphere)
 
         logging.getLogger('').debug('Calculated sphere %i, containing %i of %i progress items.' % (len(collection_spheres), len(sphere), len(prog_locations)))