tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-29 16:54:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Attack.GetDamage() for GM Moves

Browse Source
This commit is contained in:
JappaWakka 2025-02-19 17:45:31 +01:00
parent 438fff5e54
commit 8b560a0dcc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
P3D/Pokemon/Attacks/Attack.vb
View File

@ -1998,7 +1998,11 @@
Public Overridable Function GetDamage(ByVal Critical As Boolean, ByVal Own As Boolean, ByVal targetPokemon As Boolean, ByVal BattleScreen As BattleScreen, Optional ByVal ExtraParameter As String = "") As Integer Public Overridable Function GetDamage(ByVal Critical As Boolean, ByVal Own As Boolean, ByVal targetPokemon As Boolean, ByVal BattleScreen As BattleScreen, Optional ByVal ExtraParameter As String = "") As Integer
If gmCopyMove <> -1 Then If gmCopyMove <> -1 Then
Dim _attack As Attack = GetAttackByID(gmCopyMove) Dim _attack As Attack = GetAttackByID(gmCopyMove)
Return BattleCalculation.CalculateDamage(_attack, Critical, Own, targetPokemon, BattleScreen, ExtraParameter) If _attack.IsGameModeMove = False Then
Return _attack.GetDamage(Critical, Own, targetPokemon, BattleScreen, ExtraParameter)
Else
Return BattleCalculation.CalculateDamage(_attack, Critical, Own, targetPokemon, BattleScreen, ExtraParameter)
End If
Else Else
Return BattleCalculation.CalculateDamage(Me, Critical, Own, targetPokemon, BattleScreen, ExtraParameter) Return BattleCalculation.CalculateDamage(Me, Critical, Own, targetPokemon, BattleScreen, ExtraParameter)
End If End If