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

Merge branch 'pr/43' into refactor

Browse Source
This commit is contained in:
Maruno17
2020-10-17 14:40:52 +01:00
parent 7640736188 47a1cb5462
commit a6d21de0c1
18 changed files with 201 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/020_System and utilities/004_PSystem_PokemonUtilities.rb
View File

@@ -139,12 +139,8 @@ def pbAddForeignPokemon(pokemon,level=nil,ownerName=nil,nickname=nil,ownerGender
if pokemon.is_a?(Integer) && level.is_a?(Integer)
pokemon = Pokemon.new(pokemon,level)
end
# Set original trainer to a foreign one (if ID isn't already foreign)
if pokemon.trainerID==$Trainer.id
pokemon.trainerID = $Trainer.getForeignID
pokemon.ot = ownerName if ownerName && ownerName!=""
pokemon.otgender = ownerGender
end
# Set original trainer to a foreign one
pokemon.owner = Pokemon::Owner.new_foreign(ownerName || "", ownerGender)
# Set nickname
pokemon.name = nickname[0, Pokemon::MAX_NAME_SIZE] if nickname && nickname!=""
# Recalculate stats