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

Fixed escape rope and teleport not stopping surf

Browse Source
This commit is contained in:
JappaWakka 2023-01-04 20:14:38 +01:00
parent 260ff56150
commit a1a84bbe40
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
P3D/Pokemon/Items/Standard/EscapeRope.vb
View File

@ -53,6 +53,14 @@ Namespace Items.Standard
:end" :end"
CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2) CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
If Screen.Level.Surfing = True Then
Screen.Level.Surfing = False
Screen.Level.OwnPlayer.SetTexture(Core.Player.TempSurfSkin, True)
Core.Player.Skin = Core.Player.TempSurfSkin
Screen.Level.OverworldPokemon.warped = True
Screen.Level.OverworldPokemon.Visible = False
End If
Else Else
Screen.TextBox.Show("Cannot use the Escape~Rope here!", {}, True, True) Screen.TextBox.Show("Cannot use the Escape~Rope here!", {}, True, True)
End If End If

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

@ -1053,6 +1053,14 @@ Public Class PartyScreen
PlayerStatistics.Track("Dig used", 1) PlayerStatistics.Track("Dig used", 1)
CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2) CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
If Screen.Level.Surfing = True Then
Screen.Level.Surfing = False
Screen.Level.OwnPlayer.SetTexture(Core.Player.TempSurfSkin, True)
Core.Player.Skin = Core.Player.TempSurfSkin
Screen.Level.OverworldPokemon.warped = True
Screen.Level.OverworldPokemon.Visible = False
End If
Else Else
TextBox.Show("Cannot use Dig here.", {}, True, False) TextBox.Show("Cannot use Dig here.", {}, True, False)
End If End If
@ -1098,6 +1106,14 @@ Public Class PartyScreen
PlayerStatistics.Track("Teleport used", 1) PlayerStatistics.Track("Teleport used", 1)
CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2) CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
If Screen.Level.Surfing = True Then
Screen.Level.Surfing = False
Screen.Level.OwnPlayer.SetTexture(Core.Player.TempSurfSkin, True)
Core.Player.Skin = Core.Player.TempSurfSkin
Screen.Level.OverworldPokemon.warped = True
Screen.Level.OverworldPokemon.Visible = False
End If
Else Else
TextBox.Show("Cannot use Teleport here.", {}, True, False) TextBox.Show("Cannot use Teleport here.", {}, True, False)
End If End If