diff --git a/P3D/Content/Data/Scripts/embtower/kyurem.dat b/P3D/Content/Data/Scripts/embtower/kyurem.dat index 5d5de9cc5..5ab29635a 100644 Binary files a/P3D/Content/Data/Scripts/embtower/kyurem.dat and b/P3D/Content/Data/Scripts/embtower/kyurem.dat differ diff --git a/P3D/Content/Data/Scripts/embtower/mapscript.dat b/P3D/Content/Data/Scripts/embtower/mapscript.dat index 8cf8b002d..ae736d838 100644 Binary files a/P3D/Content/Data/Scripts/embtower/mapscript.dat and b/P3D/Content/Data/Scripts/embtower/mapscript.dat differ diff --git a/P3D/Content/Data/Scripts/embtower/n.dat b/P3D/Content/Data/Scripts/embtower/n.dat index 5d5de9cc5..612b7f62e 100644 Binary files a/P3D/Content/Data/Scripts/embtower/n.dat and b/P3D/Content/Data/Scripts/embtower/n.dat differ diff --git a/P3D/Content/Data/Scripts/embtower/reshiram.dat b/P3D/Content/Data/Scripts/embtower/reshiram.dat index 5d5de9cc5..48da538eb 100644 Binary files a/P3D/Content/Data/Scripts/embtower/reshiram.dat and b/P3D/Content/Data/Scripts/embtower/reshiram.dat differ diff --git a/P3D/Content/Data/Scripts/embtower/reshroar.dat b/P3D/Content/Data/Scripts/embtower/reshroar.dat new file mode 100644 index 000000000..7b0e58139 Binary files /dev/null and b/P3D/Content/Data/Scripts/embtower/reshroar.dat differ diff --git a/P3D/Content/Data/Scripts/embtower/zekroar.dat b/P3D/Content/Data/Scripts/embtower/zekroar.dat new file mode 100644 index 000000000..73ecaa3ac Binary files /dev/null and b/P3D/Content/Data/Scripts/embtower/zekroar.dat differ diff --git a/P3D/Content/Data/Scripts/embtower/zekrom.dat b/P3D/Content/Data/Scripts/embtower/zekrom.dat index 5d5de9cc5..a10a91ef4 100644 Binary files a/P3D/Content/Data/Scripts/embtower/zekrom.dat and b/P3D/Content/Data/Scripts/embtower/zekrom.dat differ diff --git a/P3D/Content/Data/Scripts/fortune/dot/dstone.dat b/P3D/Content/Data/Scripts/fortune/dot/dstone.dat index 1964f8d83..64d2dc644 100644 Binary files a/P3D/Content/Data/Scripts/fortune/dot/dstone.dat and b/P3D/Content/Data/Scripts/fortune/dot/dstone.dat differ diff --git a/P3D/Content/Data/Scripts/mtember/lstone.dat b/P3D/Content/Data/Scripts/mtember/lstone.dat index 7c6cd7627..26a9fb01b 100644 Binary files a/P3D/Content/Data/Scripts/mtember/lstone.dat and b/P3D/Content/Data/Scripts/mtember/lstone.dat differ diff --git a/P3D/Content/Data/Scripts/worldmap/johto.dat b/P3D/Content/Data/Scripts/worldmap/johto.dat index 93742f5a6..9bc2c268a 100644 Binary files a/P3D/Content/Data/Scripts/worldmap/johto.dat and b/P3D/Content/Data/Scripts/worldmap/johto.dat differ diff --git a/P3D/Content/Data/maps/battle/routes/route47/embtower/kyurem.dat b/P3D/Content/Data/maps/battle/routes/route47/embtower/kyurem.dat new file mode 100644 index 000000000..800fb5ac1 Binary files /dev/null and b/P3D/Content/Data/maps/battle/routes/route47/embtower/kyurem.dat differ diff --git a/P3D/Content/Data/maps/battle/routes/route47/embtower/reshiram.dat b/P3D/Content/Data/maps/battle/routes/route47/embtower/reshiram.dat new file mode 100644 index 000000000..3180b8fbc Binary files /dev/null and b/P3D/Content/Data/maps/battle/routes/route47/embtower/reshiram.dat differ diff --git a/P3D/Content/Data/maps/battle/routes/route47/embtower/zekrom.dat b/P3D/Content/Data/maps/battle/routes/route47/embtower/zekrom.dat new file mode 100644 index 000000000..1349a846a Binary files /dev/null and b/P3D/Content/Data/maps/battle/routes/route47/embtower/zekrom.dat differ diff --git a/P3D/Content/Data/maps/fortune/dot/end.dat b/P3D/Content/Data/maps/fortune/dot/end.dat index c31a37a64..3ace645a8 100644 --- a/P3D/Content/Data/maps/fortune/dot/end.dat +++ b/P3D/Content/Data/maps/fortune/dot/end.dat @@ -1,5 +1,5 @@ {"Level"{LEV[{"Name"{str[Dotted Hole]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}} -{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"MapScript"{str[fortune\dot\bstonemap]}}{"Lightning"{int[1]}}]}} +{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"MapScript"{str[fortune\dot\dstonemap]}}{"Lightning"{int[1]}}]}} Floor: {"Floor"{ENT[{"Size"{intArr[9,9]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}} @@ -90,4 +90,5 @@ ent: {"Entity"{ENT[{"EntityID"{str[Cube]}}{"Scale"{sngArr[1,2.05,0.25]}}{"Position"{sngArr[8,0.5,4]}}{"TexturePath"{str[WoodTower]}}{"Textures"{recArr[[16,83,16,32][16,83,4,32]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} NPC: -{"NPC"{NPC[{"Position"{sngArr[4,-1,5]}}{"TextureID"{str[N]}}{"ID"{int[0]}}{"Name"{str[Father]}}{"Action"{int[1]}}{"AdditionalValue"{str[mtember\n]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} +{"NPC"{NPC[{"Position"{sngArr[4,-1,5]}}{"TextureID"{str[N]}}{"ID"{int[0]}}{"Name"{str[Father]}}{"Action"{int[1]}}{"AdditionalValue"{str[fortune\dot\n]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} +{"NPC"{NPC[{"Position"{sngArr[4,0.25,4]}}{"TextureID"{str[N]}}{"ID"{int[1]}}{"Name"{str[Father]}}{"Action"{int[1]}}{"AdditionalValue"{str[fortune\dot\dstone]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} diff --git a/P3D/Content/Data/maps/fortune/valley.dat b/P3D/Content/Data/maps/fortune/valley.dat index 22e953b54..0e0ad67e2 100644 --- a/P3D/Content/Data/maps/fortune/valley.dat +++ b/P3D/Content/Data/maps/fortune/valley.dat @@ -544,9 +544,6 @@ NPC: {"NPC"{NPC[{"Position"{sngArr[33,2,16]}}{"TextureID"{str[2]}}{"ID"{int[3]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[3|trainer\fortune\valley\004]}}{"Rotation"{int[3]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}} {"NPC"{NPC[{"Position"{sngArr[31,2,24]}}{"TextureID"{str[2]}}{"ID"{int[4]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[2|trainer\fortune\valley\005]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}} -{"NPC"{NPC[{"Position"{sngArr[24,0,26]}}{"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[25,0,26]}}{"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[]}}]}} - 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]}}]}} diff --git a/P3D/Content/Data/maps/mtember/braille2.dat b/P3D/Content/Data/maps/mtember/braille2.dat index 68346ab40..d6278766b 100644 Binary files a/P3D/Content/Data/maps/mtember/braille2.dat and b/P3D/Content/Data/maps/mtember/braille2.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/3.dat b/P3D/Content/Data/maps/routes/route47/3.dat index 8bb8315f9..bd4dea084 100644 Binary files a/P3D/Content/Data/maps/routes/route47/3.dat and b/P3D/Content/Data/maps/routes/route47/3.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/embtower/dstone.dat b/P3D/Content/Data/maps/routes/route47/embtower/dstone.dat index 226b2d848..deaca9b30 100644 Binary files a/P3D/Content/Data/maps/routes/route47/embtower/dstone.dat and b/P3D/Content/Data/maps/routes/route47/embtower/dstone.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/embtower/kyurem.dat b/P3D/Content/Data/maps/routes/route47/embtower/kyurem.dat index 55a5b49a0..0de97f899 100644 Binary files a/P3D/Content/Data/maps/routes/route47/embtower/kyurem.dat and b/P3D/Content/Data/maps/routes/route47/embtower/kyurem.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/embtower/lstone.dat b/P3D/Content/Data/maps/routes/route47/embtower/lstone.dat index d4c827c46..2dcf04af3 100644 Binary files a/P3D/Content/Data/maps/routes/route47/embtower/lstone.dat and b/P3D/Content/Data/maps/routes/route47/embtower/lstone.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/embtower/main.dat b/P3D/Content/Data/maps/routes/route47/embtower/main.dat index 920eca46e..5ab074d8f 100644 Binary files a/P3D/Content/Data/maps/routes/route47/embtower/main.dat and b/P3D/Content/Data/maps/routes/route47/embtower/main.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/embtower/main2.dat b/P3D/Content/Data/maps/routes/route47/embtower/main2.dat index 1c3461be3..d7298012e 100644 Binary files a/P3D/Content/Data/maps/routes/route47/embtower/main2.dat and b/P3D/Content/Data/maps/routes/route47/embtower/main2.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/embtower/pkyurem.dat b/P3D/Content/Data/maps/routes/route47/embtower/pkyurem.dat index 0b7f390f2..aadbc9787 100644 Binary files a/P3D/Content/Data/maps/routes/route47/embtower/pkyurem.dat and b/P3D/Content/Data/maps/routes/route47/embtower/pkyurem.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/embtower/reshiram.dat b/P3D/Content/Data/maps/routes/route47/embtower/reshiram.dat index 6e0fc86f6..77232b29f 100644 Binary files a/P3D/Content/Data/maps/routes/route47/embtower/reshiram.dat and b/P3D/Content/Data/maps/routes/route47/embtower/reshiram.dat differ diff --git a/P3D/Content/Data/maps/routes/route47/embtower/zekrom.dat b/P3D/Content/Data/maps/routes/route47/embtower/zekrom.dat index 83f8d85b8..7f2c60310 100644 Binary files a/P3D/Content/Data/maps/routes/route47/embtower/zekrom.dat and b/P3D/Content/Data/maps/routes/route47/embtower/zekrom.dat differ diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat index a1c985e41..98dfd7a84 100644 --- a/P3D/Content/Localization/Tokens_en.dat +++ b/P3D/Content/Localization/Tokens_en.dat @@ -450,6 +450,7 @@ Places_Millenial Star Tower,Millenial Star Tower Places_Kolben Tower,Kolben Tower Places_Faraway Island,Faraway Island Places_Underwater Cave,Underwater Cave +Places_Embedded Tower,Embedded Tower Routes: Places_Route 1,Route 1 diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 14e2041d3..f32da254d 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -26307,6 +26307,15 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -26442,6 +26451,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest