Skip to content

Commit 5c05ab1

Browse files
AlchavAlchav
authored
LTTP: KDS Default on (#2850)
1 parent 46fc8df commit 5c05ab1

17 files changed

+176
-190
lines changed

‎worlds/alttp/Options.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ class Goal(Choice):
4343
Triforce Hunt: Collect Triforce pieces spread throughout the worlds, then turn them in to Murahadala in front of Hyrule Castle
4444
Local Triforce Hunt: Collect Triforce pieces spread throughout your world, then turn them in to Murahadala in front of Hyrule Castle
4545
Ganon Triforce Hunt: Collect Triforce pieces spread throughout the worlds, then kill Ganon
46-
Local Ganon Triforce Hunt: Collect Triforce pieces spread throughout your world, then kill Ganon
47-
Ice Rod Hunt: You start with everything except Ice Rod. Find the Ice rod, then kill Trinexx at Turtle rock."""
46+
Local Ganon Triforce Hunt: Collect Triforce pieces spread throughout your world, then kill Ganon"""
4847
display_name = "Goal"
4948
default = 0
5049
option_ganon = 0
@@ -211,13 +210,12 @@ class map_shuffle(DungeonItem):
211210
display_name = "Map Shuffle"
212211

213212

214-
class key_drop_shuffle(Toggle):
213+
class key_drop_shuffle(DefaultOnToggle):
215214
"""Shuffle keys found in pots and dropped from killed enemies,
216215
respects the small key and big key shuffle options."""
217216
display_name = "Key Drop Shuffle"
218217

219218

220-
221219
class DungeonCounters(Choice):
222220
"""On: Always display amount of items checked in a dungeon. Pickup: Show when compass is picked up.
223221
Default: Show when compass is picked up if the compass itself is shuffled. Off: Never show item count in dungeons."""

‎worlds/alttp/Rules.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,7 @@ def global_rules(world, player):
420420
set_rule(world.get_location('Ice Palace - Jelly Key Drop', player), lambda state: can_melt_things(state, player))
421421
set_rule(world.get_location('Ice Palace - Compass Chest', player), lambda state: can_melt_things(state, player) and state._lttp_has_key('Small Key (Ice Palace)', player))
422422
set_rule(world.get_entrance('Ice Palace (Second Section)', player), lambda state: can_melt_things(state, player) and state._lttp_has_key('Small Key (Ice Palace)', player) and can_use_bombs(state, player))
423-
if not world.enemy_shuffle[player]:
424-
# Stalfos Knights can be killed by damaging them repeatedly with boomerang, swords, etc. if bombs are
425-
# unavailable. If bombs are available, the pots can be thrown at them, so no other weapons are needed
426-
add_rule(world.get_entrance('Ice Palace (Second Section)', player), lambda state: (can_use_bombs(state, player)
427-
or state.has('Blue Boomerang', player) or state.has('Red Boomerang', player) or has_sword(state, player) or state.has("Hammer", player)))
423+
428424
set_rule(world.get_entrance('Ice Palace (Main)', player), lambda state: state._lttp_has_key('Small Key (Ice Palace)', player, 2))
429425
set_rule(world.get_location('Ice Palace - Big Chest', player), lambda state: state.has('Big Key (Ice Palace)', player))
430426
set_rule(world.get_entrance('Ice Palace (Kholdstare)', player), lambda state: can_lift_rocks(state, player) and state.has('Hammer', player) and state.has('Big Key (Ice Palace)', player) and (state._lttp_has_key('Small Key (Ice Palace)', player, 6) or (state.has('Cane of Somaria', player) and state._lttp_has_key('Small Key (Ice Palace)', player, 5))))

‎worlds/alttp/test/dungeons/TestAgahnimsTower.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ def testTower(self):
2323
["Castle Tower - Dark Archer Key Drop", True, ['Progressive Sword', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Lamp']],
2424

2525
["Castle Tower - Circle of Pots Key Drop", False, []],
26-
["Castle Tower - Circle of Pots Key Drop", False, ['Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)']],
26+
["Castle Tower - Circle of Pots Key Drop", False, ['Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)']],
2727
["Castle Tower - Circle of Pots Key Drop", False, [], ['Lamp']],
2828
["Castle Tower - Circle of Pots Key Drop", False, [], ['Bomb Upgrade (+5)', 'Bomb Upgrade (+10)', 'Bomb Upgrade (50)', 'Progressive Sword', 'Hammer', 'Progressive Bow', 'Fire Rod', 'Ice Rod', 'Cane of Somaria', 'Cane of Byrna']],
29-
["Castle Tower - Circle of Pots Key Drop", True, ['Progressive Sword', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Lamp']],
29+
["Castle Tower - Circle of Pots Key Drop", True, ['Progressive Sword', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Lamp']],
3030

3131
["Agahnim 1", False, []],
32-
["Agahnim 1", False, ['Small Key (Agahnims Tower)'], ['Small Key (Agahnims Tower)']],
32+
["Agahnim 1", False, ['Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)']],
3333
["Agahnim 1", False, [], ['Progressive Sword']],
3434
["Agahnim 1", False, [], ['Lamp']],
35-
["Agahnim 1", True, ['Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Lamp', 'Progressive Sword']],
35+
["Agahnim 1", True, ['Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Small Key (Agahnims Tower)', 'Lamp', 'Progressive Sword']],
3636
])

‎worlds/alttp/test/dungeons/TestDesertPalace.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,35 @@ def testDesertPalace(self):
1919
["Desert Palace - Compass Chest", False, []],
2020
["Desert Palace - Compass Chest", False, [], ['Small Key (Desert Palace)']],
2121
["Desert Palace - Compass Chest", False, ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
22-
["Desert Palace - Compass Chest", False, ['Small Key (Desert Palace)']],
23-
["Desert Palace - Compass Chest", True, ['Progressive Sword', 'Small Key (Desert Palace)']],
22+
["Desert Palace - Compass Chest", True, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)']],
23+
["Desert Palace - Compass Chest", True, ['Progressive Sword', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)']],
2424

2525
["Desert Palace - Big Key Chest", False, []],
2626
["Desert Palace - Big Key Chest", False, [], ['Small Key (Desert Palace)']],
2727
["Desert Palace - Big Key Chest", False, ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
28-
["Desert Palace - Big Key Chest", False, ['Small Key (Desert Palace)']],
29-
["Desert Palace - Big Key Chest", True, ['Progressive Sword', 'Small Key (Desert Palace)']],
28+
["Desert Palace - Big Key Chest", False, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)']],
29+
["Desert Palace - Big Key Chest", True, ['Progressive Sword', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)']],
3030

3131
["Desert Palace - Desert Tiles 1 Pot Key", True, []],
3232

3333
["Desert Palace - Beamos Hall Pot Key", False, []],
34-
["Desert Palace - Beamos Hall Pot Key", False, [], ['Small Key (Desert Palace)']],
34+
["Desert Palace - Beamos Hall Pot Key", False, ['Small Key (Desert Palace)']],
3535
["Desert Palace - Beamos Hall Pot Key", False, ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
36-
["Desert Palace - Beamos Hall Pot Key", True, ['Small Key (Desert Palace)', 'Progressive Sword']],
36+
["Desert Palace - Beamos Hall Pot Key", True, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Progressive Sword']],
3737

3838
["Desert Palace - Desert Tiles 2 Pot Key", False, []],
39-
["Desert Palace - Desert Tiles 2 Pot Key", False, ['Small Key (Desert Palace)']],
39+
["Desert Palace - Desert Tiles 2 Pot Key", False, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)']],
4040
["Desert Palace - Desert Tiles 2 Pot Key", False, ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
41-
["Desert Palace - Desert Tiles 2 Pot Key", True, ['Small Key (Desert Palace)', 'Progressive Sword']],
41+
["Desert Palace - Desert Tiles 2 Pot Key", True, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Progressive Sword']],
4242

4343
["Desert Palace - Boss", False, []],
44-
["Desert Palace - Boss", False, [], ['Small Key (Desert Palace)']],
44+
["Desert Palace - Boss", False, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)']],
4545
["Desert Palace - Boss", False, [], ['Big Key (Desert Palace)']],
4646
["Desert Palace - Boss", False, [], ['Lamp', 'Fire Rod']],
4747
["Desert Palace - Boss", False, [], ['Progressive Sword', 'Hammer', 'Fire Rod', 'Ice Rod', 'Progressive Bow', 'Cane of Somaria', 'Cane of Byrna']],
48-
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Fire Rod']],
49-
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Progressive Sword']],
50-
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Hammer']],
51-
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Cane of Somaria']],
52-
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Cane of Byrna']],
48+
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Fire Rod']],
49+
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Progressive Sword']],
50+
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Hammer']],
51+
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Cane of Somaria']],
52+
["Desert Palace - Boss", True, ['Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Small Key (Desert Palace)', 'Big Key (Desert Palace)', 'Lamp', 'Cane of Byrna']],
5353
])

‎worlds/alttp/test/dungeons/TestEasternPalace.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ def testEastern(self):
1919
["Eastern Palace - Big Key Chest", False, []],
2020
["Eastern Palace - Big Key Chest", False, [], ['Lamp']],
2121
["Eastern Palace - Big Key Chest", True, ['Lamp', 'Small Key (Eastern Palace)', 'Small Key (Eastern Palace)', 'Progressive Sword']],
22-
["Eastern Palace - Big Key Chest", True, ['Lamp', 'Big Key (Eastern Palace)', 'Progressive Sword']],
2322

2423
#@todo: Advanced?
2524
["Eastern Palace - Boss", False, []],
2625
["Eastern Palace - Boss", False, [], ['Lamp']],
2726
["Eastern Palace - Boss", False, [], ['Progressive Bow']],
2827
["Eastern Palace - Boss", False, [], ['Big Key (Eastern Palace)']],
29-
["Eastern Palace - Boss", True, ['Lamp', 'Progressive Bow', 'Big Key (Eastern Palace)']]
28+
["Eastern Palace - Boss", False, ['Small Key (Eastern Palace)', 'Small Key (Eastern Palace)']],
29+
["Eastern Palace - Boss", True, ['Lamp', 'Small Key (Eastern Palace)', 'Small Key (Eastern Palace)', 'Progressive Bow', 'Big Key (Eastern Palace)']]
3030
])

0 commit comments

Comments
 (0)