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

Fixed "cannotRun" battle rule not applying to Roar/Circle Throw/Poké Dolls, commented out compiler code that edits what it thinks are supposed to be doors

Browse Source
This commit is contained in:
Maruno17
2021-03-27 20:11:16 +00:00
parent b5c8c6ba26
commit ca5dcf70ae
5 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2985,6 +2985,10 @@ class PokeBattle_Move_0EB < PokeBattle_Move
@battle.pbDisplay(_INTL("{1} anchored itself with its roots!",target.pbThis))
return true
end
if !@battle.canRun
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
if @battle.wildBattle? && target.level>user.level
@battle.pbDisplay(_INTL("But it failed!"))
return true
@@ -3041,7 +3045,7 @@ end
#===============================================================================
class PokeBattle_Move_0EC < PokeBattle_Move
def pbEffectAgainstTarget(user,target)
if @battle.wildBattle? && target.level<=user.level &&
if @battle.wildBattle? && target.level<=user.level && @battle.canRun &&
(target.effects[PBEffects::Substitute]==0 || ignoresSubstitute?(user))
@battle.decision = 3
end
@@ -3282,11 +3286,7 @@ class PokeBattle_Move_0F2 < PokeBattle_Move
user.setInitialItem(oldTargetItem)
end
@battle.pbDisplay(_INTL("{1} switched items with its opponent!",user.pbThis))
if oldUserItem && oldTargetItem
@battle.pbDisplay(_INTL("{1} obtained {2}.",user.pbThis,oldTargetItemName))
elsif oldTargetItem
@battle.pbDisplay(_INTL("{1} obtained {2}.",user.pbThis,oldTargetItemName))
end
@battle.pbDisplay(_INTL("{1} obtained {2}.",user.pbThis,oldTargetItemName)) if oldTargetItem
@battle.pbDisplay(_INTL("{1} obtained {2}.",target.pbThis,oldUserItemName)) if oldUserItem
user.pbHeldItemTriggerCheck
target.pbHeldItemTriggerCheck