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

Pokemon: apply rename of location_item_name

This commit is contained in:
black-sliver 2023-03-14 01:25:59 +01:00
parent 573a1a8402
commit 2a28a6de28
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/pokemon_rb/rules.py
View File

@ -1,4 +1,4 @@
from ..generic.Rules import add_item_rule, add_rule, item_name
from ..generic.Rules import add_item_rule, add_rule, location_item_name
from .items import item_groups
@ -31,7 +31,7 @@ def set_rules(world, player):
"Route 2 - Oak's Aide": lambda state: state.pokemon_rb_oaks_aide(state.multiworld.oaks_aide_rt_2[player].value + 5, player),
"Pewter City - Museum": lambda state: state.pokemon_rb_can_cut(player),
"Cerulean City - Bicycle Shop": lambda state: state.has("Bike Voucher", player)
or item_name(state, "Cerulean City - Bicycle Shop", player) == ("Bike Voucher", player),
or location_item_name(state, "Cerulean City - Bicycle Shop", player) == ("Bike Voucher", player),
"Lavender Town - Mr. Fuji": lambda state: state.has("Fuji Saved", player),
"Vermilion Gym - Lt. Surge 1": lambda state: state.pokemon_rb_can_cut(player or state.pokemon_rb_can_surf(player)),
"Vermilion Gym - Lt. Surge 2": lambda state: state.pokemon_rb_can_cut(player or state.pokemon_rb_can_surf(player)),
@ -39,7 +39,7 @@ def set_rules(world, player):
"Celadon City - Stranded Man": lambda state: state.pokemon_rb_can_surf(player),
"Silph Co 11F - Silph Co President (Card Key)": lambda state: state.has("Card Key", player),
"Fuchsia City - Safari Zone Warden": lambda state: state.has("Gold Teeth", player)
or item_name(state, "Fuchsia City - Safari Zone Warden", player) == ("Gold Teeth", player),
or location_item_name(state, "Fuchsia City - Safari Zone Warden", player) == ("Gold Teeth", player),
"Route 12 - Island Item": lambda state: state.pokemon_rb_can_surf(player),
"Route 12 - Item Behind Cuttable Tree": lambda state: state.pokemon_rb_can_cut(player),
"Route 15 - Oak's Aide": lambda state: state.pokemon_rb_oaks_aide(state.multiworld.oaks_aide_rt_15[player].value + 5, player),