Minecraft

BaseClasses.py

@@ -1575,9 +1575,10 @@ def bool_to_text(variable: Union[bool, str]) -> str:
                                                          '<=>' if entry['direction'] == 'both' else
                                                          '<=' if entry['direction'] == 'exit' else '=>',
                                                          entry['exit']) for entry in self.entrances.values()]))
-            outfile.write('\n\nMedallions:\n')
-            for dungeon, medallion in self.medallions.items():
-                outfile.write(f'\n{dungeon}: {medallion}')
+            if list(self.world.alttp_player_ids):
+                outfile.write('\n\nMedallions:\n')
+                for dungeon, medallion in self.medallions.items():
+                    outfile.write(f'\n{dungeon}: {medallion}')
             if self.startinventory:
                 outfile.write('\n\nStarting Inventory:\n\n')
                 outfile.write('\n'.join(self.startinventory))

Mystery.py

@@ -564,6 +564,17 @@ def roll_settings(weights: dict, plando_options: typing.Set[str] = frozenset(("b
                 setattr(ret, option_name, option.from_any(get_choice(option_name, weights)))
             else:
                 setattr(ret, option_name, option(option.default))
+        # bad hardcoded behavior to make this work for now    
+        ret.plando_connections = []
+        if "connections" in plando_options:
+            options = weights.get("plando_connections", [])
+            for placement in options:
+                if roll_percentage(get_choice("percentage", placement, 100)):
+                    ret.plando_connections.append(PlandoConnection(
+                        get_choice("entrance", placement),
+                        get_choice("exit", placement),
+                        get_choice("direction", placement, "both")
+                    ))
     else:
         raise Exception(f"Unsupported game {ret.game}")
     return ret

test/minecraft/TestAdvancements.py

@@ -201,14 +201,9 @@ def test_42014(self):
             ["Hot Tourist Destinations", False, [], ['Ingot Crafting']], 
             ["Hot Tourist Destinations", False, [], ['Flint and Steel']], 
             ["Hot Tourist Destinations", False, [], ['Progressive Tools']], 
-            ["Hot Tourist Destinations", False, [], ['Progressive Weapons']], 
-            ["Hot Tourist Destinations", False, [], ['Progressive Armor', 'Shield']], 
-            ["Hot Tourist Destinations", False, [], ['Fishing Rod']],
             ["Hot Tourist Destinations", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], 
-            ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Bucket', 'Fishing Rod']], 
-            ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
-            ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Bucket', 'Fishing Rod']], 
-            ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
+            ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], 
+            ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']],
             ])
 
     def test_42015(self):
@@ -979,7 +974,8 @@ def test_42074(self):
             ["Sticky Situation", False, []],
             ["Sticky Situation", False, [], ['Bottles']],
             ["Sticky Situation", False, [], ['Ingot Crafting']],
-            ["Sticky Situation", True, ['Bottles', 'Ingot Crafting']],
+            ["Sticky Situation", False, [], ['Campfire']],
+            ["Sticky Situation", True, ['Bottles', 'Ingot Crafting', 'Campfire']],
             ])
 
     def test_42075(self):
