mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-10 14:44:58 +00:00
More or less standardised separator comments in the code
This commit is contained in:
Maruno17
@@ -1,7 +1,11 @@
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
module PBEffects
|
||||
#===========================================================================
|
||||
# These effects apply to a battler
|
||||
#===========================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
# These effects apply to a battler.
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
AquaRing = 0
|
||||
Attract = 1
|
||||
BanefulBunker = 2
|
||||
@@ -123,9 +127,10 @@ module PBEffects
|
||||
WeightChange = 115
|
||||
Yawn = 116
|
||||
|
||||
#=============================================================================
|
||||
# These effects apply to a battler position
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
# These effects apply to a battler position.
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
FutureSightCounter = 700
|
||||
FutureSightMove = 701
|
||||
FutureSightUserIndex = 702
|
||||
@@ -136,9 +141,10 @@ module PBEffects
|
||||
WishAmount = 707
|
||||
WishMaker = 708
|
||||
|
||||
#=============================================================================
|
||||
# These effects apply to a side
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
# These effects apply to a side.
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
AuroraVeil = 800
|
||||
CraftyShield = 801
|
||||
EchoedVoiceCounter = 802
|
||||
@@ -162,9 +168,10 @@ module PBEffects
|
||||
ToxicSpikes = 820
|
||||
WideGuard = 821
|
||||
|
||||
#=============================================================================
|
||||
# These effects apply to the battle (i.e. both sides)
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
# These effects apply to the battle (i.e. both sides).
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
AmuletCoin = 900
|
||||
FairyLock = 901
|
||||
FusionBolt = 902
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
module Battle::CatchAndStoreMixin
|
||||
#=============================================================================
|
||||
# Store caught Pokémon
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
# Store caught Pokémon.
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def pbStorePokemon(pkmn)
|
||||
# Nickname the Pokémon (unless it's a Shadow Pokémon)
|
||||
if !pkmn.shadowPokemon?
|
||||
@@ -102,9 +106,10 @@ module Battle::CatchAndStoreMixin
|
||||
@caughtPokemon.clear
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
# Throw a Poké Ball
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
# Throw a Poké Ball.
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def pbThrowPokeBall(idxBattler, ball, catch_rate = nil, showPlayer = false)
|
||||
# Determine which Pokémon you're throwing the Poké Ball at
|
||||
battler = nil
|
||||
@@ -196,9 +201,10 @@ module Battle::CatchAndStoreMixin
|
||||
end
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
# Calculate how many shakes a thrown Poké Ball will make (4 = capture)
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
# Calculate how many shakes a thrown Poké Ball will make (4 = capture).
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def pbCaptureCalc(pkmn, battler, catch_rate, ball)
|
||||
return 4 if $DEBUG && Input.press?(Input::CTRL)
|
||||
# Get a catch rate if one wasn't provided
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#===============================================================================
|
||||
# This script modifies the battle system to implement battle rules
|
||||
# This script modifies the battle system to implement battle rules.
|
||||
#===============================================================================
|
||||
class Battle
|
||||
unless @__clauses__aliased
|
||||
@@ -102,7 +102,7 @@ class Battle::Battler
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Double Team
|
||||
# Double Team.
|
||||
#===============================================================================
|
||||
class Battle::Move::RaiseUserEvasion1
|
||||
unless method_defined?(:__clauses__pbMoveFailed?)
|
||||
@@ -119,7 +119,7 @@ class Battle::Move::RaiseUserEvasion1
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Minimize
|
||||
# Minimize.
|
||||
#===============================================================================
|
||||
class Battle::Move::RaiseUserEvasion2MinimizeUser
|
||||
unless method_defined?(:__clauses__pbMoveFailed?)
|
||||
@@ -136,7 +136,7 @@ class Battle::Move::RaiseUserEvasion2MinimizeUser
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Skill Swap
|
||||
# Skill Swap.
|
||||
#===============================================================================
|
||||
class Battle::Move::UserTargetSwapAbilities
|
||||
unless method_defined?(:__clauses__pbFailsAgainstTarget?)
|
||||
@@ -153,7 +153,7 @@ class Battle::Move::UserTargetSwapAbilities
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Sonic Boom
|
||||
# Sonic Boom.
|
||||
#===============================================================================
|
||||
class Battle::Move::FixedDamage20
|
||||
unless method_defined?(:__clauses__pbFailsAgainstTarget?)
|
||||
@@ -170,7 +170,7 @@ class Battle::Move::FixedDamage20
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Dragon Rage
|
||||
# Dragon Rage.
|
||||
#===============================================================================
|
||||
class Battle::Move::FixedDamage40
|
||||
unless method_defined?(:__clauses__pbFailsAgainstTarget?)
|
||||
@@ -238,7 +238,7 @@ class Battle::Move::OHKOHitsUndergroundTarget
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Self-Destruct
|
||||
# Self-Destruct.
|
||||
#===============================================================================
|
||||
class Battle::Move::UserFaintsExplosive
|
||||
unless method_defined?(:__clauses__pbMoveFailed?)
|
||||
@@ -270,7 +270,7 @@ class Battle::Move::UserFaintsExplosive
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Perish Song
|
||||
# Perish Song.
|
||||
#===============================================================================
|
||||
class Battle::Move::StartPerishCountsForAllBattlers
|
||||
unless method_defined?(:__clauses__pbFailsAgainstTarget?)
|
||||
@@ -288,7 +288,7 @@ class Battle::Move::StartPerishCountsForAllBattlers
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Destiny Bond
|
||||
# Destiny Bond.
|
||||
#===============================================================================
|
||||
class Battle::Move::AttackerFaintsIfUserFaints
|
||||
unless method_defined?(:__clauses__pbFailsAgainstTarget?)
|
||||
|
||||
@@ -665,7 +665,7 @@ def pbSpriteSetAnimFrame(sprite, frame, user = nil, target = nil, inEditor = fal
|
||||
end
|
||||
|
||||
#===============================================================================
|
||||
# Animation player
|
||||
# Animation player.
|
||||
#===============================================================================
|
||||
class PBAnimationPlayerX
|
||||
attr_accessor :looping
|
||||
|
||||
@@ -64,14 +64,14 @@ module Battle::AbilityEffects
|
||||
# Running from battle
|
||||
CertainEscapeFromBattle = AbilityHandlerHash.new # Run Away
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.trigger(hash, *args, ret: false)
|
||||
new_ret = hash.trigger(*args)
|
||||
return (!new_ret.nil?) ? new_ret : ret
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerSpeedCalc(ability, battler, mult)
|
||||
return trigger(SpeedCalc, ability, battler, mult, ret: mult)
|
||||
@@ -81,13 +81,13 @@ module Battle::AbilityEffects
|
||||
return trigger(WeightCalc, ability, battler, weight, ret: weight)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerOnHPDroppedBelowHalf(ability, user, move_user, battle)
|
||||
return trigger(OnHPDroppedBelowHalf, ability, user, move_user, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerStatusCheckNonIgnorable(ability, battler, status)
|
||||
return trigger(StatusCheckNonIgnorable, ability, battler, status)
|
||||
@@ -113,7 +113,7 @@ module Battle::AbilityEffects
|
||||
return trigger(StatusCure, ability, battler)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerStatLossImmunity(ability, battler, stat, battle, show_messages)
|
||||
return trigger(StatLossImmunity, ability, battler, stat, battle, show_messages)
|
||||
@@ -135,7 +135,7 @@ module Battle::AbilityEffects
|
||||
OnStatLoss.trigger(ability, battler, stat, user)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerPriorityChange(ability, battler, move, priority)
|
||||
return trigger(PriorityChange, ability, battler, move, priority, ret: priority)
|
||||
@@ -149,7 +149,7 @@ module Battle::AbilityEffects
|
||||
PriorityBracketUse.trigger(ability, battler, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerOnFlinch(ability, battler, battle)
|
||||
OnFlinch.trigger(ability, battler, battle)
|
||||
@@ -163,13 +163,13 @@ module Battle::AbilityEffects
|
||||
return trigger(MoveImmunity, ability, user, target, move, type, battle, show_message)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerModifyMoveBaseType(ability, user, move, type)
|
||||
return trigger(ModifyMoveBaseType, ability, user, move, type, ret: type)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerAccuracyCalcFromUser(ability, mods, user, target, move, type)
|
||||
AccuracyCalcFromUser.trigger(ability, mods, user, target, move, type)
|
||||
@@ -183,7 +183,7 @@ module Battle::AbilityEffects
|
||||
AccuracyCalcFromTarget.trigger(ability, mods, user, target, move, type)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerDamageCalcFromUser(ability, user, target, move, mults, power, type)
|
||||
DamageCalcFromUser.trigger(ability, user, target, move, mults, power, type)
|
||||
@@ -213,7 +213,7 @@ module Battle::AbilityEffects
|
||||
return trigger(CriticalCalcFromTarget, ability, user, target, move, crit_stage, ret: crit_stage)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerOnBeingHit(ability, user, target, move, battle)
|
||||
OnBeingHit.trigger(ability, user, target, move, battle)
|
||||
@@ -223,7 +223,7 @@ module Battle::AbilityEffects
|
||||
OnDealingHit.trigger(ability, user, target, move, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerOnEndOfUsingMove(ability, user, targets, move, battle)
|
||||
OnEndOfUsingMove.trigger(ability, user, targets, move, battle)
|
||||
@@ -233,7 +233,7 @@ module Battle::AbilityEffects
|
||||
AfterMoveUseFromTarget.trigger(ability, target, user, move, switched_battlers, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerEndOfRoundWeather(ability, weather, battler, battle)
|
||||
EndOfRoundWeather.trigger(ability, weather, battler, battle)
|
||||
@@ -251,7 +251,7 @@ module Battle::AbilityEffects
|
||||
EndOfRoundGainItem.trigger(ability, battler, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerCertainSwitching(ability, switcher, battle)
|
||||
return trigger(CertainSwitching, ability, switcher, battle)
|
||||
@@ -285,7 +285,7 @@ module Battle::AbilityEffects
|
||||
OnIntimidated.trigger(ability, battler, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerCertainEscapeFromBattle(ability, battler)
|
||||
return trigger(CertainEscapeFromBattle, ability, battler)
|
||||
|
||||
@@ -50,14 +50,14 @@ module Battle::ItemEffects
|
||||
# Running from battle
|
||||
CertainEscapeFromBattle = ItemHandlerHash.new # Smoke Ball
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.trigger(hash, *args, ret: false)
|
||||
new_ret = hash.trigger(*args)
|
||||
return (!new_ret.nil?) ? new_ret : ret
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerSpeedCalc(item, battler, mult)
|
||||
return trigger(SpeedCalc, item, battler, mult, ret: mult)
|
||||
@@ -67,7 +67,7 @@ module Battle::ItemEffects
|
||||
return trigger(WeightCalc, item, battler, w, ret: w)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerHPHeal(item, battler, battle, forced)
|
||||
return trigger(HPHeal, item, battler, battle, forced)
|
||||
@@ -77,19 +77,19 @@ module Battle::ItemEffects
|
||||
return trigger(OnStatLoss, item, user, move_user, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerStatusCure(item, battler, battle, forced)
|
||||
return trigger(StatusCure, item, battler, battle, forced)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerStatLossImmunity(item, battler, stat, battle, show_messages)
|
||||
return trigger(StatLossImmunity, item, battler, stat, battle, show_messages)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerPriorityBracketChange(item, battler, battle)
|
||||
return trigger(PriorityBracketChange, item, battler, battle, ret: 0)
|
||||
@@ -99,13 +99,13 @@ module Battle::ItemEffects
|
||||
PriorityBracketUse.trigger(item, battler, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerOnMissingTarget(item, user, target, move, hit_num, battle)
|
||||
OnMissingTarget.trigger(item, user, target, move, hit_num, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerAccuracyCalcFromUser(item, mods, user, target, move, type)
|
||||
AccuracyCalcFromUser.trigger(item, mods, user, target, move, type)
|
||||
@@ -115,7 +115,7 @@ module Battle::ItemEffects
|
||||
AccuracyCalcFromTarget.trigger(item, mods, user, target, move, type)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerDamageCalcFromUser(item, user, target, move, mults, power, type)
|
||||
DamageCalcFromUser.trigger(item, user, target, move, mults, power, type)
|
||||
@@ -133,7 +133,7 @@ module Battle::ItemEffects
|
||||
return trigger(CriticalCalcFromTarget, item, user, target, move, crit_stage, ret: crit_stage)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerOnBeingHit(item, user, target, move, battle)
|
||||
OnBeingHit.trigger(item, user, target, move, battle)
|
||||
@@ -143,7 +143,7 @@ module Battle::ItemEffects
|
||||
return trigger(OnBeingHitPositiveBerry, item, battler, battle, forced)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerAfterMoveUseFromTarget(item, battler, user, move, switched_battlers, battle)
|
||||
AfterMoveUseFromTarget.trigger(item, battler, user, move, switched_battlers, battle)
|
||||
@@ -161,7 +161,7 @@ module Battle::ItemEffects
|
||||
return trigger(OnEndOfUsingMoveStatRestore, item, battler, battle, forced)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerExpGainModifier(item, battler, exp)
|
||||
return trigger(ExpGainModifier, item, battler, exp, ret: -1)
|
||||
@@ -173,7 +173,7 @@ module Battle::ItemEffects
|
||||
return true
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerWeatherExtender(item, weather, duration, battler, battle)
|
||||
return trigger(WeatherExtender, item, weather, duration, battler, battle, ret: duration)
|
||||
@@ -187,7 +187,7 @@ module Battle::ItemEffects
|
||||
return trigger(TerrainStatBoost, item, battler, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerEndOfRoundHealing(item, battler, battle)
|
||||
EndOfRoundHealing.trigger(item, battler, battle)
|
||||
@@ -197,7 +197,7 @@ module Battle::ItemEffects
|
||||
EndOfRoundEffect.trigger(item, battler, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerCertainSwitching(item, switcher, battle)
|
||||
return trigger(CertainSwitching, item, switcher, battle)
|
||||
@@ -215,7 +215,7 @@ module Battle::ItemEffects
|
||||
return trigger(OnIntimidated, item, battler, battle)
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
def self.triggerCertainEscapeFromBattle(item, battler)
|
||||
return trigger(CertainEscapeFromBattle, item, battler)
|
||||
|
||||
@@ -30,6 +30,7 @@ end
|
||||
#===============================================================================
|
||||
# IsUnconditional
|
||||
#===============================================================================
|
||||
|
||||
Battle::PokeBallEffects::IsUnconditional.add(:MASTERBALL, proc { |ball, battle, battler|
|
||||
next true
|
||||
})
|
||||
@@ -40,6 +41,7 @@ Battle::PokeBallEffects::IsUnconditional.add(:MASTERBALL, proc { |ball, battle,
|
||||
# Ball is a Beast Ball). In this case, all Balls' catch rates are set
|
||||
# elsewhere to 0.1x.
|
||||
#===============================================================================
|
||||
|
||||
Battle::PokeBallEffects::ModifyCatchRate.add(:GREATBALL, proc { |ball, catchRate, battle, battler|
|
||||
next catchRate * 1.5
|
||||
})
|
||||
@@ -189,6 +191,7 @@ Battle::PokeBallEffects::ModifyCatchRate.add(:BEASTBALL, proc { |ball, catchRate
|
||||
#===============================================================================
|
||||
# OnCatch
|
||||
#===============================================================================
|
||||
|
||||
Battle::PokeBallEffects::OnCatch.add(:HEALBALL, proc { |ball, battle, pkmn|
|
||||
pkmn.heal
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user