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

Condensed references to Unnerve, fixed Copycat always using Copycat

Browse Source
This commit is contained in:
Maruno17
2021-01-10 19:00:03 +00:00
parent 831555616e
commit 386396cdf6
4 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb
View File

@@ -1214,9 +1214,14 @@ class PokeBattle_Move_0AF < PokeBattle_Move
end
end
def pbChangeUsageCounters(user,specialUsage)
super
@copied_move = @battle.lastMoveUsed || 0
end
def pbMoveFailed?(user,targets)
if @battle.lastMoveUsed<=0 ||
@moveBlacklist.include?(pbGetMoveData(@battle.lastMoveUsed,MOVE_FUNCTION_CODE))
if @copied_move<=0 ||
@moveBlacklist.include?(pbGetMoveData(@copied_move,MOVE_FUNCTION_CODE))
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -1224,7 +1229,7 @@ class PokeBattle_Move_0AF < PokeBattle_Move
end
def pbEffectGeneral(user)
user.pbUseMoveSimple(@battle.lastMoveUsed)
user.pbUseMoveSimple(@copied_move)
end
end
@@ -3547,7 +3552,7 @@ class PokeBattle_Move_0F7 < PokeBattle_Move
@willFail = false
@willFail = true if user.item==0 || !user.itemActive? || user.unlosableItem?(user.item)
if pbIsBerry?(user.item)
@willFail = true if @battle.pbCheckOpposingAbility(:UNNERVE,user.index)
@willFail = true if !user.canConsumeBerry?
return
end
return if pbIsMegaStone?(user.item)