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

Reverted some inconsistencies related to ShowMessage and TextBox

This commit is contained in:
CaptainSegis 2017-08-26 14:14:04 -05:00
parent 8fa8392965
commit d96bf1b926
1 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
2.5DHero/2.5DHero/Pokemon/Items/MedicineItem.vb
View File

@ -26,11 +26,14 @@ Namespace Items
End If End If
If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is fainted!") Screen.TextBox.reDelay = 0.0F
Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {})
Return False Return False
Else Else
If Pokemon.HP = Pokemon.MaxHP Then If Pokemon.HP = Pokemon.MaxHP Then
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " has full HP already.") Screen.TextBox.reDelay = 0.0F
Screen.TextBox.Show(Pokemon.GetDisplayName() & " has full~HP already.", {})
Return False Return False
Else Else
@ -39,11 +42,13 @@ Namespace Items
Pokemon.Heal(HP) Pokemon.Heal(HP)
Dim t As String = "Restored " & Pokemon.GetDisplayName() & "'s HP by " & diff & "." Screen.TextBox.reDelay = 0.0F
Dim t As String = "Restored " & Pokemon.GetDisplayName() & "'s~HP by " & diff & "."
t &= RemoveItem() t &= RemoveItem()
SoundManager.PlaySound("single_heal", False) SoundManager.PlaySound("single_heal", False)
CType(CurrentScreen, PartyScreen).ShowMessage(t) Screen.TextBox.Show(t, {})
PlayerStatistics.Track("[17]Medicine Items used", 1) PlayerStatistics.Track("[17]Medicine Items used", 1)
Return True Return True
@ -63,23 +68,27 @@ Namespace Items
Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex) Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex)
If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is fainted!") Screen.TextBox.reDelay = 0.0F
Return False Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {})
Return False
ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Poison Or Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.BadPoison Then ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Poison Or Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.BadPoison Then
Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None
Screen.TextBox.reDelay = 0.0F
Dim t As String = "Cures the poison of " & Pokemon.GetDisplayName() & "." Dim t As String = "Cures the poison of " & Pokemon.GetDisplayName() & "."
t &= RemoveItem() t &= RemoveItem()
PlayerStatistics.Track("[17]Medicine Items used", 1) PlayerStatistics.Track("[17]Medicine Items used", 1)
SoundManager.PlaySound("single_heal", False) SoundManager.PlaySound("single_heal", False)
CType(CurrentScreen, PartyScreen).ShowMessage(t) Screen.TextBox.Show(t, {})
Return True Return True
Else Else
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is not poisoned.") Screen.TextBox.reDelay = 0.0F
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is not poisoned.", {})
Return False Return False
End If End If
End Function End Function
@ -96,23 +105,26 @@ Namespace Items
Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex) Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex)
If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is fainted!") Screen.TextBox.reDelay = 0.0F
Return False Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {})
Return False
ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Sleep Then ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Sleep Then
Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None
Screen.TextBox.reDelay = 0.0F
Dim t As String = "Cures the sleep of " & Pokemon.GetDisplayName() & "." Dim t As String = "Cures the sleep of " & Pokemon.GetDisplayName() & "."
t &= RemoveItem() t &= RemoveItem()
SoundManager.PlaySound("single_heal", False) SoundManager.PlaySound("single_heal", False)
CType(CurrentScreen, PartyScreen).ShowMessage(t) Screen.TextBox.Show(t, {})
PlayerStatistics.Track("[17]Medicine Items used", 1) PlayerStatistics.Track("[17]Medicine Items used", 1)
Return True Return True
Else Else
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is not asleep.") Screen.TextBox.reDelay = 0.0F
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is not asleep.", {})
Return False Return False
End If End If
@ -130,23 +142,26 @@ Namespace Items
Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex) Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex)
If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is fainted!") Screen.TextBox.reDelay = 0.0F
Return False Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {})
Return False
ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Burn Then ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Burn Then
Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None
Screen.TextBox.reDelay = 0.0F
Dim t As String = "Cures the burn of " & Pokemon.GetDisplayName() & "." Dim t As String = "Cures the burn of " & Pokemon.GetDisplayName() & "."
t &= RemoveItem() t &= RemoveItem()
SoundManager.PlaySound("single_heal", False) SoundManager.PlaySound("single_heal", False)
CType(CurrentScreen, PartyScreen).ShowMessage(t) Screen.TextBox.Show(t, {})
PlayerStatistics.Track("[17]Medicine Items used", 1) PlayerStatistics.Track("[17]Medicine Items used", 1)
Return True Return True
Else Else
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is not burned.") Screen.TextBox.reDelay = 0.0F
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is not burned.", {})
Return False Return False
End If End If
@ -164,25 +179,28 @@ Namespace Items
Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex) Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex)
If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is fainted!") Screen.TextBox.reDelay = 0.0F
Return False Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {})
Return False
ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Freeze Then ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Freeze Then
Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None
Core.Player.Inventory.RemoveItem(Me.ID, 1) Core.Player.Inventory.RemoveItem(Me.ID, 1)
Screen.TextBox.reDelay = 0.0F
Dim t As String = "Cures the ice of " & Pokemon.GetDisplayName() & "." Dim t As String = "Cures the ice of " & Pokemon.GetDisplayName() & "."
t &= RemoveItem() t &= RemoveItem()
SoundManager.PlaySound("single_heal", False) SoundManager.PlaySound("single_heal", False)
CType(CurrentScreen, PartyScreen).ShowMessage(t) Screen.TextBox.Show(t, {})
PlayerStatistics.Track("[17]Medicine Items used", 1) PlayerStatistics.Track("[17]Medicine Items used", 1)
Return True Return True
Else Else
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is not frozen.") Screen.TextBox.reDelay = 0.0F
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is not frozen.", {})
Return False Return False
End If End If
@ -200,30 +218,33 @@ Namespace Items
Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex) Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex)
If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then If Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Fainted Then
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is fainted!") Screen.TextBox.reDelay = 0.0F
Return False Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {})
Return False
ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Paralyzed Then ElseIf Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.Paralyzed Then
Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None Pokemon.Status = net.Pokemon3D.Game.Pokemon.StatusProblems.None
Core.Player.Inventory.RemoveItem(Me.ID, 1) Core.Player.Inventory.RemoveItem(Me.ID, 1)
Screen.TextBox.reDelay = 0.0F
Dim t As String = "Cures the paralysis of " & Pokemon.GetDisplayName() & "." Dim t As String = "Cures the paralysis~of " & Pokemon.GetDisplayName() & "."
t &= RemoveItem() t &= RemoveItem()
SoundManager.PlaySound("single_heal", False) SoundManager.PlaySound("single_heal", False)
CType(CurrentScreen, PartyScreen).ShowMessage(t) Screen.TextBox.Show(t, {})
PlayerStatistics.Track("[17]Medicine Items used", 1) PlayerStatistics.Track("[17]Medicine Items used", 1)
Return True Return True
Else Else
CType(CurrentScreen, PartyScreen).ShowMessage(Pokemon.GetDisplayName() & " is not paralyzed.") Screen.TextBox.reDelay = 0.0F
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is not~paralyzed.", {})
Return False Return False
End If End If
End Function End Function
End Class End Class
End Namespace End Namespace