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

Fix faint Pokémon message not showing... 

when the Pokémon faints due to effects not caused by attacks/moves
This commit is contained in:
JappaWakka 2023-02-27 19:41:57 +01:00
parent 1114c3ae36
commit 611e9688b9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -4531,6 +4531,9 @@
End If
End If
End If
If p.HP <= 0 And cause.Contains("move:") = False Then
FaintPokemon(own, BattleScreen, "")
End If
End Sub
Public Sub UseBerry(ByVal own As Boolean, ByVal from As Boolean, ByVal BerryItem As Item, ByVal BattleScreen As BattleScreen, ByVal message As String, ByVal cause As String)

4
P3D/Pokemon/Attacks/AttackSpecialFunctions.vb
View File

@ -87,7 +87,7 @@
Message = f.GetSplit(3, ",")
End If
End If
BattleScreen.Battle.ReduceHP(HPAmount, Target, own, BattleScreen, Message, Move.Name.ToLower)
BattleScreen.Battle.ReduceHP(HPAmount, Target, own, BattleScreen, Message, "move:" & Move.Name.ToLower)
Case "gainhp", "increasehp", "heal"
Dim Target As Boolean = CBool(f.GetSplit(1, ","))
Dim HPAmount As Integer = 0
@ -99,7 +99,7 @@
Message = f.GetSplit(3, ",")
End If
End If
BattleScreen.Battle.GainHP(HPAmount, Target, own, BattleScreen, Message, Move.Name.ToLower)
BattleScreen.Battle.GainHP(HPAmount, Target, own, BattleScreen, Message, "move:" & Move.Name.ToLower)
Case "endbattle"
Dim Blackout As Boolean = False