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

Added separate SellPrice property for items, changed messages when learning a move, updates to Gen 8 items.txt

Browse Source
This commit is contained in:
Maruno17
2021-07-10 22:17:02 +01:00
parent 8ed9c5139e
commit 3d634a7f22
8 changed files with 501 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
View File

@@ -228,10 +228,10 @@ class PokeBattle_Battle
battler = pbFindBattler(idxParty)
moveName = GameData::Move.get(newMove).name
# Pokémon already knows the move
return if pkmn.moves.any? { |m| m && m.id == newMove }
return if pkmn.hasMove?(newMove)
# Pokémon has space for the new move; just learn it
if pkmn.moves.length < Pokemon::MAX_MOVES
pkmn.moves.push(Pokemon::Move.new(newMove))
if pkmn.numMoves < Pokemon::MAX_MOVES
pkmn.learn_move(newMove)
pbDisplay(_INTL("{1} learned {2}!",pkmnName,moveName)) { pbSEPlay("Pkmn move learnt") }
if battler
battler.moves.push(PokeBattle_Move.from_pokemon_move(self, pkmn.moves.last))
@@ -240,17 +240,16 @@ class PokeBattle_Battle
return
end
# Pokémon already knows the maximum number of moves; try to forget one to learn the new move
loop do
pbDisplayPaused(_INTL("{1} wants to learn {2}, but it already knows {3} moves.",
pkmnName, moveName, pkmn.moves.length.to_word))
if pbDisplayConfirm(_INTL("Forget a move to learn {1}?",moveName))
pbDisplayPaused(_INTL("Which move should be forgotten?"))
pbDisplayPaused(_INTL("{1} wants to learn {2}, but it already knows {3} moves.",
pkmnName, moveName, pkmn.numMoves.to_word))
if pbDisplayConfirm(_INTL("Should {1} forget a move to learn {2}?", pkmnName, moveName))
loop do
forgetMove = @scene.pbForgetMove(pkmn,newMove)
if forgetMove>=0
oldMoveName = pkmn.moves[forgetMove].name
pkmn.moves[forgetMove] = Pokemon::Move.new(newMove) # Replaces current/total PP
battler.moves[forgetMove] = PokeBattle_Move.from_pokemon_move(self, pkmn.moves[forgetMove]) if battler
pbDisplayPaused(_INTL("1, 2, and... ... ... Ta-da!"))
pbDisplayPaused(_INTL("1, 2, and... ... ... Ta-da!")) { pbSEPlay("Battle ball drop") }
pbDisplayPaused(_INTL("{1} forgot how to use {2}. And...",pkmnName,oldMoveName))
pbDisplay(_INTL("{1} learned {2}!",pkmnName,moveName)) { pbSEPlay("Pkmn move learnt") }
battler.pbCheckFormOnMovesetChange if battler
@@ -259,10 +258,9 @@ class PokeBattle_Battle
pbDisplay(_INTL("{1} did not learn {2}.",pkmnName,moveName))
break
end
elsif pbDisplayConfirm(_INTL("Give up on learning {1}?",moveName))
pbDisplay(_INTL("{1} did not learn {2}.",pkmnName,moveName))
break
end
else
pbDisplay(_INTL("{1} did not learn {2}.", pkmnName, moveName))
end
end
end