Merge pull request #2963 from UmedMuzl/final-things-for-umed

Author: UmedMuzl

archipelago.json

@@ -1,6 +1,6 @@
 {
     "minimum_ap_version": "0.6.5", 
-    "world_version": "1.4.21",
+    "world_version": "1.4.22",
     "authors": ["2dos", "AlmostSeagull", "Ballaam", "Green Bean", "Killklli", "Lrauq", "PoryGone", "Umed"],
     "version": 7,
     "compatible_version": 7,

archipelago/FillSettings.py

@@ -47,6 +47,7 @@
     TroffSetting,
     WinConditionComplex,
     WrinklyHints,
+    KroolInBossPool,
 )
 from randomizer.Enums.Items import Items as DK64RItems
 from randomizer.Enums.Types import Types
@@ -249,7 +250,6 @@ def get_default_settings() -> dict:
             MiscChangesSelected.move_spring_cabin_rocketbarrel,
         ],
         "more_cutscene_skips": ExtraCutsceneSkips.auto,
-        "no_consumable_upgrades": False,
         "no_healing": False,
         "no_melons": False,
         "open_lobbies": False,
@@ -328,7 +328,10 @@ def apply_archipelago_settings(settings_dict: dict, options, multiworld) -> None
     settings_dict["archipelago"] = True
     settings_dict["starting_kongs_count"] = options.starting_kong_count.value
     settings_dict["open_lobbies"] = options.open_lobbies.value
-    settings_dict["krool_in_boss_pool"] = options.krool_in_boss_pool.value
+    if options.krool_in_boss_pool.value:
+        settings_dict["krool_in_boss_pool_v2"] = KroolInBossPool.full_shuffle
+    else:
+        settings_dict["krool_in_boss_pool_v2"] = KroolInBossPool.off
     settings_dict["helm_phase_count"] = options.helm_phase_count.value
     settings_dict["krool_phase_count"] = options.krool_phase_count.value
     settings_dict["level_randomization"] = LevelRandomization.loadingzone if options.loading_zone_rando.value else LevelRandomization.level_order_complex
@@ -342,7 +345,6 @@ def apply_archipelago_settings(settings_dict: dict, options, multiworld) -> None
     settings_dict["medal_requirement"] = options.jetpac_requirement.value
     settings_dict["rareware_gb_fairies"] = options.rareware_gb_fairies.value
     settings_dict["mirror_mode"] = options.mirror_mode.value
-    settings_dict["hard_mode"] = options.hard_mode.value
     settings_dict["key_8_helm"] = options.helm_key_lock.value
     settings_dict["shuffle_helm_location"] = options.shuffle_helm_level_order.value
     settings_dict["mermaid_gb_pearls"] = options.mermaid_gb_pearls.value
@@ -358,6 +360,7 @@ def apply_archipelago_settings(settings_dict: dict, options, multiworld) -> None
         settings_dict["galleon_water"] = GalleonWaterSetting.raised
     else:
         settings_dict["galleon_water"] = GalleonWaterSetting.vanilla
+    settings_dict["no_consumable_upgrades"] = options.remove_bait_potions.value
 
 
 def apply_blocker_settings(settings_dict: dict, options) -> None:
@@ -764,65 +767,28 @@ def apply_minigame_settings(settings_dict: dict, options, multiworld) -> None:
     settings_dict["bonus_barrel_auto_complete"] = options.auto_complete_bonus_barrels.value and options.goal.value != Goal.option_bonuses
     settings_dict["helm_room_bonus_count"] = HelmBonuses(options.helm_room_bonus_count.value)
 
