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

Merge branch 'dev' into dev-gen8

Browse Source
This commit is contained in:
Maruno17
2021-07-01 21:09:05 +01:00
parent 5736ef404b 93b67c9047
commit 0af3fe46bd
10 changed files with 172 additions and 34 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

@@ -397,7 +397,7 @@ class PokeBattle_Battler
end
end
# Magic Coat/Magic Bounce checks (for moves which don't target Pokémon)
if targets.length==0 && move.canMagicCoat?
if targets.length==0 && move.statusMove? && move.canMagicCoat?
@battle.pbPriority(true).each do |b|
next if b.fainted? || !b.opposes?(user)
next if b.semiInvulnerable?

2
Data/Scripts/011_Battle/001_Battler/008_Battler_UseMove_Targeting.rb
View File

@@ -9,7 +9,7 @@ class PokeBattle_Battler
def pbChangeUser(choice,move,user)
# Snatch
move.snatched = false
if move.canSnatch?
if move.statusMove? && move.canSnatch?
newUser = nil; strength = 100
@battle.eachBattler do |b|
next if b.effects[PBEffects::Snatch]==0 ||

2
Data/Scripts/011_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb
View File

@@ -398,7 +398,7 @@ class PokeBattle_Battler
end
end
# Magic Coat/Magic Bounce
if move.canMagicCoat? && !target.semiInvulnerable? && target.opposes?(user)
if move.statusMove? && move.canMagicCoat? && !target.semiInvulnerable? && target.opposes?(user)
if target.effects[PBEffects::MagicCoat]
target.damageState.magicCoat = true
target.effects[PBEffects::MagicCoat] = false