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

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

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

6
Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb
View File

@@ -108,7 +108,8 @@ class PokemonEggHatch_Scene
$player.pokedex.set_owned(@pokemon.species)
$player.pokedex.set_seen_egg(@pokemon.species)
# 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
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned &&
$player.has_pokedex && $player.pokedex.species_in_unlocked_dex?(@pokemon.species)
pbMessage(_INTL("{1}'s data was added to the Pokédex.", @pokemon.name)) { update }
$player.pokedex.register_last_seen(@pokemon)
pbFadeOutIn do
@@ -227,7 +228,8 @@ def pbHatch(pokemon)
$player.pokedex.set_owned(pokemon.species)
$player.pokedex.set_seen_egg(pokemon.species)
# 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
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned &&
$player.has_pokedex && $player.pokedex.species_in_unlocked_dex?(pokemon.species)
pbMessage(_INTL("{1}'s data was added to the Pokédex.", speciesname))
$player.pokedex.register_last_seen(pokemon)
pbFadeOutIn do

3
Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
View File

@@ -230,7 +230,8 @@ class PokemonEvolutionScene
moves_to_learn.push(i[1])
end
# 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
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned &&
$player.has_pokedex && $player.pokedex.species_in_unlocked_dex?(@pokemon.species)
pbMessageDisplay(@sprites["msgwindow"],
_INTL("{1}'s data was added to the Pokédex.", newspeciesname)) { pbUpdate }
$player.pokedex.register_last_seen(@pokemon)

3
Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb
View File

@@ -191,7 +191,8 @@ class PokemonTrade_Scene
pbMessageDisplay(@sprites["msgwindow"],
_INTL("Take good care of {1}.", speciesname2)) { pbUpdate }
# 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
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned &&
$player.has_pokedex && $player.pokedex.species_in_unlocked_dex?(@pokemon2.species)
pbMessageDisplay(@sprites["msgwindow"],
_INTL("{1}'s data was added to the Pokédex.", speciesname2)) { pbUpdate }
$player.pokedex.register_last_seen(@pokemon2)

3
Data/Scripts/016_UI/024_UI_MysteryGift.rb
View File

@@ -384,7 +384,8 @@ def pbReceiveMysteryGift(id)
pbMessage("\\me[Pkmn get]" + _INTL("{1} received {2}!", $player.name, gift[2].name))
$player.mystery_gifts[index] = [id]
# 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
if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned &&
$player.has_pokedex && $player.pokedex.species_in_unlocked_dex?(gift[2].species)
pbMessage(_INTL("{1}'s data was added to the Pokédex.", gift[2].name))
$player.pokedex.register_last_seen(gift[2])
pbFadeOutIn do