Merge branch 'dev' into silly-haha-allsanity-seed

Author: GreenestBeen

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = False
-current_version = 5.7.12
+current_version = 5.7.16
 
 [bumpversion:file:version.py]
 search = version = "{current_version}"

__init__.py

@@ -905,7 +905,7 @@ def generate_output(self, output_directory: str):
                             slam_text = " or ".join(hinted_slams)
                             text = f"Ladies and Gentlemen! It appears that one fighter has come unequipped to properly handle this reptilian beast. Perhaps they should have looked in {slam_text} for the elusive slam.".upper()
                         elif self.options.shopkeeper_hints.value and hintedItem in shopkeepers:
-                            text = f"{hintedItem.name} has gone on a space mission to \x07{self.foreignMicroHints[hintedItem][0]}'s\x07 \x0d{self.foreignMicroHints[hintedItem][1]}\x0d.".upper()
+                            text = f"{hintedItem.name} has gone on a space mission to \x07{self.foreignMicroHints[hintedItem][0][0]}'s\x07 \x0d{self.foreignMicroHints[hintedItem][0][1]}\x0d.".upper()
 
                         # Only create microhint if we have text to display
                         if text:

ap_version.py

@@ -1,3 +1,3 @@
 """Holds the version for Archipelago."""
 
-version = "1.4.8"
+version = "1.4.10"

archipelago/FillSettings.py

@@ -101,43 +101,7 @@ def get_default_settings() -> dict:
         "dos_door_rando": False,
         "enable_shop_hints": True,
         "enable_tag_anywhere": True,
-        "enemies_selected": [
-            Enemies.Bat,
-            Enemies.BeaverBlue,
-            Enemies.BeaverGold,
-            Enemies.Bug,
-            Enemies.FireballGlasses,
-            Enemies.GetOut,
-            Enemies.Ghost,
-            Enemies.Gimpfish,
-            Enemies.Kaboom,
-            Enemies.KasplatChunky,
-            Enemies.KasplatDK,
-            Enemies.KasplatDiddy,
-            Enemies.KasplatLanky,
-            Enemies.KasplatTiny,
-            Enemies.KlaptrapGreen,
-            Enemies.KlaptrapPurple,
-            Enemies.KlaptrapRed,
-            Enemies.Klobber,
-            Enemies.Klump,
-            Enemies.Guard,
-            Enemies.Kosha,
-            Enemies.Kremling,
-            Enemies.Krossbones,
-            Enemies.MrDice0,
-            Enemies.MrDice1,
-            Enemies.MushroomMan,
-            Enemies.Pufftup,
-            Enemies.RoboKremling,
-            Enemies.ZingerRobo,
-            Enemies.Ruler,
-            Enemies.Shuri,
-            Enemies.SirDomino,
-            Enemies.SpiderSmall,
-            Enemies.ZingerCharger,
-            Enemies.ZingerLime,
-        ],
+        "enemies_selected": [],
         "enemy_kill_crown_timer": True,
         "enemy_speed_rando": False,
         "fairy_queen_behavior": RandomRequirement.pre_selected,
@@ -435,16 +399,9 @@ def apply_item_randomization_settings(settings_dict: dict, options) -> None:
     settings_dict["item_rando_list_1"].extend(always_enabled_categories)
     settings_dict["decouple_item_rando"] = False
 
-    if options.enable_filler_items.value:
-        if options.enable_chaos_blockers.value:
-            settings_dict["filler_items_selected"] = [ItemRandoFiller.banana, ItemRandoFiller.crown, ItemRandoFiller.fairy, ItemRandoFiller.medal, ItemRandoFiller.pearl, ItemRandoFiller.rainbowcoin]
-        else:
-            settings_dict["filler_items_selected"] = [
-                ItemRandoFiller.banana,
-                ItemRandoFiller.fairy,
-                ItemRandoFiller.medal,
-                ItemRandoFiller.pearl,
-            ]
+    # Set a default filler list for compatibility with core randomizer
+    settings_dict["filler_items_selected"] = [ItemRandoFiller.junkitem]
+
     # Conditional item categories
     if options.hints_in_item_pool.value:
         settings_dict["item_rando_list_1"].append(ItemRandoListSelected.hint)
@@ -624,6 +581,57 @@ def apply_glitches_and_tricks_settings(settings_dict: dict, options) -> None:
             settings_dict["glitches_selected"].append(glitches_mapping[glitch])
 
 
