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

Fixed EndRound, hopefully fixed Hyper Beam and similar moves recharge conditions

This commit is contained in:
CaptainSegis 2016-12-25 15:43:45 -05:00
parent 2b647f801a
commit 85b365a5ff
9 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
View File

@ -199,7 +199,7 @@
End Sub
Public Sub StartRound(ByVal BattleScreen As BattleScreen)
If BattleScreen.OwnFaint OrElse BattleScreen.OppFaint Then
If BattleScreen.OwnFaint OrElse (BattleScreen.OppFaint AndAlso BattleScreen.IsRemoteBattle) Then
IsAfterFaint = True
End If
BattleScreen.BattleMenu.MenuState = BattleMenu.MenuStates.Main
@ -1873,7 +1873,7 @@
End If
End If
moveUsed.MoveRecoil(own, BattleScreen)
moveUsed.MoveRecharge(own, BattleScreen)
If op.HP > 0 Then
If own = True Then
If BattleScreen.FieldEffects.OppRageCounter > 0 Then

8
2.5DHero/2.5DHero/Pokemon/Attacks/Attack.vb
View File

@ -1589,6 +1589,14 @@
'DO NOTHING HERE (will do recoil if moves overrides it)
End Sub
Public Overridable Sub MoveRecharge(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
'DO NOTHING HERE (will do recoil if moves overrides it)
End Sub
Public Overridable Sub MoveSwitch(ByVal own As Boolean, ByVal BattleScreen As BattleScreen)
'DO NOTHING HERE (will do recoil if moves overrides it)
End Sub
''' <summary>
''' Event that occurs when the move misses its target.
''' </summary>

2
2.5DHero/2.5DHero/Pokemon/Attacks/Dragon/RoarOfTime.vb
View File

@ -55,7 +55,7 @@
Me.AIField2 = AIField.Recharge
End Sub
Public Overrides Sub PreAttack(Own As Boolean, BattleScreen As BattleScreen)
Public Overrides Sub MoveRecharge(Own As Boolean, BattleScreen As BattleScreen)
If Own = True Then
BattleScreen.FieldEffects.OwnRecharge += 1
Else

2
2.5DHero/2.5DHero/Pokemon/Attacks/Fire/BlastBurn.vb
View File

@ -55,7 +55,7 @@ Namespace BattleSystem.Moves.Fire
Me.AIField2 = AIField.Recharge
End Sub
Public Overrides Sub PreAttack(Own As Boolean, BattleScreen As BattleScreen)
Public Overrides Sub MoveRecharge(Own As Boolean, BattleScreen As BattleScreen)
If Own = True Then
BattleScreen.FieldEffects.OwnRecharge += 1
Else

2
2.5DHero/2.5DHero/Pokemon/Attacks/Grass/FrenzyPlant.vb
View File

@ -55,7 +55,7 @@ Namespace BattleSystem.Moves.Grass
Me.AIField2 = AIField.Recharge
End Sub
Public Overrides Sub PreAttack(Own As Boolean, BattleScreen As BattleScreen)
Public Overrides Sub MoveRecharge(Own As Boolean, BattleScreen As BattleScreen)
If Own = True Then
BattleScreen.FieldEffects.OwnRecharge += 1
Else

2
2.5DHero/2.5DHero/Pokemon/Attacks/Normal/GigaImpact.vb
View File

@ -55,7 +55,7 @@
Me.AIField2 = AIField.MultiTurn
End Sub
Public Overrides Sub PreAttack(Own As Boolean, BattleScreen As BattleScreen)
Public Overrides Sub MoveRecharge(Own As Boolean, BattleScreen As BattleScreen)
If Own = True Then
BattleScreen.FieldEffects.OwnRecharge += 1
Else

2
2.5DHero/2.5DHero/Pokemon/Attacks/Normal/HyperBeam.vb
View File

@ -55,7 +55,7 @@
Me.AIField2 = AIField.Recharge
End Sub
Public Overrides Sub PreAttack(Own As Boolean, BattleScreen As BattleScreen)
Public Overrides Sub MoveRecharge(Own As Boolean, BattleScreen As BattleScreen)
If Own = True Then
BattleScreen.FieldEffects.OwnRecharge += 1
Else

BIN
2.5DHero/2.5DHero/Pokemon/Attacks/Rock/RockWrecker.vb
View File

Binary file not shown.

2
2.5DHero/2.5DHero/Pokemon/Attacks/Water/Hydrocannon.vb
View File

@ -55,7 +55,7 @@
Me.AIField2 = AIField.Recharge
End Sub
Public Overrides Sub PreAttack(Own As Boolean, BattleScreen As BattleScreen)
Public Overrides Sub MoveRecharge(Own As Boolean, BattleScreen As BattleScreen)
If Own = True Then
BattleScreen.FieldEffects.OwnRecharge += 1
Else