Fixed lock on interaction with some two turn moves

This commit is contained in:
CaptainSegis 2016-11-01 00:34:57 -05:00
parent 8ed2ba478c
commit 48887fbf17
1 changed files with 63 additions and 62 deletions

View File

@ -1261,7 +1261,8 @@
If lockon > 0 Then If lockon > 0 Then
DoesNotMiss = True DoesNotMiss = True
Else End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'Dig check If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'Dig check
Dim dig As Integer = BattleScreen.FieldEffects.OppDigCounter Dim dig As Integer = BattleScreen.FieldEffects.OppDigCounter
If own = False Then If own = False Then
@ -1327,7 +1328,7 @@
DoesNotMiss = False DoesNotMiss = False
End If End If
End If End If
End If
If DoesNotMiss = True Then If DoesNotMiss = True Then
Dim effectiveness As Single = BattleCalculation.CalculateEffectiveness(own, moveUsed, BattleScreen) Dim effectiveness As Single = BattleCalculation.CalculateEffectiveness(own, moveUsed, BattleScreen)