DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 06:04:59 +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

12
Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
View File

@@ -3285,8 +3285,8 @@ class PokeBattle_Move_0F1 < PokeBattle_Move
itemName = target.itemName
user.item = target.item
# Permanently steal the item from wild Pokémon
if @battle.wildBattle? && target.opposes? &&
target.initialItem==target.item && !user.initialItem
if @battle.wildBattle? && target.opposes? && !user.initialItem &&
target.item == target.initialItem
user.setInitialItem(target.item)
target.pbRemoveItem
else
@@ -3348,8 +3348,8 @@ class PokeBattle_Move_0F2 < PokeBattle_Move
target.effects[PBEffects::ChoiceBand] = nil
target.effects[PBEffects::Unburden] = (!target.item && oldTargetItem)
# Permanently steal the item from wild Pokémon
if @battle.wildBattle? && target.opposes? &&
target.initialItem==oldTargetItem && !user.initialItem
if @battle.wildBattle? && target.opposes? && !user.initialItem &&
oldTargetItem == target.initialItem
user.setInitialItem(oldTargetItem)
end
@battle.pbDisplay(_INTL("{1} switched items with its opponent!",user.pbThis))
@@ -3392,8 +3392,8 @@ class PokeBattle_Move_0F3 < PokeBattle_Move
itemName = user.itemName
target.item = user.item
# Permanently steal the item from wild Pokémon
if @battle.wildBattle? && user.opposes? &&
user.initialItem==user.item && !target.initialItem
if @battle.wildBattle? && user.opposes? && !target.initialItem &&
user.item == user.initialItem
target.setInitialItem(user.item)
user.pbRemoveItem
else