Fixed Electro Ball and Gyro Ball moves damage output

2017-01-19 16:58:58 -05:00 · 2017-01-19 16:58:58 -05:00 · bd204cd026
parent 591a698515
commit bd204cd026
2 changed files with 4 additions and 1 deletions
--- a/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ElectroBall.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ElectroBall.vb
--- a/2.5DHero/2.5DHero/Pokemon/Attacks/Steel/GyroBall.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Steel/GyroBall.vb
@ -61,7 +61,10 @@
                op = BattleScreen.OwnPokemon
            End If

-            Dim basepower As Integer = CInt(Math.Ceiling(25 * (op.Speed / p.Speed)))
+            Dim p_Speed As Integer = BattleCalculation.DetermineBattleSpeed(own, BattleScreen)
+            Dim op_Speed As Integer = BattleCalculation.DetermineBattleSpeed(Not own, BattleScreen)
+
+            Dim basepower As Integer = CInt(Math.Ceiling(25 * (op_Speed / p_Speed)))

            basepower = basepower.Clamp(1, 150)