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

Remove all usage of the newly deprecated methods

Browse Source
This commit is contained in:
jonisavo
2020-10-16 14:32:20 +03:00
parent b9801ef171
commit ad1487be1d
5 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/012_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb
View File

@@ -134,10 +134,10 @@ class PokeBattle_Battle
exp /= 7 exp /= 7
end end
# Foreign Pokémon gain more Exp # Foreign Pokémon gain more Exp
isOutsider = (pkmn.trainerID!=pbPlayer.id || isOutsider = (pkmn.owner.id != pbPlayer.id ||
(pkmn.language!=0 && pkmn.language!=pbPlayer.language)) (pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language))
if isOutsider if isOutsider
if pkmn.language!=0 && pkmn.language!=pbPlayer.language if pkmn.owner.language != 0 && pkmn.owner.language != pbPlayer.language
exp = (exp*1.7).floor exp = (exp*1.7).floor
else else
exp = (exp*1.5).floor exp = (exp*1.5).floor

6
Data/Scripts/013_Overworld/013_PField_DayCare.rb
View File

@@ -155,8 +155,8 @@ def pbDayCareGetCompat
isConst?(compat21,PBEggGroups,:Ditto) isConst?(compat21,PBEggGroups,:Ditto)
if pbDayCareCompatibleGender(pkmn1,pkmn2) if pbDayCareCompatibleGender(pkmn1,pkmn2)
ret = 1 ret = 1
ret += 1 if pkmn1.species==pkmn2.species ret += 1 if pkmn1.species == pkmn2.species
ret += 1 if pkmn1.trainerID!=pkmn2.trainerID ret += 1 if pkmn1.owner.id != pkmn2.owner.id
return ret return ret
end end
end end
@@ -350,7 +350,7 @@ def pbDayCareGenerateEgg
end end
# Masuda method and Shiny Charm # Masuda method and Shiny Charm
shinyretries = 0 shinyretries = 0
shinyretries += 5 if father.language!=mother.language shinyretries += 5 if father.owner.language != mother.owner.language
shinyretries += 2 if hasConst?(PBItems,:SHINYCHARM) && $PokemonBag.pbHasItem?(:SHINYCHARM) shinyretries += 2 if hasConst?(PBItems,:SHINYCHARM) && $PokemonBag.pbHasItem?(:SHINYCHARM)
if shinyretries>0 if shinyretries>0
shinyretries.times do shinyretries.times do

2
Data/Scripts/017_UI/006_PScreen_Summary.rb
View File

@@ -407,7 +407,7 @@ class PokemonSummary_Scene
else else
ownerbase = Color.new(64,64,64) ownerbase = Color.new(64,64,64)
ownershadow = Color.new(176,176,176) ownershadow = Color.new(176,176,176)
case @pokemon.otgender case @pokemon.owner.gender
when 0; ownerbase = Color.new(24,112,216); ownershadow = Color.new(136,168,208) when 0; ownerbase = Color.new(24,112,216); ownershadow = Color.new(136,168,208)
when 1; ownerbase = Color.new(248,56,32); ownershadow = Color.new(224,152,144) when 1; ownerbase = Color.new(248,56,32); ownershadow = Color.new(224,152,144)
end end

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) if pokemon.is_a?(Integer) && level.is_a?(Integer)
pokemon = Pokemon.new(pokemon,level) pokemon = Pokemon.new(pokemon,level)
end end
# Set original trainer to a foreign one (if ID isn't already foreign) # Set original trainer to a foreign one
if pokemon.trainerID==$Trainer.id pokemon.owner = Pokemon::Owner.new_foreign(ownerName || "", ownerGender)
pokemon.trainerID = $Trainer.getForeignID
pokemon.ot = ownerName if ownerName && ownerName!=""
pokemon.otgender = ownerGender
end
# Set nickname # Set nickname
pokemon.name = nickname[0, Pokemon::MAX_NAME_SIZE] if nickname && nickname!="" pokemon.name = nickname[0, Pokemon::MAX_NAME_SIZE] if nickname && nickname!=""
# Recalculate stats # Recalculate stats

12
Data/Scripts/021_Debug/003_Debug_Pokemon.rb
View File

@@ -667,7 +667,7 @@ module PokemonDebugMixin
when "ownership" when "ownership"
cmd = 0 cmd = 0
loop do loop do
gender = [_INTL("Male"),_INTL("Female"),_INTL("Unknown")][pkmn.otgender] gender = [_INTL("Male"),_INTL("Female"),_INTL("Unknown")][pkmn.owner.gender]
msg = [_INTL("Player's Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id), msg = [_INTL("Player's Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id),
_INTL("Foreign Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id) _INTL("Foreign Pokémon\n{1}\n{2}\n{3} ({4})",pkmn.owner.name,gender,pkmn.owner.public_id,pkmn.owner.id)
][pkmn.foreign?($Trainer) ? 1 : 0] ][pkmn.foreign?($Trainer) ? 1 : 0]
@@ -685,18 +685,18 @@ module PokemonDebugMixin
pkmn.owner.name = pbEnterPlayerName(_INTL("{1}'s OT's name?",pkmn.name),1,MAX_PLAYER_NAME_SIZE) pkmn.owner.name = pbEnterPlayerName(_INTL("{1}'s OT's name?",pkmn.name),1,MAX_PLAYER_NAME_SIZE)
when 2 # Set OT's gender when 2 # Set OT's gender
cmd2 = pbShowCommands(_INTL("Set OT's gender."), cmd2 = pbShowCommands(_INTL("Set OT's gender."),
[_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.otgender) [_INTL("Male"),_INTL("Female"),_INTL("Unknown")],pkmn.owner.gender)
pkmn.otgender = cmd2 if cmd2>=0 pkmn.owner.gender = cmd2 if cmd2>=0
when 3 # Random foreign ID when 3 # Random foreign ID
pkmn.trainerID = $Trainer.getForeignID pkmn.owner.id = $Trainer.getForeignID
when 4 # Set foreign ID when 4 # Set foreign ID
params = ChooseNumberParams.new params = ChooseNumberParams.new
params.setRange(0,65535) params.setRange(0,65535)
params.setDefaultValue(pkmn.owner.public_id) params.setDefaultValue(pkmn.owner.public_id)
val = pbMessageChooseNumber( val = pbMessageChooseNumber(
_INTL("Set the new ID (max. 65535)."),params) { pbUpdate } _INTL("Set the new ID (max. 65535)."),params) { pbUpdate }
pkmn.trainerID = val pkmn.owner.id = val
pkmn.trainerID |= val << 16 pkmn.owner.id |= val << 16
end end
end end
#=========================================================================== #===========================================================================