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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Maruno17
2021-08-03 18:48:11 +01:00
parent 76eaadda61 7f86115c36
commit 2db3cc49af
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1670,7 +1670,7 @@ BattleHandlers::UserAbilityEndOfMove.add(:MAGICIAN,
user.item = b.item
b.item = nil
b.effects[PBEffects::Unburden] = true
if battle.wildBattle? && !user.initialItem && b.initialItem==user.item
if battle.wildBattle? && !user.initialItem && user.item == b.initialItem
user.setInitialItem(user.item)
b.setInitialItem(nil)
end
@@ -1749,7 +1749,7 @@ BattleHandlers::TargetAbilityAfterMoveUse.add(:PICKPOCKET,
target.item = user.item
user.item = nil
user.effects[PBEffects::Unburden] = true
if battle.wildBattle? && !target.initialItem && user.initialItem==target.item
if battle.wildBattle? && !target.initialItem && target.item == user.initialItem
target.setInitialItem(target.item)
user.setInitialItem(nil)
end