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

Fixed some bad uses of @battle

Browse Source
This commit is contained in:
Maruno17
2021-12-29 11:43:24 +00:00
parent 01ce5d347c
commit 63b157d7ec
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battle/001_Battle.rb
View File

@@ -754,7 +754,7 @@ class Battle
def pbStartWeatherAbility(new_weather, battler, ignore_primal = false) def pbStartWeatherAbility(new_weather, battler, ignore_primal = false)
return if !ignore_primal && [:HarshSun, :HeavyRain, :StrongWinds].include?(@field.weather) return if !ignore_primal && [:HarshSun, :HeavyRain, :StrongWinds].include?(@field.weather)
return if @field.weather == new_weather return if @field.weather == new_weather
battle.pbShowAbilitySplash(battler) pbShowAbilitySplash(battler)
if !Scene::USE_ABILITY_SPLASH if !Scene::USE_ABILITY_SPLASH
pbDisplay(_INTL("{1}'s {2} activated!", battler.pbThis, battler.abilityName)) pbDisplay(_INTL("{1}'s {2} activated!", battler.pbThis, battler.abilityName))
end end

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

@@ -323,7 +323,7 @@ class Battle::Battler
user.lastMoveFailed = true user.lastMoveFailed = true
if ![:Rain, :HeavyRain].include?(user.effectiveWeather) && user.takesIndirectDamage? if ![:Rain, :HeavyRain].include?(user.effectiveWeather) && user.takesIndirectDamage?
user.pbTakeEffectDamage((user.totalhp / 4.0).round, false) { |hp_lost| user.pbTakeEffectDamage((user.totalhp / 4.0).round, false) { |hp_lost|
battle.pbDisplay(_INTL("{1} is hurt by its {2}!", battler.pbThis, battler.itemName)) @battle.pbDisplay(_INTL("{1} is hurt by its {2}!", battler.pbThis, battler.itemName))
} }
@battle.pbGainExp # In case user is KO'd by this @battle.pbGainExp # In case user is KO'd by this
end end

3
Data/Scripts/011_Battle/006_Other battle code/009_Battle_ItemEffects.rb
View File

@@ -1476,8 +1476,7 @@ Battle::ItemEffects::OnBeingHitPositiveBerry.add(:ENIGMABERRY,
if forced if forced
battle.pbDisplay(_INTL("{1}'s HP was restored.", battler.pbThis)) battle.pbDisplay(_INTL("{1}'s HP was restored.", battler.pbThis))
else else
battle.pbDisplay(_INTL("{1} restored its health using its {2}!", battler.pbThis, battle.pbDisplay(_INTL("{1} restored its health using its {2}!", battler.pbThis, itemName))
itemName))
end end
next true next true
} }