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

Pokémon R/B: Fix move intervention (#2687)

This commit is contained in:
Alchav 2024-01-11 18:49:54 -05:00 committed by GitHub
parent 4ce8a7ec4d
commit 47dd36456e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/__init__.py
View File

@ -353,7 +353,9 @@ class PokemonRedBlueWorld(World):
location.show_in_spoiler = False location.show_in_spoiler = False
def intervene(move, test_state): def intervene(move, test_state):
if self.multiworld.randomize_wild_pokemon[self.player]: move_bit = pow(2, poke_data.hm_moves.index(move) + 2)
viable_mons = [mon for mon in self.local_poke_data if self.local_poke_data[mon]["tms"][6] & move_bit]
if self.multiworld.randomize_wild_pokemon[self.player] and viable_mons:
accessible_slots = [loc for loc in self.multiworld.get_reachable_locations(test_state, self.player) if accessible_slots = [loc for loc in self.multiworld.get_reachable_locations(test_state, self.player) if
loc.type == "Wild Encounter"] loc.type == "Wild Encounter"]
@ -363,8 +365,6 @@ class PokemonRedBlueWorld(World):
zones.add(loc.name.split(" - ")[0]) zones.add(loc.name.split(" - ")[0])
return len(zones) return len(zones)
move_bit = pow(2, poke_data.hm_moves.index(move) + 2)
viable_mons = [mon for mon in self.local_poke_data if self.local_poke_data[mon]["tms"][6] & move_bit]
placed_mons = [slot.item.name for slot in accessible_slots] placed_mons = [slot.item.name for slot in accessible_slots]
if self.multiworld.area_1_to_1_mapping[self.player]: if self.multiworld.area_1_to_1_mapping[self.player]: