Added some more Gen 8 move effects

This commit is contained in:
Maruno17
2021-06-26 22:12:47 +01:00
parent 18408d204e
commit e93b08a87b
12 changed files with 197 additions and 40 deletions

View File

@@ -74,6 +74,7 @@ class PokeBattle_Battle
attr_reader :recycleItems
attr_reader :belch
attr_reader :battleBond
attr_reader :corrosiveGas
attr_reader :usedInBattle # Whether each Pokémon was used in battle (for Burmy)
attr_reader :successStates # Success states
attr_accessor :lastMoveUsed # Last move used
@@ -150,6 +151,7 @@ class PokeBattle_Battle
@recycleItems = [Array.new(@party1.length, nil), Array.new(@party2.length, nil)]
@belch = [Array.new(@party1.length, false), Array.new(@party2.length, false)]
@battleBond = [Array.new(@party1.length, false), Array.new(@party2.length, false)]
@corrosiveGas = [Array.new(@party1.length, false), Array.new(@party2.length, false)]
@usedInBattle = [Array.new(@party1.length, false), Array.new(@party2.length, false)]
@successStates = []
@lastMoveUsed = nil
@@ -585,6 +587,7 @@ class PokeBattle_Battle
effectsToSwap = [PBEffects::Attract,
PBEffects::BideTarget,
PBEffects::CounterTarget,
PBEffects::JawLock,
PBEffects::LockOnPos,
PBEffects::MeanLook,
PBEffects::MirrorCoatTarget,

View File

@@ -66,12 +66,7 @@ class PokeBattle_Battle
# Other certain switching effects
return true if Settings::MORE_TYPE_EFFECTS && battler.pbHasType?(:GHOST)
# 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
if battler.trappedInBattle?
partyScene.pbDisplay(_INTL("{1} can't be switched out!",battler.pbThis)) if partyScene
return false
end

View File

@@ -11,12 +11,7 @@ class PokeBattle_Battle
BattleHandlers.triggerRunFromBattleAbility(battler.ability,battler)
return true if battler.itemActive? &&
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
return false if battler.trappedInBattle?
eachOtherSideBattler(idxBattler) do |b|
return false if b.abilityActive? &&
BattleHandlers.triggerTrappingTargetAbility(b.ability,battler,b,self)
@@ -101,12 +96,7 @@ class PokeBattle_Battle
end
end
# 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
if battler.trappedInBattle?
pbDisplayPaused(_INTL("You can't escape!"))
return 0
end

View File

@@ -648,6 +648,8 @@ class PokeBattle_Battle
b.lastHPLostFromFoe = 0
b.tookDamage = false
b.tookPhysicalHit = false
b.statsRaised = false
b.statsLowered = false
b.lastRoundMoveFailed = b.lastMoveFailed
b.lastAttacker.clear
b.lastFoeAttacker.clear