DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-03-10 02:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-08-12 20:37:25 +01:00
parent c360c4ddd2 4b768bec32
commit 153aa69bb8
7 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battler/006_Battler_AbilityAndItem.rb
View File

@@ -165,7 +165,7 @@ class PokeBattle_Battler
def pbSymbiosis
return if fainted?
return if !self.item
return if self.item
@battle.pbPriority(true).each do |b|
next if b.opposes?
next if !b.hasActiveAbility?(:SYMBIOSIS)

3
Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
View File

@@ -2522,7 +2522,8 @@ class PokeBattle_Move_0D6 < PokeBattle_HealingMove
return (user.totalhp/2.0).round
end
def pbEffectAfterAllHits(user,target)
def pbEffectGeneral(user)
super
user.effects[PBEffects::Roost] = true
end
end

2
Data/Scripts/011_Battle/003_BattleHandlers_Abilities.rb
View File

@@ -872,7 +872,7 @@ BattleHandlers::DamageCalcUserAbility.add(:AERILATE,
}
)
BattleHandlers::DamageCalcUserAbility.copy(:AERILATE,:PIXILATE,:REFRIGERATE,:GALVANIZE)
BattleHandlers::DamageCalcUserAbility.copy(:AERILATE, :PIXILATE, :REFRIGERATE, :GALVANIZE, :NORMALIZE)
BattleHandlers::DamageCalcUserAbility.add(:ANALYTIC,
proc { |ability,user,target,move,mults,baseDmg,type|