The Pokédex entry of a newly obtained species now only shows if that species is in an unlocked Dex list

This commit is contained in:
Maruno17
2023-07-12 21:08:02 +01:00
parent 8287f32a5e
commit 4ca2500d6b
7 changed files with 26 additions and 9 deletions

View File

@@ -60,7 +60,8 @@ def pbAddPokemon(pkmn, level = 1, see_form = true)
$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 && see_form && !was_owned && $player.has_pokedex
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && see_form && !was_owned &&
$player.has_pokedex && $player.pokedex.species_in_unlocked_dex?(pkmn.species)
pbMessage(_INTL("{1}'s data was added to the Pokédex.", species_name))
$player.pokedex.register_last_seen(pkmn)
pbFadeOutIn do
@@ -102,7 +103,8 @@ def pbAddToParty(pkmn, level = 1, see_form = true)
$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 && see_form && !was_owned && $player.has_pokedex
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && see_form && !was_owned &&
$player.has_pokedex && $player.pokedex.species_in_unlocked_dex?(pkmn.species)
pbMessage(_INTL("{1}'s data was added to the Pokédex.", species_name))
$player.pokedex.register_last_seen(pkmn)
pbFadeOutIn do
@@ -142,7 +144,8 @@ def pbAddForeignPokemon(pkmn, level = 1, owner_name = nil, nickname = nil, owner
$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 && see_form && !was_owned && $player.has_pokedex
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && see_form && !was_owned &&
$player.has_pokedex && $player.pokedex.species_in_unlocked_dex?(pkmn.species)
pbMessage(_INTL("The Pokémon's data was added to the Pokédex."))
$player.pokedex.register_last_seen(pkmn)
pbFadeOutIn do