starting moves and kongs count

Author: Lrauq

worlds/dk64/Items.py

@@ -97,15 +97,56 @@ def setup_items(world: World) -> typing.List[DK64Item]:
         item_table.append(DK64Item(seed_item.name, classification, full_item_table[item.name].code, world.player))
         # print("Adding item: " + seed_item.name + " | " + str(classification))
 
-    # Extract starting moves from the list - these items will be placed in your starting inventory directly
+    # Extract starting moves from the item table - these items will be placed in your starting inventory directly
     for move in world.options.start_inventory:
         for i in range(world.options.start_inventory[move]):
-            print(move)
             for item in item_table:
-                if item.name == move:
+                # The starting inventory move name may or may not have spaces in it.
+                if item.name == move.replace(" ", ""):
                     item_table.remove(item)
                     break
 
+    # Handle starting Kong list here
+    for kong in world.logic_holder.settings.starting_kong_list:
+        kong_item = DK64RItemPoolUtility.ItemFromKong(kong)
+        for item in item_table:
+            if item.name == kong_item.name:
+                # We don't need to precollect Kong items, as they'll patch in to the main menu properly
+                item_table.remove(item)
+                print("Removing starting kong: " + kong_item.name)
+                break
+    print(world.logic_holder.settings.starting_kong_list)
+
+    # Handle starting move alterations here
+    all_eligible_starting_moves = DK64RItemPoolUtility.AllKongMoves()
+    all_eligible_starting_moves.extend(DK64RItemPoolUtility.TrainingBarrelAbilities())
+    # Either include Climbing as an eligible starting move or place it in the starting inventory
+    if world.options.climbing_shuffle:
+        all_eligible_starting_moves.extend(DK64RItemPoolUtility.ClimbingAbilities())
+    else:
+        world.multiworld.push_precollected(DK64Item("Climbing", ItemClassification.progression, full_item_table[DK64RItems.Climbing.name].code, world.player))
+        for item in item_table:
+            if item.name == "Climbing":
+                item_table.remove(item)
+                break
+
+    world.random.shuffle(all_eligible_starting_moves)
+    for i in range(world.options.starting_move_count):
+        if len(all_eligible_starting_moves) == 0:
+            break
+        move_id = all_eligible_starting_moves.pop()
+        move = DK64RItem.ItemList[move_id]
+        # We don't want to pick anything we're already starting with. As an aside, the starting inventory move name may or may not have spaces in it.
+        if move_id.name in world.options.start_inventory.options or move.name in world.options.start_inventory.options:
+            # If we were to choose a move we're forcibly starting with, pick another
+            i =- 1
+            continue
+        for item in item_table:
+            if item.name == move_id.name or item.name == move.name:
+                world.multiworld.push_precollected(item)
+                item_table.remove(item)
+                break
+
     # If there's too many locations and not enough items, add some junk
     junk_item = DK64RItem.ItemList[DK64RItems.JunkMelon]
     # print("location comparison: " + str(world.logic_holder.location_pool_size - 1))

worlds/dk64/Options.py

