Items: make some more progress on ItemClassification #2

Author: Berserker66

BaseClasses.py

@@ -1177,7 +1177,6 @@ def __init__(self, name: str, classification: ItemClassification, code: Optional
             self.classification = classification
         else:  # temporary compat for old bool saying advancement
             warnings.warn("Use of advancement bool in Item.__init__ instead of new classification.")
-            raise Exception
             self.classification = ItemClassification.progression if classification else ItemClassification.filler
         self.player = player
         self.code = code

worlds/generic/__init__.py

@@ -1,7 +1,7 @@
 from typing import NamedTuple, Union
 import logging
 
-from BaseClasses import Item, Tutorial
+from BaseClasses import Item, Tutorial, ItemClassification
 
 from ..AutoWorld import World, WebWorld
 from NetUtils import SlotType
@@ -46,7 +46,7 @@ def generate_early(self):
 
     def create_item(self, name: str) -> Item:
         if name == "Nothing":
-            return Item(name, False, -1, self.player)
+            return Item(name, ItemClassification.filler, -1, self.player)
         raise KeyError(name)
 
 

worlds/spire/__init__.py

@@ -1,6 +1,6 @@
 import string
 
-from BaseClasses import Item, MultiWorld, Region, Location, Entrance, Tutorial
+from BaseClasses import Item, MultiWorld, Region, Location, Entrance, Tutorial, ItemClassification, RegionType
 from .Items import item_table, item_pool, event_item_pairs
 from .Locations import location_table
 from .Regions import create_regions
@@ -12,7 +12,8 @@
 class SpireWeb(WebWorld):
     tutorials = [Tutorial(
         "Multiworld Setup Guide",
-        "A guide to setting up Slay the Spire for Archipelago. This guide covers single-player, multiworld, and related software.",
+        "A guide to setting up Slay the Spire for Archipelago. "
+        "This guide covers single-player, multiworld, and related software.",
         "English",
         "slay-the-spire_en.md",
         "slay-the-spire/en",
@@ -77,8 +78,7 @@ def set_rules(self):
         set_rules(self.world, self.player)
 
     def create_item(self, name: str) -> Item:
-        item_data = item_table[name]
-        return Item(name, item_data.progression, item_data.code, self.player)
+        return SpireItem(name, self.player)
 
     def create_regions(self):
         create_regions(self.world, self.player)
@@ -95,7 +95,7 @@ def get_filler_item_name(self) -> str:
 
 
 def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):
-    ret = Region(name, None, name, player)
+    ret = Region(name, RegionType.Generic, name, player)
     ret.world = world
     if locations:
         for location in locations:
@@ -124,4 +124,8 @@ class SpireItem(Item):
 
     def __init__(self, name, player: int = None):
         item_data = item_table[name]
-        super(SpireItem, self).__init__(name, item_data.progression, item_data.code, player)
+        super(SpireItem, self).__init__(
+            name,
+            ItemClassification.progression if item_data.progression else ItemClassification.filler,
+            item_data.code, player
+        )

worlds/subnautica/__init__.py

@@ -11,7 +11,7 @@
 from .Rules import set_rules
 from .Options import options
 
-from BaseClasses import Region, Entrance, Location, MultiWorld, Item, Tutorial
+from BaseClasses import Region, Entrance, Location, MultiWorld, Item, Tutorial, ItemClassification, RegionType
 from ..AutoWorld import World, WebWorld
 
 
@@ -74,7 +74,7 @@ def generate_basic(self):
         self.world.get_location("Aurora - Captain Data Terminal", self.player).place_locked_item(
             neptune_launch_platform)
         self.world.get_location("Neptune Launch", self.player).place_locked_item(
-            SubnauticaItem("Victory", True, None, player=self.player))
+            SubnauticaItem("Victory", ItemClassification.progression, None, player=self.player))
 
     def set_rules(self):
         set_rules(self.world, self.player)
@@ -88,10 +88,13 @@ def fill_slot_data(self):
 
     def create_item(self, name: str) -> Item:
         item = lookup_name_to_item[name]
-        return SubnauticaItem(name, item["progression"], item["id"], player=self.player)
+        return SubnauticaItem(name,
+                              ItemClassification.progression if item["progression"] else ItemClassification.filler,
+                              item["id"], player=self.player)
+
 
 def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):
-    ret = Region(name, None, name, player)
+    ret = Region(name, RegionType.Generic, name, player)
     ret.world = world
     if locations:
         for location in locations: