From 920240cb6f152043ac595d3aaebbcd5bd6353ae3 Mon Sep 17 00:00:00 2001 From: SonicRPika <68293462+SonicRPika@users.noreply.github.com> Date: Tue, 24 Jan 2023 03:34:45 +0000 Subject: [PATCH] Pokemon Red and Blue: Fix to having all traps disabled (#1408) --- worlds/pokemon_rb/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py index d4d14960..90c782b5 100644 --- a/worlds/pokemon_rb/__init__.py +++ b/worlds/pokemon_rb/__init__.py @@ -318,7 +318,8 @@ class PokemonRedBlueWorld(World): spoiler_handle.write(f"{matchup[0]} deals {matchup[2] * 10}% damage to {matchup[1]}\n") def get_filler_item_name(self) -> str: - if self.multiworld.random.randint(1, 100) <= self.multiworld.trap_percentage[self.player].value: + combined_traps = self.multiworld.poison_trap_weight[self.player].value + self.multiworld.fire_trap_weight[self.player].value + self.multiworld.paralyze_trap_weight[self.player].value + self.multiworld.ice_trap_weight[self.player].value + if self.multiworld.random.randint(1, 100) <= self.multiworld.trap_percentage[self.player].value and combined_traps != 0: return self.select_trap() return self.multiworld.random.choice([item for item in item_table if item_table[