Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy.git
This commit is contained in:
CaptainSegis
commit
42ecd51262
File diff suppressed because it is too large
Load Diff
|
|
@ -110,6 +110,9 @@ Public Class ChatScreen
|
|||
If KeyBoardHandler.KeyPressed(Keys.C) = True Then
|
||||
Me.Copy()
|
||||
End If
|
||||
If KeyBoardHandler.KeyPressed(Keys.X) = True Then
|
||||
Me.Cut()
|
||||
End If
|
||||
If KeyBoardHandler.KeyPressed(Keys.V) = True Then
|
||||
If System.Windows.Forms.Clipboard.ContainsText() = True Then
|
||||
Dim t As String = System.Windows.Forms.Clipboard.GetText().Replace(vbNewLine, " ")
|
||||
|
|
@ -163,6 +166,23 @@ Public Class ChatScreen
|
|||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub Cut()
|
||||
If Me.SelectionLength > 0 Then
|
||||
Try
|
||||
Dim DefaultSelection As Integer = Selection
|
||||
System.Windows.Forms.Clipboard.SetText(Me.currentText.Substring(Me.SelectionStart, Me.SelectionLength))
|
||||
currentText = currentText.Remove(SelectionStart, SelectionLength)
|
||||
If Selection = SelectionStart + SelectionLength Then
|
||||
Selection -= SelectionLength
|
||||
End If
|
||||
SelectionStart = 0
|
||||
SelectionLength = 0
|
||||
Catch ex As Exception
|
||||
Logger.Log(Logger.LogTypes.Warning, "ChatScreen.vb: An error occurred while cutting text to the clipboard (""" & Me.currentText.Substring(Me.SelectionStart, Me.SelectionLength) & """).")
|
||||
End Try
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub SelectAll()
|
||||
Me.Selection = Me.currentText.Length
|
||||
Me.SelectionStart = 0
|
||||
|
|
|
|||
|
|
@ -583,6 +583,112 @@
|
|||
If Core.Player.Pokemons.Count - 1 >= PokemonIndex And Core.Player.Pokemons.Count < 6 Then
|
||||
Core.Player.Pokemons.Add(Core.Player.Pokemons(PokemonIndex))
|
||||
End If
|
||||
Case "sendtostorage"
|
||||
' @Pokemon.SendToStorage(PokeIndex, [BoxIndex])
|
||||
Dim Data() As String = argument.Split(CChar(","))
|
||||
|
||||
If Data.Length = 1 Then
|
||||
Dim PokemonIndex As Integer = int(Data(0))
|
||||
|
||||
If Core.Player.Pokemons.Count - 1 >= PokemonIndex Then
|
||||
StorageSystemScreen.DepositPokemon(Core.Player.Pokemons(PokemonIndex))
|
||||
Core.Player.Pokemons.RemoveAt(PokemonIndex)
|
||||
End If
|
||||
ElseIf Data.Length = 2 Then
|
||||
Dim PokemonIndex As Integer = int(Data(0))
|
||||
|
||||
If Core.Player.Pokemons.Count - 1 >= PokemonIndex Then
|
||||
StorageSystemScreen.DepositPokemon(Core.Player.Pokemons(PokemonIndex), int(Data(1)))
|
||||
Core.Player.Pokemons.RemoveAt(PokemonIndex)
|
||||
End If
|
||||
End If
|
||||
Case "addtostorage"
|
||||
' @Pokemon.AddToStorage([BoxIndex], PokemonData)
|
||||
' @Pokemon.AddToStorage(PokemonID, Level, [Method], [BallID], [Location], [isEgg], [trainerName])
|
||||
|
||||
If argument.StartsWith("{") = True Or argument.Remove(0, 1).StartsWith(",{") = True Then
|
||||
Dim insertIndex As Integer = Core.Player.Pokemons.Count
|
||||
If argument.Remove(0, 1).StartsWith(",{") = True Then
|
||||
insertIndex = int(argument.GetSplit(0))
|
||||
End If
|
||||
|
||||
argument = argument.Remove(0, argument.IndexOf("{"))
|
||||
|
||||
Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ","))
|
||||
StorageSystemScreen.DepositPokemon(p, insertIndex)
|
||||
|
||||
Dim pokedexType As Integer = 2
|
||||
If p.IsShiny = True Then
|
||||
pokedexType = 3
|
||||
End If
|
||||
|
||||
If p.IsEgg() = False Then
|
||||
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, p.Number, pokedexType)
|
||||
End If
|
||||
Else
|
||||
Dim commas As Integer = 0
|
||||
For Each c As Char In argument
|
||||
If c = "," Then
|
||||
commas += 1
|
||||
End If
|
||||
Next
|
||||
|
||||
Dim PokemonID As Integer = int(argument.GetSplit(0))
|
||||
Dim Level As Integer = int(argument.GetSplit(1))
|
||||
|
||||
Dim catchMethod As String = "random reason"
|
||||
If commas > 1 Then
|
||||
catchMethod = argument.GetSplit(2)
|
||||
End If
|
||||
|
||||
Dim catchBall As Item = Item.GetItemByID(1)
|
||||
If commas > 2 Then
|
||||
catchBall = Item.GetItemByID(int(argument.GetSplit(3)))
|
||||
End If
|
||||
|
||||
Dim catchLocation As String = Screen.Level.MapName
|
||||
If commas > 3 Then
|
||||
catchLocation = argument.GetSplit(4)
|
||||
End If
|
||||
|
||||
Dim isEgg As Boolean = False
|
||||
If commas > 4 Then
|
||||
isEgg = CBool(argument.GetSplit(5))
|
||||
End If
|
||||
|
||||
Dim catchTrainer As String = Core.Player.Name
|
||||
If commas > 5 And argument.GetSplit(6) <> "<playername>" Then
|
||||
catchTrainer = argument.GetSplit(6)
|
||||
End If
|
||||
|
||||
Dim Pokemon As Pokemon = Pokemon.GetPokemonByID(PokemonID)
|
||||
Pokemon.Generate(Level, True)
|
||||
|
||||
Pokemon.CatchTrainerName = catchTrainer
|
||||
Pokemon.OT = Core.Player.OT
|
||||
|
||||
Pokemon.CatchLocation = catchLocation
|
||||
Pokemon.CatchBall = catchBall
|
||||
Pokemon.CatchMethod = catchMethod
|
||||
|
||||
If isEgg = True Then
|
||||
Pokemon.EggSteps = 1
|
||||
Pokemon.SetCatchInfos(Item.GetItemByID(5), "obtained at")
|
||||
Else
|
||||
Pokemon.EggSteps = 0
|
||||
End If
|
||||
|
||||
StorageSystemScreen.DepositPokemon(Pokemon)
|
||||
|
||||
Dim pokedexType As Integer = 2
|
||||
If Pokemon.IsShiny = True Then
|
||||
pokedexType = 3
|
||||
End If
|
||||
|
||||
If Pokemon.IsEgg() = False Then
|
||||
Core.Player.PokedexData = Pokedex.ChangeEntry(Core.Player.PokedexData, Pokemon.Number, pokedexType)
|
||||
End If
|
||||
End If
|
||||
End Select
|
||||
|
||||
IsReady = True
|
||||
|
|
|
|||
Loading…
Reference in New Issue