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

Added more Gen 8 move effects

Browse Source
This commit is contained in:
Maruno17
2021-06-24 20:47:47 +01:00
parent 223d480e0f
commit 49e7374c3d
12 changed files with 195 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/Scripts/011_Battle/003_Battle/002_PokeBattle_Battle.rb
View File

@@ -588,6 +588,7 @@ class PokeBattle_Battle
PBEffects::LockOnPos,
PBEffects::MeanLook,
PBEffects::MirrorCoatTarget,
PBEffects::Octolock,
PBEffects::SkyDrop,
PBEffects::TrappingUser]
eachBattler do |b|

2
Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb
View File

@@ -68,7 +68,9 @@ class PokeBattle_Battle
# Other certain trapping effects
if battler.effects[PBEffects::Trapping]>0 ||
battler.effects[PBEffects::MeanLook]>=0 ||
battler.effects[PBEffects::Octolock]>=0 ||
battler.effects[PBEffects::Ingrain] ||
battler.effects[PBEffects::NoRetreat] ||
@field.effects[PBEffects::FairyLock]>0
partyScene.pbDisplay(_INTL("{1} can't be switched out!",battler.pbThis)) if partyScene
return false

4
Data/Scripts/011_Battle/003_Battle/008_Battle_Action_Running.rb
View File

@@ -13,7 +13,9 @@ class PokeBattle_Battle
BattleHandlers.triggerRunFromBattleItem(battler.item,battler)
return false if battler.effects[PBEffects::Trapping]>0 ||
battler.effects[PBEffects::MeanLook]>=0 ||
battler.effects[PBEffects::Octolock]>=0 ||
battler.effects[PBEffects::Ingrain] ||
battler.effects[PBEffects::NoRetreat] ||
@field.effects[PBEffects::FairyLock]>0
eachOtherSideBattler(idxBattler) do |b|
return false if b.abilityActive? &&
@@ -101,7 +103,9 @@ class PokeBattle_Battle
# Other certain trapping effects
if battler.effects[PBEffects::Trapping]>0 ||
battler.effects[PBEffects::MeanLook]>=0 ||
battler.effects[PBEffects::Octolock]>=0 ||
battler.effects[PBEffects::Ingrain] ||
battler.effects[PBEffects::NoRetreat] ||
@field.effects[PBEffects::FairyLock]>0
pbDisplayPaused(_INTL("You can't escape!"))
return 0

8
Data/Scripts/011_Battle/003_Battle/012_Battle_Phase_EndOfRound.rb
View File

@@ -428,6 +428,13 @@ class PokeBattle_Battle
end
end
end
# Octolock
priority.each do |b|
next if b.fainted? || b.effects[PBEffects::Octolock] < 0
pbCommonAnimation("Octolock", b)
b.pbLowerStatStage(:DEFENSE, 1, nil) if b.pbCanLowerStatStage?(:DEFENSE)
b.pbLowerStatStage(:SPECIAL_DEFENSE, 1, nil) if b.pbCanLowerStatStage?(:SPECIAL_DEFENSE)
end
# Taunt
pbEORCountDownBattlerEffect(priority,PBEffects::Taunt) { |battler|
pbDisplay(_INTL("{1}'s taunt wore off!",battler.pbThis))
@@ -625,6 +632,7 @@ class PokeBattle_Battle
b.effects[PBEffects::MagicCoat] = false
b.effects[PBEffects::MirrorCoat] = -1
b.effects[PBEffects::MirrorCoatTarget] = -1
b.effects[PBEffects::Obstruct] = false
b.effects[PBEffects::Powder] = false
b.effects[PBEffects::Prankster] = false
b.effects[PBEffects::PriorityAbility] = false