DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-11 23:24:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs with Metal Burst and Powder

Browse Source
This commit is contained in:
Maruno17
2020-09-20 15:14:27 +01:00
parent 301a4c9b4f
commit 3099cc4802
9 changed files with 157 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/012_Battle/001_Battler/001_PokeBattle_Battler.rb
View File

@@ -220,7 +220,7 @@ class PokeBattle_Battler
stageDiv = [8,7,6,5,4,3, 2, 2,2,2,2,2,2]
stage = @stages[PBStats::SPEED] + 6
speed = @speed*stageMul[stage]/stageDiv[stage]
speedMult = 0x1000
speedMult = 1.0
# Ability effects that alter calculated Speed
if abilityActive?
speedMult = BattleHandlers.triggerSpeedCalcAbility(@ability,self,speedMult)
@@ -242,7 +242,7 @@ class PokeBattle_Battler
speedMult *= 1.1
end
# Calculation
return [(speed.to_f*speedMult/0x1000).round,1].max
return [(speed*speedMult).round,1].max
end
def pbWeight

2
Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb
View File

@@ -323,7 +323,7 @@ class PokeBattle_Battler
@battle.pbDisplay(_INTL("When the flame touched the powder on the Pokémon, it exploded!"))
user.lastMoveFailed = true
w = @battle.pbWeather
if w!=PBWeather.RAINDANCE && w!=PBWeather.HEAVYRAIN && user.takesIndirectDamage?
if w!=PBWeather::Rain && w!=PBWeather::HeavyRain && user.takesIndirectDamage?
oldHP = user.hp
user.pbReduceHP((user.totalhp/4.0).round,false)
user.pbFaint if user.fainted?