Add boss shuffle

Author: PoryGone

worlds/smw/Levels.py

@@ -43,6 +43,38 @@ def __init__(self, name: str, exitAddress: int, roomID: int):
     BowserRoom("Room 8", 0x3AAC7, 0xCC),
 ]
 
+
+class BossRoom():
+    name: str
+    exitAddress: int
+    exitAddressAlt: int
+    roomID: int
+
+    def __init__(self, name: str, exitAddress: int, roomID: int, exitAddressAlt=None):
+        self.name           = name
+        self.exitAddress    = exitAddress
+        self.roomID         = roomID
+        self.exitAddressAlt = exitAddressAlt
+
+
+submap_boss_rooms = [
+    BossRoom("#1 Lemmy Koopa", 0x311E3, 0xF6), # Submap 0x1F6
+    BossRoom("#3 Lemmy Koopa", 0x33749, 0xF2), # Submap 0x1F2
+    BossRoom("Valley Reznor", 0x3A132, 0xDE),  # Submap 0x1DE
+    BossRoom("#7 Larry Koopa", 0x3A026, 0xEB), # Submap 0x1EB
+]
+
+ow_boss_rooms = [
+    BossRoom("#2 Morton Koopa Jr.", 0x3209B, 0xE5),    # OW 0x0E5
+    BossRoom("Vanilla Reznor", 0x33EAB, 0xDF),         # OW 0x0DF
+    BossRoom("#4 Ludwig von Koopa", 0x346EA, 0xD9),    # OW 0x0D9
+    BossRoom("Forest Reznor", 0x3643E, 0xD5, 0x36442), # OW 0x0D5
+    BossRoom("#5 Roy Koopa", 0x35ABC, 0xCC),           # OW 0x0CC
+    BossRoom("Chocolate Reznor", 0x3705B, 0xE2),       # OW 0x0E2
+    BossRoom("#6 Wendy O. Koopa", 0x38BB5, 0xD3),      # OW 0x0D3
+]
+
+
 class SMWPath():
     thisEndDirection: int
     otherLevelID: int

worlds/smw/Options.py

@@ -86,6 +86,22 @@ class BowserCastleRooms(Choice):
     default = 1
 
 
