DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-29 17:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from jvpr94/master

Browse Source 
Fix nickname reset in Pokebattle_pokemon
This commit is contained in:
Maruno17
2020-09-08 20:08:01 +01:00
committed by GitHub
parent 0236740ab6 4d0e9cd331
commit d5926810d2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/016_Pokemon/001_PokeBattle_Pokemon.rb
View File

@@ -628,9 +628,9 @@ class PokeBattle_Pokemon
# Other # Other
#============================================================================= #=============================================================================
def species=(value) def species=(value)
resetName = nicknamed? hasNickname = nicknamed?
@species = value @species = value
@name = PBSpecies.getName(@species) if !resetName @name = PBSpecies.getName(@species) unless hasNickname
@level = nil # In case growth rate is different for the new species @level = nil # In case growth rate is different for the new species
@forcedForm = nil @forcedForm = nil
self.form = 0 # Also recalculates stats self.form = 0 # Also recalculates stats
@@ -647,7 +647,7 @@ class PokeBattle_Pokemon
end end
def nicknamed? def nicknamed?
return @name==self.speciesName return @name!=self.speciesName
end end
# Returns this Pokémon's language. # Returns this Pokémon's language.