-    # Map crown door and coin door settings
-    crown_door_mapping = {
-        0: HelmDoorItem.vanilla,
-        1: HelmDoorItem.opened,
-        2: HelmDoorItem.medium_random,
-        3: HelmDoorItem.req_gb,
-        4: HelmDoorItem.req_bp,
-        5: HelmDoorItem.req_companycoins,
-        6: HelmDoorItem.req_key,
-        7: HelmDoorItem.req_medal,
-        8: HelmDoorItem.req_crown,
-        9: HelmDoorItem.req_fairy,
-        10: HelmDoorItem.req_rainbowcoin,
-        11: HelmDoorItem.req_bean,
-        12: HelmDoorItem.req_pearl,
-        13: HelmDoorItem.easy_random,
-        14: HelmDoorItem.hard_random,
-    }
-
-    coin_door_mapping = {
-        0: HelmDoorItem.vanilla,
-        1: HelmDoorItem.opened,
-        2: HelmDoorItem.medium_random,
-        3: HelmDoorItem.req_gb,
-        4: HelmDoorItem.req_bp,
-        5: HelmDoorItem.req_companycoins,
-        6: HelmDoorItem.req_key,
-        7: HelmDoorItem.req_medal,
-        8: HelmDoorItem.req_crown,
-        9: HelmDoorItem.req_fairy,
-        10: HelmDoorItem.req_rainbowcoin,
-        11: HelmDoorItem.req_bean,
-        12: HelmDoorItem.req_pearl,
-        13: HelmDoorItem.easy_random,
-        14: HelmDoorItem.hard_random,
-    }
-
     # Map door item type to the key name in helm_door_item_count dict
     door_item_to_key = {
-        3: "golden_bananas",  # req_gb
-        4: "blueprints",  # req_bp
-        5: "company_coins",  # req_companycoins
-        6: "keys",  # req_key
-        7: "medals",  # req_medal
-        8: "crowns",  # req_crown
-        9: "fairies",  # req_fairy
-        10: "rainbow_coins",  # req_rainbowcoin
-        11: "bean",  # req_bean
-        12: "pearls",  # req_pearl
+        HelmDoorItem.req_gb: "golden_bananas",
+        HelmDoorItem.req_bp: "blueprints",
+        HelmDoorItem.req_companycoins: "company_coins",
+        HelmDoorItem.req_key: "keys",
+        HelmDoorItem.req_medal: "medals",
+        HelmDoorItem.req_crown: "crowns",
+        HelmDoorItem.req_fairy: "fairies",
+        HelmDoorItem.req_rainbowcoin: "rainbow_coins",
+        HelmDoorItem.req_bean: "bean",
+        HelmDoorItem.req_pearl: "pearls",
     }
 
-    settings_dict["crown_door_item"] = crown_door_mapping.get(options.crown_door_item.value, HelmDoorItem.opened)
+    settings_dict["crown_door_item"] = HelmDoorItem(options.crown_door_item.value)
     # Get count from dict based on selected item, default to 1 if not found
-    crown_item_key = door_item_to_key.get(options.crown_door_item.value)
+    crown_item_key = door_item_to_key.get(settings_dict["crown_door_item"])
     settings_dict["crown_door_item_count"] = options.helm_door_item_count.value.get(crown_item_key, 1) if crown_item_key else 1
 
-    settings_dict["coin_door_item"] = coin_door_mapping.get(options.coin_door_item.value, HelmDoorItem.opened)
+    settings_dict["coin_door_item"] = HelmDoorItem(options.coin_door_item.value)
     # Get count from dict based on selected item, default to 1 if not found
-    coin_item_key = door_item_to_key.get(options.coin_door_item.value)
+    coin_item_key = door_item_to_key.get(settings_dict["coin_door_item"])
     settings_dict["coin_door_item_count"] = options.helm_door_item_count.value.get(coin_item_key, 1) if coin_item_key else 1
 
     if hasattr(multiworld, "generation_is_fake"):

archipelago/Items.py

@@ -136,6 +136,9 @@ def setup_items(world: "DK64World") -> typing.List[DK64Item]:
             case DK64RTypes.Shop | DK64RTypes.TrainingBarrel | DK64RTypes.Shockwave:
                 if name == "Camera and Shockwave":
                     continue
+                # Skip JunkSharedMoves if no_consumable_upgrades is enabled
+                if item_id in DK64RItemPoolUtility.JunkSharedMoves and world.spoiler.settings.no_consumable_upgrades:
+                    continue
                 if item_id in DK64RItemPoolUtility.JunkSharedMoves:
                     ap_item.classification = ItemClassification.useful
                 num_moves = 1  # Track the number of each potion, default 1

