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

Attempt to fix client not able to perform Mega Evolution

This commit is contained in:
CaptainSegis 2016-10-04 16:28:47 -05:00
parent 25908af6b4
commit 24f0200dbd
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,8 +340,11 @@
If BattleScreen.IsRemoteBattle AndAlso BattleScreen.IsHost Then
BattleScreen.OppStatistics.Turns += 1
BattleScreen.OwnStatistics.Turns += 1
If BattleScreen.ReceivedInput.StartsWith("MOVE|") Then
If BattleScreen.ReceivedInput.StartsWith("MOVE|") OrElse BattleScreen.ReceivedInput.StartsWith("MEGA|") Then
BattleScreen.OppStatistics.Moves += 1
If BattleScreen.ReceivedInput.StartsWith("MEGA|") Then
BattleScreen.IsMegaEvolvingOpp = True
End If
Dim moveID As Integer = CInt(BattleScreen.ReceivedInput.Remove(0, 5))
Return New RoundConst() With {.StepType = RoundConst.StepTypes.Move, .Argument = GetPokemonMoveFromID(BattleScreen.OppPokemon, moveID)}
ElseIf BattleScreen.ReceivedInput.StartsWith("SWITCH|") Then

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

@ -821,7 +821,11 @@
BattleScreen.BattleQuery.Clear()
BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())
BattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
If BattleScreen.IsMegaEvolvingOwn Then
BattleScreen.SendClientCommand("MEGA|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
Else
BattleScreen.SendClientCommand("MOVE|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
End If
Else
BattleScreen.OwnStatistics.Moves += 1
BattleScreen.BattleQuery.Clear()