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

Replaced inconsistent overworldpokemon commands 

The following commands has been replaced by @overworldpokemon.hide:
* @pokemon.hide
* @player.hidepokemonfollow
The following command has been replaced by @overworldpokemon.show:
* @player.showpokemonfollow
and the following unused command is now replaced by @overworldpokemon.toggle:
* @player.togglepokemonfollow
This commit is contained in:
Jasper "JappaWakka" Speelman 2022-04-04 19:37:40 +02:00
parent 7a049012ef
commit d65b7dc10b
13 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
P3D/Content/Data/Scripts/center_script.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/quest/sevault/danceguy.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/rival/rival_azalea/startscript.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/saffron/rotom/elevator.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/twirl forest/confused_man.dat
View File

Binary file not shown.

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

@ -118,9 +118,9 @@
"@sound.play(destroy)" & Environment.NewLine &
"@player.move(" & Steps & ")" & Environment.NewLine &
"@player.setmovement(" & Screen.Camera.GetMoveDirection().X & ",0," & Screen.Camera.GetMoveDirection().Z & ")" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.move(1)" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.wearskin(" & tempSkin & ")" & Environment.NewLine
If Not Me.TempScriptEntity Is Nothing Then
@ -191,7 +191,7 @@
"@player.setmovement(" & Screen.Camera.GetMoveDirection().X & ",-1," & Screen.Camera.GetMoveDirection().Z & ")" & Environment.NewLine &
"@sound.play(destroy)" & Environment.NewLine &
"@player.move(" & Steps & ")" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.wearskin(" & tempSkin & ")" & Environment.NewLine
If Not Me.TempScriptEntity Is Nothing Then

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

@ -57,9 +57,9 @@
"@player.setspeed(" & walkSpeed & ")" & Environment.NewLine &
"@player.move(" & Steps & ")" & Environment.NewLine &
"@player.setmovement(" & Screen.Camera.GetMoveDirection().X & ",0," & Screen.Camera.GetMoveDirection().Z & ")" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.move(1)" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.resetspeed" & Environment.NewLine
If Not Me.TempScriptEntity Is Nothing Then
@ -151,7 +151,7 @@
"@player.move(1)" & Environment.NewLine &
"@player.setmovement(" & Screen.Camera.GetMoveDirection().X & ",-1," & Screen.Camera.GetMoveDirection().Z & ")" & Environment.NewLine &
"@player.move(" & Steps & ")" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.resetspeed" & Environment.NewLine
If Not Me.TempScriptEntity Is Nothing Then

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

@ -208,12 +208,12 @@
End While
s = "version=2" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.move(2)" & Environment.NewLine &
"@player.setmovement(0,-1,0)" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.move(" & Steps & ")" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
":end"
CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
@ -264,9 +264,9 @@
"@sound.play(select)" & Environment.NewLine &
"@text.show(" & pName & " used~Waterfall.)" & Environment.NewLine &
"@player.move(" & Steps & ")" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
"@player.move(2)" & Environment.NewLine &
"@pokemon.hide" & Environment.NewLine &
"@overworldpokemon.hide" & Environment.NewLine &
":end"
PlayerStatistics.Track("Waterfall used", 1)

6
P3D/World/ActionScript/V2/ScriptCommands/DoOverworldPokemon.vb
View File

@ -13,11 +13,15 @@
Select Case command.ToLower()
Case "hide"
Screen.Level.OverworldPokemon.Visible = False
IsReady = True
Case "show"
Screen.Level.OverworldPokemon.Visible = True
IsReady = True
Case "toggle"
Screen.Level.OverworldPokemon.Visible = Not Screen.Level.OverworldPokemon.Visible
IsReady = True
End Select
IsReady = True
End Sub
End Class

14
P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb
View File

@ -255,20 +255,6 @@
Case "hiderod"
OverworldScreen.DrawRodID = -1
IsReady = True
Case "showpokemonfollow"
Screen.Level.OverworldPokemon.Visible = True
IsReady = True
Case "hidepokemonfollow"
Screen.Level.OverworldPokemon.Visible = False
IsReady = True
Case "togglepokemonfollow"
Screen.Level.OverworldPokemon.Visible = Not Screen.Level.OverworldPokemon.Visible
IsReady = True
Case "save"
Core.Player.SaveGame(False)

2
P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
View File

@ -257,8 +257,6 @@
CType(Core.CurrentScreen, PartyScreen).ExitedSub = AddressOf Script.ExitedNPCTrade
CanContinue = False
Case "hide"
Screen.Level.OverworldPokemon.Visible = False
Case "rename"
Dim index As String = argument
Dim renameOTcheck As Boolean = False

13
P3D/World/ActionScript/V2/ScriptLibrary.vb
View File

@ -29,6 +29,8 @@ Namespace ScriptVersion2
DoPokemon()
DoOverworldPokemon()
DoNPC()
DoPlayer()
@ -474,9 +476,6 @@ Namespace ScriptVersion2
r(New ScriptCommand("player", "addbp", {New ScriptArgument("amount", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Adds the given amount to the player's Battle Points."))
r(New ScriptCommand("player", "showrod", {New ScriptArgument("rodID", ScriptArgument.ArgumentTypes.Int, {"0-2"})}.ToList(), "Displays a Fishing Rod on the screen."))
r(New ScriptCommand("player", "hiderod", "Hides the Fishing Rod."))
r(New ScriptCommand("player", "showpokemonfollow", "Shows the following Pokémon."))
r(New ScriptCommand("player", "hidepokemonfollow", "Hides the following Pokémon."))
r(New ScriptCommand("player", "togglepokemonfollow", "Toggles the following Pokémon's visibility."))
r(New ScriptCommand("player", "save", "Saves the game."))
r(New ScriptCommand("player", "setrivalname", {New ScriptArgument("name", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Sets the rival's name."))
r(New ScriptCommand("player", "setrivalskin", {New ScriptArgument("skin", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Sets the rival's skin."))
@ -637,7 +636,12 @@ Namespace ScriptVersion2
r(New ScriptCommand("daycare", "canbreed", "int", {New ScriptArgument("daycareID", ScriptArgument.ArgumentTypes.Int),
New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the chance the Pokémon in the Day Care can breed (in %).", ",", True))
End Sub
Private Shared Sub DoOverworldPokemon()
' Commands:
r(New ScriptCommand("player", "show", "Shows the following Pokémon."))
r(New ScriptCommand("player", "hide", "Hides the following Pokémon."))
r(New ScriptCommand("player", "toggle", "Toggles the following Pokémon's visibility."))
End Sub
Private Shared Sub DoPokemon()
' Commands:
r(New ScriptCommand("pokemon", "cry", {New ScriptArgument("pokemonID", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Plays the cry of the given Pokémon."))
@ -689,7 +693,6 @@ Namespace ScriptVersion2
New ScriptArgument("message1", ScriptArgument.ArgumentTypes.Str),
New ScriptArgument("message2", ScriptArgument.ArgumentTypes.Str),
New ScriptArgument("register", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Trades a Pokémon with an NPC.", "|", False))
r(New ScriptCommand("pokemon", "hide", "Hides the following Pokémon."))
r(New ScriptCommand("pokemon", "rename", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Str, {"0-5", "last"}),
New ScriptArgument("OTcheck", ScriptArgument.ArgumentTypes.Bool)}.ToList(), "Opens the Name Rater rename feature."))
r(New ScriptCommand("pokemon", "read", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Str, {"[empty],0-5"})}.ToList(), "Displays the reader's dialogue."))