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 sucker punch interaction

This commit is contained in:
CaptainSegis 2016-10-30 20:03:36 -05:00
parent 3ca677e9d5
commit 7a9897f8f1
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,7 +470,7 @@
Exit Sub
End If
Dim OppStep As RoundConst = GetOppStep(BattleScreen, OwnStep)
OppStep = GetOppStep(BattleScreen, OwnStep)
BattleScreen.OwnFaint = False '''
BattleScreen.OppFaint = False '''
If OwnStep.StepType = RoundConst.StepTypes.Move Then
@ -1341,7 +1341,19 @@
If moveUsed.MoveFailBeforeAttack(own, BattleScreen) = True Then
moveWorks = False
End If
If moveUsed.Name.ToLower = "sucker punch" Then
If own Then
If OppStep.StepType <> RoundConst.StepTypes.Move OrElse CType(OppStep.Argument, Attack).Category = Attack.Categories.Status Then
moveWorks = False
BattleScreen.BattleQuery.Add(New TextQueryObject("But it failed!"))
End If
Else
If OwnStep.StepType <> RoundConst.StepTypes.Move OrElse CType(OwnStep.Argument, Attack).Category = Attack.Categories.Status Then
moveWorks = False
BattleScreen.BattleQuery.Add(New TextQueryObject("But it failed!"))
End If
End If
End If
If op.Ability.Name.ToLower() = "volt absorb" And moveUsed.GetAttackType(own, BattleScreen).Type = Element.Types.Electric And moveWorks = True And moveUsed.Category <> Attack.Categories.Status Then
If BattleScreen.FieldEffects.CanUseAbility(Not own, BattleScreen) = True Then
moveWorks = False

2
2.5DHero/2.5DHero/Pokemon/Attacks/Dark/SuckerPunch.vb
View File

@ -41,7 +41,7 @@
Me.IsHealingMove = False
Me.IsRecoilMove = False
Me.IsPunchingMove = True
Me.IsPunchingMove = False
Me.IsDamagingMove = True
Me.IsProtectMove = False
Me.IsSoundMove = False