Skip to content

Commit

Permalink
Yoshi's Island: Minor Fixes (#3142)
Browse files Browse the repository at this point in the history
  • Loading branch information
PinkSwitch authored Apr 18, 2024
1 parent ee1e578 commit 5996a81
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion worlds/yoshisisland/Items.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class ItemData(NamedTuple):
"1-Up": ItemData("Lives", 0x30208C, ItemClassification.filler, 0),
"2-Up": ItemData("Lives", 0x30208D, ItemClassification.filler, 0),
"3-Up": ItemData("Lives", 0x30208E, ItemClassification.filler, 0),
"10-Up": ItemData("Lives", 0x30208F, ItemClassification.filler, 5),
"10-Up": ItemData("Lives", 0x30208F, ItemClassification.useful, 5),
"Bonus Consumables": ItemData("Events", None, ItemClassification.progression, 0),
"Bandit Consumables": ItemData("Events", None, ItemClassification.progression, 0),
"Bandit Watermelons": ItemData("Events", None, ItemClassification.progression, 0),
Expand Down
4 changes: 2 additions & 2 deletions worlds/yoshisisland/Options.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@ class BossShuffle(Toggle):

class LevelShuffle(Choice):
"""Disabled: All levels will appear in their normal location.
Bosses Guranteed: All worlds will have a boss on -4 and -8.
Bosses Guaranteed: All worlds will have a boss on -4 and -8.
Full: Worlds may have more than 2 or no bosses in them.
Regardless of the setting, 6-8 and Extra stages are not shuffled."""
display_name = "Level Shuffle"
option_disabled = 0
option_bosses_guranteed = 1
option_bosses_guaranteed = 1
option_full = 2
default = 0

Expand Down
4 changes: 2 additions & 2 deletions worlds/yoshisisland/setup_game.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ def setup_gamevars(world: "YoshisIslandWorld") -> None:
norm_start_lv.extend([0x24, 0x3C])
hard_start_lv.extend([0x1D, 0x3C])

if world.options.level_shuffle != LevelShuffle.option_bosses_guranteed:
if world.options.level_shuffle != LevelShuffle.option_bosses_guaranteed:
hard_start_lv.extend([0x07, 0x1B, 0x1F, 0x2B, 0x33, 0x37])
if not world.options.shuffle_midrings:
easy_start_lv.extend([0x1B])
Expand All @@ -286,7 +286,7 @@ def setup_gamevars(world: "YoshisIslandWorld") -> None:
if world.options.level_shuffle:
world.global_level_list.remove(starting_level)
world.random.shuffle(world.global_level_list)
if world.options.level_shuffle == LevelShuffle.option_bosses_guranteed:
if world.options.level_shuffle == LevelShuffle.option_bosses_guaranteed:
for i in range(11):
world.global_level_list = [item for item in world.global_level_list
if item not in boss_lv]
Expand Down

0 comments on commit 5996a81

Please sign in to comment.