monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yoshi's Island: Minor Fixes (#3142)

This commit is contained in:
PinkSwitch 2024-04-18 11:40:00 -05:00 committed by GitHub
parent ee1e578201
commit 5996a8163d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/yoshisisland/Items.py
View File

@ -75,7 +75,7 @@ item_table: Dict[str, ItemData] = {
"1-Up": ItemData("Lives", 0x30208C, ItemClassification.filler, 0), "1-Up": ItemData("Lives", 0x30208C, ItemClassification.filler, 0),
"2-Up": ItemData("Lives", 0x30208D, ItemClassification.filler, 0), "2-Up": ItemData("Lives", 0x30208D, ItemClassification.filler, 0),
"3-Up": ItemData("Lives", 0x30208E, 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), "Bonus Consumables": ItemData("Events", None, ItemClassification.progression, 0),
"Bandit Consumables": ItemData("Events", None, ItemClassification.progression, 0), "Bandit Consumables": ItemData("Events", None, ItemClassification.progression, 0),
"Bandit Watermelons": ItemData("Events", None, ItemClassification.progression, 0), "Bandit Watermelons": ItemData("Events", None, ItemClassification.progression, 0),

4
worlds/yoshisisland/Options.py
View File

@ -169,12 +169,12 @@ class BossShuffle(Toggle):
class LevelShuffle(Choice): class LevelShuffle(Choice):
"""Disabled: All levels will appear in their normal location. """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. Full: Worlds may have more than 2 or no bosses in them.
Regardless of the setting, 6-8 and Extra stages are not shuffled.""" Regardless of the setting, 6-8 and Extra stages are not shuffled."""
display_name = "Level Shuffle" display_name = "Level Shuffle"
option_disabled = 0 option_disabled = 0
option_bosses_guranteed = 1 option_bosses_guaranteed = 1
option_full = 2 option_full = 2
default = 0 default = 0

4
worlds/yoshisisland/setup_game.py
View File

@ -274,7 +274,7 @@ def setup_gamevars(world: "YoshisIslandWorld") -> None:
norm_start_lv.extend([0x24, 0x3C]) norm_start_lv.extend([0x24, 0x3C])
hard_start_lv.extend([0x1D, 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]) hard_start_lv.extend([0x07, 0x1B, 0x1F, 0x2B, 0x33, 0x37])
if not world.options.shuffle_midrings: if not world.options.shuffle_midrings:
easy_start_lv.extend([0x1B]) easy_start_lv.extend([0x1B])
@ -286,7 +286,7 @@ def setup_gamevars(world: "YoshisIslandWorld") -> None:
if world.options.level_shuffle: if world.options.level_shuffle:
world.global_level_list.remove(starting_level) world.global_level_list.remove(starting_level)
world.random.shuffle(world.global_level_list) 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): for i in range(11):
world.global_level_list = [item for item in world.global_level_list world.global_level_list = [item for item in world.global_level_list
if item not in boss_lv] if item not in boss_lv]