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

Localized field moves and switching

This commit is contained in:
JappaWakka 2023-07-30 18:16:27 +02:00
parent d66da7f1e8
commit e497776ecd
11 changed files with 91 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
P3D/Battle/BattleSystemV2/BattleMenu.vb
View File

@ -1023,15 +1023,15 @@
If PokeIndex = TempBattleScreen.OwnPokemonIndex Then
If Pokemon.Status <> P3D.Pokemon.StatusProblems.Fainted Then
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is already~in battle!", {}, True, False)
Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_already_in_battle", "is already~in battle!"), {}, True, False)
Else
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is fainted!", {}, True, False)
Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_fainted", "is fainted!"), {}, True, False)
End If
Else
If Pokemon.IsEgg() = False Then
If Pokemon.Status <> P3D.Pokemon.StatusProblems.Fainted Then
If BattleCalculation.CanSwitch(TempBattleScreen, True) = False Then
Screen.TextBox.Show(Localization.GetString("battle_main_cannot_switch", "Cannot switch out."), {}, True, False)
Screen.TextBox.Show(Localization.GetString("battle_cannot_switch", "Cannot switch out."), {}, True, False)
Else
If TempBattleScreen.IsRemoteBattle = True And TempBattleScreen.IsHost = False Then
TempBattleScreen.OppFaint = False
@ -1048,10 +1048,10 @@
End If
End If
Else
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is fainted!", {}, True, False)
Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_fainted", "is fainted!"), {}, True, False)
End If
Else
Screen.TextBox.Show("Cannot switch in~the egg!", {}, True, False)
Screen.TextBox.Show(Localization.GetString("battle_switch_egg", "Cannot switch in~the egg!"), {}, True, False)
End If
End If
End Sub

18
P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb
View File

@ -89,7 +89,7 @@
If rec.Contains(MouseHandler.MousePosition) = False Then
If Controls.Accept(True, True, True) = True Then
If _chooseIndex = 0 Then
Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_main_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
AddHandler selScreen.SelectedObject, AddressOf ChoosePokemonHandler
SoundManager.PlaySound("select")
Core.SetScreen(selScreen)
@ -109,7 +109,7 @@
Else
If Controls.Accept(False, True, True) = True Then
If _chooseIndex = 0 Then
Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_main_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
AddHandler selScreen.SelectedObject, AddressOf ChoosePokemonHandler
SoundManager.PlaySound("select")
Core.SetScreen(selScreen)
@ -129,7 +129,7 @@
If Controls.Accept(True, False, False) Then
If New Rectangle(Core.windowSize.Width - 213, Core.windowSize.Height - 438, 80, 50).Contains(MouseHandler.MousePosition) Then
_chooseIndex = 0
Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_main_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
AddHandler selScreen.SelectedObject, AddressOf ChoosePokemonHandler
SoundManager.PlaySound("select")
Core.SetScreen(selScreen)
@ -148,7 +148,7 @@
_ready = True
End If
End If
End If
End If
If Controls.Dismiss(True, True, True) = True Then
SoundManager.PlaySound("select")
TempScreen.BattleQuery.Clear()
@ -189,12 +189,12 @@
Private Sub ChoosePokemon(ByVal PokeIndex As Integer)
Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex)
If PokeIndex = TempScreen.OwnPokemonIndex Then
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is already~in battle!", {}, True, False)
Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_already_in_battle", "is already~in battle!"), {}, True, False)
Else
If Pokemon.IsEgg() = False Then
If Pokemon.Status <> P3D.Pokemon.StatusProblems.Fainted Then
If BattleCalculation.CanSwitch(TempScreen, True) = False Then
Screen.TextBox.Show(Localization.GetString("battle_main_cannot_switch", "Cannot switch out."), {}, True, False)
Screen.TextBox.Show(Localization.GetString("battle_cannot_switch", "Cannot switch out."), {}, True, False)
Else
Dim TempQuery = TempScreen.BattleQuery.ToArray
If TempScreen.OwnPokemonIndex <> PokeIndex Then
@ -229,10 +229,10 @@
End If
End If
Else
Screen.TextBox.Show(Pokemon.GetDisplayName() & " is fainted!", {}, True, False)
Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_fainted", "is fainted!"), {}, True, False)
End If
Else
Screen.TextBox.Show("Cannot switch in~the egg!", {}, True, False)
Screen.TextBox.Show(Localization.GetString("battle_switch_egg", "Cannot switch in~the egg!"), {}, True, False)
End If
End If
End Sub
@ -243,7 +243,7 @@
MyBase.New(QueryTypes.SwitchPokemon)
Me.TempScreen = BattleScreen
TransformText(BattleScreen.Trainer.Name & " " & Localization.GetString("battle_main_trainer_about_to_send_out_1") & " " & NewPokemon.GetDisplayName() & Localization.GetString("battle_main_trainer_about_to_send_out_2"))
TransformText(BattleScreen.Trainer.Name & " " & Localization.GetString("battle_trainer_about_to_send_out_1") & " " & NewPokemon.GetDisplayName() & Localization.GetString("battle_trainer_about_to_send_out_2"))
End Sub
Dim delay As Single = 2.0F