@@ -24,9 +24,31 @@ class ClimbingShuffle(Toggle):
     Whether or not you shuffle the Climbing ability into the world(s)
     """
     display_name = "Climbing Shuffle"
+    
+    
+class StartingKongCount(Range):
+    """
+    Determines how many Kongs you start with
+    """
+    display_name = "Starting Kong Count"
+    range_start = 1
+    range_end = 5
+    default = 1
+
+
+class StartingMoveCount(Range):
+    """
+    Determines how many additional random moves you start with. If you choose more moves than are available, you will start with all moves.
+    """
+    display_name = "Starting Move Count"
+    range_start = 0
+    range_end = 50
+    default = 0
 
 
 @dataclass
 class DK64Options(PerGameCommonOptions):
     goal: Goal
     climbing_shuffle: ClimbingShuffle
+    starting_kong_count: StartingKongCount
+    starting_move_count: StartingMoveCount

worlds/dk64/__init__.py

@@ -126,14 +126,6 @@ def __init__(self, multiworld: MultiWorld, player: int):
 
             self.rom_name_available_event = threading.Event()
             super().__init__(multiworld, player)
-            # V1 LIMITATION: We are restricting settings pretty heavily. This string serves as the base for all seeds, with AP options overriding some options
-            self.settings_string = "fjNPxAMxDIUx0QSpbHPUlZlBLg5gPQ+oBwRDIhKlsa58Iz8fiNEpEtiFKi4bVAhMF6AAd+AAOCAAGGAAGKAAAdm84FBiMhjoStwFIKW2wLcBJIBpkzVRCjFIKUUwGTLK/BQBuAIMAN4CBwBwAYQAOIECQByAoUAOYGCwB0A4YeXIITIagOrIrwAZTiU1QwkoSjuq1ZLEjQ0gRydoVFtRl6KiLAImIoArFljkbsl4u8igch2MvacgZ5GMGQBlU4IhAALhQALhgAJhwAJiAAHrQAHiQAFigADiwAHjAAFjQADrgALT5XoElypbPZZDCOZJ6Nh8Zq7WBgM5dVhVFZoKZUWjHFKAFBWDReUAnFRaJIuIZiTxrSyDSIjXR2AB0AvCoICQoLDA0OEBESFBUWGBkaHB0eICEiIyQlJicoKSorLC0uLzAxMjM0Nay+AMAAwgDEAJ0AsgBRAA"
-            settings_dict = decrypt_settings_string_enum(self.settings_string)
-            settings_dict["archipelago"] = True
-            settings = Settings(settings_dict, self.random)
-            spoiler = Spoiler(settings)
-            spoiler.settings.shuffled_location_types.append(Types.ArchipelagoItem)
-            self.logic_holder = LogicVarHolder(spoiler, self)
 
         @classmethod
         def stage_assert_generate(cls, multiworld: MultiWorld):
@@ -148,6 +140,16 @@ def _get_slot_data(self):
             }
 
         def generate_early(self):
+            # V1 LIMITATION: We are restricting settings pretty heavily. This string serves as the base for all seeds, with AP options overriding some options
+            self.settings_string = "fjNPxAMxDIUx0QSpbHPUlZlBLg5gPQ+oBwRDIhKlsa58Iz8fiNEpEtiFKi4bVAhMF6AAd+AAOCAAGGAAGKAAAdm84FBiMhjoStwFIKW2wLcBJIBpkzVRCjFIKUUwGTLK/BQBuAIMAN4CBwBwAYQAOIECQByAoUAOYGCwB0A4YeXIITIagOrIrwAZTiU1QwkoSjuq1ZLEjQ0gRydoVFtRl6KiLAImIoArFljkbsl4u8igch2MvacgZ5GMGQBlU4IhAALhQALhgAJhwAJiAAHrQAHiQAFigADiwAHjAAFjQADrgALT5XoElypbPZZDCOZJ6Nh8Zq7WBgM5dVhVFZoKZUWjHFKAFBWDReUAnFRaJIuIZiTxrSyDSIjXR2AB0AvCoICQoLDA0OEBESFBUWGBkaHB0eICEiIyQlJicoKSorLC0uLzAxMjM0Nay+AMAAwgDEAJ0AsgBRAA"
+            settings_dict = decrypt_settings_string_enum(self.settings_string)
+            settings_dict["archipelago"] = True
+            settings_dict["starting_kongs_count"] = self.options.starting_kong_count.value
+            settings = Settings(settings_dict, self.random)
+            spoiler = Spoiler(settings)
+            spoiler.settings.shuffled_location_types.append(Types.ArchipelagoItem)
+            self.logic_holder = LogicVarHolder(spoiler, self)
+
             # Handle enemy rando
             spoiler = self.logic_holder.spoiler
             spoiler.enemy_rando_data = {}
@@ -163,9 +165,6 @@ def create_regions(self) -> None:
             create_regions(self.multiworld, self.player, self.logic_holder)
 
         def create_items(self) -> None:
-            # Handle starting inventory alterations here
-            if not self.options.climbing_shuffle.value:
-                self.options.start_inventory.options["Climbing"] = 1
             itempool: typing.List[DK64Item] = setup_items(self)
             self.multiworld.itempool += itempool
 
@@ -178,7 +177,7 @@ def set_rules(self):
         def generate_basic(self):
             connect_regions(self, self.logic_holder)
 
-            self.multiworld.get_location("Banana Hoard", self.player).place_locked_item(DK64Item("BananaHoard", ItemClassification.progression, 0x000000, self.player)) # TEMP?
+            self.multiworld.get_location("Banana Hoard", self.player).place_locked_item(DK64Item("BananaHoard", ItemClassification.progression, 0xD64060, self.player)) # TEMP?
 
         def generate_output(self, output_directory: str):
             try: