From aa87b78dde375142d83abba25f20412333b8d907 Mon Sep 17 00:00:00 2001 From: espeon65536 Date: Sat, 6 Nov 2021 14:50:15 -0500 Subject: [PATCH] Overpowered is no longer hard, instead requires Bastion Remnant + iron pick + basic combat to get gold blocks --- test/minecraft/TestAdvancements.py | 13 +++++++++---- worlds/minecraft/Locations.py | 3 +-- worlds/minecraft/Rules.py | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/test/minecraft/TestAdvancements.py b/test/minecraft/TestAdvancements.py index 249e4c88..a3578973 100644 --- a/test/minecraft/TestAdvancements.py +++ b/test/minecraft/TestAdvancements.py @@ -1132,9 +1132,14 @@ class TestAdvancements(TestMinecraft): def test_42091(self): self.run_location_tests([ ["Overpowered", False, []], - ["Overpowered", False, ['Progressive Resource Crafting'], ['Progressive Resource Crafting']], - ["Overpowered", False, ['Progressive Tools'], ['Flint and Steel', 'Progressive Tools', 'Progressive Tools']], - ["Overpowered", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools']], - ["Overpowered", True, ['Progressive Resource Crafting', 'Progressive Resource Crafting', 'Progressive Tools', 'Bucket', 'Flint and Steel']], + ["Overpowered", False, [], ['Progressive Resource Crafting']], + ["Overpowered", False, [], ['Flint and Steel']], + ["Overpowered", False, ['Progressive Tools', 'Progressive Tools', 'Bucket', 'Flint and Steel']], + ["Overpowered", False, [], ['Progressive Weapons']], + ["Overpowered", False, [], ['Progressive Armor', 'Shield']], + ["Overpowered", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Weapons', 'Progressive Armor']], + ["Overpowered", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Progressive Armor']], + ["Overpowered", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Progressive Tools', 'Progressive Weapons', 'Shield']], + ["Overpowered", True, ['Progressive Resource Crafting', 'Progressive Tools', 'Progressive Tools', 'Flint and Steel', 'Bucket', 'Progressive Weapons', 'Shield']], ]) diff --git a/worlds/minecraft/Locations.py b/worlds/minecraft/Locations.py index 4bb1f0c4..d1134e15 100644 --- a/worlds/minecraft/Locations.py +++ b/worlds/minecraft/Locations.py @@ -107,7 +107,7 @@ advancement_table = { "When Pigs Fly": AdvData(42088, 'Overworld'), "Overkill": AdvData(42089, 'Nether Fortress'), "Librarian": AdvData(42090, 'Overworld'), - "Overpowered": AdvData(42091, 'Overworld'), + "Overpowered": AdvData(42091, 'Bastion Remnant'), "Blaze Spawner": AdvData(None, 'Nether Fortress'), "Ender Dragon": AdvData(None, 'The End') @@ -126,7 +126,6 @@ exclusion_table = { "Uneasy Alliance", "Cover Me in Debris", "A Complete Catalogue", - "Overpowered", }, "insane": { "How Did We Get Here?", diff --git a/worlds/minecraft/Rules.py b/worlds/minecraft/Rules.py index 09a3346d..d3c0873f 100644 --- a/worlds/minecraft/Rules.py +++ b/worlds/minecraft/Rules.py @@ -247,4 +247,5 @@ def set_rules(world: MultiWorld, player: int): set_rule(world.get_location("Overkill", player), lambda state: state._mc_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("Progressive Resource Crafting", player, 2) and state._mc_has_gold_ingots(player)) + set_rule(world.get_location("Overpowered", player), lambda state: state._mc_has_iron_ingots(player) and + state.has('Progressive Tools', player, 2) and state._mc_basic_combat(player)) # mine gold blocks w/ iron pick