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

Pokemon Red and Blue: Fix to having all traps disabled (#1408)

Browse Source
This commit is contained in:
SonicRPika
2023-01-24 03:34:45 +00:00
committed by GitHub
parent 53dd0d5a7d
commit 920240cb6f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/pokemon_rb/__init__.py
View File

@@ -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[