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 branch 'master' of https://github.com/Maruno17/pokemon-essentials

Browse Source
This commit is contained in:
m3rein
2020-09-05 17:28:46 +02:00
parent 6a89919634 04ae64f026
commit b7c7fb04b8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -534,7 +534,8 @@ class PokeBattle_Battler
end end
# Dancer # Dancer
if !@effects[PBEffects::Dancer] && !user.lastMoveFailed && realNumHits>0 && if !@effects[PBEffects::Dancer] && !user.lastMoveFailed && realNumHits>0 &&
!move.snatched && magicCoater<0 && @battle.pbCheckGlobalAbility(:DANCER) !move.snatched && magicCoater<0 && @battle.pbCheckGlobalAbility(:DANCER) &&
move.danceMove?
dancers = [] dancers = []
@battle.pbPriority(true).each do |b| @battle.pbPriority(true).each do |b|
dancers.push(b) if b.index!=user.index && b.hasActiveAbility?(:DANCER) dancers.push(b) if b.index!=user.index && b.hasActiveAbility?(:DANCER)