finished logic for structure randomization

BaseClasses.py

@@ -814,6 +814,9 @@ def can_get_glitched_speed_dw(self, player: int):
     def has_iron_ingots(self, player: int):
         return self.has('Progressive Tools', player) and self.has('Ingot Crafting', player)
 
+    def has_gold_ingots(self, player: int): 
+        return self.has('Ingot Crafting', player) and (self.has('Progressive Tools', player, 2) or self.can_reach('The Nether', 'Region', player))
+
     def has_diamond_pickaxe(self, player: int):
         return self.has('Progressive Tools', player, 3) and self.has_iron_ingots(player)
 
@@ -826,32 +829,32 @@ def can_enchant(self, player: int):
     def can_use_anvil(self, player: int): 
         return self.has('Enchanting', player) and self.has('Resource Blocks', player) and self.has_iron_ingots(player)
 
-    def can_adventure(self, player: int):
-        return self.has('Progressive Weapons', player) and (self.has('Ingot Crafting', player) or self.has('Campfire', player)) # logic for finding villages and pillager outposts
+    def can_adventure(self, player: int): # kill basic enemies, cook food
+        return self.has('Progressive Weapons', player) and (self.has('Ingot Crafting', player) or self.has('Campfire', player))
+
+    def basic_combat(self, player: int): 
+        return self.has('Progressive Weapons', player) and self.has('Progressive Armor', player) and self.has_iron_ingots(player)
 
-    def enter_nether(self, player: int): 
-        return self.has("Flint and Steel", player) and (self.has("Bucket", player) or self.has("Progressive Tools", player, 3)) and self.has_iron_ingots(player)
+    def complete_raid(self, player: int): 
+        return self.can_reach('Village', 'Region', player) and self.can_reach('Pillager Outpost', 'Region', player) and self.basic_combat(player) and self.has('Progressive Weapons', player, 2)
 
-    def enter_fortress(self, player: int): 
-        return self.enter_nether(player) and self.has('Progressive Armor', player) and self.has('Progressive Weapons', player)
+    def fortress_loot(self, player: int): # saddles, blaze rods, wither skulls
+        return self.has('Nether Fortress Entry', player) and self.basic_combat(player) # needs an event because this is part of End Portal access logic
 
     def can_brew_potions(self, player: int): 
-        return self.enter_fortress(player) and self.has('Brewing', player) and self.has('Bottles', player)
+        return self.fortress_loot(player) and self.has('Brewing', player) and self.has('Bottles', player) and self.has('Ingot Crafting', player)
 
     def can_piglin_trade(self, player: int): 
-        return self.enter_nether(player) and self.has('Ingot Crafting', player)
+        return self.has_gold_ingots(player) and (self.can_reach('The Nether', 'Region', player) or self.can_reach('Bastion Remnant', 'Region', player))
 
-    def can_kill_wither(self, player: int):
-        return self.enter_fortress(player) and self.has("Progressive Weapons", player, 3) and self.has("Progressive Armor", player, 2) and self.can_brew_potions(player) and self.can_enchant(player)
+    def can_kill_wither(self, player: int): # need skulls and soul sand
+        return self.fortress_loot(player) and (self.can_reach('The Nether', 'Region', player) or self.can_piglin_trade(player)) and self.has("Progressive Weapons", player, 3) and self.has("Progressive Armor", player, 2) and self.can_brew_potions(player) and self.can_enchant(player)
 
     def enter_stronghold(self, player: int): 
-        return self.enter_fortress(player) and self.has('Brewing', player) and self.has('3 Ender Pearls', player)
-
-    def enter_end(self, player: int):
-        return self.enter_stronghold(player) and self.has('3 Ender Pearls', player, 4)
+        return self.fortress_loot(player) and self.has('Brewing', player) and self.has('3 Ender Pearls', player)
 
     def can_kill_ender_dragon(self, player: int):
-        return self.enter_end(player) and self.has('Progressive Weapons', player, 2) and self.has('Archery', player)
+        return self.has('Progressive Weapons', player, 2) and self.has('Progressive Armor', player) and self.has('Archery', player)
 
 
     def collect(self, item: Item, event: bool = False, location: Location = None) -> bool:

test/minecraft/TestAdvancements.py

