mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-01-29 01:35:59 +00:00
Snowstorm, forfeiting trainer battles, battle outcome values
This commit is contained in:
@@ -14,6 +14,7 @@ class Battle
|
||||
when :Rain then pbDisplay(_INTL("The rain stopped."))
|
||||
when :Sandstorm then pbDisplay(_INTL("The sandstorm subsided."))
|
||||
when :Hail then pbDisplay(_INTL("The hail stopped."))
|
||||
when :Snowstorm then pbDisplay(_INTL("The snow stopped."))
|
||||
when :ShadowSky then pbDisplay(_INTL("The shadow sky faded."))
|
||||
end
|
||||
@field.weather = :None
|
||||
@@ -31,6 +32,7 @@ class Battle
|
||||
when :Rain then pbDisplay(_INTL("Rain continues to fall."))
|
||||
when :Sandstorm then pbDisplay(_INTL("The sandstorm is raging."))
|
||||
when :Hail then pbDisplay(_INTL("The hail is crashing down."))
|
||||
when :Snowstorm then pbDisplay(_INTL("The snow is blowing about!"))
|
||||
when :HarshSun then pbDisplay(_INTL("The sunlight is extremely harsh."))
|
||||
when :HeavyRain then pbDisplay(_INTL("It is raining heavily."))
|
||||
when :StrongWinds then pbDisplay(_INTL("The wind is strong."))
|
||||
@@ -390,7 +392,6 @@ class Battle
|
||||
(perishSongUsers.find_all { |idxBattler| !opposes?(idxBattler) }.length == perishSongUsers.length))
|
||||
pbJudgeCheckpoint(@battlers[perishSongUsers[0]])
|
||||
end
|
||||
return if @decision > 0
|
||||
end
|
||||
|
||||
#=============================================================================
|
||||
@@ -675,7 +676,7 @@ class Battle
|
||||
# Effects that apply to a battler that wear off after a number of rounds
|
||||
pbEOREndBattlerEffects(priority)
|
||||
# Check for end of battle (i.e. because of Perish Song)
|
||||
if @decision > 0
|
||||
if decided?
|
||||
pbGainExp
|
||||
return
|
||||
end
|
||||
@@ -702,12 +703,12 @@ class Battle
|
||||
end
|
||||
end
|
||||
pbGainExp
|
||||
return if @decision > 0
|
||||
return if decided?
|
||||
# Form checks
|
||||
priority.each { |battler| battler.pbCheckForm(true) }
|
||||
# Switch Pokémon in if possible
|
||||
pbEORSwitch
|
||||
return if @decision > 0
|
||||
return if decided?
|
||||
# In battles with at least one side of size 3+, move battlers around if none
|
||||
# are near to any foes
|
||||
pbEORShiftDistantBattlers
|
||||
|
||||
Reference in New Issue
Block a user