Revised changes in previous commit about Pokémon generation for non-standard battles

This commit is contained in:
Maruno17
2022-11-05 19:29:06 +00:00
parent 5dd8c31ff0
commit bbe654028c
3 changed files with 11 additions and 4 deletions

View File

@@ -115,8 +115,9 @@ EventHandlers.add(:on_calling_wild_battle, :safari_battle,
}
)
def pbSafariBattle(pkmn)
def pbSafariBattle(pkmn, level = 1)
# Generate a wild Pokémon based on the species and level
pkmn = pbGenerateWildPokemon(pkmn, level) if !pkmn.is_a?(Pokemon)
foeParty = [pkmn]
# Calculate who the trainer is
playerTrainer = $player

View File

@@ -365,10 +365,12 @@ EventHandlers.add(:on_calling_wild_battle, :bug_contest_battle,
}
)
def pbBugContestBattle(pkmn)
def pbBugContestBattle(pkmn, level = 1)
# Record information about party Pokémon to be used at the end of battle (e.g.
# comparing levels for an evolution check)
EventHandlers.trigger(:on_start_battle)
# Generate a wild Pokémon based on the species and level
pkmn = pbGenerateWildPokemon(pkmn, level) if !pkmn.is_a?(Pokemon)
foeParty = [pkmn]
# Calculate who the trainers and their party are
playerTrainer = [$player]