tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
View File

@ -1261,74 +1261,75 @@
If lockon > 0 Then
DoesNotMiss = True
Else
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'Dig check
Dim dig As Integer = BattleScreen.FieldEffects.OppDigCounter
If own = False Then
dig = BattleScreen.FieldEffects.OwnDigCounter
End If
End If
If dig > 0 And moveUsed.CanHitUnderground = False Then
DoesNotMiss = False
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'Dig check
Dim dig As Integer = BattleScreen.FieldEffects.OppDigCounter
If own = False Then
dig = BattleScreen.FieldEffects.OwnDigCounter
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'Fly check
Dim fly As Integer = BattleScreen.FieldEffects.OppFlyCounter
If own = False Then
fly = BattleScreen.FieldEffects.OwnFlyCounter
End If
If fly > 0 And moveUsed.CanHitInMidAir = False Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'bounce check
Dim bounce As Integer = BattleScreen.FieldEffects.OppBounceCounter
If own = False Then
bounce = BattleScreen.FieldEffects.OwnBounceCounter
End If
If bounce > 0 And moveUsed.CanHitInMidAir = False Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'dive check
Dim dive As Integer = BattleScreen.FieldEffects.OppDiveCounter
If own = False Then
dive = BattleScreen.FieldEffects.OwnDiveCounter
End If
If dive > 0 And moveUsed.CanHitInMidAir = False Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'shadowforce check
Dim shadowforce As Integer = BattleScreen.FieldEffects.OppShadowForceCounter
If own = False Then
shadowforce = BattleScreen.FieldEffects.OwnShadowForceCounter
End If
If shadowforce > 0 Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'sky drop check
Dim skydrop As Integer = BattleScreen.FieldEffects.OppSkyDropCounter
If own = False Then
skydrop = BattleScreen.FieldEffects.OwnSkyDropCounter
End If
If skydrop > 0 And moveUsed.CanHitInMidAir = False Then
DoesNotMiss = False
End If
If dig > 0 And moveUsed.CanHitUnderground = False Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'Fly check
Dim fly As Integer = BattleScreen.FieldEffects.OppFlyCounter
If own = False Then
fly = BattleScreen.FieldEffects.OwnFlyCounter
End If
If fly > 0 And moveUsed.CanHitInMidAir = False Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'bounce check
Dim bounce As Integer = BattleScreen.FieldEffects.OppBounceCounter
If own = False Then
bounce = BattleScreen.FieldEffects.OwnBounceCounter
End If
If bounce > 0 And moveUsed.CanHitInMidAir = False Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'dive check
Dim dive As Integer = BattleScreen.FieldEffects.OppDiveCounter
If own = False Then
dive = BattleScreen.FieldEffects.OwnDiveCounter
End If
If dive > 0 And moveUsed.CanHitInMidAir = False Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'shadowforce check
Dim shadowforce As Integer = BattleScreen.FieldEffects.OppShadowForceCounter
If own = False Then
shadowforce = BattleScreen.FieldEffects.OwnShadowForceCounter
End If
If shadowforce > 0 Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True And moveUsed.Target <> Attack.Targets.Self Then 'sky drop check
Dim skydrop As Integer = BattleScreen.FieldEffects.OppSkyDropCounter
If own = False Then
skydrop = BattleScreen.FieldEffects.OwnSkyDropCounter
End If
If skydrop > 0 And moveUsed.CanHitInMidAir = False Then
DoesNotMiss = False
End If
End If
If DoesNotMiss = True Then
Dim effectiveness As Single = BattleCalculation.CalculateEffectiveness(own, moveUsed, BattleScreen)