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

Fixed party screen not animating while teaching a machine move

Browse Source
This commit is contained in:
Maruno17
2020-09-12 01:39:31 +01:00
parent e5139b4d57
commit a756539651
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Scripts/015_Items/001_PItem_Items.rb
View File

@@ -729,7 +729,7 @@ def pbUseItem(bag,item,bagscene=nil)
if ret && useType==1 # Usable on Pokémon, consumed if ret && useType==1 # Usable on Pokémon, consumed
bag.pbDeleteItem(item) bag.pbDeleteItem(item)
if !bag.pbHasItem?(item) if !bag.pbHasItem?(item)
pbMessage(_INTL("You used your last {1}.",PBItems.getName(item))) pbMessage(_INTL("You used your last {1}.",PBItems.getName(item))) { screen.pbUpdate }
break break
end end
end end
@@ -764,13 +764,13 @@ def pbUseItemOnPokemon(item,pkmn,scene)
return false if machine==nil return false if machine==nil
movename = PBMoves.getName(machine) movename = PBMoves.getName(machine)
if pkmn.shadowPokemon? if pkmn.shadowPokemon?
pbMessage(_INTL("Shadow Pokémon can't be taught any moves.")) pbMessage(_INTL("Shadow Pokémon can't be taught any moves.")) { scene.pbUpdate }
elsif !pkmn.compatibleWithMove?(machine) elsif !pkmn.compatibleWithMove?(machine)
pbMessage(_INTL("{1} can't learn {2}.",pkmn.name,movename)) pbMessage(_INTL("{1} can't learn {2}.",pkmn.name,movename)) { scene.pbUpdate }
else else
pbMessage(_INTL("\\se[PC access]You booted up {1}.\1",PBItems.getName(item))) pbMessage(_INTL("\\se[PC access]You booted up {1}.\1",PBItems.getName(item))) { scene.pbUpdate }
if pbConfirmMessage(_INTL("Do you want to teach {1} to {2}?",movename,pkmn.name)) if pbConfirmMessage(_INTL("Do you want to teach {1} to {2}?",movename,pkmn.name)) { scene.pbUpdate }
if pbLearnMove(pkmn,machine,false,true) if pbLearnMove(pkmn,machine,false,true) { scene.pbUpdate }
$PokemonBag.pbDeleteItem(item) if pbIsTechnicalMachine?(item) && !INFINITE_TMS $PokemonBag.pbDeleteItem(item) if pbIsTechnicalMachine?(item) && !INFINITE_TMS
return true return true
end end
@@ -786,7 +786,7 @@ def pbUseItemOnPokemon(item,pkmn,scene)
if ret && useType && useType==1 # Usable on Pokémon, consumed if ret && useType && useType==1 # Usable on Pokémon, consumed
$PokemonBag.pbDeleteItem(item) $PokemonBag.pbDeleteItem(item)
if !$PokemonBag.pbHasItem?(item) if !$PokemonBag.pbHasItem?(item)
pbMessage(_INTL("You used your last {1}.",PBItems.getName(item))) pbMessage(_INTL("You used your last {1}.",PBItems.getName(item))) { scene.pbUpdate }
end end
end end
return ret return ret

31
Data/Scripts/020_System and utilities/005_PSystem_Utilities.rb
View File

@@ -1025,24 +1025,21 @@ def pbMoveTutorChoose(move,movelist=nil,bymachine=false)
screen.pbStartScene(_INTL("Teach which Pokémon?"),false,annot) screen.pbStartScene(_INTL("Teach which Pokémon?"),false,annot)
loop do loop do
chosen = screen.pbChoosePokemon chosen = screen.pbChoosePokemon
if chosen>=0 break if chosen<0
pokemon = $Trainer.party[chosen] pokemon = $Trainer.party[chosen]
if pokemon.egg? if pokemon.egg?
pbMessage(_INTL("Eggs can't be taught any moves.")) pbMessage(_INTL("Eggs can't be taught any moves.")) { screen.pbUpdate }
elsif pokemon.shadowPokemon? elsif pokemon.shadowPokemon?
pbMessage(_INTL("Shadow Pokémon can't be taught any moves.")) pbMessage(_INTL("Shadow Pokémon can't be taught any moves.")) { screen.pbUpdate }
elsif movelist && !movelist.any? { |j| j==pokemon.species } elsif movelist && !movelist.any? { |j| j==pokemon.species }
pbMessage(_INTL("{1} can't learn {2}.",pokemon.name,movename)) pbMessage(_INTL("{1} can't learn {2}.",pokemon.name,movename)) { screen.pbUpdate }
elsif !pokemon.compatibleWithMove?(move) elsif !pokemon.compatibleWithMove?(move)
pbMessage(_INTL("{1} can't learn {2}.",pokemon.name,movename)) pbMessage(_INTL("{1} can't learn {2}.",pokemon.name,movename)) { screen.pbUpdate }
else
if pbLearnMove(pokemon,move,false,bymachine)
ret = true
break
end
end
else else
break if pbLearnMove(pokemon,move,false,bymachine) { screen.pbUpdate }
ret = true
break
end
end end
end end
screen.pbEndScene screen.pbEndScene