Merge pull request #2923 from Lrauq/decouple-snide-gbs

Decoupled Snide GBs from all GBs

Author: Lrauq

archipelago/FillSettings.py

@@ -151,6 +151,7 @@ def get_default_settings() -> dict:
             ItemRandoListSelected.wrinkly,
             ItemRandoListSelected.gauntletbanana,
             ItemRandoListSelected.racebanana,
+            ItemRandoListSelected.sniderewards,
             ItemRandoListSelected.arenas,
             ItemRandoListSelected.halfmedal,
             ItemRandoListSelected.enemies,
@@ -382,6 +383,7 @@ def apply_item_randomization_settings(settings_dict: dict, options) -> None:
         ItemRandoListSelected.banana,
         ItemRandoListSelected.racebanana,
         ItemRandoListSelected.gauntletbanana,
+        ItemRandoListSelected.blueprintbanana,
         ItemRandoListSelected.crown,
         ItemRandoListSelected.blueprint,
         ItemRandoListSelected.key,

randomizer/CompileHints.py

@@ -1436,6 +1436,8 @@ def compileHints(spoiler: Spoiler) -> bool:
             # The Castle Museum Map is segmented by glass walls. Different regions of the Museum care about different transitions.
             Regions.Museum: [Transitions.CastleMuseumToMain],
             Regions.MuseumBehindGlass: [Transitions.CastleMuseumToBallroom, Transitions.CastleMuseumToCarRace],
+            # The Arcade region doesn't contain the transition that leads into it because the transition needed dedicated climbing logic for the pole.
+            Regions.FactoryArcadeTunnel: [Transitions.FactoryArcadeToStorage],
         }
         # These are the maps we classify as "connectors" - they are regions with exactly two entrances
         connector_maps = {
@@ -1513,7 +1515,8 @@ def compileHints(spoiler: Spoiler) -> bool:
                 Maps.CrystalCaves,
                 Maps.CreepyCastle,
             )
-            if woth_map in main_level_maps:
+            # One exception: the Arcade is effectively an isolated loading zone within the main map of Factory
+            if woth_map in main_level_maps and region_id != Regions.FactoryArcadeTunnel:
                 continue
             # Blast maps all happen to be contained in the main map of the respective level
             if woth_map in (

randomizer/Enums/Settings.jsonc

@@ -544,7 +544,8 @@
     "dummyitem_halfmedal": 44,
     "racebanana": 45,
     "gauntletbanana": 46,
-    "blueprintbanana": 47
+    "blueprintbanana": 47,
+    "sniderewards": 48
   },
 
   "ItemRandoFiller": {

randomizer/Enums/Types.json

@@ -71,12 +71,20 @@
         },
         {
             "name": "Snide's Rewards",
-            "value": "blueprintbanana",
-            "tooltip": "All banana checks which are obtained after turning in a blueprint is in the pool.",
+            "value": "sniderewards",
+            "tooltip": "Snide can have random rewards instead of Golden Bananas. Use the Max Snide Reward Limit to customize how many locations will be shuffled.",
             "check_count": 40,
             "item_count": 0,
             "is_check": true,
-            "tied": "banana"
+            "tied": "blueprintbanana"
+        },
+        {
+            "name": "Snide's Bananas",
+            "value": "blueprintbanana",
+            "tooltip": "All banana checks which are obtained after turning in a blueprint are in the pool. Use the Max Snide Reward Limit to customize how many GBs will be shuffled.",
+            "check_count": 0,
+            "item_count": 40,
+            "is_check": false
         },
         {
             "name": "Crown Arenas",

randomizer/Enums/Types.py

@@ -62,6 +62,7 @@
     "racebanana": 45,
     "gauntletbanana": 46,
     "blueprintbanana": 47,
+    "sniderewards": 48,
 }
 for item in ItemRandoSelector:
     item["num_val"] = check_map.get(item["value"], 0)

randomizer/Lists/Location.py

@@ -653,46 +653,46 @@ def UnplaceItem(self, spoiler):
     Locations.ChunkyIslesPotion: Location(Levels.DKIsles, "Isles Cranky Chunky", Items.NoItem, Types.Shop, Kongs.chunky, [MoveTypes.Moves, 0, VendorType.Cranky]),
 
     # Blueprints