@@ -74,7 +74,7 @@ def test_42005(self):
                                     'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 
                                     'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']], 
             ["Free the End", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 
-                                    'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor', 
+                                    'Progressive Weapons', 'Progressive Weapons', 'Archery', 'Progressive Armor',  
                                     'Brewing', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls', '3 Ender Pearls']],
             ])
 
@@ -189,10 +189,12 @@ 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']], 
             ["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', 'Flint and Steel', 'Bucket', 'Fishing Rod']], 
-            ["Hot Tourist Destinations", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
+            ["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']],
             ])
 
     def test_42015(self):
@@ -201,10 +203,12 @@ def test_42015(self):
             ["This Boat Has Legs", False, [], ['Ingot Crafting']], 
             ["This Boat Has Legs", False, [], ['Flint and Steel']], 
             ["This Boat Has Legs", False, [], ['Progressive Tools']], 
+            ["This Boat Has Legs", False, [], ['Progressive Weapons']], 
+            ["This Boat Has Legs", False, [], ['Progressive Armor']], 
             ["This Boat Has Legs", False, [], ['Fishing Rod']],
             ["This Boat Has Legs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], 
-            ["This Boat Has Legs", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Fishing Rod']], 
-            ["This Boat Has Legs", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
+            ["This Boat Has Legs", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Bucket', 'Fishing Rod']], 
+            ["This Boat Has Legs", True, ['Ingot Crafting', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Fishing Rod']],
             ])
 
     def test_42016(self): 
@@ -434,9 +438,11 @@ def test_42034(self):
             ["War Pigs", False, [], ['Ingot Crafting']], 
             ["War Pigs", False, [], ['Flint and Steel']], 
             ["War Pigs", False, [], ['Progressive Tools']], 
+            ["War Pigs", False, [], ['Progressive Weapons']], 
+            ["War Pigs", False, [], ['Progressive Armor']], 
             ["War Pigs", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], 
-            ["War Pigs", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], 
-            ["War Pigs", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']],
+            ["War Pigs", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], 
+            ["War Pigs", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor']],
             ])
 
     def test_42035(self):
@@ -626,9 +632,10 @@ def test_42050(self):
         self.run_location_tests([
             ["Voluntary Exile", False, []],
             ["Voluntary Exile", False, [], ['Progressive Weapons']],
-            ["Voluntary Exile", False, [], ['Campfire', 'Ingot Crafting']],
-            ["Voluntary Exile", True, ['Progressive Weapons', 'Campfire']],
-            ["Voluntary Exile", True, ['Progressive Weapons', 'Ingot Crafting']],
+            ["Voluntary Exile", False, [], ['Progressive Armor']],
+            ["Voluntary Exile", False, [], ['Progressive Tools']],
+            ["Voluntary Exile", False, [], ['Ingot Crafting']],
+            ["Voluntary Exile", True, ['Progressive Tools', 'Progressive Armor', 'Progressive Weapons', 'Ingot Crafting']],
             ])
 
     def test_42051(self):
@@ -717,9 +724,10 @@ def test_42058(self):
             ["Those Were the Days", False, [], ['Ingot Crafting']], 
             ["Those Were the Days", False, [], ['Flint and Steel']], 
             ["Those Were the Days", False, [], ['Progressive Tools']], 
+            ["Those Were the Days", False, [], ['Progressive Weapons']], 
             ["Those Were the Days", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], 
-            ["Those Were the Days", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], 
-            ["Those Were the Days", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']],
+            ["Those Were the Days", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], 
+            ["Those Were the Days", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']],
             ])
 
     def test_42059(self):
@@ -875,9 +883,10 @@ def test_42071(self):
             ["A Terrible Fortress", False, [], ['Ingot Crafting']], 
             ["A Terrible Fortress", False, [], ['Flint and Steel']], 
             ["A Terrible Fortress", False, [], ['Progressive Tools']], 
+            ["A Terrible Fortress", False, [], ['Progressive Weapons']], 
             ["A Terrible Fortress", False, ['Progressive Tools', 'Progressive Tools'], ['Bucket', 'Progressive Tools']], 
-            ["A Terrible Fortress", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket']], 
-            ["A Terrible Fortress", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools']],
+            ["A Terrible Fortress", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons']], 
+            ["A Terrible Fortress", True, ['Ingot Crafting', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Tools', 'Progressive Weapons']],
             ])
 
     def test_42072(self):

test/minecraft/TestMinecraft.py

@@ -1,6 +1,6 @@
 from test.TestBase import TestBase
 from BaseClasses import MultiWorld
-from worlds.minecraft import minecraft_create_regions, minecraft_gen_item_pool
+from worlds.minecraft import minecraft_create_regions, minecraft_gen_item_pool, link_minecraft_structures
 from worlds.minecraft.Rules import set_rules
 from worlds.minecraft.Items import MinecraftItem, item_table
 from Options import AdvancementGoal
@@ -31,7 +31,9 @@ def setUp(self):
         for pool in exclusion_pools:
             setattr(self.world, f"include_{pool}_advancements", [False, False])
         setattr(self.world, "advancement_goal", [0, AdvancementGoal(value=1)])
+        setattr(self.world, "shuffle_structures", [False, False])
         minecraft_create_regions(self.world, 1)
+        link_minecraft_structures(self.world, 1)
         minecraft_gen_item_pool(self.world, 1)
         set_rules(self.world, 1)
 

worlds/minecraft/Items.py

@@ -45,7 +45,8 @@ def __init__(self, name: str, progression: bool, code: int, player: int):
     "16 Porkchops": ItemData(45031, False), 
     "8 Gold Ore": ItemData(45032, False), 
     "Rotten Flesh": ItemData(45033, False), 
-    "Single Arrow": ItemData(45034, False)
+    "Single Arrow": ItemData(45034, False), 
+    "Nether Fortress Entry": ItemData(0, True)
 }
 
 # If not listed here then has frequency 1
@@ -69,4 +70,4 @@ def __init__(self, name: str, progression: bool, code: int, player: int):
     "Single Arrow": 0
 }
 
-lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in item_table.items()}
+lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in item_table.items() if data.code}

worlds/minecraft/Locations.py

@@ -11,8 +11,8 @@ def __init__(self, player: int, name: str, address: int, parent):
         super().__init__(player, name, address, parent)
 
 advancement_table = {
-    "Who is Cutting Onions?": AdvData(42000, 'The Nether'), # nether or bastion?
-    "Oh Shiny": AdvData(42001, 'The Nether'), # nether or bastion?
+    "Who is Cutting Onions?": AdvData(42000, 'Overworld'),
+    "Oh Shiny": AdvData(42001, 'Overworld'),
     "Suit Up": AdvData(42002, 'Overworld'),
     "Very Very Frightening": AdvData(42003, 'Village'),
     "Hot Stuff": AdvData(42004, 'Overworld'),
@@ -74,7 +74,7 @@ def __init__(self, player: int, name: str, address: int, parent):
     "Hidden in the Depths": AdvData(42060, 'The Nether'),
     "Beaconator": AdvData(42061, 'Nether Fortress'),
     "Withering Heights": AdvData(42062, 'Nether Fortress'),
-    "A Balanced Diet": AdvData(42063, 'Overworld'),
+    "A Balanced Diet": AdvData(42063, 'Village'),
     "Subspace Bubble": AdvData(42064, 'The Nether'),
     "Husbandry": AdvData(42065, 'Overworld'),
     "Country Lode, Take Me Home": AdvData(42066, 'The Nether'),
@@ -102,7 +102,9 @@ def __init__(self, player: int, name: str, address: int, parent):
     "When Pigs Fly": AdvData(42088, 'Overworld'),
     "Overkill": AdvData(42089, 'Nether Fortress'),
     "Librarian": AdvData(42090, 'Overworld'),
-    "Overpowered": AdvData(42091, 'Overworld')
+    "Overpowered": AdvData(42091, 'Overworld'), 
+
+    "Nether Fortress Entry": AdvData(0, 'Nether Fortress')
 }
 
 exclusion_table = {
@@ -131,4 +133,9 @@ def __init__(self, player: int, name: str, address: int, parent):
 }
 
 
-lookup_id_to_name: typing.Dict[int, str] = {loc_data.id: loc_name for loc_name, loc_data in advancement_table.items()}
+events_table = {
+    "Nether Fortress Entry": "Nether Fortress Entry"
+}
+
+
+lookup_id_to_name: typing.Dict[int, str] = {loc_data.id: loc_name for loc_name, loc_data in advancement_table.items() if loc_data.id}