DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 05:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb
View File

@@ -196,13 +196,17 @@ EventHandlers.add(:on_calling_wild_battle, :roaming_pokemon,
} }
) )
def pbRoamingPokemonBattle(pkmn) def pbRoamingPokemonBattle(pkmn, level = 1)
# Get the roaming Pokémon to encounter; generate it based on the species and # Get the roaming Pokémon to encounter; generate it based on the species and
# level if it doesn't already exist # level if it doesn't already exist
idxRoamer = $game_temp.roamer_index_for_encounter idxRoamer = $game_temp.roamer_index_for_encounter
if !$PokemonGlobal.roamPokemon[idxRoamer] || if !$PokemonGlobal.roamPokemon[idxRoamer] ||
!$PokemonGlobal.roamPokemon[idxRoamer].is_a?(Pokemon) !$PokemonGlobal.roamPokemon[idxRoamer].is_a?(Pokemon)
$PokemonGlobal.roamPokemon[idxRoamer] = pbGenerateWildPokemon(pkmn.species_data.id, pkmn.level, true) if pkmn.is_a?(Pokemon)
$PokemonGlobal.roamPokemon[idxRoamer] = pbGenerateWildPokemon(pkmn.species_data.id, pkmn.level, true)
else
$PokemonGlobal.roamPokemon[idxRoamer] = pbGenerateWildPokemon(pkmn, level, true)
end
end end
# Set some battle rules # Set some battle rules
setBattleRule("single") setBattleRule("single")

3
Data/Scripts/018_Alternate battle modes/001_SafariZone.rb
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 # Generate a wild Pokémon based on the species and level
pkmn = pbGenerateWildPokemon(pkmn, level) if !pkmn.is_a?(Pokemon)
foeParty = [pkmn] foeParty = [pkmn]
# Calculate who the trainer is # Calculate who the trainer is
playerTrainer = $player playerTrainer = $player

4
Data/Scripts/018_Alternate battle modes/002_BugContest.rb
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. # Record information about party Pokémon to be used at the end of battle (e.g.
# comparing levels for an evolution check) # comparing levels for an evolution check)
EventHandlers.trigger(:on_start_battle) 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] foeParty = [pkmn]
# Calculate who the trainers and their party are # Calculate who the trainers and their party are
playerTrainer = [$player] playerTrainer = [$player]