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

forbid fused trades

Browse Source 
for Kyurem
This commit is contained in:
darkfire006 2019-10-06 18:28:42 -05:00
parent e6a50f64ca
commit efa001061f
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
P3D/Network/GameJolt/GTS/GTSSetupScreen.vb
View File

@ -721,6 +721,7 @@
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
End If End If
If New Rectangle(700, 540, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then If New Rectangle(700, 540, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then
Me.GTSSetupScreen.loaded = False Me.GTSSetupScreen.loaded = False

1
P3D/Network/GameJolt/GTS/WonderTradeScreen.vb
View File

@ -207,6 +207,7 @@
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
Me.OpenedSelect = True Me.OpenedSelect = True
End If End If
Else Else

1
P3D/Network/Servers/DirectTradeScreen.vb
View File

@ -293,6 +293,7 @@
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
Case 2 Case 2
Me.QuitTrade() Me.QuitTrade()

8
P3D/Screens/Pokemon/PartyScreen.vb
View File

@ -65,6 +65,7 @@ Public Class PartyScreen
Public CanChooseFainted As Boolean = True Public CanChooseFainted As Boolean = True
Public CanChooseEgg As Boolean = True Public CanChooseEgg As Boolean = True
Public CanChooseHMPokemon As Boolean = True Public CanChooseHMPokemon As Boolean = True
Public CanChooseFusedPokemon As Boolean = True
Public Delegate Sub DoStuff(ByVal PokeIndex As Integer) Public Delegate Sub DoStuff(ByVal PokeIndex As Integer)
Dim ChoosePokemon As DoStuff Dim ChoosePokemon As DoStuff
@ -585,6 +586,13 @@ Public Class PartyScreen
Return False Return False
End If End If
End If End If
If Me.CanChooseFusedPokemon = False Then
If p.OriginalNumber = 646 Then
If p.AdditionalData = "black" Or p.AdditionalData = "white" Then
Return False
End If
End If
End If
Return True Return True
End Function End Function