archipelago/Options.py

@@ -492,12 +492,6 @@ class MirrorMode(Toggle):
     display_name = "Mirror Mode"
 
 
-class HardModeEnabled(Toggle):
-    """Determines whether Hard Mode is enabled. Use the yaml option below this to determine which settings you want enabled."""
-
-    display_name = "Hard Mode Enabled"
-
-
 class HardModeSelected(OptionList):
     """If Hard Mode is enabled, determines which Hard Mode settings are included.
 
@@ -1370,6 +1364,16 @@ class GalleonWaterLevel(Choice):
     default = 0
 
 
+class RemoveBaitPotions(Toggle):
+    """If enabled, Ammo Belts and Instrument Upgrades will not be placed in the world.
+
+    You can still start with them.
+    Only recommended to enable this with Loading Zone Rando enabled.
+    """
+
+    display_name = "Remove Bait Potions"
+
+
 @dataclass
 class DK64Options(PerGameCommonOptions):
     """Options for DK64R."""
@@ -1415,7 +1419,6 @@ class DK64Options(PerGameCommonOptions):
     tricks_selected: TricksSelected
     half_medals_in_pool: HalfMedals
     glitches_selected: GlitchesSelected
-    hard_mode: HardModeEnabled
     hard_mode_selected: HardModeSelected
     mirror_mode: MirrorMode
     hints_in_item_pool: HintItemRandomization
@@ -1469,6 +1472,7 @@ class DK64Options(PerGameCommonOptions):
     shop_prices: ShopPrices
     loading_zone_rando: LoadingZoneRando
     galleon_water_level: GalleonWaterLevel
+    remove_bait_potions: RemoveBaitPotions
 
 
 dk64_option_groups: List[OptionGroup] = [
@@ -1567,7 +1571,6 @@ class DK64Options(PerGameCommonOptions):
     OptionGroup(
         "Hard Mode",
         [
-            HardModeEnabled,
             HardModeSelected,
             HardBosses,
             MirrorMode,
@@ -1634,6 +1637,7 @@ class DK64Options(PerGameCommonOptions):
         "Quality of Life",
         [
             EnableCutscenes,
+            RemoveBaitPotions,
             ReceiveNotifications,
         ],
     ),

base-hack/src/randomizers/crowd_control.c

@@ -474,13 +474,14 @@ int cc_enabler_paper(void) {
     for (int i = 0; i < ActorCount; i++) {
         actorData *actor = ActorArray[i];
         if (actor) {
-            if (inShortList(actor->actorType, &ignored_paper_types, sizeof(ignored_paper_types) >> 1)) {
+            if (!inShortList(actor->actorType, &ignored_paper_types, sizeof(ignored_paper_types) >> 1)) {
                 if (actor->render) {
                     actor->render->scale_z = 0.015f;
                 }   
             }
         }
     }
+    return 0;
 }
 
 int cc_disabler_paper(void) {
@@ -494,6 +495,7 @@ int cc_disabler_paper(void) {
             }
         }
     }
+    return 0;
 }
 
 int cc_enabler_time(void) {

randomizer/ItemPool.py

@@ -657,9 +657,9 @@ def DistributeItems(items: list, count: int, distro: list[int] = None) -> list:
 
 
 def FakeItems(settings):
-    """Return a list of Fake Items to be placed."""
+    """Return a copy of the list of Fake Items to be placed."""
     # This order of items helps ensure that with low ice trap counts, you see models other than GBs
-    return settings.trap_assortment
+    return [item for item in settings.trap_assortment]
 
 
 def FillerItems(settings):

randomizer/Patching/DoorPlacer.py

@@ -507,7 +507,7 @@ def place_door_locations(spoiler, ROM_COPY: LocalROM):
                     pushNewDKPortalScript(portal_map, dk_portal_ids, ROM_COPY)
                     exit_start = getPointerLocation(TableNames.Exits, portal_map)
                     exits_to_alter = [-1]
-                    if cont_map_id in LEVEL_MAIN_MAPS:
+                    if portal_map in LEVEL_MAIN_MAPS:
                         exits_to_alter = PORTAL_MAP_EXIT_PAIRING[portal_map]
                     for exit_index in exits_to_alter:
                         if exit_index >= 0:

randomizer/ShuffleBosses.py

@@ -43,8 +43,8 @@ def getBosses(settings) -> list:
 def ShuffleBosses(boss_location_rando: bool, settings):
     """Shuffle boss locations."""
     boss_maps = getBosses(settings)
-    if len(boss_maps) < 12:
-        dupe_count = math.ceil(12 / len(boss_maps))
+    if len(boss_maps) < 7:
+        dupe_count = math.ceil(7 / len(boss_maps))
         original_maps = boss_maps.copy()
         for _ in range(dupe_count):
             boss_maps.extend(original_maps)

static/js/randomize_settings.js

@@ -116,6 +116,10 @@ function random_multi_select_setting(weights_obj) {
 function assign_multi_select_setting(setting_name, options_list) {
     /** Assign a list of values to a multi-select. */
     const selectElem = get_setting_element(setting_name);
+    if (!selectElem) {
+        console.warn(`Setting element not found: ${setting_name}`);
+        return;
+    }
     if (selectElem.tagName == "SELECT") {
         // Regular Multi-select
         for (let i = 0; i < selectElem.options.length; i++) {
@@ -125,8 +129,18 @@ function assign_multi_select_setting(setting_name, options_list) {
     } else {
         // Dropdown Multiselect
         const checkboxes = Array.from(selectElem.getElementsByTagName("input"));
+        let selectedCount = 0;
         for (let cb of checkboxes) {
             cb.checked = options_list.includes(cb.value);
+            if (cb.checked) {
+                selectedCount++;
+            }
+        }
+        // Update the count display directly
+        const baseName = setting_name.endsWith('_selected') ? setting_name.slice(0, -9) : setting_name;
+        const countLabel = document.getElementById(`selectedCount_${baseName}`);
+        if (countLabel) {
+            countLabel.innerText = `${selectedCount} item${selectedCount !== 1 ? 's' : ''} selected`;
         }
     }
 }
@@ -238,8 +252,9 @@ function randomize_settings() {
             // value to the list if the number is's above the provided weight.
             const min_selected = data.min_selected ?? 0;
             let length = -1;
-            while (length >= min_selected) {
-                let randomList = random_multi_select_setting(data.options[parsed_weight_name]);
+            let randomList;
+            while (length < min_selected) {
+                randomList = random_multi_select_setting(data.options[parsed_weight_name]);
                 length = randomList.length;
             }
             randSettings[settingName] = {
@@ -295,7 +310,7 @@ function randomize_settings() {
         randSettings["blocker_text"].value = parseInt((randSettings["blocker_text"].value / 201) * 100);
     }
     console.log(randSettings)
-    if (randSettings["no_healing"].value) {
+    if (randSettings["no_healing"]?.value && randSettings["hard_mode_selected"]?.value) {
         // Disable water is lava if no healing is selected
         randSettings["hard_mode_selected"].value = randSettings["hard_mode_selected"].value.filter(k => k != 'water_is_lava');
     }
@@ -310,12 +325,20 @@ function randomize_settings() {
         const settingType = setting_data.type;
         if (settingType == "bool") {
             const settingElem = get_setting_element(settingName);
+            if (!settingElem) {
+                console.warn(`Setting element not found: ${settingName}`);
+                continue;
+            }
             settingElem.checked = settingVal;
         } else if (settingType == "choice_multiple") {
             assign_multi_select_setting(settingName, settingVal);
         } else if (settingType != "item_rando") {
             // Both numeric and single-select settings work here.
             const settingElem = get_setting_element(settingName);
+            if (!settingElem) {
+                console.warn(`Setting element not found: ${settingName}`);
+                continue;
+            }
             settingElem.value = settingVal;
         }
     }