Some changes from review (ArchipelagoMW#28)

worlds/dark_souls_3/Items.py

@@ -1677,8 +1677,8 @@ def event(name: str, player: int) -> "DarkSouls3Item":
 _all_items = _vanilla_items + _dlc_items
 
 for item_data in _all_items:
-  for group_name in item_data.item_groups():
-    item_name_groups[group_name].add(item_data.name)
+    for group_name in item_data.item_groups():
+        item_name_groups[group_name].add(item_data.name)
 
 filler_item_names = [item_data.name for item_data in _all_items if item_data.filler]
 item_dictionary = {item_data.name: item_data for item_data in _all_items}

worlds/dark_souls_3/__init__.py

@@ -118,8 +118,7 @@ def generate_early(self):
                     not self.options.late_basin_of_vows
                 )
             ):
-                self.multiworld.early_items[self.player]["Storm Ruler"] = 1
-                self.options.local_items.value.add("Storm Ruler")
+                self.multiworld.local_early_items[self.player]["Storm Ruler"] = 1
         else:
             self.yhorm_location = default_yhorm_location
 
@@ -336,11 +335,12 @@ def create_items(self):
         # Extra filler items for locations containing skip items
         self.local_itempool.extend(self.create_filler() for _ in range(num_required_extra_items))
 
+        # Potentially fill some items locally and remove them from the itempool
+        self._fill_local_items()
+
         # Add items to itempool
         self.multiworld.itempool += self.local_itempool
 
-        self._fill_local_items()
-
     def _create_injectable_items(self, num_required_extra_items: int) -> List[Item]:
         """Returns a list of items to inject into the multiworld instead of skipped items.
 
@@ -492,7 +492,6 @@ def _fill_local_item(
             and location.item_rule(item)
         ]
 
-        self.multiworld.itempool.remove(item)
         self.local_itempool.remove(item)
 
         if not candidate_locations: