DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-10 14:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Snowstorm, forfeiting trainer battles, battle outcome values

Browse Source
This commit is contained in:
Maruno17
2024-06-15 21:29:00 +01:00
parent 22b33ca6c2
commit 8e9417c3b7
41 changed files with 284 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/011_Battle/002_Battler/003_Battler_ChangeSelf.rb
View File

@@ -190,7 +190,7 @@ class Battle::Battler
case effectiveWeather
when :Sun, :HarshSun then newForm = 1
when :Rain, :HeavyRain then newForm = 2
when :Hail then newForm = 3
when :Hail, :Snowstorm then newForm = 3
end
if @form != newForm
@battle.pbShowAbilitySplash(self, true)
@@ -217,7 +217,7 @@ class Battle::Battler
end
# Eiscue - Ice Face
if !ability_changed && isSpecies?(:EISCUE) && self.ability == :ICEFACE &&
@form == 1 && effectiveWeather == :Hail
@form == 1 && [:Hail, :Snowstorm].include?(effectiveWeather)
@canRestoreIceFace = true # Changed form at end of round
end
end

6
Data/Scripts/011_Battle/002_Battler/007_Battler_UseMove.rb
View File

@@ -10,7 +10,7 @@ class Battle::Battler
pbBeginTurn(choice)
pbSEPlay("Battle flee")
@battle.pbDisplay(_INTL("{1} fled from battle!", pbThis))
@battle.decision = 3
@battle.decision = Battle::Outcome::FLEE
pbEndTurn(choice)
return true
end
@@ -537,7 +537,7 @@ class Battle::Battler
end
b.lastRoundMoved = oldLastRoundMoved
@battle.pbJudge
return if @battle.decision > 0
return if @battle.decided?
end
b.effects[PBEffects::Instructed] = false
end
@@ -573,7 +573,7 @@ class Battle::Battler
nextUser.effects[PBEffects::Outrage] = oldOutrage
nextUser.currentMove = oldCurrentMove
@battle.pbJudge
return if @battle.decision > 0
return if @battle.decided?
end
nextUser.effects[PBEffects::Dancer] = false
end