diff --git a/P3D/Content/Data/Scripts/fortune/dot/bstone.dat b/P3D/Content/Data/Scripts/fortune/dot/bstone.dat index 5d5de9cc5..d6a63bcc4 100644 Binary files a/P3D/Content/Data/Scripts/fortune/dot/bstone.dat and b/P3D/Content/Data/Scripts/fortune/dot/bstone.dat differ diff --git a/P3D/Content/Data/Scripts/fortune/dot/bstonemap.dat b/P3D/Content/Data/Scripts/fortune/dot/bstonemap.dat index 5d5de9cc5..4169435b3 100644 Binary files a/P3D/Content/Data/Scripts/fortune/dot/bstonemap.dat and b/P3D/Content/Data/Scripts/fortune/dot/bstonemap.dat differ diff --git a/P3D/Content/Data/Scripts/fortune/dot/door.dat b/P3D/Content/Data/Scripts/fortune/dot/door.dat index a8d2a69fc..6e435566f 100644 Binary files a/P3D/Content/Data/Scripts/fortune/dot/door.dat and b/P3D/Content/Data/Scripts/fortune/dot/door.dat differ diff --git a/P3D/Content/Data/Scripts/fortune/dot/ent.dat b/P3D/Content/Data/Scripts/fortune/dot/ent.dat index aa7286b96..ab45b4836 100644 Binary files a/P3D/Content/Data/Scripts/fortune/dot/ent.dat and b/P3D/Content/Data/Scripts/fortune/dot/ent.dat differ diff --git a/P3D/Content/Data/Scripts/fortune/dot/n.dat b/P3D/Content/Data/Scripts/fortune/dot/n.dat index 5d5de9cc5..3471ceedd 100644 Binary files a/P3D/Content/Data/Scripts/fortune/dot/n.dat and b/P3D/Content/Data/Scripts/fortune/dot/n.dat differ diff --git a/P3D/Content/Data/Scripts/mtember/mapscript.dat b/P3D/Content/Data/Scripts/mtember/mapscript.dat index fcbad4f43..e5d9a661d 100644 Binary files a/P3D/Content/Data/Scripts/mtember/mapscript.dat and b/P3D/Content/Data/Scripts/mtember/mapscript.dat differ diff --git a/P3D/Content/Data/Scripts/mtember/n.dat b/P3D/Content/Data/Scripts/mtember/n.dat index 5d5de9cc5..88bc794c3 100644 Binary files a/P3D/Content/Data/Scripts/mtember/n.dat and b/P3D/Content/Data/Scripts/mtember/n.dat differ diff --git a/P3D/Content/Data/Scripts/mtember/wstone.dat b/P3D/Content/Data/Scripts/mtember/wstone.dat index 5d5de9cc5..6f4b69e8f 100644 Binary files a/P3D/Content/Data/Scripts/mtember/wstone.dat and b/P3D/Content/Data/Scripts/mtember/wstone.dat differ diff --git a/P3D/Content/Data/Scripts/mtember/wstonemap.dat b/P3D/Content/Data/Scripts/mtember/wstonemap.dat index 5d5de9cc5..14f5f85de 100644 Binary files a/P3D/Content/Data/Scripts/mtember/wstonemap.dat and b/P3D/Content/Data/Scripts/mtember/wstonemap.dat differ diff --git a/P3D/Content/Data/Scripts/pallet/oak.dat b/P3D/Content/Data/Scripts/pallet/oak.dat index 87e821d29..adbefa770 100644 --- a/P3D/Content/Data/Scripts/pallet/oak.dat +++ b/P3D/Content/Data/Scripts/pallet/oak.dat @@ -11,7 +11,7 @@ version=2 @item.give(284,1) @item.messagegive(284,1) @register.register(rainbowpass) - @npc.register(mtember\exterior.dat|4|position|~,1,~) + @npc.register(mtember\exterior.dat|4|position|42,1,40) @register.register(taostart) @text.show(That pass will allow~you to take the~Sea Gallop Ferries~from Vermilion to all~of the Sevii Islands.*I have heard many~ruins and secrets lie~on those islands.*I am sure visiting~those islands will be~an amazing experience!) @register.register(postblueoak) diff --git a/P3D/Content/Data/maps/fortune/dot/end.dat b/P3D/Content/Data/maps/fortune/dot/end.dat index 6a31f50d9..c31a37a64 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]}}{"Lightning"{int[1]}}]}} +{"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]}}]}} Floor: {"Floor"{ENT[{"Size"{intArr[9,9]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}} @@ -83,11 +83,11 @@ Braille: Item: {"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"Scale"{SngArr[1,0.25,1]}}{"Position"{sngArr[4,-0.375,4]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[112,32,16,16][112,16,16,16]]}}{"TextureIndex"{intArr[1,1,1,1,1,1,1,1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} -Boulder: -{"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Scale"{sngArr[0.8,0.8,0.8]}}{"EntityID"{str[WallBill]}}{"Position"{sngArr[8,-0.15,3]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[80,128,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} - Warps: ent: {"Entity"{ENT[{"EntityID"{str[AllSidesObject]}}{"Position"{sngArr[8,1.99,4]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[16,128,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} -{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[8,0,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[240,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\dot\ent.dat,12,0.1,4,0,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} +{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[8,0,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[240,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\dot\ent.dat,12,0.1,4,2,0|2]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} {"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[]}}]}} diff --git a/P3D/Content/Data/maps/fortune/dot/ent.dat b/P3D/Content/Data/maps/fortune/dot/ent.dat index 6ca219c99..206b1e95b 100644 --- a/P3D/Content/Data/maps/fortune/dot/ent.dat +++ b/P3D/Content/Data/maps/fortune/dot/ent.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]}}{"Lightning"{int[1]}}]}} +{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"MapScript"{str[fortune\dot\n]}}{"Lightning"{int[1]}}]}} Floor: {"Floor"{ENT[{"Size"{intArr[14,10]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}} @@ -66,7 +66,11 @@ valley: 1: {"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[5,0,4]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[16,128,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[4]}}{"AdditionalValue"{str[fortune\dot\drop0]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} end: -{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[12,0,4]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[16,128,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\dot\end.dat,8,0.1,4,0,2]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} +{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[12,0,4]}}{"TexturePath"{str[Sevii]}}{"Textures"{recArr[[16,128,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[fortune\dot\end.dat,8,0.1,4,2,0|2]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}} {"Entity"{ENT[{"EntityID"{str[Cube]}}{"Scale"{sngArr[1,1,0.25]}}{"Position"{sngArr[12,0,4]}}{"TexturePath"{str[WoodTower]}}{"Textures"{recArr[[16,80,16,16][16,80,4,16]]}}{"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[2]}}]}} +NPC: +{"NPC"{NPC[{"Position"{sngArr[42,0,40]}}{"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[42,0,40]}}{"TextureID"{str[N]}}{"ID"{int[1]}}{"Name"{str[Father]}}{"Action"{int[1]}}{"AdditionalValue"{str[mtember\n]}}{"AnimateIdle"{bool[1]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} + diff --git a/P3D/Content/Data/maps/mtember/braille2.dat b/P3D/Content/Data/maps/mtember/braille2.dat index 09738b443..68346ab40 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/mtember/exterior.dat b/P3D/Content/Data/maps/mtember/exterior.dat index 6d7129867..6b0f47d45 100644 Binary files a/P3D/Content/Data/maps/mtember/exterior.dat and b/P3D/Content/Data/maps/mtember/exterior.dat differ