Client now uses location_id consistently internally, instead of switching on a dime all the time

And some smaller changes

BaseClasses.py

@@ -395,7 +395,8 @@ class MultiWorld():
 
         while prog_locations:
             sphere = []
-            # build up spheres of collection radius. Everything in each sphere is independent from each other in dependencies and only depends on lower spheres
+            # 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 prog_locations:
                 if location.can_reach(state):
                     sphere.append(location)
@@ -433,8 +434,6 @@ class MultiWorld():
                 state.collect(location.item, True, location)
             locations -= sphere
 
-
-
     def fulfills_accessibility(self, state: Optional[CollectionState] = None):
         """Check if accessibility rules are fulfilled with current or supplied state."""
         if not state: