mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 21:54:58 +00:00
Lots of rubocop
This commit is contained in:
@@ -109,11 +109,11 @@ class PokemonEggHatch_Scene
|
||||
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned && $player.has_pokedex
|
||||
pbMessage(_INTL("{1}'s data was added to the Pokédex.", @pokemon.name)) { update }
|
||||
$player.pokedex.register_last_seen(@pokemon)
|
||||
pbFadeOutIn {
|
||||
pbFadeOutIn do
|
||||
scene = PokemonPokedexInfo_Scene.new
|
||||
screen = PokemonPokedexInfoScreen.new(scene)
|
||||
screen.pbDexEntry(@pokemon.species)
|
||||
}
|
||||
end
|
||||
end
|
||||
# Nickname the Pokémon
|
||||
if $PokemonSystem.givenicknames == 0 &&
|
||||
@@ -195,11 +195,11 @@ end
|
||||
#===============================================================================
|
||||
def pbHatchAnimation(pokemon)
|
||||
pbMessage(_INTL("Huh?\1"))
|
||||
pbFadeOutInWithMusic {
|
||||
pbFadeOutInWithMusic do
|
||||
scene = PokemonEggHatch_Scene.new
|
||||
screen = PokemonEggHatchScreen.new(scene)
|
||||
screen.pbStartScreen(pokemon)
|
||||
}
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
@@ -226,11 +226,11 @@ def pbHatch(pokemon)
|
||||
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned && $player.has_pokedex
|
||||
pbMessage(_INTL("{1}'s data was added to the Pokédex.", speciesname))
|
||||
$player.pokedex.register_last_seen(pokemon)
|
||||
pbFadeOutIn {
|
||||
pbFadeOutIn do
|
||||
scene = PokemonPokedexInfo_Scene.new
|
||||
screen = PokemonPokedexInfoScreen.new(scene)
|
||||
screen.pbDexEntry(pokemon.species)
|
||||
}
|
||||
end
|
||||
end
|
||||
# Nickname the Pokémon
|
||||
if $PokemonSystem.givenicknames == 0 &&
|
||||
|
||||
@@ -617,13 +617,13 @@ class PokemonEvolutionScene
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
_INTL("{1}'s data was added to the Pokédex.", newspeciesname)) { pbUpdate }
|
||||
$player.pokedex.register_last_seen(@pokemon)
|
||||
pbFadeOutIn {
|
||||
pbFadeOutIn do
|
||||
scene = PokemonPokedexInfo_Scene.new
|
||||
screen = PokemonPokedexInfoScreen.new(scene)
|
||||
screen.pbDexEntry(@pokemon.species)
|
||||
@sprites["msgwindow"].text = "" if moves_to_learn.length > 0
|
||||
pbEndScreen(false) if moves_to_learn.length == 0
|
||||
}
|
||||
end
|
||||
end
|
||||
# Learn moves upon evolution for evolved species
|
||||
moves_to_learn.each do |move|
|
||||
|
||||
@@ -195,12 +195,12 @@ class PokemonTrade_Scene
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
_INTL("{1}'s data was added to the Pokédex.", speciesname2)) { pbUpdate }
|
||||
$player.pokedex.register_last_seen(@pokemon2)
|
||||
pbFadeOutIn {
|
||||
pbFadeOutIn do
|
||||
scene = PokemonPokedexInfo_Scene.new
|
||||
screen = PokemonPokedexInfoScreen.new(scene)
|
||||
screen.pbDexEntry(@pokemon2.species)
|
||||
pbEndScreen(false)
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -227,11 +227,11 @@ def pbStartTrade(pokemonIndex, newpoke, nickname, trainerName, trainerGender = 0
|
||||
yourPokemon.obtain_method = 2 # traded
|
||||
yourPokemon.reset_moves if resetmoves
|
||||
yourPokemon.record_first_moves
|
||||
pbFadeOutInWithMusic {
|
||||
pbFadeOutInWithMusic do
|
||||
evo = PokemonTrade_Scene.new
|
||||
evo.pbStartScreen(myPokemon, yourPokemon, $player.name, trainerName)
|
||||
evo.pbTrade
|
||||
evo.pbEndScreen
|
||||
}
|
||||
end
|
||||
$player.party[pokemonIndex] = yourPokemon
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user