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/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/kin/berry.dat b/P3D/Content/Data/maps/kin/berry.dat index 0d0a884cf..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/poke/fortune/altering.poke b/P3D/Content/Data/maps/poke/fortune/altering.poke index c06e1148c..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|41|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/P3D.vbproj b/P3D/P3D.vbproj index 9e999706a..9242dd7b0 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -5201,45 +5201,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -25637,9 +25598,51 @@ PreserveNewest + + PreserveNewest + PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -27432,9 +27435,7 @@ GameDevCommon - - - +