diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb index bbd2bb24f..a25271320 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb @@ -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 diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Dark/SuckerPunch.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Dark/SuckerPunch.vb index 369aa7140..ac5c22d58 100644 --- a/2.5DHero/2.5DHero/Pokemon/Attacks/Dark/SuckerPunch.vb +++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Dark/SuckerPunch.vb @@ -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