morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Pokemon R/B] add logic to Fighting Dojo and check for non-vanilla old_man setting for cinnabar gym

Browse Source
This commit is contained in:
Alchav
2022-12-18 16:52:28 -05:00
committed by Fabian Dill
parent caf63dd737
commit b83aec5c12
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/pokemon_rb/logic.py
View File

@@ -83,5 +83,10 @@ class PokemonLogic(LogicMixin):
def pokemon_rb_cinnabar_gym(self, player):
# ensures higher level Pokémon are obtainable before Cinnabar Gym is in logic
return ((not self.multiworld.extra_key_items[player]) or self.has("Mansion Key", player)
or self.has("Oak's Parcel", player) or self.pokemon_rb_can_surf(player))
return ((self.multiworld.old_man[player] != "vanilla") or (not self.multiworld.extra_key_items[player]) or
self.has("Mansion Key", player) or self.has("Oak's Parcel", player) or self.pokemon_rb_can_surf(player))
def pokemon_rb_dojo(self, player):
# ensures higher level Pokémon are obtainable before Fighting Dojo is in logic
return (self.pokemon_rb_can_pass_guards(player) or self.has("Oak's Parcel", player) or
self.pokemon_rb_can_surf(player))