diff --git a/P3D/Content/Data/Scripts/cherrygrove/oldguide.dat b/P3D/Content/Data/Scripts/cherrygrove/oldguide.dat index 4449f6c2c..1acf31e00 100644 Binary files a/P3D/Content/Data/Scripts/cherrygrove/oldguide.dat and b/P3D/Content/Data/Scripts/cherrygrove/oldguide.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2004.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2004.dat deleted file mode 100644 index de8d184aa..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2004.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2006.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2006.dat deleted file mode 100644 index 0d42f0415..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2006.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2007.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2007.dat deleted file mode 100644 index 6b37c7ac9..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2007.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2008.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2008.dat deleted file mode 100644 index 6e21eec20..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2008.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2015.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2015.dat deleted file mode 100644 index 48194e05d..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2015.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2016.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2016.dat deleted file mode 100644 index b314970e0..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2016.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2017.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2017.dat deleted file mode 100644 index 4c6501171..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2017.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2018.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2018.dat deleted file mode 100644 index 6fb795603..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2018.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2019.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2019.dat deleted file mode 100644 index 3ec1088aa..000000000 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2019.dat and /dev/null differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2000.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2051.dat similarity index 66% rename from P3D/Content/Data/Scripts/kin/berryforestitems/2000.dat rename to P3D/Content/Data/Scripts/kin/berryforestitems/2051.dat index c7d95cc22..71217006c 100644 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2000.dat and b/P3D/Content/Data/Scripts/kin/berryforestitems/2051.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2001.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2052.dat similarity index 66% rename from P3D/Content/Data/Scripts/kin/berryforestitems/2001.dat rename to P3D/Content/Data/Scripts/kin/berryforestitems/2052.dat index b98417444..dd3768987 100644 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2001.dat and b/P3D/Content/Data/Scripts/kin/berryforestitems/2052.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2002.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2053.dat similarity index 66% rename from P3D/Content/Data/Scripts/kin/berryforestitems/2002.dat rename to P3D/Content/Data/Scripts/kin/berryforestitems/2053.dat index d570f53e4..e953c8a0e 100644 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2002.dat and b/P3D/Content/Data/Scripts/kin/berryforestitems/2053.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2003.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2054.dat similarity index 66% rename from P3D/Content/Data/Scripts/kin/berryforestitems/2003.dat rename to P3D/Content/Data/Scripts/kin/berryforestitems/2054.dat index 3593443be..8ab9d1ba3 100644 Binary files a/P3D/Content/Data/Scripts/kin/berryforestitems/2003.dat and b/P3D/Content/Data/Scripts/kin/berryforestitems/2054.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2055.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2055.dat new file mode 100644 index 000000000..cdf374270 Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2055.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2056.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2056.dat new file mode 100644 index 000000000..a25f29206 Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2056.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2057.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2057.dat new file mode 100644 index 000000000..3d874499b Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2057.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2058.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2058.dat new file mode 100644 index 000000000..6c9ac7cae Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2058.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2059.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2059.dat new file mode 100644 index 000000000..99233bd4b Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2059.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2060.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2060.dat new file mode 100644 index 000000000..00c81613d Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2060.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2061.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2061.dat new file mode 100644 index 000000000..79f2e45f4 Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2061.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2062.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2062.dat new file mode 100644 index 000000000..c1ae75bb9 Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2062.dat differ diff --git a/P3D/Content/Data/Scripts/kin/berryforestitems/2063.dat b/P3D/Content/Data/Scripts/kin/berryforestitems/2063.dat new file mode 100644 index 000000000..b2adf4a3a Binary files /dev/null and b/P3D/Content/Data/Scripts/kin/berryforestitems/2063.dat differ diff --git a/P3D/Content/Data/Scripts/route30/mrpokemon.dat b/P3D/Content/Data/Scripts/route30/mrpokemon.dat index 533d12180..20260e8dc 100644 Binary files a/P3D/Content/Data/Scripts/route30/mrpokemon.dat and b/P3D/Content/Data/Scripts/route30/mrpokemon.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat b/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat index 9c0d8b28e..2436df1cc 100644 --- a/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat +++ b/P3D/Content/Data/Scripts/trainer/fortune/north/006.dat @@ -1,5 +1,5 @@ version=2 -@text.show(Stay back, kid!*I was asked not to let~anyone enter this cave.*It's home to Pokémon from~different locations and~we're investigating that.*...) +@text.show(Stay back, kid!*I was asked not to let~anyone enter this crucial~spot for our future~operations.*...) @battle.starttrainer(fortune\north\006) @text.show(My Pokémon...*Gah!~Who even cares~about those stupid islands~and their weird Pokémon~anyway?*I'll go back to the~Unova branch...) @screen.fadeout @@ -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.messagegive(592,1) +@item.give(592,1) :end \ No newline at end of file diff --git a/P3D/Content/Data/Scripts/trainer/quest/tanoby/002.trainer b/P3D/Content/Data/Scripts/trainer/quest/tanoby/002.trainer index ace747f8b..469f5c6bc 100644 --- a/P3D/Content/Data/Scripts/trainer/quest/tanoby/002.trainer +++ b/P3D/Content/Data/Scripts/trainer/quest/tanoby/002.trainer @@ -2,7 +2,7 @@ Name|Clifford TrainerClass|Gentleman Money|3888 -IntroMessage|Today, in addition to our~lesson, we came to see the~chamber. +IntroMessage|Today, in addition to our~lesson, we came to see~the chamber. OutroMessage|My, how extraordinary. DefeatMessage|Ah, so you are studying~Pokémon on your own...*Yes, you certainly are quite the~extraordinary person, indeed. TextureID|oldhatman diff --git a/P3D/Content/Data/maps/fortune/altering.dat b/P3D/Content/Data/maps/fortune/altering.dat index 05df700a1..a0fa68894 100644 --- a/P3D/Content/Data/maps/fortune/altering.dat +++ b/P3D/Content/Data/maps/fortune/altering.dat @@ -218,14 +218,6 @@ Boulders: {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Scale"{sngArr[0.8,0.8,0.8]}}{"EntityID"{str[WallBill]}}{"Position"{sngArr[7,-0.15,1]}}{"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]}}]}} {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Scale"{sngArr[0.8,0.8,0.8]}}{"EntityID"{str[WallBill]}}{"Position"{sngArr[17,-0.15,10]}}{"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]}}]}} -Items: -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[5,-0.375,2]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,2059]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[19,-0.375,9]}}{"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,2010]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[26,0.625,9]}}{"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,2011]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[11,-0.375,14]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,2012]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[3,-0.375,9]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[4,2013]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[4,-0.375,15]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[5,2014]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} - Stairs: {"Structure"{STR[{"Map"{str[structures\stairs\0\n]}}{"Offset"{sngArr[25,0,12]}}]}} {"Structure"{STR[{"Map"{str[structures\stairs\0\n]}}{"Offset"{sngArr[26,0,12]}}]}} diff --git a/P3D/Content/Data/maps/fortune/valley.dat b/P3D/Content/Data/maps/fortune/valley.dat index ddcd9866d..ae2e49f1e 100644 --- a/P3D/Content/Data/maps/fortune/valley.dat +++ b/P3D/Content/Data/maps/fortune/valley.dat @@ -551,7 +551,7 @@ Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[5,-0.375,33]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,26]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[43,-0.375,32]}}{"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,169]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[19,1.625,12]}}{"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,14]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[39,0.625,35]}}{"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,445]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[39,0.625,35]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,445]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} Pillars: {"Entity"{ENT[{"Position"{sngArr[22.75,0.25,24.5]}}{"Scale"{sngArr[1,1.5,1]}}{"EntityID"{str[WallBlock]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[16,144,16,16][32,144,16,24][48,144,16,24]]}}{"TextureIndex"{intArr[2,2,1,1,1,1,1,1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} diff --git a/P3D/Content/Data/maps/kin/berry.dat b/P3D/Content/Data/maps/kin/berry.dat index b7cc03660..090e3df53 100644 Binary files a/P3D/Content/Data/maps/kin/berry.dat and b/P3D/Content/Data/maps/kin/berry.dat differ diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat index 7e5d59364..bf258394b 100644 --- a/P3D/Content/Data/maps/liberty/garden.dat +++ b/P3D/Content/Data/maps/liberty/garden.dat @@ -450,7 +450,7 @@ Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[4,2,22]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[0,32]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[5,0.625,17]}}{"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,124]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[35,0.625,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,21]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[12,0.625,28]}}{"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,447]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[12,0.625,28]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,447]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} NPC: {"NPC"{NPC[{"Position"{sngArr[11,2,11]}}{"TextureID"{str[32]}}{"ID"{int[0]}}{"Name"{str[Sailor]}}{"Action"{int[1]}}{"AdditionalValue"{str[faraway\dockhand]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} diff --git a/P3D/Content/Data/maps/mtsilver/1f.dat b/P3D/Content/Data/maps/mtsilver/1f.dat index 011986ab2..cb56ccdcd 100644 --- a/P3D/Content/Data/maps/mtsilver/1f.dat +++ b/P3D/Content/Data/maps/mtsilver/1f.dat @@ -753,7 +753,7 @@ Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[36,4.625,30]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[1,44]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[36,6.625,2]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[2,39]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[45,8.625,0]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,14]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[15,3.625,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[4,98]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[15,3.625,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[4,591]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} Warps: mt base: diff --git a/P3D/Content/Data/maps/nationalpark/nationalpark0.dat b/P3D/Content/Data/maps/nationalpark/nationalpark0.dat index 2a3ce4bca..37cea0e87 100644 --- a/P3D/Content/Data/maps/nationalpark/nationalpark0.dat +++ b/P3D/Content/Data/maps/nationalpark/nationalpark0.dat @@ -494,7 +494,7 @@ Items: {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[37,-0.375,13]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,13]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[8,-0.375,47]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[1,38]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[3,-0.375,43]}}{"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,218]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} -{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[22,-0.375,15]}}{"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,148]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} +{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[22,-0.375,15]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[3,148]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}} Mega Stone (Pinsirite): {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[17,-0.2,47]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[2]}}{"AdditionalValue"{str[3,531]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.3,0.3,0.3]}}]}} \ No newline at end of file diff --git a/P3D/Content/Data/maps/poke/fortune/altering.poke b/P3D/Content/Data/maps/poke/fortune/altering.poke index 320382efc..ebe2f18b8 100644 --- a/P3D/Content/Data/maps/poke/fortune/altering.poke +++ b/P3D/Content/Data/maps/poke/fortune/altering.poke @@ -1,5 +1,4 @@ name=Altering Cave type=Cave -{0|42|60|-1|35,45} -{0|528|35|-1|35,45} -{0|714|5|-1|35,45} \ No newline at end of file +{0|41|95|-1|35,45} +{0|528|5|-1|35,45} diff --git a/P3D/Content/Data/maps/route30.dat b/P3D/Content/Data/maps/route30.dat index b3824ef81..473bbbe04 100644 Binary files a/P3D/Content/Data/maps/route30.dat and b/P3D/Content/Data/maps/route30.dat differ diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index a27edef35..a3a0c898b 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -3899,12 +3899,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -5201,45 +5195,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -25634,9 +25589,54 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -27429,9 +27429,7 @@ GameDevCommon - - - +