Remove total_items option.

worlds/ror2/Options.py

@@ -9,13 +9,6 @@ class TotalLocations(Range):
     range_end = 50
     default = 15
 
-class TotalItems(Range):
-    """Number of items which are added to the multiworld on behalf of the Risk of Rain player."""
-    displayname = "Total Items"
-    range_start = 10
-    range_end = 50
-    default = 30
-
 
 class TotalRevivals(Range):
     """Number of `Dio's Best Friend` item put in the item pool."""
@@ -50,6 +43,5 @@ ror2_options: typing.Dict[str, type(Option)] = {
     "total_revivals":       TotalRevivals,
     "start_with_revive":    StartWithRevive,
     "item_pickup_step":     ItemPickupStep,
-    "total_items":          TotalItems,
     "enable_lunar":         AllowLunarItems
 }

worlds/ror2/__init__.py

@@ -43,7 +43,7 @@ class RiskOfRainWorld(World):
 
         # Fill remaining items with randomly generated junk
         itempool += self.world.random.choices(list(junk_pool.keys()), weights=list(junk_pool.values()),
-                                              k=self.world.total_items[self.player] -
+                                              k=self.world.total_locations[self.player] -
                                                 self.world.total_revivals[self.player])
 
         # Convert itempool into real items
@@ -61,7 +61,7 @@ class RiskOfRainWorld(World):
         return {
             "itemPickupStep": self.world.item_pickup_step[self.player].value,
             "seed": "".join(self.world.slot_seeds[self.player].choice(string.digits) for i in range(16)),
-            "totalLocations": self.world.total_items[self.player].value,
+            "totalLocations": self.world.total_locations[self.player].value,
             "totalRevivals": self.world.total_revivals[self.player].value
         }