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

Merge branch 'master' of https://github.com/Maruno17/pokemon-essentials

Browse Source
This commit is contained in:
Maruno17
2020-09-06 17:32:33 +01:00
parent 681a8331ab 7731893a1c
commit a91d13adcb
20 changed files with 102 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/016_Pokemon/004_Pokemon_ShadowPokemon.rb
View File

@@ -193,7 +193,7 @@ end
#===============================================================================
def pbIsPurifiable?(pkmn)
return false if !pkmn
return false if isConst?(pkmn.species,PBSpecies,:LUGIA)
return false if pkmn.isSpecies?(:LUGIA)
return false if !pkmn.shadowPokemon? || pkmn.heartgauge>0
return true
end

6
Data/Scripts/016_Pokemon/008_Pokemon_Storage.rb
View File

@@ -181,7 +181,7 @@ class PokemonStorage
pkmn = self[boxSrc,indexSrc]
raise "Trying to copy nil to storage" if !pkmn
pkmn.formTime = nil if pkmn.respond_to?("formTime")
pkmn.form = 0 if isConst?(pkmn.species,PBSpecies,:SHAYMIN)
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal
self[boxDst,indexDst] = pkmn
end
@@ -204,7 +204,7 @@ class PokemonStorage
if self[box,i]==nil
if box>=0
pkmn.formTime = nil if pkmn.respond_to?("formTime") && pkmn.formTime
pkmn.form = 0 if isConst?(pkmn.species,PBSpecies,:SHAYMIN)
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal
end
self[box,i] = pkmn
@@ -217,7 +217,7 @@ class PokemonStorage
def pbStoreCaught(pkmn)
if @currentBox>=0
pkmn.formTime = nil if pkmn.respond_to?("formTime")
pkmn.form = 0 if isConst?(pkmn.species,PBSpecies,:SHAYMIN)
pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN)
pkmn.heal
end
for i in 0...maxPokemon(@currentBox)