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

Pokémon in storage no longer recalculate their form

Browse Source
This commit is contained in:
Maruno17
2021-08-30 00:10:31 +01:00
parent 70ef588190
commit c92bb2fb42
6 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb
View File

@@ -190,8 +190,6 @@ class PokemonStorage
else # Copying into box
pkmn = self[boxSrc,indexSrc]
raise "Trying to copy nil to storage" if !pkmn
pkmn.time_form_set = nil
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal if Settings::HEAL_STORED_POKEMON
self[boxDst,indexDst] = pkmn
end
@@ -212,11 +210,7 @@ class PokemonStorage
def pbMoveCaughtToBox(pkmn,box)
for i in 0...maxPokemon(box)
if self[box,i]==nil
if box>=0
pkmn.time_form_set = nil if pkmn.time_form_set
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal if Settings::HEAL_STORED_POKEMON
end
pkmn.heal if box >= 0 && Settings::HEAL_STORED_POKEMON
self[box,i] = pkmn
return true
end
@@ -225,11 +219,7 @@ class PokemonStorage
end
def pbStoreCaught(pkmn)
if @currentBox>=0
pkmn.time_form_set = nil
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal if Settings::HEAL_STORED_POKEMON
end
pkmn.heal if Settings::HEAL_STORED_POKEMON if @currentBox >= 0
for i in 0...maxPokemon(@currentBox)
if self[@currentBox,i]==nil
self[@currentBox,i] = pkmn

2
Data/Scripts/014_Pokemon/001_Pokemon.rb
View File

@@ -137,7 +137,7 @@ class Pokemon
def form
return @forced_form if !@forced_form.nil?
return @form if $game_temp.in_battle
return @form if $game_temp.in_battle || $game_temp.in_storage
calc_form = MultipleForms.call("getForm", self)
self.form = calc_form if calc_form != nil && calc_form != @form
return @form