Merge branch 'dev' into final-changes-for-ballaam

Author: theballaam96

.bumpversion.cfg

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

archipelago/FillSettings.py

@@ -249,6 +249,7 @@ 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,

randomizer/Enums/Settings.jsonc

@@ -1420,7 +1420,8 @@
     "win_condition_spawns_ship": 292,
     "ice_trap_model": 293,
     "krool_in_boss_pool_v2": 294,
-    "bosses_selected": 295
+    "no_consumable_upgrades": 295,
+    "bosses_selected": 296
   },
   /*
     SettingsStringDataType:
@@ -2115,6 +2116,7 @@
     "SettingsStringEnum.shops_dont_cost": { "obj": "SettingsStringDataType.bool" },
     "SettingsStringEnum.alt_minecart_mayhem": { "obj": "SettingsStringDataType.bool" },
     "SettingsStringEnum.less_fragile_boulders": { "obj": "SettingsStringDataType.bool" },
+    "SettingsStringEnum.no_consumable_upgrades": { "obj": "SettingsStringDataType.bool" },
     "SettingsStringEnum.prog_slam_level_1": { "obj": "SlamRequirement" },
     "SettingsStringEnum.prog_slam_level_2": { "obj": "SlamRequirement" },
     "SettingsStringEnum.prog_slam_level_3": { "obj": "SlamRequirement" },

randomizer/Fill.py

@@ -2290,7 +2290,8 @@ def Fill(spoiler: Spoiler) -> None:
         bigListOfItemsToPlace = []
         if Types.Shop in spoiler.settings.shuffled_location_types:
             bigListOfItemsToPlace.extend(ItemPool.ImportantSharedMoves.copy())
-            bigListOfItemsToPlace.extend(ItemPool.JunkSharedMoves.copy())
+            if not spoiler.settings.no_consumable_upgrades:
+                bigListOfItemsToPlace.extend(ItemPool.JunkSharedMoves.copy())
             bigListOfItemsToPlace.extend(ItemPool.DonkeyMoves)
             bigListOfItemsToPlace.extend(ItemPool.DiddyMoves)
             bigListOfItemsToPlace.extend(ItemPool.LankyMoves)
@@ -2823,19 +2824,20 @@ def ShuffleSharedMoves(spoiler: Spoiler, placedMoves: List[Items], placedTypes:
     )
     if importantSharedUnplaced > 0:
         raise Ex.ItemPlacementException("Unable to find enough locations to place " + str(importantSharedUnplaced) + " shared important items.")
-    junkSharedToPlace = ItemPool.JunkSharedMoves.copy()
-    for item in placedMoves:
-        if item in junkSharedToPlace:
-            junkSharedToPlace.remove(item)
-    placedMoves.extend(junkSharedToPlace)
-    junkSharedUnplaced = PlaceItems(
-        spoiler,
-        FillAlgorithm.random,
-        junkSharedToPlace,
-        [x for x in ItemPool.GetItemsNeedingToBeAssumed(spoiler.settings, placedTypes) if x not in junkSharedToPlace],
-    )
-    if junkSharedUnplaced > 0:
-        raise Ex.ItemPlacementException("Unable to find enough locations to place " + str(junkSharedUnplaced) + " shared junk items.")
+    if not spoiler.settings.no_consumable_upgrades:
+        junkSharedToPlace = ItemPool.JunkSharedMoves.copy()
+        for item in placedMoves:
+            if item in junkSharedToPlace:
+                junkSharedToPlace.remove(item)
+        placedMoves.extend(junkSharedToPlace)
+        junkSharedUnplaced = PlaceItems(
+            spoiler,
+            FillAlgorithm.random,
+            junkSharedToPlace,
+            [x for x in ItemPool.GetItemsNeedingToBeAssumed(spoiler.settings, placedTypes) if x not in junkSharedToPlace],
+        )
+        if junkSharedUnplaced > 0:
+            raise Ex.ItemPlacementException("Unable to find enough locations to place " + str(junkSharedUnplaced) + " shared junk items.")
 
 
 def GeneratePlaythrough(spoiler: Spoiler) -> None:
@@ -4255,6 +4257,8 @@ def CheckForIncompatibleSettings(settings: Settings) -> None:
     if IsDDMSSelected(settings.hard_mode_selected, HardModeSelected.water_is_lava):
         if settings.no_healing:
             found_incompatibilities += "Cannot turn on 'Water is Lava' whilst disabling healing. "
+        if settings.no_consumable_upgrades and not settings.start_with_3rd_melon:
+            found_incompatibilities += "Cannot turn on 'Water is Lava' without access to 3 Melons of health. "
     if IsDDMSSelected(settings.hard_mode_selected, HardModeSelected.angry_caves):
         if settings.perma_death or settings.wipe_file_on_death:
             if settings.damage_amount == DamageAmount.quad or settings.damage_amount == DamageAmount.ohko:

randomizer/Patching/ASM/Items.py

@@ -299,7 +299,9 @@ def grabUpdates(ROM_COPY: LocalROM, settings, offset_dict: dict, spoiler):
     writeValue(ROM_COPY, 0x806F6F76, Overlay.Static, FLAG_ABILITY_CAMERA, offset_dict)  # Film Refill
     writeFunction(ROM_COPY, 0x806F6F78, Overlay.Static, "hasFlagMove", offset_dict)
     writeValue(ROM_COPY, 0x806F916A, Overlay.Static, FLAG_ABILITY_CAMERA, offset_dict)  # Film max
-    writeFunction(ROM_COPY, 0x806F916C, Overlay.Static, "hasFlagMove", offset_dict)
+    # writeFunction(ROM_COPY, 0x806F916C, Overlay.Static, "hasFlagMove", offset_dict)
+    writeValue(ROM_COPY, 0x806F916C, Overlay.Static, 0x00000000, offset_dict, 4)  # NOP (Skip this check, as the line below will render it obsolete)
+    writeValue(ROM_COPY, 0x806F9174, Overlay.Static, 0x00000000, offset_dict, 4)  # NOP (Skip setting film count to 0, to prevent that from happening)
     # Shockwave
     writeFunction(ROM_COPY, 0x806CA308, Overlay.Static, "hasFlagMove", offset_dict)
     writeFunction(ROM_COPY, 0x806F6EBC, Overlay.Static, "hasFlagMove", offset_dict)

randomizer/Settings.py

@@ -954,6 +954,7 @@ def generate_misc(self):
         self.holiday_setting_offseason = False
         self.remove_wrinkly_puzzles = False
         self.smaller_shops = False
+        self.no_consumable_upgrades = False
         self.alter_switch_allocation = False
         self.prog_slam_level_1 = SlamRequirement.green
         self.prog_slam_level_2 = SlamRequirement.green
@@ -1092,6 +1093,11 @@ def resolve_settings(self):
             self.climbing_status = ClimbingStatus.normal
         else:
             self.climbing_status = ClimbingStatus.shuffled
+        # If you start with two copies of Progressive Instrument Upgrade, you start with 3 melons of health
+        if guaranteed_starting_moves.count(Items.ProgressiveInstrumentUpgrade) == 2:
+            self.start_with_3rd_melon = True
+        else:
+            self.start_with_3rd_melon = False
 
         # Switchsanity handling
         ShufflableExits[Transitions.AztecMainToLlama].entryKongs = {

static/presets/weights/weight_files_raw.json

@@ -1340,6 +1340,15 @@
             },
             "qol_uses_hard": true
         },
+        "no_consumable_upgrades": {
+            "setting_type": "bool",
+            "options": {
+                "easy": 0,
+                "standard": 25,
+                "difficult": 50
+            },
+            "qol_uses_hard": true
+        },
         "open_lobbies": {
             "setting_type": "bool",
             "options": {

templates/items.html

@@ -745,7 +745,7 @@ <h3 class="modal-title title" id="starting_moves_ModalLabel">CUSTOMIZE STARTING
                 if (allow_splitting) {
                     let bk_copy_largest_to_smallest = temp_bk.slice();
                     bk_copy_largest_to_smallest.sort((a, b) => b.size - a.size);
-                    console.log(bk_copy_largest_to_smallest);
+                    //console.log(bk_copy_largest_to_smallest);
                     /*
                         Rule 4:
                         For all remaining buckets, check the pools which need the checks the most

templates/overworld.html

@@ -354,7 +354,18 @@ <h2 class="title">DIFFICULTY</h2>
                     </label>
                     {{ properties_selector(helm_hurry_items, "helmhurry_list", "HELM HURRY SELECTOR", "This will open a popup that will let you customize what how much time each item will give you.") }}
                 {# Remove end </div> as it's included in the macro for formatting #}
-                <div class="spacer"></div>
+                <div class="form-check form-switch item-switch">
+                    <label data-toggle="tooltip"
+                    title="Prevents consumable upgrades (Ammo Belts, Instrument Upgrades) from being placed in the game. You can still start with them.">
+                        <input class="form-check-input"
+                        type="checkbox"
+                        name="no_consumable_upgrades"
+                        id="no_consumable_upgrades"
+                        display_name="No Consumable Upgrades"
+                        value="True"/>
+                        No Consumable Upgrades
+                    </label>
+                </div>
             </div>
             <div class="flex-container">
                 {{ dropdown_multiselector(hard_mode, "hard_mode", "Hard Mode", "This will open a dropdown that will let you customize what hard mode Options are active.", 10) }}

tests/test_spoiler.py

@@ -36,7 +36,7 @@ class TestSpoiler(unittest.TestCase):
     def test_settings_string(self):
         """Confirm that settings strings decryption is working and generate a spoiler log with it."""
         # The settings string is defined either here or in the string above, pick your poison
-        self.settings_string = "Px+YQAAEKA4WBwwDhoDDgGHgMQAYiAxICiYFFAKKgUWA4+AyABkIFF8mMFEcFI2FRkQjQLHaF6AAa/AAZggAEwwAAYoAAP9A0yAoCBgIDgYIBASCgoGBYODAiAJ1SxuABvABwABxAByABzAB0AC5ABMwEJw9AhQgMDDCDQkE1kArQLRLSLTLUTVTWbXbYtmtqG22426ndW83CXAW+HfXhXEHOXGHInK3MHQHSXVHWnY3bDRElNSZRcYB1qiVAISIUQKMFIClBTBIyQRcE9TZPlm2YhGyyH6fx6GQllbEW4pJJGMxTSBDofEKakl6LELYvVOhUQsFBMwogEiR2qqrKBjLDkyTvEUByvIFY4PPJYwMgAAVTPEN0EIQAC0KABaGAAlDgASiAAHVoADokABUUAAaLAAdGAAKjQADVwAFk+EsqoMVgtj2Z4sgwRwwDOZJYF2BwpioWhjisDQViGIo1hcJIQn8SxBkiXReEQIBIKBYNBwQCISCgVCwYDIaDgdDwgEIiEYkEomE4oFIsFouF4wGq+BgYKxiNC+rGABlwul5hAYqGQzYgAdgB+gIpwJDEZDpWx6dDxI0VniavN7w6R4wCHdcQZaxCC9fP4Bs8fDCaOd3Ur2VmZxTZ1bF8KcKAeEQyGQlS2Nc+ET+ALIAgoG1CiPBEMhTHQlS2Nc+EZTpW18Z1vnfPIGUimnose4KrHLVW8w4IOFIx6lxpi9YUl8CQLckD7qbK5yCJpAlw1r0AT3yA4PUBKfQCW9gB9gA"
+        self.settings_string = "PyEAABCgOFgcMA4aAw4Bh4DEAGIgMSAomBRQCioFFgOPgMgAZCBRfJjBRHBSNhUZEI0Cx2hegAGvwAGYIABMMAAGKAAD/QNMgKAgYCA4GCAQEgoKBgWDgwIgCdUsbgAbwAcAAcQAcgAcwAdAAuQATMBCcPQIUIDAwwg0JBNZAK0C0S0i0y1E1U1m122LZrahttuNup3VvNwlwFvh314VxBzlxhyJytzB0B0l1R1p2N2w0RJTUmUXGAdaolQCEiFECjBSApQUwSMkEXBPU2T5ZtmIRssh+n8ehkJZWxluESSRiMU0gQ6HxCmpJeixC2L1ToVELAITMKIBIkdqqqygYyw5Mk7xFAcryBWODzyWMDIAAFUzxDdBCEAAtCgAWhgAJQ4AEogAB1aAA6JAAVFAAGiwAHRgACo0AA1cABZPhLfgqoMVgtj2Z4sgwRwwDOZJYF2BwpioWhjisDQViGIo1hcJIQn8SxBkiXReEQIBIKBYNBwQCISCgVCwYDIaDgdDwgEIiEYkEomE4oFIsFouF4wGq+BgYKxiNC+rGABlwul5hAYqGQzYgAdgB+gIpwJDEZDpWx6dDxI0VniavN7w6R4wCHdcQZaxCC9fP4Bs8fDCaOd3Ur2VmZxTZ1bF8KcKAeEQyGQlS2Nc+ET+ALIAgoG1CiPBEMhTHQlS2Nc+EZTpW18Z1vnfPIHUivmnose4KrHLVg8w8IOFIx6lxphY8Uol8CgLclcD7qbK6KBxZpAlw1r0AHyAPUAfQA9gB9gA"
         settings_dict = decrypt_settings_string_enum(self.settings_string)
         settings_dict["seed"] = random.randint(0, 100000000)  # Can be fixed if you want to test a specific seed repeatedly