From dde6cb5c34fe2dc7e8baffe5066dbe899a262f94 Mon Sep 17 00:00:00 2001 From: "Jasper \"JappaWakka\" Speelman" <31563291+JappaWakka@users.noreply.github.com> Date: Sat, 5 Feb 2022 10:28:48 +0100 Subject: [PATCH] Removed unneccessary item use sounds --- P3D/Battle/BattleSystemV2/Battle.vb | 65 ++++++++++++----------------- 1 file changed, 26 insertions(+), 39 deletions(-) diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index 3404d56cb..07b311e05 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -978,48 +978,35 @@ 'Potion,Super Point,Hyper Potion,Full Heal,Full Restore,Burn Heal,Antidote,Paralyze heal,Awakening,Ice Heal,Revive,Max Revive,Max Potion Select Case ItemID - Case 18 'Potion - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.GainHP(20, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Potion on " & p.GetDisplayName() & "!", "item:potion") - Case 17 'Super Potion - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.GainHP(50, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Super Potion on " & p.GetDisplayName() & "!", "item:superpotion") - Case 16 'Hyper Potion - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.GainHP(100, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Hyper Potion on " & p.GetDisplayName() & "!", "item:hyperpotion") - Case 15 'Max Potion - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.GainHP(p.MaxHP, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Max Potion on " & p.GetDisplayName() & "!", "item:maxpotion") - Case 14 'Full Restore - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.GainHP(p.MaxHP, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Full Restore on " & p.GetDisplayName() & "!", "item:fullrestore") + Case 18 'Potion + Me.GainHP(20, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Potion on " & p.GetDisplayName() & "!", "item:potion") + Case 17 'Super Potion + Me.GainHP(50, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Super Potion on " & p.GetDisplayName() & "!", "item:superpotion") + Case 16 'Hyper Potion + Me.GainHP(100, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Hyper Potion on " & p.GetDisplayName() & "!", "item:hyperpotion") + Case 15 'Max Potion + Me.GainHP(p.MaxHP, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Max Potion on " & p.GetDisplayName() & "!", "item:maxpotion") + Case 14 'Full Restore + Me.GainHP(p.MaxHP, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Full Restore on " & p.GetDisplayName() & "!", "item:fullrestore") Me.CureStatusProblem(False, False, BattleScreen, "", "item:fullrestore") - Case 38 'Full Heal - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Full Heal on " & p.GetDisplayName() & "!", "item:fullheal") - Case 9 'Antidote - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Antidote on " & p.GetDisplayName() & "!", "item:antidote") - Case 10 'Burn Heal - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Burn Heal on " & p.GetDisplayName() & "!", "item:burnheal") - Case 11 'Ice Heal - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Ice Heal on " & p.GetDisplayName() & "!", "item:iceheal") - Case 12 'Awakening - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Awakening on " & p.GetDisplayName() & "!", "item:awakening") - Case 13 'Paralyze Heal - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Paralyze Heal on " & p.GetDisplayName() & "!", "item:paralyzeheal") - Case 39 'Revive - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & " used a Revive on " & p.GetDisplayName() & "!")) + Case 38 'Full Heal + Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Full Heal on " & p.GetDisplayName() & "!", "item:fullheal") + Case 9 'Antidote + Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Antidote on " & p.GetDisplayName() & "!", "item:antidote") + Case 10 'Burn Heal + Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Burn Heal on " & p.GetDisplayName() & "!", "item:burnheal") + Case 11 'Ice Heal + Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Ice Heal on " & p.GetDisplayName() & "!", "item:iceheal") + Case 12 'Awakening + Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Awakening on " & p.GetDisplayName() & "!", "item:awakening") + Case 13 'Paralyze Heal + Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Paralyze Heal on " & p.GetDisplayName() & "!", "item:paralyzeheal") + Case 39 'Revive + BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & " used a Revive on " & p.GetDisplayName() & "!")) p.Status = Pokemon.StatusProblems.None p.HP = CInt(Math.Ceiling(p.MaxHP / 2)) - Case 40 'Max Revive - BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("Use_Item", False)) - BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & " used a Revive on " & p.GetDisplayName() & "!")) + Case 40 'Max Revive + BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & " used a Revive on " & p.GetDisplayName() & "!")) p.Status = Pokemon.StatusProblems.None p.HP = p.MaxHP End Select