From 58d438f179985f0c90503f9b236433854c7c37e5 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Sun, 10 Dec 2023 13:13:06 +0100 Subject: [PATCH] Fix Rare Candy healing before checking evolution --- P3D/Pokemon/Items/Medicine/RareCandy.vb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/P3D/Pokemon/Items/Medicine/RareCandy.vb b/P3D/Pokemon/Items/Medicine/RareCandy.vb index efca7a8a5..0ab3dacea 100644 --- a/P3D/Pokemon/Items/Medicine/RareCandy.vb +++ b/P3D/Pokemon/Items/Medicine/RareCandy.vb @@ -29,10 +29,6 @@ Namespace Items.Medicine Dim beforeHP As Integer = Pokemon.MaxHP Pokemon.LevelUp(False) Pokemon.Experience = Pokemon.NeedExperience(Pokemon.Level) - If Pokemon.Status = P3D.Pokemon.StatusProblems.Fainted Then - Pokemon.Status = P3D.Pokemon.StatusProblems.None - Pokemon.HP = (Pokemon.MaxHP - beforeHP).Clamp(1, 999) - End If Dim s As String = "version=2" & Environment.NewLine & @@ -66,6 +62,11 @@ Namespace Items.Medicine s &= "@pokemon.evolve(" & PokeIndex & ")" & Environment.NewLine End If + If Pokemon.Status = P3D.Pokemon.StatusProblems.Fainted Then + s &= "@pokemon.setstatus(" & PokeIndex & ",none)" & Environment.NewLine & + "@pokemon.setstat(" & PokeIndex & ",chp," & (Pokemon.MaxHP - beforeHP).Clamp(1, 999) & ")" & Environment.NewLine + End If + If removedItem = False Then Dim t As String = Me.RemoveItem() If t <> "" Then