+def apply_enemies(settings_dict: dict, options) -> None:
+    """Apply Enemy settings."""
+    settings_dict["enemies_selected"] = []
+
+    enemy_mapping = {
+        "Bat": Enemies.Bat,
+        "BeaverBlue": Enemies.BeaverBlue,
+        "BeaverGold": Enemies.BeaverGold,
+        "Bug": Enemies.Bug,
+        "FireballGlasses": Enemies.FireballGlasses,
+        "GetOut": Enemies.GetOut,
+        "Ghost": Enemies.Ghost,
+        "Gimpfish": Enemies.Gimpfish,
+        "Kaboom": Enemies.Kaboom,
+        "KasplatChunky": Enemies.KasplatChunky,
+        "KasplatDK": Enemies.KasplatDK,
+        "KasplatDiddy": Enemies.KasplatDiddy,
+        "KasplatLanky": Enemies.KasplatLanky,
+        "KasplatTiny": Enemies.KasplatTiny,
+        "KlaptrapGreen": Enemies.KlaptrapGreen,
+        "KlaptrapPurple": Enemies.KlaptrapPurple,
+        "KlaptrapRed": Enemies.KlaptrapRed,
+        "Klobber": Enemies.Klobber,
+        "Klump": Enemies.Klump,
+        "Guard": Enemies.Guard,
+        "Kosha": Enemies.Kosha,
+        "Kremling": Enemies.Kremling,
+        "Krossbones": Enemies.Krossbones,
+        "MrDice0": Enemies.MrDice0,
+        "MrDice1": Enemies.MrDice1,
+        "MushroomMan": Enemies.MushroomMan,
+        "Pufftup": Enemies.Pufftup,
+        "RoboKremling": Enemies.RoboKremling,
+        "ZingerRobo": Enemies.ZingerRobo,
+        "Ruler": Enemies.Ruler,
+        "Shuri": Enemies.Shuri,
+        "SirDomino": Enemies.SirDomino,
+        "SpiderSmall": Enemies.SpiderSmall,
+        "ZingerCharger": Enemies.ZingerCharger,
+        "ZingerLime": Enemies.ZingerLime,
+        "GuardDisableA": Enemies.GuardDisableA,
+        "GuardDisableZ": Enemies.GuardDisableZ,
+        "GuardTag": Enemies.GuardTag,
+        "GuardGetOut": Enemies.GuardGetOut,
+    }
+
+    for enemy in options.enemies_selected:
+        if enemy in enemy_mapping:
+            settings_dict["enemies_selected"].append(enemy_mapping[enemy])
+
+
 def apply_boss_and_key_settings(settings_dict: dict, options) -> None:
     """Apply boss and key settings."""
     # Starting keys configuration
@@ -808,6 +816,7 @@ def fillsettings(options, multiworld, random_obj):
     apply_starting_moves_settings(settings_dict, options)
     apply_hint_settings(settings_dict, options)
     apply_minigame_settings(settings_dict, options, multiworld)
+    apply_enemies(settings_dict, options)
 
     # Handle fake generation keys if needed
     if hasattr(multiworld, "generation_is_fake"):

archipelago/Items.py

@@ -11,7 +11,7 @@
 from randomizer.Enums.Levels import Levels
 from randomizer.Lists import Item as DK64RItem
 from randomizer.Enums.Items import Items as DK64RItems
-from randomizer.Enums.Settings import WinConditionComplex, ItemRandoFiller
+from randomizer.Enums.Settings import WinConditionComplex
 from randomizer.Enums.Types import Types as DK64RTypes, BarrierItems
 import randomizer.ItemPool as DK64RItemPoolUtility
 import copy
@@ -287,26 +287,22 @@ def setup_items(world: World) -> typing.List[DK64Item]:
     trap_count = 0 if (len(trap_weights) == 0) else math.ceil(filler_item_count * (world.options.trap_fill_percentage.value / 100.0))
     filler_item_count -= trap_count
 
-    filler_mapping = {
-        ItemRandoFiller.junkitem: [DK64RItems.JunkMelon],
-        ItemRandoFiller.banana: [DK64RItems.FillerBanana],
-        ItemRandoFiller.crown: [DK64RItems.FillerCrown],
-        ItemRandoFiller.fairy: [DK64RItems.FillerFairy],
-        ItemRandoFiller.medal: [DK64RItems.FillerMedal],
-        ItemRandoFiller.pearl: [DK64RItems.FillerPearl],
-        ItemRandoFiller.rainbowcoin: [DK64RItems.FillerRainbowCoin],
-    }
+    # Build filler weights based on options
+    filler_weights = []
+    filler_weights += [DK64RItems.JunkMelon] * world.options.junk_filler_weight.value
+    filler_weights += [DK64RItems.FillerBanana] * world.options.banana_filler_weight.value
+    filler_weights += [DK64RItems.FillerCrown] * world.options.crown_filler_weight.value
+    filler_weights += [DK64RItems.FillerFairy] * world.options.fairy_filler_weight.value
+    filler_weights += [DK64RItems.FillerMedal] * world.options.medal_filler_weight.value
+    filler_weights += [DK64RItems.FillerPearl] * world.options.pearl_filler_weight.value
+    filler_weights += [DK64RItems.FillerRainbowCoin] * world.options.rainbowcoin_filler_weight.value
 
-    possible_junk = []
-    for filler_type in world.spoiler.settings.filler_items_selected:
-        if filler_type in filler_mapping:
-            possible_junk.extend(filler_mapping[filler_type])
-
-    if not possible_junk:
-        possible_junk = [DK64RItems.JunkMelon]
+    # If no filler weights are set, default to junk
+    if not filler_weights:
+        filler_weights = [DK64RItems.JunkMelon]
 
     for _ in range(filler_item_count):
-        junk_enum = world.random.choice(possible_junk)
+        junk_enum = world.random.choice(filler_weights)
         junk_item = DK64RItem.ItemList[junk_enum]
         item_table.append(DK64Item(junk_item.name, ItemClassification.filler, full_item_table[junk_item.name].code, world.player))