From 0a8866945776f9f896510718d7f005d45aa88f5e Mon Sep 17 00:00:00 2001 From: Capt_Segis Date: Sat, 10 Sep 2016 02:26:22 -0500 Subject: [PATCH] Update BattleCalculation.vb --- .../Battle/BattleSystemV2/BattleCalculation.vb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb index 347facb8d..beb8dc64c 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleCalculation.vb @@ -131,9 +131,11 @@ Dim speed As Integer = CInt(p.Speed * GetMultiplierFromStat(p.StatSpeed)) 'Calculate the speed's basic value from the speed and the speed stat If own = True Then - If Core.Player.Badges.Contains(3) = True Then - speed = CInt(speed + (speed * (1 / 8))) 'Add 1/8 of the speed if the player has the 3rd badge - End If + If BattleScreen.IsPVPBattle = False Then + If Core.Player.Badges.Contains(3) = True Then + speed = CInt(speed + (speed * (1 / 8))) 'Add 1/8 of the speed if the player has the 3rd badge and it's not a PvP battle + End If + End If End If If p.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Paralyzed And p.Ability.Name.ToLower() <> "quick feet" Then @@ -1784,4 +1786,4 @@ End Class -End Namespace \ No newline at end of file +End Namespace