45
P3D/Content/Localization/Tokens_en.dat
View File

@ -93,6 +93,37 @@ Sp_Attack,Sp. Attack
Special_Defense,Special Defense
Sp_Defense,Sp. Defense
Speed,Speed
---
FieldMoves:
fieldmove_cut_1,This tree looks like it~can be Cut down!
fieldmove_cut_2,*Do you want to use Cut?
fieldmove_cut_used,used~Cut!
fieldmove_rocksmash_1,This rock looks like~it can be broken!
fieldmove_rocksmash_2,*Do you want to~use Rock Smash?
fieldmove_rocksmash_used,used~Rock Smash!
fieldmove_strength_1,A Pokémon may be able~to move this.
fieldmove_strength_2,*Do you want to use Strength?
fieldmove_strength_used,used~Strength!
fieldmove_surf_type0,Do you want to Surf?
fieldmove_surf_type1,The water looks still~and deep.~Do you want to Surf?
fieldmove_surf_type2,This lake is~calm and shallow~Do you want to Surf?
fieldmove_surf_used,used~Surf!
fieldmove_dive_down_1,The water seems to be~really deep at this point.
fieldmove_dive_down_2,*Do you want to~use Dive?
fieldmove_dive_up_type1,Light shines down from~the surface.*Do you want to~use Dive?
fieldmove_dive_up_type2,The boat's shadow is cast~upon the ocean floor.*Do you want to~use Dive?
fieldmove_dive_used,used~Dive!
fieldmove_headbutt_question,This tree could have~a Pokémon in it.*Do you want to~use Headbutt?
fieldmove_headbutt_used,used~Headbutt!
fieldmove_waterfall_used,used~Waterfall.
---
GameInteractions:
game_interaction_interact,Interact
@ -346,13 +377,15 @@ VoltorbFlip_Tutorial_HowToPlay_Image2,If you select "Quit", you'll keep those 18
VoltorbFlip_Tutorial_HowToPlay_Image3,But if you find Voltorb, you'll lose all your Coins!
VoltorbFlip_Tutorial_Hint_Image,By looking at the numbers on the sides of the cards, you can see the hidden number and Voltorb totals.
VoltorbFlip_Tutorial_AboutMemos_Image,Select "Open Memo" to open the Memo Window. Select the cards and press [<system.button(enter1)>] to add and [<system.button(back1)>] to remove marks.
----
Battle:
---
main:
battle_main_trainer_about_to_send_out_1,is about to send out
battle_main_trainer_about_to_send_out_2,! Do you want to switch your Pokémon?
battle_main_choose_pokemon,Choose Pokémon
battle_main_cannot_switch,Cannot switch out.
battle_trainer_about_to_send_out_1,is about to send out
battle_trainer_about_to_send_out_2,! Do you want to switch your Pokémon?
battle_choose_pokemon,Choose Pokémon
battle_switch_already_in_battle,is already~in battle!
battle_switch_fainted,is fainted!
battle_switch_egg,Cannot switch in~the egg!
battle_cannot_switch,Cannot switch out.
---
Badges:
badge_1,Boulder

4
P3D/Entites/Enviroment/AnimatedBlock.vb
View File

