mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-09 14:14:59 +00:00
Removed all excess whitespace and standardized line endings.
This commit is contained in:
@@ -599,7 +599,7 @@ class PokeBattle_Battle
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
#
|
||||
#
|
||||
#=============================================================================
|
||||
# Returns the battler representing the Pokémon at index idxParty in its party,
|
||||
# on the same side as a battler with battler index of idxBattlerOther.
|
||||
@@ -650,7 +650,7 @@ class PokeBattle_Battle
|
||||
return if @field.weather==newWeather
|
||||
@field.weather = newWeather
|
||||
duration = (fixedDuration) ? 5 : -1
|
||||
if duration>0 && user && user.itemActive?
|
||||
if duration>0 && user && user.itemActive?
|
||||
duration = BattleHandlers.triggerWeatherExtenderItem(user.item,
|
||||
@field.weather,duration,user,self)
|
||||
end
|
||||
@@ -708,7 +708,7 @@ class PokeBattle_Battle
|
||||
return if @field.terrain==newTerrain
|
||||
@field.terrain = newTerrain
|
||||
duration = (fixedDuration) ? 5 : -1
|
||||
if duration>0 && user && user.itemActive?
|
||||
if duration>0 && user && user.itemActive?
|
||||
duration = BattleHandlers.triggerTerrainExtenderItem(user.item,
|
||||
newTerrain,duration,user,self)
|
||||
end
|
||||
@@ -778,4 +778,4 @@ class PokeBattle_Battle
|
||||
return if !PokeBattle_SceneConstants::USE_ABILITY_SPLASH
|
||||
@scene.pbReplaceAbilitySplash(battler)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -376,7 +376,7 @@ class PokeBattle_Battle
|
||||
moneyLost = oldMoney-pbPlayer.money
|
||||
if moneyLost>0
|
||||
if trainerBattle?
|
||||
pbDisplayPaused(_INTL("You gave ${1} to the winner...",moneyLost.to_s_formatted))
|
||||
pbDisplayPaused(_INTL("You gave ${1} to the winner...",moneyLost.to_s_formatted))
|
||||
else
|
||||
pbDisplayPaused(_INTL("You panicked and dropped ${1}...",moneyLost.to_s_formatted))
|
||||
end
|
||||
@@ -534,4 +534,4 @@ class PokeBattle_Battle
|
||||
elsif fainted2; @decision = 1 # Win
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -188,7 +188,7 @@ class PokeBattle_Battle
|
||||
curLevel += 1
|
||||
if curLevel>newLevel
|
||||
# Gained all the Exp now, end the animation
|
||||
pkmn.calcStats
|
||||
pkmn.calcStats
|
||||
battler.pbUpdate(false) if battler
|
||||
@scene.pbRefreshOne(battler.index) if battler
|
||||
break
|
||||
@@ -260,4 +260,4 @@ class PokeBattle_Battle
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -251,4 +251,4 @@ class PokeBattle_Battle
|
||||
end
|
||||
return ret
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -189,7 +189,7 @@ class PokeBattle_Battle
|
||||
switched.push(idxBattler)
|
||||
else # Player's Pokémon has fainted in a wild battle
|
||||
switch = false
|
||||
if !pbDisplayConfirm(_INTL("Use next Pokémon?"))
|
||||
if !pbDisplayConfirm(_INTL("Use next Pokémon?"))
|
||||
switch = (pbRun(idxBattler,true)<=0)
|
||||
else
|
||||
switch = true
|
||||
@@ -408,4 +408,4 @@ class PokeBattle_Battle
|
||||
battler.pbCheckForm
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -141,4 +141,4 @@ class PokeBattle_Battle
|
||||
# Return unused item to Bag
|
||||
pbReturnUnusedItemToBag(item,userBattler.index)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -35,7 +35,7 @@ class PokeBattle_Battle
|
||||
if battler.opposes?
|
||||
return 0 if trainerBattle?
|
||||
@choices[idxBattler][0] = :Run
|
||||
@choices[idxBattler][1] = 0
|
||||
@choices[idxBattler][1] = 0
|
||||
@choices[idxBattler][2] = nil
|
||||
return -1
|
||||
end
|
||||
@@ -142,4 +142,4 @@ class PokeBattle_Battle
|
||||
pbDisplayPaused(_INTL("You couldn't get away!"))
|
||||
return -1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -189,4 +189,4 @@ class PokeBattle_Battle
|
||||
end
|
||||
pbDisplay(_INTL("{1}'s Primal Reversion!\nIt reverted to its primal form!",battler.pbThis))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -247,4 +247,4 @@ class PokeBattle_Battle
|
||||
break if commandsEnd
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -187,4 +187,4 @@ class PokeBattle_Battle
|
||||
pbAttackPhaseMegaEvolution
|
||||
pbAttackPhaseMoves
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -79,7 +79,7 @@ class PokeBattle_Battle
|
||||
b.pbFaint if b.fainted?
|
||||
end
|
||||
# Weather damage
|
||||
# NOTE:
|
||||
# NOTE:
|
||||
case curWeather
|
||||
when PBWeather::Sandstorm
|
||||
next if !b.takesSandstormDamage?
|
||||
@@ -442,7 +442,7 @@ class PokeBattle_Battle
|
||||
if b.effects[PBEffects::Encore]==0 || b.moves[idxEncoreMove].pp==0
|
||||
b.effects[PBEffects::Encore] = 0
|
||||
pbDisplay(_INTL("{1}'s encore ended!",b.pbThis))
|
||||
end
|
||||
end
|
||||
else
|
||||
PBDebug.log("[End of effect] #{b.pbThis}'s encore ended (encored move no longer known)")
|
||||
b.effects[PBEffects::Encore] = 0
|
||||
@@ -573,7 +573,7 @@ class PokeBattle_Battle
|
||||
if b.effects[PBEffects::Uproar]==0
|
||||
pbDisplay(_INTL("{1} calmed down.",b.pbThis))
|
||||
else
|
||||
pbDisplay(_INTL("{1} is making an uproar!",b.pbThis))
|
||||
pbDisplay(_INTL("{1} is making an uproar!",b.pbThis))
|
||||
end
|
||||
end
|
||||
# Slow Start's end message
|
||||
@@ -664,4 +664,4 @@ class PokeBattle_Battle
|
||||
@field.effects[PBEffects::FusionFlare] = false
|
||||
@endOfRound = false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user