From 91fdfe3e17039df25ad3507da65eaeb41564bdc5 Mon Sep 17 00:00:00 2001 From: Alchav <59858495+Alchav@users.noreply.github.com> Date: Mon, 16 Jan 2023 14:02:37 -0500 Subject: [PATCH] =?UTF-8?q?Pok=C3=A9mon=20R/B:=20Add=20inheritance=20to=20?= =?UTF-8?q?"Completely=20Random"=20option=20as=20well?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worlds/pokemon_rb/rom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/pokemon_rb/rom.py b/worlds/pokemon_rb/rom.py index 088d51fd..169388c6 100644 --- a/worlds/pokemon_rb/rom.py +++ b/worlds/pokemon_rb/rom.py @@ -332,8 +332,8 @@ def process_pokemon_data(self): 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]]["type2"]) and ( - (flag < 50 and self.multiworld.tm_compatibility[self.player].value == 1) or ( - flag >= 51 and self.multiworld.hm_compatibility[self.player].value == 1))): + (flag < 50 and self.multiworld.tm_compatibility[self.player].value in [1, 2]) or ( + 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 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"]]