@ -152,7 +152,7 @@
End If
If canSurf = True Then
Dim message As String = "Do you want to Surf?%Yes|No%"
Dim message As String = Localization.GetString("fieldmove_surf_type0", "Do you want to Surf?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
SoundManager.PlaySound("select")
Screen.TextBox.Show(message, {Me}, True, True)
End If
@ -204,7 +204,7 @@
Public Overrides Sub ResultFunction(ByVal Result As Integer)
If Result = 0 Then
Screen.TextBox.Show(Core.Player.Pokemons(Core.Player.SurfPokemon).GetDisplayName() & " used~Surf!", {Me})
Screen.TextBox.Show(Core.Player.Pokemons(Core.Player.SurfPokemon).GetDisplayName() & " " & Localization.GetString("fieldmove_surf_used", "used~Surf!"), {Me})
Screen.Level.Surfing = True
Screen.Camera.Move(1)
PlayerStatistics.Track("Surf used", 1)

10
P3D/Entites/Enviroment/CutDownTree.vb
View File

@ -29,10 +29,10 @@
End If
Next
Dim text As String = "This tree looks like it~can be Cut down!"
Dim text As String = Localization.GetString("fieldmove_cut_1", "This tree looks like it~can be Cut down!")
If pName <> "" And Badge.CanUseHMMove(Badge.HMMoves.Cut) = True Or Core.Player.SandBoxMode = True Or GameController.IS_DEBUG_ACTIVE = True Then
text &= "~Do you want to~use Cut?%Yes|No%"
text &= Localization.GetString("fieldmove_cut_2", "*Do you want to use Cut?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
End If
Screen.TextBox.Show(text, {Me})
@ -41,7 +41,7 @@
Public Overrides Sub ResultFunction(Result As Integer)
If Result = 0 Then
Dim pName As String = ""
Dim pName As String = "MissignNo."
For Each p As Pokemon In Core.Player.Pokemons
If p.IsEgg() = False Then
@ -58,13 +58,13 @@
End If
Next
Dim Text As String = pName & " used~Cut!"
Dim Text As String = pName & " " & Localization.GetString("fieldmove_cut_used", "used~Cut!")
Me.CanBeRemoved = True
Dim s As String =
"version=2" & Environment.NewLine &
"@text.show(" & Text & ")" & Environment.NewLine &
"@sound.play(destroy,0)" & Environment.NewLine &
"@sound.play(FieldMove_Cut,0)" & Environment.NewLine &
":end"
PlayerStatistics.Track("Cut used", 1)

14
P3D/Entites/Enviroment/DiveTile.vb
View File

@ -27,23 +27,23 @@
Private Sub StartDive()
If diveUp = 0 Then
'Down
Dim t As String = "The water seems to be~really deep at this point."
Dim t As String = Localization.GetString("fieldmove_dive_down_1", "The water seems to be~really deep at this point.")
Dim d As String = GetDivePokemon()
If d <> "" And Badge.CanUseHMMove(Badge.HMMoves.Dive) = True Or Core.Player.SandBoxMode = True Or GameController.IS_DEBUG_ACTIVE = True Then
t &= "*Do you want to~use Dive?%Yes|No%"
t &= Localization.GetString("fieldmove_dive_down_2", "*Do you want to~use Dive?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
End If
Screen.TextBox.Show(t, {Me})
SoundManager.PlaySound("select")
ElseIf diveUp = 1 Then
'Up
Dim t As String = "Light shines down from~the surface.*Do you want to~use Dive?%Yes|No%"
Dim t As String = Localization.GetString("fieldmove_dive_up_type1", "Light shines down from~the surface.*Do you want to~use Dive?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
Screen.TextBox.Show(t, {Me})
SoundManager.PlaySound("select")
ElseIf diveUp = 2 Then
'Up
Dim t As String = "The boat's shadow is cast~upon the ocean floor.*Do you want to~use Dive?%Yes|No%"
Dim t As String = Localization.GetString("fieldmove_dive_up_type2", "The boat's shadow is cast~upon the ocean floor.*Do you want to~use Dive?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
Screen.TextBox.Show(t, {Me})
SoundManager.PlaySound("select")
@ -55,7 +55,7 @@
If diveUp = 0 Then
'Down
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & GetDivePokemon() & "~used Dive!)" & Environment.NewLine &
"@text.show(" & GetDivePokemon() & " " & Localization.GetString("fieldmove_dive_used", "used~Dive!") & ")" & Environment.NewLine &
"@screen.fadeout" & Environment.NewLine &
"@player.warp(" & Me.AdditionalValue & ")" & Environment.NewLine &
"@level.update" & Environment.NewLine &
@ -69,7 +69,7 @@
ElseIf diveUp = 1 Then
'Up
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & GetDivePokemon() & "~used Dive!)" & Environment.NewLine &
"@text.show(" & GetDivePokemon() & " " & Localization.GetString("fieldmove_dive_used", "used~Dive!") & ")" & Environment.NewLine &
"@player.setmovement(0,0.5,0)" & Environment.NewLine &
"@player.move(8)" & Environment.NewLine &
"@player.resetmovement" & Environment.NewLine &
@ -83,7 +83,7 @@
ElseIf diveUp = 2 Then
'Up
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & GetDivePokemon() & "~used Dive!)" & Environment.NewLine &
"@text.show(" & GetDivePokemon() & " " & Localization.GetString("fieldmove_dive_used", "used~Dive!") & ")" & Environment.NewLine &
"@player.setmovement(0,0.5,0)" & Environment.NewLine &
"@player.move(6)" & Environment.NewLine &
"@player.resetmovement" & Environment.NewLine &

6
P3D/Entites/Enviroment/HeadbuttTree.vb
View File

@ -31,7 +31,7 @@
Next
If pName <> "" And Core.Player.Badges.Contains(10) Then
Dim text As String = "This tree could have~a Pokémon in it.*Do you want to~use Headbutt?%Yes|No%"
Dim text As String = Localization.GetString("fieldmove_headbutt_question", "This tree could have~a Pokémon in it.*Do you want to~use Headbutt?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
Screen.TextBox.Show(text, {Me})
SoundManager.PlaySound("select")
End If
@ -58,7 +58,7 @@
Dim spawnedPokemon As Pokemon = Spawner.GetPokemon(Screen.Level.LevelFile, Spawner.EncounterMethods.Headbutt, False)
If spawnedPokemon Is Nothing Then
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & pName & " used~Headbutt!)" & Environment.NewLine &
"@text.show(" & pName & " " & Localization.GetString("fieldmove_headbutt_used", "used~Headbutt!") & ")" & Environment.NewLine &
"@sound.play(destroy,0)" & Environment.NewLine &
"@level.wait(20)" & Environment.NewLine &
"@text.show(Nothing happened...)" & Environment.NewLine &
@ -66,7 +66,7 @@
CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
Else
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & pName & " used~Headbutt!)" & Environment.NewLine &
"@text.show(" & pName & " " & Localization.GetString("fieldmove_headbutt_used", "used~Headbutt!") & ")" & Environment.NewLine &
"@sound.play(destroy,0)" & Environment.NewLine &
"@level.wait(20)" & Environment.NewLine &
"@text.show(A wild Pokémon~appeared!)" & Environment.NewLine &

20
P3D/Entites/Enviroment/SmashRock.vb
View File

@ -21,10 +21,10 @@
End If
Next
Dim text As String = "This rock looks like~it can be broken!"
Dim text As String = Localization.GetString("fieldmove_rocksmash_1", "This rock looks like~it can be broken!")
If pName <> "" Or GameController.IS_DEBUG_ACTIVE = True Or Core.Player.SandBoxMode = True Then
text &= "~Do you want to~use Rock Smash?%Yes|No%"
text &= Localization.GetString("fieldmove_rocksmash_2", "*Do you want to~use Rock Smash?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
End If
Screen.TextBox.Show(text, {Me})
@ -56,14 +56,14 @@
spawnedPokemon = Spawner.GetPokemon(Screen.Level.LevelFile, Spawner.EncounterMethods.RockSmash, False)
If spawnedPokemon Is Nothing Then
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & pName & " used~Rock Smash!)" & Environment.NewLine &
"@sound.play(destroy)" & Environment.NewLine &
"@text.show(" & pName & " " & Localization.GetString("fieldmove_rocksmash_used", "used~Rock Smash!") & ")" & Environment.NewLine &
"@sound.play(FieldMove_RockSmash)" & Environment.NewLine &
":end"
CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
Else
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & pName & " used~Rock Smash!)" & Environment.NewLine &
"@sound.play(destroy)" & Environment.NewLine &
"@text.show(" & pName & " " & Localization.GetString("fieldmove_rocksmash_used", "used~Rock Smash!") & ")" & Environment.NewLine &
"@sound.play(FieldMove_RockSmash)" & Environment.NewLine &
"@level.update" & Environment.NewLine &
"@text.show(A wild Pokémon~appeared!)" & Environment.NewLine &
"@battle.wild(" & spawnedPokemon.GetSaveData() & ")" & Environment.NewLine &
@ -74,8 +74,8 @@
If Core.Random.Next(0, 100) < 20 Then
Dim ItemID As Integer = GetItemID()
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & pName & " used~Rock Smash!)" & Environment.NewLine &
"@sound.play(destroy)" & Environment.NewLine &
"@text.show(" & pName & " " & Localization.GetString("fieldmove_rocksmash_used", "used~Rock Smash!") & ")" & Environment.NewLine &
"@sound.play(FieldMove_RockSmash)" & Environment.NewLine &
"@level.update" & Environment.NewLine &
"@item.give(" & ItemID & ",1)" & Environment.NewLine &
"@item.messagegive(" & ItemID & ",1)" & Environment.NewLine &
@ -83,8 +83,8 @@
CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
Else
Dim s As String = "version=2" & Environment.NewLine &
"@text.show(" & pName & " used~Rock Smash!)" & Environment.NewLine &
"@sound.play(destroy)" & Environment.NewLine &
"@text.show(" & pName & " " & Localization.GetString("fieldmove_rocksmash_used", "used~Rock Smash!") & ")" & Environment.NewLine &
"@sound.play(FieldMove_RockSmash)" & Environment.NewLine &
":end"
CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
End If

10
P3D/Entites/Enviroment/StrengthRock.vb
View File

@ -31,12 +31,12 @@
End If
Next
Dim text As String = "A Pokémon may be~able to move this."
Dim text As String = Localization.GetString("fieldmove_strength_1", "A Pokémon may be able~to move this.")
If pName <> "" And Badge.CanUseHMMove(Badge.HMMoves.Strength) = True Or GameController.IS_DEBUG_ACTIVE = True Or Core.Player.SandBoxMode = True Then
text &= "~Do you want to~use Strength?%Yes|No%"
text &= Localization.GetString("fieldmove_strength_2", "*Do you want to use Strength?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
End If
ChooseBox.CancelIndex = 1
Screen.TextBox.Show(text, {Me})
SoundManager.PlaySound("select")
End If
@ -72,7 +72,7 @@
Screen.Level.UsedStrength = True
SoundManager.PlayPokemonCry(pNumber)
Screen.TextBox.Show(pName & " used~Strength!", {}, True, False)
Screen.TextBox.Show(pName & " " & Localization.GetString("fieldmove_strength_used", "used~Strength!"), {}, True, False)
PlayerStatistics.Track("Strength used", 1)
End If
End Sub
@ -88,7 +88,7 @@
CType(Screen.Camera, OverworldCamera).IsPushingStrengthRock = True
Me.Moved = 1
Me.FaceDirection = Screen.Camera.GetPlayerFacingDirection()
SoundManager.PlaySound("destroy", False)
SoundManager.PlaySound("FieldMove_Strength", False)
End If
End If

10
P3D/Entites/Enviroment/Water.vb
View File

@ -169,7 +169,7 @@
End If
If canSurf = True Then
Dim message As String = "Do you want to Surf?%Yes|No%"
Dim message As String = Localization.GetString("fieldmove_surf_type0", "Do you want to Surf?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
Dim waterType As String = ""
If Me.AdditionalValue.CountSeperators(",") >= 6 Then
waterType = Me.AdditionalValue.GetSplit(5)
@ -178,11 +178,11 @@
End If
Select Case waterType.ToLower()
Case "0", ""
message = "Do you want to Surf?%Yes|No%"
message = Localization.GetString("fieldmove_surf_type0", "Do you want to Surf?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
Case "1", "sea", "water"
message = "The water looks still~and deep.~Do you want to Surf?%Yes|No%"
message = Localization.GetString("fieldmove_surf_type1", "The water looks still~and deep.~Do you want to Surf?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
Case "2", "lake", "pond"
message = "This lake is~calm and shallow~Do you want to Surf?%Yes|No%"
message = Localization.GetString("fieldmove_surf_type2", "This lake is~calm and shallow~Do you want to Surf?") & "%" & Localization.GetString("global_yes", "Yes") & "|" & Localization.GetString("global_no", "No") & "%"
End Select
Screen.TextBox.Show(message, {Me}, True, True)
@ -262,7 +262,7 @@
Public Overrides Sub ResultFunction(ByVal Result As Integer)
If Result = 0 Then
Screen.TextBox.Show(Core.Player.Pokemons(Core.Player.SurfPokemon).GetDisplayName() & " used~Surf!", {Me})
Screen.TextBox.Show(Core.Player.Pokemons(Core.Player.SurfPokemon).GetDisplayName() & " " & Localization.GetString("fieldmove_surf_used", "used~Surf!"), {Me})
Screen.Level.Surfing = True
Screen.Camera.Move(1)
PlayerStatistics.Track("Surf used", 1)

2
P3D/Entites/Enviroment/Waterfall.vb
View File

@ -305,7 +305,7 @@
"@player.stopmovement" & Environment.NewLine &
"@pokemon.cry(" & pNumber & ")" & Environment.NewLine &
"@sound.play(select)" & Environment.NewLine &
"@text.show(" & pName & " used~Waterfall.)" & Environment.NewLine &
"@text.show(" & pName & " " & Localization.GetString("fieldmove_waterfall_used", "used~Waterfall!") & ")" & Environment.NewLine &
"@player.setmovement(0,1,0)" & Environment.NewLine &
"@player.move(" & Steps & ")" & Environment.NewLine &
"@player.resetmovement" & Environment.NewLine &