mapping fill results to spoiler

Author: Lrauq

worlds/dk64/DK64R

@@ -374,6 +374,7 @@ def UpdateFromArchipelagoItems(self, collectionState: CollectionState):
         self.Update(ownedItems)
 
         # We update CBs after updating items because we need to know if we have each Kong
+        colored_banana_counts = [[0] * 5 for _ in range(9)]
         for item_name in cbArchItems:
             # CBs are carefully named in the following format:
             # index 0: "Collectible CBs" - needed to identify this as a collectible item
@@ -387,7 +388,8 @@ def UpdateFromArchipelagoItems(self, collectionState: CollectionState):
                 continue
             level = Levels[item_data[2]]
             quantity = int(item_data[3])
-            self.ColoredBananas[level][kong] += quantity
+            colored_banana_counts[level][kong] += quantity
+        self.ColoredBananas = colored_banana_counts
 
     def Update(self, ownedItems):
         """Update logic variables based on owned items."""

worlds/dk64/Logic.py

@@ -10,7 +10,7 @@
 from worlds.dk64.DK64R.randomizer.Enums.Levels import Levels
 from worlds.dk64.DK64R.randomizer.Enums.Locations import Locations
 from worlds.dk64.DK64R.randomizer.Enums.Regions import Regions
-from worlds.dk64.DK64R.randomizer.Enums.Settings import HelmSetting, FungiTimeSetting
+from worlds.dk64.DK64R.randomizer.Enums.Settings import HelmSetting, FungiTimeSetting, FasterChecksSelected
 from worlds.dk64.DK64R.randomizer.Enums.Types import Types
 from worlds.dk64.DK64R.randomizer.Lists import Location as DK64RLocation, Item as DK64RItem
 from worlds.dk64.DK64R.randomizer.LogicClasses import Collectible, Event, LocationLogic, TransitionFront, Region as DK64Region
@@ -130,6 +130,12 @@ def create_region(multiworld: MultiWorld, player: int, region_name: str, level:
             location_logics = []
         for location_logic in location_logics:
             location_obj = DK64RLocation.LocationListOriginal[location_logic.id]
+            # DK Arcade Round 1 is dependent on a setting - don't create the inaccessible location depending on that Faster Checks toggle
+            if location_logic.id == Locations.FactoryDonkeyDKArcade:
+                if logic_holder.checkFastCheck(FasterChecksSelected.factory_arcade_round_1) and region_name == "FactoryArcadeTunnel":
+                    continue
+                elif not logic_holder.checkFastCheck(FasterChecksSelected.factory_arcade_round_2) and region_name == "FactoryBaboonBlast":
+                    continue
             # Starting move locations and Kongs may be shuffled but their locations are not relevant ever due to item placement restrictions
             if location_obj.type in (Types.TrainingBarrel, Types.PreGivenMove, Types.Kong):
                 continue
@@ -187,7 +193,7 @@ def create_region(multiworld: MultiWorld, player: int, region_name: str, level:
         elif collectible.type == Collectibles.balloon:
             quantity *= 10
         location.place_locked_item(DK64Item("Collectible CBs, " + collectible.kong.name + ", " + level.name + ", " + str(quantity), ItemClassification.progression, None, player))
-        print("Collectible CBs, " + collectible.kong.name + ", " + level.name + ", " + str(quantity))
+        # print("Collectible CBs, " + collectible.kong.name + ", " + level.name + ", " + str(quantity))
         new_region.locations.append(location)
 
     for event in events:

worlds/dk64/Regions.py

@@ -9,6 +9,7 @@
     sys.path.append('./worlds/dk64/DK64R/')
 
     from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification
+    from worlds.dk64.DK64R.randomizer.Enums.Items import Items as DK64RItems
     from worlds.dk64.DK64R.randomizer.SettingStrings import decrypt_settings_string_enum
     from .Items import DK64Item, full_item_table, setup_items
     from .Options import GenerateDK64Options, dk64_options
@@ -94,7 +95,34 @@ def generate_basic(self):
 
         def generate_output(self, output_directory: str):
             try:
-                # DK64_TODO: Handle patching via DK64R
+                # Read through all item assignments in this AP world and find their DK64 equivalents so we can update our world state for patching purposes
+                for ap_location in self.multiworld.get_locations(self.player):
+                    # We never need to place Collectibles or Events in our world state
+                    if "Collectible" in ap_location.name or "Event" in ap_location.name:
+                        continue
+                    # Find the corresponding DK64 Locations enum
+                    dk64_location_id = None
+                    for dk64_loc_id, dk64_loc in self.logic_holder.spoiler.LocationList.items():
+                        if dk64_loc.name == ap_location.name:
+                            dk64_location_id = dk64_loc_id
+                            break
+                    if dk64_location_id is not None and ap_location.item is not None:
+                        ap_item = ap_location.item
+                        if ap_item.player != self.player:
+                            self.logic_holder.spoiler.LocationList[dk64_location_id].PlaceItem(self.logic_holder.spoiler, DK64RItems.TestItem)  # TODO: replace with new AP item
+                        elif "Collectible" in ap_item.name:
+                            continue
+                        else:
+                            dk64_item = DK64RItems[ap_item.name]
+                            if dk64_item is not None:
+                                self.logic_holder.spoiler.LocationList[dk64_location_id].PlaceItem(self.logic_holder.spoiler, dk64_item)
+                            else:
+                                print(f"Item {ap_item.name} not found in DK64 item table.")
+                    elif dk64_location_id is not None:
+                        self.logic_holder.spoiler.LocationList[dk64_location_id].PlaceItem(self.logic_holder.spoiler, DK64RItems.NoItem)
+                    else:
+                        print(f"Location {ap_location.name} not found in DK64 location table.")
+
                 rompath = os.path.join(output_directory, f"{self.multiworld.get_out_file_name_base(self.player)}.sfc")
             except:
                 raise