From 7aa3aa448f23e926af8c993dc70da3e3c9919427 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Fri, 23 Feb 2018 21:43:35 -0600 Subject: [PATCH] Sevenisland fixes and using music.stop --- .gitignore | 1 + .../Scripts/ecruteak/suicune_encounter.dat | Bin 5044 -> 5026 bytes P3D/Content/Data/Scripts/quest/sdance.dat | Bin 1104 -> 1104 bytes .../rival/rival_azalea/startscript.dat | Bin 4806 -> 4788 bytes P3D/Content/Data/Scripts/speedboatscene.dat | Bin 2090 -> 2086 bytes .../Data/Scripts/trainer/league/lance.dat | Bin 5356 -> 5318 bytes .../Data/Scripts/trainer/route25/000.dat | Bin 614 -> 616 bytes P3D/Content/Data/maps/quest/dock.dat | 5 +---- P3D/Content/Data/maps/quest/tanoby/key.dat | 14 +++++++------- .../Data/maps/quest/trainertower/main.dat | 3 +++ 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 5fd51c129..bb0e3d8cc 100644 --- a/.gitignore +++ b/.gitignore @@ -313,6 +313,7 @@ p3d/**/*.xnb p3d/ContentPacks/ p3d/GameModes/ p3d/save/ +p3d/screenshots/ p3d/log.dat # include lib/build diff --git a/P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat b/P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat index 55d71ea8c97754ff9e8600627a60342850bca9c7..07cc98f66bb966383b097da067a7ed24e2e757f8 100644 GIT binary patch delta 18 acmdm@zDRw-3HD-!5{7(+f{hO^3jqK_a|b~H delta 38 ucmZ3azD0e)iODg-T>Nae-sQ8%D;u&2Jf#nE)^w1=9ck delta 14 Vcmcb>ae-sQ8%9Qj&2Jf#nE);41$6)b diff --git a/P3D/Content/Data/Scripts/rival/rival_azalea/startscript.dat b/P3D/Content/Data/Scripts/rival/rival_azalea/startscript.dat index 846681777c4da4316d162b47e1791f5fecde089e..24b53ff90830208d31af2af0486b0da3cc158dc4 100644 GIT binary patch delta 28 jcmX@6x};E37_$TceZ>e9 delta 36 scmdm@dQ5eL4CCYnyj=Ww4EYSX45bXk44Dkc44RXDITSa$Fct^`0LkwO)Bpeg diff --git a/P3D/Content/Data/Scripts/speedboatscene.dat b/P3D/Content/Data/Scripts/speedboatscene.dat index eac0d156a500df653b36f1922c01fd700b204086..827bfb2bdccde0b4364a7711a03bd782382ecf44 100644 GIT binary patch delta 24 fcmZ1_uuNb>0wa4dLkUAZL&0QQcKOX+j0@NRTz>~C delta 26 icmZ1`uu5P<0wZSuLk>eCLnVX8!fiu>k;Ry$7KH diff --git a/P3D/Content/Data/Scripts/trainer/league/lance.dat b/P3D/Content/Data/Scripts/trainer/league/lance.dat index c880ded190d86d019aca0e402b92a59ac965cfd8..87ab87f4a03e3a07271f3748b6412e1df16418b2 100644 GIT binary patch delta 35 lcmaE(c}#PH8hbHA2}3?Z!AAQ+W*B?&M`q>C@0kAy007bz3>5$X delta 63 zcmX@6`9^bs+GHCxF8(}*e1=?xQifuNOon6z&5gQ+%y4l9gv?|`7V*gsnE5uJVE!in E02vq&4FCWD diff --git a/P3D/Content/Data/Scripts/trainer/route25/000.dat b/P3D/Content/Data/Scripts/trainer/route25/000.dat index a902d9a2de2c7c328a9f7e02fb5e2751c799b6cf..565d1df5151baaa7c45d17094b700b1dc8ef3dd2 100644 GIT binary patch delta 13 UcmaFH@`7c96%%90WJ@Mp03(Y8GXMYp delta 11 ScmaFC@{DDJ71LxJCLI79#{<9s diff --git a/P3D/Content/Data/maps/quest/dock.dat b/P3D/Content/Data/maps/quest/dock.dat index 2e201c8a4..4d00769c5 100644 --- a/P3D/Content/Data/maps/quest/dock.dat +++ b/P3D/Content/Data/maps/quest/dock.dat @@ -11,7 +11,7 @@ Water: {"EntityField"{ENT[{"EntityID"{str[Water]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,16,16,16][144,16,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}{"Position"{sngArr[0,-0.25,3]}}{"Size"{intArr[15,12]}}]}} Warp: -{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[5,0,-1]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[80,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[sevii\knot\main.dat,13,0.1,19,0]}}{"Rotation"{int[0]}}]}} +{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[5,0,-1]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[80,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[quest\town.dat,16,0.1,15,0]}}{"Rotation"{int[0]}}]}} Walls: {"EntityField"{ENT[{"Fill"{bool[0]}}{"Size"{intArr[17,13]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[-1,0,-2]}}{"TexturePath"{str[Gym]}}{"Textures"{recArr[[0,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} @@ -29,8 +29,5 @@ Fences: {"EntityField"{ENT[{"Size"{intArr[9,1]}}{"Scale"{sngArr[0.2,0.5,0.2]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[6.25,-0.25,2]}}{"TexturePath"{str[Lavender]}}{"Textures"{recArr[[48,32,4,10][52,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} NPCs: -{"NPC"{NPC[{"Position"{sngArr[5,0,0]}}{"TextureID"{str[darkfire]}}{"ID"{int[10]}}{"Name"{str[GymGuy]}}{"Action"{int[0]}}{"AdditionalValue"{str[Soon...]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} -{"NPC"{NPC[{"Position"{sngArr[6,0,0]}}{"TextureID"{str[[POKEMON|S]6]}}{"ID"{int[11]}}{"Name"{str[GymGuy]}}{"Action"{int[0]}}{"AdditionalValue"{str[Char!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} - {"NPC"{NPC[{"Position"{sngArr[5,0,2]}}{"TextureID"{str[32]}}{"ID"{int[0]}}{"Name"{str[GymGuy]}}{"Action"{int[1]}}{"AdditionalValue"{str[sevii\quest\dockguy]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"ID"{int[0]}}{"Scale"{sngArr[1,1,1]}}{"EntityID"{str[ModelEntity]}}{"Position"{sngArr[6,-0.6,5.2]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[96,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[models\boat2\boat]}}{"Rotation"{int[2]}}]}} diff --git a/P3D/Content/Data/maps/quest/tanoby/key.dat b/P3D/Content/Data/maps/quest/tanoby/key.dat index 54e58da89..c8afb22c4 100644 --- a/P3D/Content/Data/maps/quest/tanoby/key.dat +++ b/P3D/Content/Data/maps/quest/tanoby/key.dat @@ -78,13 +78,13 @@ Boulders: {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Scale"{sngArr[0.8,0.8,0.8]}}{"EntityID"{str[WallBill]}}{"Position"{sngArr[5,-0.15,5]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[48,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} StrengthTriggers: -{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[3,0,0]}}{"ID"{int[10]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} -{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[0,0,2]}}{"ID"{int[11]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} -{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[6,0,2]}}{"ID"{int[12]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} -{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[1,0,4]}}{"ID"{int[13]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} -{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[1,0,6]}}{"ID"{int[14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} -{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[5,0,4]}}{"ID"{int[15]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} -{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[5,0,6]}}{"ID"{int[16]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} +{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[3,0,0]}}{"ID"{int[10]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} +{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[0,0,2]}}{"ID"{int[11]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} +{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[6,0,2]}}{"ID"{int[12]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} +{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[1,0,4]}}{"ID"{int[13]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} +{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[1,0,6]}}{"ID"{int[14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} +{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[5,0,4]}}{"ID"{int[15]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} +{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[5,0,6]}}{"ID"{int[16]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} StrengthRocks: {"Entity"{ENT[{"Scale"{sngArr[0.7,0.4,0.7]}}{"ID"{int[0]}}{"EntityID"{str[StrengthRock]}}{"Position"{sngArr[2,-0.3,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[224,77,13,7][224,64,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} diff --git a/P3D/Content/Data/maps/quest/trainertower/main.dat b/P3D/Content/Data/maps/quest/trainertower/main.dat index 3761aabf3..d3ddbb9ea 100644 --- a/P3D/Content/Data/maps/quest/trainertower/main.dat +++ b/P3D/Content/Data/maps/quest/trainertower/main.dat @@ -442,6 +442,9 @@ Corners: NPC: {"NPC"{NPC[{"Position"{sngArr[12,0,30]}}{"TextureID"{str[29]}}{"ID"{int[0]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\outside\002]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}} {"NPC"{NPC[{"Position"{sngArr[12,1,33]}}{"TextureID"{str[29]}}{"ID"{int[1]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[2|trainer\quest\tower\outside\001]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[16,10,3,2]]}}]}} +{"NPC"{NPC[{"Position"{sngArr[14,0,10]}}{"TextureID"{str[darkfire]}}{"ID"{int[10]}}{"Name"{str[GymGuy]}}{"Action"{int[0]}}{"AdditionalValue"{str[Soon...]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} +{"NPC"{NPC[{"Position"{sngArr[15,0,10]}}{"TextureID"{str[[POKEMON|S]6]}}{"ID"{int[11]}}{"Name"{str[GymGuy]}}{"Action"{int[0]}}{"AdditionalValue"{str[Char!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} + Signs: {"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[12,0,10]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[16,32,16,16][32,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Trainer Tower Ahead]}}{"Rotation"{int[0]}}]}}