diff --git a/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat b/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat index 7bcdb0555..080fffcf9 100644 --- a/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat +++ b/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat @@ -9,6 +9,7 @@ version=2 @level.update @level.wait(15) @screen.fadein -@text.show(He left something behind.*It's a boat pass!) -@item.messagegive(500,1) +@text.show(He left something behind.*It's a sea map!) +@item.give(592,1) +@item.messagegive(592,1) :end \ No newline at end of file diff --git a/P3D/Content/Data/Scripts/vermilion/dockhand3.dat b/P3D/Content/Data/Scripts/vermilion/dockhand3.dat index a29b1ed1e..d2164db4f 100644 --- a/P3D/Content/Data/Scripts/vermilion/dockhand3.dat +++ b/P3D/Content/Data/Scripts/vermilion/dockhand3.dat @@ -1,7 +1,7 @@ version=2 :if:=false - @text.show(Yo!*I am the navigator.*If you ever find any odd~maps or specialty tickets, come~talk to me.*For our regularly scheduled~trips, talk to the first~mate next to me.) + @text.show(Yo!*I am the navigator.*If you ever find any odd~maps, come talk to me.*For our regularly scheduled~trips, talk to the first~mate next to me.) :endif :if:>0 =false @@ -39,9 +39,9 @@ version=2 :end :endif -:if:>0 =false - @text.show(Oh, this is a nice pass!*It's a tourist trip to~"Liberty Garden" in Unova.*We can take you~there if you want.) - @register.register(libertypasstonav) +:if:>0 =false + @text.show(Oh, this is a nice map!*It's a map to "Liberty Garden"~in far-off Unova.*We can take you~there if you want.) + @register.register(libertyseamaptonav) @register.register(specialmap-tixreg) @options.show(Yes,No) :when:Yes @@ -60,7 +60,7 @@ version=2 :if:=true @text.show(Where would you like to go?) - :if:=true =false =false + :if:=true =false =false @options.show(Faraway Island,Quit) :when:Faraway Island @text.show(All right!*All aboard the~Seagallop Hi-Speed 11!) @@ -73,7 +73,7 @@ version=2 :end :endif - :if:=false =true =false + :if:=false =true =false @options.show(Open Sea,Quit) :when:Open Sea @text.show(All right!*All aboard the~Seagallop Hi-Speed 11!) @@ -87,7 +87,7 @@ version=2 :end :endif - :if:=false =false =true + :if:=false =false =true @options.show(Liberty Garden,Quit) :when:Liberty Garden @text.show(All right!*All aboard the~Seagallop Hi-Speed 11!) @@ -101,7 +101,7 @@ version=2 :end :endif - :if:=true =true =false + :if:=true =true =false @options.show(Faraway Island,Open Sea,Quit) :when:Faraway Island @text.show(All right!*All aboard the~Seagallop Hi-Speed 11!) @@ -122,7 +122,7 @@ version=2 :end :endif - :if:=false =true =true + :if:=false =true =true @options.show(Open Sea,Liberty Garden,Quit) :when:Open Sea @text.show(All right!*All aboard the~Seagallop Hi-Speed 11!) @@ -144,7 +144,7 @@ version=2 :end :endif - :if:=true =false =true + :if:=true =false =true @options.show(Faraway Island,Liberty Garden,Quit) :when:Faraway Island @text.show(All right!*All aboard the~Seagallop Hi-Speed 11!) @@ -165,7 +165,7 @@ version=2 :end :endif - :if:=true =true =true + :if:=true =true =true @options.show(Faraway Island,Open Sea,Liberty Garden,Quit) :when:Faraway Island @text.show(All right!*All aboard the~Seagallop Hi-Speed 11!) diff --git a/P3D/Content/Data/maps/dungeon/2/mega.dat b/P3D/Content/Data/maps/dungeon/2/mega.dat index 1ccaa8196..09973f36b 100644 Binary files a/P3D/Content/Data/maps/dungeon/2/mega.dat and b/P3D/Content/Data/maps/dungeon/2/mega.dat differ diff --git a/P3D/Content/Data/maps/fortune/green.dat b/P3D/Content/Data/maps/fortune/green.dat index 77adf03fc..aba92da49 100644 --- a/P3D/Content/Data/maps/fortune/green.dat +++ b/P3D/Content/Data/maps/fortune/green.dat @@ -33,6 +33,7 @@ Water: {"EntityField"{ENT[{"EntityID"{str[Water]}}{"Position"{sngArr[0,-0.25,19]}}{"Size"{intArr[72,13]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,16,16,16][144,16,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}} {"EntityField"{ENT[{"EntityID"{str[Water]}}{"Position"{sngArr[16,-0.25,6]}}{"Size"{intArr[24,1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,16,16,16][144,16,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}} {"EntityField"{ENT[{"EntityID"{str[Water]}}{"Position"{sngArr[16,-0.25,7]}}{"Size"{intArr[20,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,16,16,16][144,16,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}} +{"EntityField"{ENT[{"EntityID"{str[Water]}}{"Position"{sngArr[69,-0.25,2]}}{"Size"{intArr[3,2]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,16,16,16][144,16,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}} Sides: {"EntityField"{ENT[{"Size"{intArr[30,1]}}{"EntityID"{str[Water]}}{"Position"{sngArr[42,-0.25,18]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,16,16,16][144,16,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[9]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}} @@ -162,7 +163,7 @@ trees: {"EntityField"{ENT[{"SeasonTexture"{str[PlantColoring]}}{"Size"{intArr[16,2]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[1,2,1]}}{"Position"{sngArr[47,1.3,11]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,64,16,32]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} {"EntityField"{ENT[{"SeasonTexture"{str[PlantColoring]}}{"Size"{intArr[1,4]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[1,2,1]}}{"Position"{sngArr[43,1.3,7]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,64,16,32]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} {"EntityField"{ENT[{"SeasonTexture"{str[PlantColoring]}}{"Size"{intArr[1,4]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[1,2,1]}}{"Position"{sngArr[66,1.3,7]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,64,16,32]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} -{"EntityField"{ENT[{"SeasonTexture"{str[PlantColoring]}}{"Size"{intArr[2,4]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[1,2,1]}}{"Position"{sngArr[68,1.3,7]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,64,16,32]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} +{"EntityField"{ENT[{"SeasonTexture"{str[PlantColoring]}}{"Size"{intArr[2,3]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[1,2,1]}}{"Position"{sngArr[68,1.3,7]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,64,16,32]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} {"EntityField"{ENT[{"SeasonTexture"{str[PlantColoring]}}{"Size"{intArr[2,2]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[1,2,1]}}{"Position"{sngArr[38,1.3,9]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,64,16,32]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} {"EntityField"{ENT[{"SeasonTexture"{str[PlantColoring]}}{"Size"{intArr[1,2]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[1,2,1]}}{"Position"{sngArr[71,1.3,15]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,64,16,32]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} {"EntityField"{ENT[{"SeasonTexture"{str[PlantColoring]}}{"Size"{intArr[2,2]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[1,2,1]}}{"Position"{sngArr[70,1.3,7]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,64,16,32]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} diff --git a/P3D/Content/Data/maps/fortune/water.dat b/P3D/Content/Data/maps/fortune/water.dat index 07a3a1086..ec74885e7 100644 --- a/P3D/Content/Data/maps/fortune/water.dat +++ b/P3D/Content/Data/maps/fortune/water.dat @@ -520,7 +520,7 @@ Green: Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[17,-0.375,87]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[1,151]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[14,-0.375,8]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,65]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[17,-0.375,19]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,65]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[13,-0.375,63]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[3,2019]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[15,-0.375,76]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[4,2004]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[3,0.625,8]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[5,2006]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} diff --git a/P3D/Content/Data/maps/goldenrod.dat b/P3D/Content/Data/maps/goldenrod.dat index d8ef03d4e..e0ec5df99 100644 Binary files a/P3D/Content/Data/maps/goldenrod.dat and b/P3D/Content/Data/maps/goldenrod.dat differ diff --git a/P3D/Content/Items/ItemSheet.png b/P3D/Content/Items/ItemSheet.png index 63f8523e4..4162bc5d2 100644 Binary files a/P3D/Content/Items/ItemSheet.png and b/P3D/Content/Items/ItemSheet.png differ diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 7c231ae73..aedb0cfee 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -25551,6 +25551,7 @@ + @@ -25566,31 +25567,31 @@ PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest PreserveNewest @@ -25599,154 +25600,154 @@ PreserveNewest - Always + PreserveNewest - Always + PreserveNewest PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest diff --git a/P3D/Pokemon/Items/KeyItems/LibertyPass.vb b/P3D/Pokemon/Items/KeyItems/LibertySeaMap.vb similarity index 61% rename from P3D/Pokemon/Items/KeyItems/LibertyPass.vb rename to P3D/Pokemon/Items/KeyItems/LibertySeaMap.vb index 8f7a6ae50..2f1c9549e 100644 --- a/P3D/Pokemon/Items/KeyItems/LibertyPass.vb +++ b/P3D/Pokemon/Items/KeyItems/LibertySeaMap.vb @@ -1,11 +1,11 @@ Namespace Items.KeyItems - - Public Class LibertyPass + + Public Class LibertySeaMap Inherits KeyItem - Public Overrides ReadOnly Property Description As String = "A special pass to go to Liberty Garden in Unova. It depicts a Lighthouse." + Public Overrides ReadOnly Property Description As String = "A new sea chart that shows the way to Liberty Garden in Unova. It depicts a Lighthouse." Public Sub New() _textureRectangle = New Rectangle(408, 288, 24, 24) diff --git a/P3D/Pokemon/Items/_itemList.txt b/P3D/Pokemon/Items/_itemList.txt index c87c2c1af..15c88cc90 100644 Binary files a/P3D/Pokemon/Items/_itemList.txt and b/P3D/Pokemon/Items/_itemList.txt differ diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe index 3f23dce42..aa3ecb27d 100644 Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