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

Renamed $Trainer to $player

Browse Source
This commit is contained in:
Maruno17
2021-10-20 22:57:43 +01:00
parent fbddb9034f
commit e49cd8d498
71 changed files with 470 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Data/Scripts/019_Utilities/001_Utilities.rb
View File

@@ -208,7 +208,7 @@ end
#===============================================================================
# Unused
def pbGetPlayerGraphic
id = $Trainer.character_ID
id = $player.character_ID
return "" if id < 1
meta = GameData::PlayerMetadata.get(id)
return "" if !meta
@@ -223,24 +223,24 @@ def pbChangePlayer(id)
return false if id < 1
meta = GameData::PlayerMetadata.get(id)
return false if !meta
$Trainer.character_ID = id
$Trainer.trainer_type = meta.trainer_type
$player.character_ID = id
$player.trainer_type = meta.trainer_type
$game_player.character_name = meta.walk_charset
end
def pbTrainerName(name = nil, outfit = 0)
pbChangePlayer(1) if $Trainer.character_ID < 1
pbChangePlayer(1) if $player.character_ID < 1
if name.nil?
name = pbEnterPlayerName(_INTL("Your name?"), 0, Settings::MAX_PLAYER_NAME_SIZE)
if name.nil? || name.empty?
player_metadata = GameData::PlayerMetadata.get($Trainer.character_ID)
player_metadata = GameData::PlayerMetadata.get($player.character_ID)
trainer_type = (player_metadata) ? player_metadata.trainer_type : nil
gender = pbGetTrainerTypeGender(trainer_type)
name = pbSuggestTrainerName(gender)
end
end
$Trainer.name = name
$Trainer.outfit = outfit
$player.name = name
$player.outfit = outfit
$PokemonTemp.begunNewGame = true
end
@@ -406,7 +406,7 @@ end
def pbMoveTutorAnnotations(move, movelist = nil)
ret = []
$Trainer.party.each_with_index do |pkmn, i|
$player.party.each_with_index do |pkmn, i|
if pkmn.egg?
ret[i] = _INTL("NOT ABLE")
elsif pkmn.hasMove?(move)
@@ -439,12 +439,12 @@ def pbMoveTutorChoose(move,movelist=nil,bymachine=false,oneusemachine=false)
movename = GameData::Move.get(move).name
annot = pbMoveTutorAnnotations(move,movelist)
scene = PokemonParty_Scene.new
screen = PokemonPartyScreen.new(scene,$Trainer.party)
screen = PokemonPartyScreen.new(scene,$player.party)
screen.pbStartScene(_INTL("Teach which Pokémon?"),false,annot)
loop do
chosen = screen.pbChoosePokemon
break if chosen<0
pokemon = $Trainer.party[chosen]
pokemon = $player.party[chosen]
if pokemon.egg?
pbMessage(_INTL("Eggs can't be taught any moves.")) { screen.pbUpdate }
elsif pokemon.shadowPokemon?

54
Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb
View File

