Merge branch 'main' into remove_per_sot_randoms

t3hf1gm3nt · May 2, 2024 · 6048acd · 6048acd
2 parents 7d5299d + 255e526
commit 6048acd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/worlds/tloz/Items.py b/worlds/tloz/Items.py
@@ -24,7 +24,7 @@ class ItemData(typing.NamedTuple):
     "Red Candle": ItemData(107, progression),
     "Book of Magic": ItemData(108, progression),
     "Magical Key": ItemData(109, useful),
-    "Red Ring": ItemData(110, useful),
+    "Red Ring": ItemData(110, progression),
     "Silver Arrow": ItemData(111, progression),
     "Sword": ItemData(112, progression),
     "White Sword": ItemData(113, progression),
@@ -37,7 +37,7 @@ class ItemData(typing.NamedTuple):
     "Food": ItemData(120, progression),
     "Water of Life (Blue)": ItemData(121, useful),
     "Water of Life (Red)": ItemData(122, useful),
-    "Blue Ring": ItemData(123, useful),
+    "Blue Ring": ItemData(123, progression),
     "Triforce Fragment": ItemData(124, progression),
     "Power Bracelet": ItemData(125, useful),
     "Small Key": ItemData(126, filler),

diff --git a/worlds/tloz/Rules.py b/worlds/tloz/Rules.py
@@ -28,6 +28,7 @@ def set_rules(tloz_world: "TLoZWorld"):
                     or location.name not in dangerous_weapon_locations:
                 add_rule(world.get_location(location.name, player),
                          lambda state: state.has_group("weapons", player))
+            #  This part of the loop sets up an expected amount of defense needed for each dungeon
             if i > 0:  # Don't need an extra heart for Level 1
                 add_rule(world.get_location(location.name, player),
                          lambda state, hearts=i: state.has("Heart Container", player, hearts) or