Moved Victory item to event

jamesbrq · Sep 18, 2024 · dc159c6 · dc159c6
1 parent fce3af7
commit dc159c6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/worlds/mlss/Client.py b/worlds/mlss/Client.py
@@ -189,7 +189,7 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
                 if backup_logo != "MLSSAP":
                     return
                 if flag_byte & mask != 0:
-                    if 0xDA0000 <= location < 0xE00000 and location not in self.local_events:
+                    if location >= 0xDA0000 and location not in self.local_events:
                         self.local_events += [location]
                         await ctx.send_msgs(
                             [

diff --git a/worlds/mlss/Items.py b/worlds/mlss/Items.py
@@ -160,7 +160,6 @@ class MLSSItem(Item):
     ItemData(77771142, "Game Boy Horror SP", ItemClassification.useful, 0xFE),
     ItemData(77771143, "Woo Bean", ItemClassification.skip_balancing, 0x1C),
     ItemData(77771144, "Hee Bean", ItemClassification.skip_balancing, 0x1F),
-    ItemData(77771145, "Victory", ItemClassification.progression, 0x0)
 ]
 
 item_frequencies: typing.Dict[str, int] = {
@@ -185,7 +184,6 @@ class MLSSItem(Item):
     "Hoo Bean": 100,
     "Chuckle Bean": 200,
     "Hammers": 3,
-    "Victory": 0,
 }
 
 item_table: typing.Dict[str, ItemData] = {item.itemName: item for item in itemList}

diff --git a/worlds/mlss/Locations.py b/worlds/mlss/Locations.py
@@ -4,9 +4,6 @@
 
 
 class LocationData:
-    name: str = ""
-    id: int = 0x00
-
     def __init__(self, name, id_, itemType):
         self.name = name
         self.itemType = itemType
@@ -767,7 +764,7 @@ class MLSSLocation(Location):
 ]
 
 cacklettas_soul: typing.List[LocationData] = [
-    LocationData("Cackletta's Soul", 0xF00000, 0),
+    LocationData("Cackletta's Soul", None, 0),
 ]
 
 nonBlock = [
@@ -849,7 +846,6 @@ class MLSSLocation(Location):
     (0x433D, 0x8, 0xDA0005),  # Beanstar
     (0x430F, 0x40, 0xDA0006),  # Jojora
     (0x433D, 0x10, 0xDA0007),  # Birdo
-    (0x4407, 0x40, 0xF00000),  # Cackletta
 ]
 
 roomException = {

diff --git a/worlds/mlss/__init__.py b/worlds/mlss/__init__.py
@@ -89,7 +89,7 @@ def create_regions(self) -> None:
         self.get_location(LocationName.PantsShopStartingFlag1).place_locked_item(item)
         item = self.create_item("Chuckle Bean")
         self.get_location(LocationName.PantsShopStartingFlag2).place_locked_item(item)
-        item = self.create_item("Victory")
+        item = MLSSItem("Victory", ItemClassification.progression, None, self.player)
         self.get_location("Cackletta's Soul").place_locked_item(item)
 
     def fill_slot_data(self) -> Dict[str, Any]: