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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-01-10 19:11:26 +00:00
parent d4a7de4bdd 386396cdf6
commit b11bc133bd
7 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1202,9 +1202,14 @@ class PokeBattle_Move_0AF < PokeBattle_Move
end
end
def pbChangeUsageCounters(user,specialUsage)
super
@copied_move = @battle.lastMoveUsed
end
def pbMoveFailed?(user,targets)
if !@battle.lastMoveUsed ||
@moveBlacklist.include?(GameData::Move.get(@battle.lastMoveUsed).function_code)
if !@copied_move ||
@moveBlacklist.include?(GameData::Move.get(@copied_move).function_code)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -1212,7 +1217,7 @@ class PokeBattle_Move_0AF < PokeBattle_Move
end
def pbEffectGeneral(user)
user.pbUseMoveSimple(@battle.lastMoveUsed)
user.pbUseMoveSimple(@copied_move)
end
end
@@ -3528,9 +3533,7 @@ class PokeBattle_Move_0F7 < PokeBattle_Move
@willFail = false
@willFail = true if !user.item || !user.itemActive? || user.unlosableItem?(user.item)
return if @willFail
if user.item.is_berry? && @battle.pbCheckOpposingAbility(:UNNERVE,user.index)
@willFail = true
end
@willFail = true if user.item.is_berry? && !user.canConsumeBerry?
return if @willFail
return if user.item.is_mega_stone?
flingableItem = false