From 38d551f72bbc3d5496000ab1f546cb320e2c6604 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Fri, 20 May 2022 20:22:47 +0100 Subject: [PATCH] =?UTF-8?q?Fixed=20not=20registering=20a=20gifted=20Pok?= =?UTF-8?q?=C3=A9mon=20as=20seen/owned=20before=20looking=20at=20its=20Pok?= =?UTF-8?q?=C3=A9dex=20entry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb b/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb index e67702065..1a1a90b55 100644 --- a/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb +++ b/Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb @@ -56,6 +56,8 @@ def pbAddPokemon(pkmn, level = 1, see_form = true) species_name = pkmn.speciesName pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1", $player.name, species_name)) was_owned = $player.owned?(pkmn.species) + $player.pokedex.set_seen(pkmn.species) + $player.pokedex.set_owned(pkmn.species) $player.pokedex.register(pkmn) if see_form # Show Pokédex entry for new species if it hasn't been owned before if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned && $player.has_pokedex @@ -75,8 +77,9 @@ end def pbAddPokemonSilent(pkmn, level = 1, see_form = true) return false if !pkmn || pbBoxesFull? pkmn = Pokemon.new(pkmn, level) if !pkmn.is_a?(Pokemon) - $player.pokedex.register(pkmn) if see_form + $player.pokedex.set_seen(pkmn.species) $player.pokedex.set_owned(pkmn.species) + $player.pokedex.register(pkmn) if see_form pkmn.record_first_moves if $player.party_full? $PokemonStorage.pbStoreCaught(pkmn) @@ -95,6 +98,8 @@ def pbAddToParty(pkmn, level = 1, see_form = true) species_name = pkmn.speciesName pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1", $player.name, species_name)) was_owned = $player.owned?(pkmn.species) + $player.pokedex.set_seen(pkmn.species) + $player.pokedex.set_owned(pkmn.species) $player.pokedex.register(pkmn) if see_form # Show Pokédex entry for new species if it hasn't been owned before if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned && $player.has_pokedex @@ -133,8 +138,9 @@ def pbAddForeignPokemon(pkmn, level = 1, owner_name = nil, nickname = nil, owner pbMessage(_INTL("\\me[Pkmn get]{1} received a Pokémon.\1", $player.name)) end was_owned = $player.owned?(pkmn.species) - $player.pokedex.register(pkmn) if see_form + $player.pokedex.set_seen(pkmn.species) $player.pokedex.set_owned(pkmn.species) + $player.pokedex.register(pkmn) if see_form # Show Pokédex entry for new species if it hasn't been owned before if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned && $player.has_pokedex pbMessage(_INTL("The Pokémon's data was added to the Pokédex."))