@@ -1099,16 +1095,17 @@ def test_42088(self):
         self.run_location_tests([
             ["When Pigs Fly", False, []], 
             ["When Pigs Fly", False, [], ['Ingot Crafting']], 
-            ["When Pigs Fly", False, [], ['Flint and Steel']], 
             ["When Pigs Fly", False, [], ['Progressive Tools']], 
             ["When Pigs Fly", False, [], ['Progressive Weapons']], 
             ["When Pigs Fly", False, [], ['Progressive Armor', 'Shield']], 
             ["When Pigs Fly", False, [], ['Fishing Rod']], 
-            ["When Pigs Fly", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], 
+            ["When Pigs Fly", False, ['Progressive Weapons'], ['Flint and Steel', 'Progressive Weapons', 'Progressive Weapons']], 
+            ["When Pigs Fly", False, ['Progressive Tools', 'Progressive Tools', 'Progressive Weapons'], ['Bucket', 'Progressive Tools', 'Progressive Weapons', 'Progressive Weapons']], 
             ["When Pigs Fly", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']], 
             ["When Pigs Fly", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Fishing Rod']],
             ["When Pigs Fly", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield', 'Fishing Rod']], 
             ["When Pigs Fly", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Shield', 'Fishing Rod']],
+            ["When Pigs Fly", True, ['Progressive Weapons', 'Progressive Weapons', 'Progressive Armor', 'Shield', 'Ingot Crafting', 'Progressive Tools', 'Fishing Rod']],
             ])
 
     def test_42089(self):

worlds/minecraft/Locations.py

@@ -15,7 +15,7 @@ def __init__(self, player: int, name: str, address: int, parent):
     "Who is Cutting Onions?": AdvData(42000, 'Overworld'),
     "Oh Shiny": AdvData(42001, 'Overworld'),
     "Suit Up": AdvData(42002, 'Overworld'),
-    "Very Very Frightening": AdvData(42003, 'Village'),
+    "Very Very Frightening": AdvData(42003, 'Overworld'),
     "Hot Stuff": AdvData(42004, 'Overworld'),
     "Free the End": AdvData(42005, 'The End'),
     "A Furious Cocktail": AdvData(42006, 'Nether Fortress'),

worlds/minecraft/Regions.py

@@ -38,20 +38,33 @@ def check_valid_connection(exit, struct):
         return False
 
     def set_pair(exit, struct): 
+        try: 
+            assert exit in exits
+            assert struct in structs
+        except AssertionError as e: 
+            raise Exception(f"Invalid connection: {exit} => {struct} for player {player}")
         pairs[exit] = struct
         exits.remove(exit)
         structs.remove(struct)
 
     # Plando stuff. Remove any utilized exits/structs from the lists. 
     # Raise error if trying to put Nether Fortress in the End. 
+    if world.plando_connections[player]:
+        for connection in world.plando_connections[player]:
+            try:
+                if connection.entrance == 'The End Structure' and connection.exit == 'Nether Fortress': 
+                    raise Exception(f"Cannot place Nether Fortress in the End for player {player}")
+                set_pair(connection.entrance, connection.exit)
+            except Exception as e:
+                raise Exception(f"Could not connect using {connection}") from e
 
     if world.shuffle_structures[player]: 
         # Can't put Nether Fortress in the End
         if 'The End Structure' in exits and 'Nether Fortress' in structs: 
             try: 
                 end_struct = world.random.choice([s for s in structs if s != 'Nether Fortress'])
                 set_pair('The End Structure', end_struct)
-            except IndexError as e: 
+            except IndexError as e: # should only happen if structs is emptied by plando
                 raise Exception(f"Plando forced Nether Fortress in the End for player {player}") from e
         world.random.shuffle(structs)
         for exit, struct in zip(exits[:], structs[:]): 

worlds/minecraft/Rules.py

@@ -42,9 +42,10 @@ def reachable_locations(state):
     set_rule(world.get_location("Who is Cutting Onions?", player), lambda state: state.can_piglin_trade(player))
     set_rule(world.get_location("Oh Shiny", player), lambda state: state.can_piglin_trade(player))
     set_rule(world.get_location("Suit Up", player), lambda state: state.has("Progressive Armor", player) and state.has_iron_ingots(player))
-    set_rule(world.get_location("Very Very Frightening", player), lambda state: state.has("Channeling Book", player) and state.can_use_anvil(player) and state.can_enchant(player))
+    set_rule(world.get_location("Very Very Frightening", player), lambda state: state.has("Channeling Book", player) and state.can_use_anvil(player) and state.can_enchant(player) and \
+        ((world.get_region('Village', player).entrances[0].parent_region.name != 'The End' and state.can_reach('Village', 'Region', player)) or state.can_reach('Zombie Doctor', 'Location', player))) # need villager into the overworld for lightning strike
     set_rule(world.get_location("Hot Stuff", player), lambda state: state.has("Bucket", player) and state.has_iron_ingots(player))
-    set_rule(world.get_location("Free the End", player), lambda state: can_complete(state))
+    set_rule(world.get_location("Free the End", player), lambda state: can_complete(state) and state.has('Ingot Crafting', player) and state.can_reach('The Nether', 'Region', player))
     set_rule(world.get_location("A Furious Cocktail", player), lambda state: state.can_brew_potions(player) and 
                                                                              state.has("Fishing Rod", player) and # Water Breathing
                                                                              state.can_reach('The Nether', 'Region', player) and # Regeneration, Fire Resistance, gold nuggets
@@ -58,8 +59,8 @@ def reachable_locations(state):
     set_rule(world.get_location("Local Brewery", player), lambda state: state.can_brew_potions(player))
     set_rule(world.get_location("The Next Generation", player), lambda state: can_complete(state))
     set_rule(world.get_location("Fishy Business", player), lambda state: state.has("Fishing Rod", player))
-    set_rule(world.get_location("Hot Tourist Destinations", player), lambda state: state.fortress_loot(player) and state.has("Fishing Rod", player))
-    set_rule(world.get_location("This Boat Has Legs", player), lambda state: state.fortress_loot(player) and state.has("Fishing Rod", player))
+    set_rule(world.get_location("Hot Tourist Destinations", player), lambda state: True)
+    set_rule(world.get_location("This Boat Has Legs", player), lambda state: (state.fortress_loot(player) or state.complete_raid(player)) and state.has("Fishing Rod", player))
     set_rule(world.get_location("Sniper Duel", player), lambda state: state.has("Archery", player))
     set_rule(world.get_location("Nether", player), lambda state: True)
     set_rule(world.get_location("Great View From Up Here", player), lambda state: state.basic_combat(player))
@@ -125,7 +126,7 @@ def reachable_locations(state):
     set_rule(world.get_location("A Terrible Fortress", player), lambda state: True) # since you don't have to fight anything
     set_rule(world.get_location("A Throwaway Joke", player), lambda state: True) # kill drowned
     set_rule(world.get_location("Minecraft", player), lambda state: True)
-    set_rule(world.get_location("Sticky Situation", player), lambda state: state.has_bottle_mc(player))
+    set_rule(world.get_location("Sticky Situation", player), lambda state: state.has("Campfire", player) and state.has_bottle_mc(player))
     set_rule(world.get_location("Ol' Betsy", player), lambda state: state.craft_crossbow(player))
     set_rule(world.get_location("Cover Me in Debris", player), lambda state: state.has("Progressive Armor", player, 2) and 
                                                                              state.has("8 Netherite Scrap", player, 2) and state.has("Ingot Crafting", player) and
@@ -141,7 +142,7 @@ def reachable_locations(state):
     set_rule(world.get_location("On a Rail", player), lambda state: state.has_iron_ingots(player) and state.has('Progressive Tools', player, 2)) # powered rails
     set_rule(world.get_location("Time to Strike!", player), lambda state: True)
     set_rule(world.get_location("Cow Tipper", player), lambda state: True)
-    set_rule(world.get_location("When Pigs Fly", player), lambda state: state.fortress_loot(player) and state.has("Fishing Rod", player) and state.can_adventure(player)) # saddles in fortress chests
+    set_rule(world.get_location("When Pigs Fly", player), lambda state: (state.fortress_loot(player) or state.complete_raid(player)) and state.has("Fishing Rod", player) and state.can_adventure(player))
     set_rule(world.get_location("Overkill", player), lambda state: state.can_brew_potions(player) and (state.has("Progressive Weapons", player) or state.can_reach('The Nether', 'Region', player))) # strength 1 + stone axe crit OR strength 2 + wood axe crit
     set_rule(world.get_location("Librarian", player), lambda state: state.has("Enchanting", player))
     set_rule(world.get_location("Overpowered", player), lambda state: state.has("Resource Blocks", player) and state.has_gold_ingots(player))