release 6.2

This commit is contained in:
infinitefusion
2024-06-28 12:01:39 -04:00
parent 0b9e83f554
commit 3a488c9ba6
7249 changed files with 713866 additions and 136365 deletions

View File

@@ -1276,10 +1276,13 @@ class PokemonSummary_Scene
cmdTakeItem = -1
cmdPokedex = -1
cmdMark = -1
cmdHat = -1
if !@pokemon.egg?
if pbBattleChallenge.currentChallenge == -1
commands[cmdGiveItem = commands.length] = _INTL("Give item")
commands[cmdTakeItem = commands.length] = _INTL("Take item") if @pokemon.hasItem?
commands[cmdHat = commands.length] = _INTL("Hat") if !@pokemon.egg? && $game_switches[SWITCH_UNLOCKED_POKEMON_HATS]
end
commands[cmdPokedex = commands.length] = _INTL("View Pokédex") if $Trainer.has_pokedex
end
@@ -1298,6 +1301,8 @@ class PokemonSummary_Scene
end
elsif cmdTakeItem >= 0 && command == cmdTakeItem
dorefresh = pbTakeItemFromPokemon(@pokemon, self)
elsif cmdHat >= 0 && command == cmdHat
pbPokemonHatFromSummary(@pokemon)
elsif cmdPokedex >= 0 && command == cmdPokedex
$Trainer.pokedex.register_last_seen(@pokemon)
pbFadeOutIn {
@@ -1313,6 +1318,47 @@ class PokemonSummary_Scene
return dorefresh
end
def pbOpenHatScreenSummary(pokemon)
#oldsprites = pbFadeOutAndHide(@sprites)
x_pos = -8 #todo: Set as relative position instead of hardcoded value
y_pos = 94#
scene = PokemonHatView.new(x_pos,y_pos,false)
screen = PokemonHatPresenter.new(scene, pokemon)
screen.pbStartScreen()
yield if block_given?
#pbFadeInAndShow(@sprites, oldsprites)
end
def pbPokemonHatFromSummary(pokemon)
cmd = 0
msg = "What should you do?"
loop do
cmd = pbShowCommands([
_INTL("Put on hat"),
_INTL("Remove hat"),
_INTL("Back")])
echoln cmd
break if cmd == -1
if cmd == 0 #Put on hat
@sprites["pokemon"].visible=false
pbOpenHatScreenSummary(pokemon)
@sprites["pokemon"].visible=true
pbDisplay(_INTL("{1} put on a hat!",pokemon.name))
#@sprites["pokemon"].visible=false
elsif cmd == 1 #remove hat
if pbConfirm(_INTL("Remove {1}'s hat?",pokemon.name))
pokemon.hat=nil
pbDisplay(_INTL("{1}'s hat was removed",pokemon.name))
end
else
break
end
pbChangePokemon()
end
end
def pbChooseMoveToForget(move_to_learn)
new_move = (move_to_learn) ? Pokemon::Move.new(move_to_learn) : nil
selmove = 0