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

SA2B: Add missing Whistle location (#1306)

This commit is contained in:
PoryGone 2022-12-08 04:47:39 -05:00 committed by GitHub
parent f5adc7bdc5
commit 92f75f3e03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
worlds/sa2b/Locations.py
View File

@ -467,6 +467,7 @@ hidden_whistle_location_table = {
LocationName.city_escape_hidden_4: 0xFF0760, LocationName.city_escape_hidden_4: 0xFF0760,
LocationName.green_forest_hidden_4: 0xFF0764, LocationName.green_forest_hidden_4: 0xFF0764,
LocationName.mission_street_hidden_4: 0xFF0766,
LocationName.city_escape_hidden_5: 0xFF0780, LocationName.city_escape_hidden_5: 0xFF0780,
} }

1
worlds/sa2b/Names/LocationName.py
View File

@ -118,6 +118,7 @@ mission_street_pipe_3 = "Mission Street - Pipe 3"
mission_street_hidden_1 = "Mission Street - Hidden 1" mission_street_hidden_1 = "Mission Street - Hidden 1"
mission_street_hidden_2 = "Mission Street - Hidden 2" mission_street_hidden_2 = "Mission Street - Hidden 2"
mission_street_hidden_3 = "Mission Street - Hidden 3" mission_street_hidden_3 = "Mission Street - Hidden 3"
mission_street_hidden_4 = "Mission Street - Hidden 4"
mission_street_beetle = "Mission Street - Gold Beetle" mission_street_beetle = "Mission Street - Gold Beetle"
mission_street_upgrade = "Mission Street - Upgrade" mission_street_upgrade = "Mission Street - Upgrade"
route_101_1 = "Route 101 - 1" route_101_1 = "Route 101 - 1"

1
worlds/sa2b/Regions.py
View File

@ -269,6 +269,7 @@ def create_regions(world, player: int, active_locations):
LocationName.mission_street_hidden_1, LocationName.mission_street_hidden_1,
LocationName.mission_street_hidden_2, LocationName.mission_street_hidden_2,
LocationName.mission_street_hidden_3, LocationName.mission_street_hidden_3,
LocationName.mission_street_hidden_4,
LocationName.mission_street_beetle, LocationName.mission_street_beetle,
LocationName.mission_street_upgrade, LocationName.mission_street_upgrade,
] ]

4
worlds/sa2b/Rules.py
View File

@ -604,6 +604,8 @@ def set_mission_upgrade_rules_standard(world: MultiWorld, player: int):
if world.whistlesanity[player].value == 2 or world.whistlesanity[player].value == 3: if world.whistlesanity[player].value == 2 or world.whistlesanity[player].value == 3:
add_rule(world.get_location(LocationName.mission_street_hidden_3, player), add_rule(world.get_location(LocationName.mission_street_hidden_3, player),
lambda state: state.has(ItemName.tails_booster, player)) lambda state: state.has(ItemName.tails_booster, player))
add_rule(world.get_location(LocationName.mission_street_hidden_4, player),
lambda state: state.has(ItemName.tails_booster, player))
add_rule(world.get_location(LocationName.death_chamber_hidden_1, player), add_rule(world.get_location(LocationName.death_chamber_hidden_1, player),
lambda state: state.has(ItemName.knuckles_shovel_claws, player) and lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
state.has(ItemName.knuckles_hammer_gloves, player)) state.has(ItemName.knuckles_hammer_gloves, player))
@ -1044,6 +1046,8 @@ def set_mission_upgrade_rules_hard(world: MultiWorld, player: int):
if world.whistlesanity[player].value == 2 or world.whistlesanity[player].value == 3: if world.whistlesanity[player].value == 2 or world.whistlesanity[player].value == 3:
add_rule(world.get_location(LocationName.mission_street_hidden_3, player), add_rule(world.get_location(LocationName.mission_street_hidden_3, player),
lambda state: state.has(ItemName.tails_booster, player)) lambda state: state.has(ItemName.tails_booster, player))
add_rule(world.get_location(LocationName.mission_street_hidden_4, player),
lambda state: state.has(ItemName.tails_booster, player))
add_rule(world.get_location(LocationName.death_chamber_hidden_1, player), add_rule(world.get_location(LocationName.death_chamber_hidden_1, player),
lambda state: state.has(ItemName.knuckles_shovel_claws, player) and lambda state: state.has(ItemName.knuckles_shovel_claws, player) and
state.has(ItemName.knuckles_hammer_gloves, player)) state.has(ItemName.knuckles_hammer_gloves, player))

2
worlds/sa2b/__init__.py
View File

@ -52,7 +52,7 @@ class SA2BWorld(World):
game: str = "Sonic Adventure 2 Battle" game: str = "Sonic Adventure 2 Battle"
option_definitions = sa2b_options option_definitions = sa2b_options
topology_present = False topology_present = False
data_version = 3 data_version = 4
item_name_groups = item_groups item_name_groups = item_groups
item_name_to_id = {name: data.code for name, data in item_table.items()} item_name_to_id = {name: data.code for name, data in item_table.items()}