-    Locations.TurnInJungleJapesDonkeyBlueprint: Location(Levels.Snide, "Turning In 1 Blueprint", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x3fe)]),
-    Locations.TurnInJungleJapesDiddyBlueprint: Location(Levels.Snide, "Turning In 2 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x3ff)]),
-    Locations.TurnInJungleJapesLankyBlueprint: Location(Levels.Snide, "Turning In 3 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x400)]),
-    Locations.TurnInJungleJapesTinyBlueprint: Location(Levels.Snide, "Turning In 4 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x401)]),
-    Locations.TurnInJungleJapesChunkyBlueprint: Location(Levels.Snide, "Turning In 5 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x402)]),
-    Locations.TurnInAngryAztecDonkeyBlueprint: Location(Levels.Snide, "Turning In 6 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x403)]),
-    Locations.TurnInAngryAztecDiddyBlueprint: Location(Levels.Snide, "Turning In 7 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x404)]),
-    Locations.TurnInAngryAztecLankyBlueprint: Location(Levels.Snide, "Turning In 8 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x405)]),
-    Locations.TurnInAngryAztecTinyBlueprint: Location(Levels.Snide, "Turning In 9 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x406)]),
-    Locations.TurnInAngryAztecChunkyBlueprint: Location(Levels.Snide, "Turning In 10 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x407)]),
-    Locations.TurnInFranticFactoryDonkeyBlueprint: Location(Levels.Snide, "Turning In 11 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x408)]),
-    Locations.TurnInFranticFactoryDiddyBlueprint: Location(Levels.Snide, "Turning In 12 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x409)]),
-    Locations.TurnInFranticFactoryLankyBlueprint: Location(Levels.Snide, "Turning In 13 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x40a)]),
-    Locations.TurnInFranticFactoryTinyBlueprint: Location(Levels.Snide, "Turning In 14 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x40b)]),
-    Locations.TurnInFranticFactoryChunkyBlueprint: Location(Levels.Snide, "Turning In 15 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x40c)]),
-    Locations.TurnInGloomyGalleonDonkeyBlueprint: Location(Levels.Snide, "Turning In 16 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x40d)]),
-    Locations.TurnInGloomyGalleonDiddyBlueprint: Location(Levels.Snide, "Turning In 17 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x40e)]),
-    Locations.TurnInGloomyGalleonLankyBlueprint: Location(Levels.Snide, "Turning In 18 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x40f)]),
-    Locations.TurnInGloomyGalleonTinyBlueprint: Location(Levels.Snide, "Turning In 19 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x410)]),
-    Locations.TurnInGloomyGalleonChunkyBlueprint: Location(Levels.Snide, "Turning In 20 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x411)]),
-    Locations.TurnInFungiForestDonkeyBlueprint: Location(Levels.Snide, "Turning In 21 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x412)]),
-    Locations.TurnInFungiForestDiddyBlueprint: Location(Levels.Snide, "Turning In 22 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x413)]),
-    Locations.TurnInFungiForestLankyBlueprint: Location(Levels.Snide, "Turning In 23 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x414)]),
-    Locations.TurnInFungiForestTinyBlueprint: Location(Levels.Snide, "Turning In 24 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x415)]),
-    Locations.TurnInFungiForestChunkyBlueprint: Location(Levels.Snide, "Turning In 25 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x416)]),
-    Locations.TurnInCrystalCavesDonkeyBlueprint: Location(Levels.Snide, "Turning In 26 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x417)]),
-    Locations.TurnInCrystalCavesDiddyBlueprint: Location(Levels.Snide, "Turning In 27 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x418)]),
-    Locations.TurnInCrystalCavesLankyBlueprint: Location(Levels.Snide, "Turning In 28 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x419)]),
-    Locations.TurnInCrystalCavesTinyBlueprint: Location(Levels.Snide, "Turning In 29 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x41a)]),
-    Locations.TurnInCrystalCavesChunkyBlueprint: Location(Levels.Snide, "Turning In 30 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x41b)]),
-    Locations.TurnInCreepyCastleDonkeyBlueprint: Location(Levels.Snide, "Turning In 31 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x41c)]),
-    Locations.TurnInCreepyCastleDiddyBlueprint: Location(Levels.Snide, "Turning In 32 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x41d)]),
-    Locations.TurnInCreepyCastleLankyBlueprint: Location(Levels.Snide, "Turning In 33 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x41e)]),
-    Locations.TurnInCreepyCastleTinyBlueprint: Location(Levels.Snide, "Turning In 34 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x41f)]),
-    Locations.TurnInCreepyCastleChunkyBlueprint: Location(Levels.Snide, "Turning In 35 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x420)]),
-    Locations.TurnInDKIslesDonkeyBlueprint: Location(Levels.Snide, "Turning In 36 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x421)]),
-    Locations.TurnInDKIslesDiddyBlueprint: Location(Levels.Snide, "Turning In 37 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x422)]),
-    Locations.TurnInDKIslesLankyBlueprint: Location(Levels.Snide, "Turning In 38 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x423)]),
-    Locations.TurnInDKIslesTinyBlueprint: Location(Levels.Snide, "Turning In 39 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x424)]),
-    Locations.TurnInDKIslesChunkyBlueprint: Location(Levels.Snide, "Turning In 40 Blueprints", Items.GoldenBanana, Types.Banana, Kongs.any, [MapIDCombo(0, -1, 0x425)]),
+    Locations.TurnInJungleJapesDonkeyBlueprint: Location(Levels.Snide, "Turning In 1 Blueprint", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x3fe)]),
+    Locations.TurnInJungleJapesDiddyBlueprint: Location(Levels.Snide, "Turning In 2 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x3ff)]),
+    Locations.TurnInJungleJapesLankyBlueprint: Location(Levels.Snide, "Turning In 3 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x400)]),
+    Locations.TurnInJungleJapesTinyBlueprint: Location(Levels.Snide, "Turning In 4 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x401)]),
+    Locations.TurnInJungleJapesChunkyBlueprint: Location(Levels.Snide, "Turning In 5 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x402)]),
+    Locations.TurnInAngryAztecDonkeyBlueprint: Location(Levels.Snide, "Turning In 6 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x403)]),
+    Locations.TurnInAngryAztecDiddyBlueprint: Location(Levels.Snide, "Turning In 7 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x404)]),
+    Locations.TurnInAngryAztecLankyBlueprint: Location(Levels.Snide, "Turning In 8 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x405)]),
+    Locations.TurnInAngryAztecTinyBlueprint: Location(Levels.Snide, "Turning In 9 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x406)]),
+    Locations.TurnInAngryAztecChunkyBlueprint: Location(Levels.Snide, "Turning In 10 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x407)]),
+    Locations.TurnInFranticFactoryDonkeyBlueprint: Location(Levels.Snide, "Turning In 11 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x408)]),
+    Locations.TurnInFranticFactoryDiddyBlueprint: Location(Levels.Snide, "Turning In 12 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x409)]),
+    Locations.TurnInFranticFactoryLankyBlueprint: Location(Levels.Snide, "Turning In 13 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x40a)]),
+    Locations.TurnInFranticFactoryTinyBlueprint: Location(Levels.Snide, "Turning In 14 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x40b)]),
+    Locations.TurnInFranticFactoryChunkyBlueprint: Location(Levels.Snide, "Turning In 15 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x40c)]),
+    Locations.TurnInGloomyGalleonDonkeyBlueprint: Location(Levels.Snide, "Turning In 16 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x40d)]),
+    Locations.TurnInGloomyGalleonDiddyBlueprint: Location(Levels.Snide, "Turning In 17 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x40e)]),
+    Locations.TurnInGloomyGalleonLankyBlueprint: Location(Levels.Snide, "Turning In 18 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x40f)]),
+    Locations.TurnInGloomyGalleonTinyBlueprint: Location(Levels.Snide, "Turning In 19 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x410)]),
+    Locations.TurnInGloomyGalleonChunkyBlueprint: Location(Levels.Snide, "Turning In 20 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x411)]),
+    Locations.TurnInFungiForestDonkeyBlueprint: Location(Levels.Snide, "Turning In 21 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x412)]),
+    Locations.TurnInFungiForestDiddyBlueprint: Location(Levels.Snide, "Turning In 22 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x413)]),
+    Locations.TurnInFungiForestLankyBlueprint: Location(Levels.Snide, "Turning In 23 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x414)]),
+    Locations.TurnInFungiForestTinyBlueprint: Location(Levels.Snide, "Turning In 24 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x415)]),
+    Locations.TurnInFungiForestChunkyBlueprint: Location(Levels.Snide, "Turning In 25 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x416)]),
+    Locations.TurnInCrystalCavesDonkeyBlueprint: Location(Levels.Snide, "Turning In 26 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x417)]),
+    Locations.TurnInCrystalCavesDiddyBlueprint: Location(Levels.Snide, "Turning In 27 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x418)]),
+    Locations.TurnInCrystalCavesLankyBlueprint: Location(Levels.Snide, "Turning In 28 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x419)]),
+    Locations.TurnInCrystalCavesTinyBlueprint: Location(Levels.Snide, "Turning In 29 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x41a)]),
+    Locations.TurnInCrystalCavesChunkyBlueprint: Location(Levels.Snide, "Turning In 30 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x41b)]),
+    Locations.TurnInCreepyCastleDonkeyBlueprint: Location(Levels.Snide, "Turning In 31 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x41c)]),
+    Locations.TurnInCreepyCastleDiddyBlueprint: Location(Levels.Snide, "Turning In 32 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x41d)]),
+    Locations.TurnInCreepyCastleLankyBlueprint: Location(Levels.Snide, "Turning In 33 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x41e)]),
+    Locations.TurnInCreepyCastleTinyBlueprint: Location(Levels.Snide, "Turning In 34 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x41f)]),
+    Locations.TurnInCreepyCastleChunkyBlueprint: Location(Levels.Snide, "Turning In 35 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x420)]),
+    Locations.TurnInDKIslesDonkeyBlueprint: Location(Levels.Snide, "Turning In 36 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x421)]),
+    Locations.TurnInDKIslesDiddyBlueprint: Location(Levels.Snide, "Turning In 37 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x422)]),
+    Locations.TurnInDKIslesLankyBlueprint: Location(Levels.Snide, "Turning In 38 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x423)]),
+    Locations.TurnInDKIslesTinyBlueprint: Location(Levels.Snide, "Turning In 39 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x424)]),
+    Locations.TurnInDKIslesChunkyBlueprint: Location(Levels.Snide, "Turning In 40 Blueprints", Items.GoldenBanana, Types.BlueprintBanana, Kongs.any, [MapIDCombo(0, -1, 0x425)]),
 
     # Hint Doors
     Locations.JapesDonkeyDoor: Location(Levels.JungleJapes, "Japes Donkey Hint Door", Items.JapesDonkeyHint, Types.Hint, Kongs.donkey),