@@ -2,7 +2,7 @@
# Nicknaming and storing Pokémon
#===============================================================================
def pbBoxesFull?
return ($Trainer.party_full? && $PokemonStorage.full?)
return ($player.party_full? && $PokemonStorage.full?)
end
def pbNickname(pkmn)
@@ -20,13 +20,13 @@ def pbStorePokemon(pkmn)
return
end
pkmn.record_first_moves
if $Trainer.party_full?
if $player.party_full?
oldcurbox = $PokemonStorage.currentBox
storedbox = $PokemonStorage.pbStoreCaught(pkmn)
curboxname = $PokemonStorage[oldcurbox].name
boxname = $PokemonStorage[storedbox].name
creator = nil
creator = pbGetStorageCreator if $Trainer.seen_storage_creator
creator = pbGetStorageCreator if $player.seen_storage_creator
if storedbox != oldcurbox
if creator
pbMessage(_INTL("Box \"{1}\" on {2}'s PC was full.\1", curboxname, creator))
@@ -43,7 +43,7 @@ def pbStorePokemon(pkmn)
pbMessage(_INTL("It was stored in box \"{1}.\"", boxname))
end
else
$Trainer.party[$Trainer.party.length] = pkmn
$player.party[$player.party.length] = pkmn
end
end
@@ -53,8 +53,8 @@ def pbNicknameAndStore(pkmn)
pbMessage(_INTL("The Pokémon Boxes are full and can't accept any more!"))
return
end
$Trainer.pokedex.set_seen(pkmn.species)
$Trainer.pokedex.set_owned(pkmn.species)
$player.pokedex.set_seen(pkmn.species)
$player.pokedex.set_owned(pkmn.species)
pbNickname(pkmn)
pbStorePokemon(pkmn)
end
@@ -71,22 +71,22 @@ def pbAddPokemon(pkmn, level = 1, see_form = true)
end
pkmn = Pokemon.new(pkmn, level) if !pkmn.is_a?(Pokemon)
species_name = pkmn.speciesName
pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1", $Trainer.name, species_name))
pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1", $player.name, species_name))
pbNicknameAndStore(pkmn)
$Trainer.pokedex.register(pkmn) if see_form
$player.pokedex.register(pkmn) if see_form
return true
end
def pbAddPokemonSilent(pkmn, level = 1, see_form = true)
return false if !pkmn || pbBoxesFull?
pkmn = Pokemon.new(pkmn, level) if !pkmn.is_a?(Pokemon)
$Trainer.pokedex.register(pkmn) if see_form
$Trainer.pokedex.set_owned(pkmn.species)
$player.pokedex.register(pkmn) if see_form
$player.pokedex.set_owned(pkmn.species)
pkmn.record_first_moves
if $Trainer.party_full?
if $player.party_full?
$PokemonStorage.pbStoreCaught(pkmn)
else
$Trainer.party[$Trainer.party.length] = pkmn
$player.party[$player.party.length] = pkmn
end
return true
end
@@ -95,27 +95,27 @@ end
# Giving Pokémon/eggs to the player (can only add to party)
#===============================================================================
def pbAddToParty(pkmn, level = 1, see_form = true)
return false if !pkmn || $Trainer.party_full?
return false if !pkmn || $player.party_full?
pkmn = Pokemon.new(pkmn, level) if !pkmn.is_a?(Pokemon)
species_name = pkmn.speciesName
pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1", $Trainer.name, species_name))
pbMessage(_INTL("{1} obtained {2}!\\me[Pkmn get]\\wtnp[80]\1", $player.name, species_name))
pbNicknameAndStore(pkmn)
$Trainer.pokedex.register(pkmn) if see_form
$player.pokedex.register(pkmn) if see_form
return true
end
def pbAddToPartySilent(pkmn, level = nil, see_form = true)
return false if !pkmn || $Trainer.party_full?
return false if !pkmn || $player.party_full?
pkmn = Pokemon.new(pkmn, level) if !pkmn.is_a?(Pokemon)
$Trainer.pokedex.register(pkmn) if see_form
$Trainer.pokedex.set_owned(pkmn.species)
$player.pokedex.register(pkmn) if see_form
$player.pokedex.set_owned(pkmn.species)
pkmn.record_first_moves
$Trainer.party[$Trainer.party.length] = pkmn
$player.party[$player.party.length] = pkmn
return true
end
def pbAddForeignPokemon(pkmn, level = 1, owner_name = nil, nickname = nil, owner_gender = 0, see_form = true)
return false if !pkmn || $Trainer.party_full?
return false if !pkmn || $player.party_full?
pkmn = Pokemon.new(pkmn, level) if !pkmn.is_a?(Pokemon)
# Set original trainer to a foreign one
pkmn.owner = Pokemon::Owner.new_foreign(owner_name || "", owner_gender)
@@ -124,18 +124,18 @@ def pbAddForeignPokemon(pkmn, level = 1, owner_name = nil, nickname = nil, owner
# Recalculate stats
pkmn.calc_stats
if owner_name
pbMessage(_INTL("\\me[Pkmn get]{1} received a Pokémon from {2}.\1", $Trainer.name, owner_name))
pbMessage(_INTL("\\me[Pkmn get]{1} received a Pokémon from {2}.\1", $player.name, owner_name))
else
pbMessage(_INTL("\\me[Pkmn get]{1} received a Pokémon.\1", $Trainer.name))
pbMessage(_INTL("\\me[Pkmn get]{1} received a Pokémon.\1", $player.name))
end
pbStorePokemon(pkmn)
$Trainer.pokedex.register(pkmn) if see_form
$Trainer.pokedex.set_owned(pkmn.species)
$player.pokedex.register(pkmn) if see_form
$player.pokedex.set_owned(pkmn.species)
return true
end
def pbGenerateEgg(pkmn, text = "")
return false if !pkmn || $Trainer.party_full?
return false if !pkmn || $player.party_full?
pkmn = Pokemon.new(pkmn, Settings::EGG_LEVEL) if !pkmn.is_a?(Pokemon)
# Set egg's details
pkmn.name = _INTL("Egg")
@@ -143,7 +143,7 @@ def pbGenerateEgg(pkmn, text = "")
pkmn.obtain_text = text
pkmn.calc_stats
# Add egg to party
$Trainer.party[$Trainer.party.length] = pkmn
$player.party[$player.party.length] = pkmn
return true
end
alias pbAddEgg pbGenerateEgg
@@ -154,7 +154,7 @@ alias pbGenEgg pbGenerateEgg
#===============================================================================
# Returns the first unfainted, non-egg Pokémon in the player's party.
def pbFirstAblePokemon(variable_ID)
$Trainer.party.each_with_index do |pkmn, i|
$player.party.each_with_index do |pkmn, i|
next if !pkmn.able?
pbSet(variable_ID, i)
return pkmn