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

Merge pull request #2 from Marin-MK/master

Browse Source 
Bug Fixes
This commit is contained in:
Maruno17
2020-09-05 16:25:10 +01:00
committed by GitHub
parent 59aa22d3c7 866f543e97
commit 04ae64f026
6 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb
View File

@@ -360,7 +360,7 @@ class PokeBattle_Battler
end end
# Protean # Protean
if user.hasActiveAbility?(:PROTEAN) && !move.callsAnotherMove? && !move.snatched if user.hasActiveAbility?(:PROTEAN) && !move.callsAnotherMove? && !move.snatched
if user.pbHasOtherType?(moveType) && !PBTypes.isPseudoType?(move.calcType) if user.pbHasOtherType?(move.calcType) && !PBTypes.isPseudoType?(move.calcType)
@battle.pbShowAbilitySplash(user) @battle.pbShowAbilitySplash(user)
user.pbChangeTypes(move.calcType) user.pbChangeTypes(move.calcType)
typeName = PBTypes.getName(move.calcType) typeName = PBTypes.getName(move.calcType)

2
Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb
View File

@@ -255,7 +255,7 @@ class PokeBattle_Move
target.damageState.calcDamage = damage target.damageState.calcDamage = damage
end end
def pbCalcDamageMultipliers(user,target,numTargets,baseDmg,type,multipliers) def pbCalcDamageMultipliers(user,target,numTargets,type,baseDmg,multipliers)
# Global abilities # Global abilities
if (@battle.pbCheckGlobalAbility(:DARKAURA) && isConst?(type,PBTypes,:DARK)) || if (@battle.pbCheckGlobalAbility(:DARKAURA) && isConst?(type,PBTypes,:DARK)) ||
(@battle.pbCheckGlobalAbility(:FAIRYAURA) && isConst?(type,PBTypes,:FAIRY)) (@battle.pbCheckGlobalAbility(:FAIRYAURA) && isConst?(type,PBTypes,:FAIRY))

5
Data/Scripts/016_UI/013_PScreen_Load.rb
View File

@@ -356,6 +356,7 @@ class PokemonLoadScreen
metadata = Marshal.load(f) metadata = Marshal.load(f)
$PokemonBag = Marshal.load(f) $PokemonBag = Marshal.load(f)
$PokemonStorage = Marshal.load(f) $PokemonStorage = Marshal.load(f)
$SaveVersion = Marshal.load(f) unless f.eof?
pbRefreshResizeFactor # To fix Game_Screen pictures pbRefreshResizeFactor # To fix Game_Screen pictures
magicNumberMatches = false magicNumberMatches = false
if $data_system.respond_to?("magic_number") if $data_system.respond_to?("magic_number")
@@ -456,12 +457,12 @@ class PokemonLoadScreen
savedata = [] savedata = []
if safeExists?(savefile) if safeExists?(savefile)
File.open(savefile,"rb") { |f| File.open(savefile,"rb") { |f|
15.times { savedata.push(Marshal.load(f)) } 16.times { savedata.push(Marshal.load(f)) }
} }
savedata[3]=$PokemonSystem savedata[3]=$PokemonSystem
begin begin
File.open(RTP.getSaveFileName("Game.rxdata"),"wb") { |f| File.open(RTP.getSaveFileName("Game.rxdata"),"wb") { |f|
15.times { |i| Marshal.dump(savedata[i],f) } 16.times { |i| Marshal.dump(savedata[i],f) }
} }
rescue rescue
end end

1
Data/Scripts/016_UI/014_PScreen_Save.rb
View File

@@ -24,6 +24,7 @@ def pbSave(safesave=false)
Marshal.dump($PokemonMap,f) Marshal.dump($PokemonMap,f)
Marshal.dump($PokemonBag,f) Marshal.dump($PokemonBag,f)
Marshal.dump($PokemonStorage,f) Marshal.dump($PokemonStorage,f)
Marshal.dump(ESSENTIALS_VERSION,f)
} }
Graphics.frame_reset Graphics.frame_reset
rescue rescue