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

Pokémon R/B: Add inheritance to "Completely Random" option as well

This commit is contained in:
Alchav 2023-01-16 14:02:37 -05:00 committed by Fabian Dill
parent a41b0051a6
commit 91fdfe3e17
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/pokemon_rb/rom.py
View File

@ -332,8 +332,8 @@ def process_pokemon_data(self):
if ((mon in poke_data.evolves_from.keys() and mon_data["type1"] == if ((mon in poke_data.evolves_from.keys() and mon_data["type1"] ==
local_poke_data[poke_data.evolves_from[mon]]["type1"] and mon_data["type2"] == local_poke_data[poke_data.evolves_from[mon]]["type1"] and mon_data["type2"] ==
local_poke_data[poke_data.evolves_from[mon]]["type2"]) and ( local_poke_data[poke_data.evolves_from[mon]]["type2"]) and (
(flag < 50 and self.multiworld.tm_compatibility[self.player].value == 1) or ( (flag < 50 and self.multiworld.tm_compatibility[self.player].value in [1, 2]) or (
flag >= 51 and self.multiworld.hm_compatibility[self.player].value == 1))): flag >= 51 and self.multiworld.hm_compatibility[self.player].value in [1, 2]))):
bit = 1 if local_poke_data[poke_data.evolves_from[mon]]["tms"][int(flag / 8)] & 1 << (flag % 8) else 0 bit = 1 if local_poke_data[poke_data.evolves_from[mon]]["tms"][int(flag / 8)] & 1 << (flag % 8) else 0
elif (flag < 50 and self.multiworld.tm_compatibility[self.player].value == 1) or (flag >= 50 and self.multiworld.hm_compatibility[self.player].value == 1): elif (flag < 50 and self.multiworld.tm_compatibility[self.player].value == 1) or (flag >= 50 and self.multiworld.hm_compatibility[self.player].value == 1):
type_match = poke_data.moves[tm_move]["type"] in [mon_data["type1"], mon_data["type2"]] type_match = poke_data.moves[tm_move]["type"] in [mon_data["type1"], mon_data["type2"]]