+class BossShuffle(Choice):
+    """
+    How the rooms of Bowser's Castle Front Door behave
+    None: Bosses are not shuffled
+    Simple: Four Reznors and the seven Koopalings are shuffled around
+    Full: Each boss location gets a fully random boss
+    Singularity: One or two bosses are chosen and placed at every boss location
+    """
+    display_name = "Boss Shuffle"
+    option_none = 0
+    option_simple = 1
+    option_full = 2
+    option_singularity = 3
+    default = 0
+
+
 class LevelShuffle(Toggle):
     """
     Whether levels are shuffled
@@ -240,6 +256,7 @@ class StartingLifeCount(Range):
     "bowser_castle_doors": BowserCastleDoors,
     "bowser_castle_rooms": BowserCastleRooms,
     "level_shuffle": LevelShuffle,
+    "boss_shuffle": BossShuffle,
     "swap_donut_gh_exits": SwapDonutGhostHouseExits,
     #"display_sent_item_popups": DisplaySentItemPopups,
     "display_received_item_popups": DisplayReceivedItemPopups,

worlds/smw/Rom.py

@@ -1,7 +1,7 @@
 import Utils
 from worlds.Files import APDeltaPatch
 from .Aesthetics import generate_shuffled_header_data
-from .Levels import level_info_dict, full_bowser_rooms, standard_bowser_rooms
+from .Levels import level_info_dict, full_bowser_rooms, standard_bowser_rooms, submap_boss_rooms, ow_boss_rooms
 from .Names.TextBox import generate_goal_text, title_text_mapping, generate_text_box
 
 USHASH = 'cdd3c8c37322978ca8669b34bc89c804'
@@ -743,7 +743,7 @@ def handle_bowser_rooms(rom, world, player):
         rom.write_byte(chosen_rooms[len(chosen_rooms)-1].exitAddress, 0xBD)
 
     elif world.bowser_castle_rooms[player] == "random_five_room":
-        chosen_rooms = world.random.sample(standard_bowser_rooms)
+        chosen_rooms = world.random.sample(standard_bowser_rooms, 5)
 
         rom.write_byte(0x3A680, chosen_rooms[0].roomID)
         rom.write_byte(0x3A684, chosen_rooms[0].roomID)
@@ -779,7 +779,50 @@ def handle_bowser_rooms(rom, world, player):
         for i in range(0, len(bowser_rooms_copy) - 1):
             rom.write_byte(bowser_rooms_copy[i].exitAddress, bowser_rooms_copy[i+1].roomID)
 
-        rom.write_byte(chosen_rooms[len(chosen_rooms)-1].exitAddress, 0xBD)
+        rom.write_byte(bowser_rooms_copy[len(bowser_rooms_copy)-1].exitAddress, 0xBD)
+
+
+def handle_boss_shuffle(rom, world, player):
+    if world.boss_shuffle[player] == "simple":
+        submap_boss_rooms_copy = submap_boss_rooms.copy()
+        ow_boss_rooms_copy = ow_boss_rooms.copy()
+
+        world.random.shuffle(submap_boss_rooms_copy)
+        world.random.shuffle(ow_boss_rooms_copy)
+
+        for i in range(len(submap_boss_rooms_copy)):
+            rom.write_byte(submap_boss_rooms[i].exitAddress, submap_boss_rooms_copy[i].roomID)
+
+        for i in range(len(ow_boss_rooms_copy)):
+            rom.write_byte(ow_boss_rooms[i].exitAddress, ow_boss_rooms_copy[i].roomID)
+
+            if ow_boss_rooms[i].exitAddressAlt is not None:
+                rom.write_byte(ow_boss_rooms[i].exitAddressAlt, ow_boss_rooms_copy[i].roomID)
+
+    elif world.boss_shuffle[player] == "full":
+        for i in range(len(submap_boss_rooms)):
+            chosen_boss = world.random.choice(submap_boss_rooms)
+            rom.write_byte(submap_boss_rooms[i].exitAddress, chosen_boss.roomID)
+
+        for i in range(len(ow_boss_rooms)):
+            chosen_boss = world.random.choice(ow_boss_rooms)
+            rom.write_byte(ow_boss_rooms[i].exitAddress, chosen_boss.roomID)
+
+            if ow_boss_rooms[i].exitAddressAlt is not None:
+                rom.write_byte(ow_boss_rooms[i].exitAddressAlt, chosen_boss.roomID)
+
+    elif world.boss_shuffle[player] == "singularity":
+        chosen_submap_boss = world.random.choice(submap_boss_rooms)
+        chosen_ow_boss = world.random.choice(ow_boss_rooms)
+
+        for i in range(len(submap_boss_rooms)):
+            rom.write_byte(submap_boss_rooms[i].exitAddress, chosen_submap_boss.roomID)
+
+        for i in range(len(ow_boss_rooms)):
+            rom.write_byte(ow_boss_rooms[i].exitAddress, chosen_ow_boss.roomID)
+
+            if ow_boss_rooms[i].exitAddressAlt is not None:
+                rom.write_byte(ow_boss_rooms[i].exitAddressAlt, chosen_ow_boss.roomID)
 
 
 def patch_rom(world, rom, player, active_level_dict):
@@ -794,6 +837,7 @@ def patch_rom(world, rom, player, active_level_dict):
     rom.write_bytes(0x2A5D9, intro_text)
 
     handle_bowser_rooms(rom, world, player)
+    handle_boss_shuffle(rom, world, player)
 
     # Prevent Title Screen Deaths
     rom.write_byte(0x1C6A, 0x80)