From 3817f73935949751def51af3853fc2e564326521 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Wed, 30 Jan 2019 00:01:26 -0600 Subject: [PATCH 01/11] Slight modification of tutor situation --- P3D/Content/Data/Scripts/liberty/room.dat | 2 +- P3D/Content/Data/Scripts/liberty/tutor.dat | 4 + P3D/Content/Data/maps/liberty/garden.dat | 6 +- P3D/P3D.vbproj | 162 +++++++++++++++++++++ 4 files changed, 170 insertions(+), 4 deletions(-) diff --git a/P3D/Content/Data/Scripts/liberty/room.dat b/P3D/Content/Data/Scripts/liberty/room.dat index 6450f9c46..ba8ff1a7c 100644 --- a/P3D/Content/Data/Scripts/liberty/room.dat +++ b/P3D/Content/Data/Scripts/liberty/room.dat @@ -42,7 +42,7 @@ version=2 @npc.register(liberty\garden.dat|39|position|33,2,17) @npc.register(liberty\garden.dat|40|position|41,1,8) @npc.register(liberty\garden.dat|41|position|33,2,26) -@npc.register(liberty\garden.dat|42|position|29,2,22) +@npc.register(liberty\garden.dat|42|position|28,2,24) @npc.register(liberty\garden.dat|1|remove|0) @npc.register(liberty\garden.dat|2|remove|0) diff --git a/P3D/Content/Data/Scripts/liberty/tutor.dat b/P3D/Content/Data/Scripts/liberty/tutor.dat index ffa5bdaee..77ae78ebd 100644 --- a/P3D/Content/Data/Scripts/liberty/tutor.dat +++ b/P3D/Content/Data/Scripts/liberty/tutor.dat @@ -1,4 +1,8 @@ version=2 +:if:=false + @text.show(I'm looking for the~strongest Pokémon to~pass down my teachings,~but those grunts want~to use the same power~for their greedy interests.) + :end +:endif :if:=false @text.show(I seek a strong Pokémon~to pass down my teachings.*I don't, however, seek~just raw power, but~instead a Pokémon whose~body overflows with energy~and a burning passion~for victory!*Only such a creature~could use V-Create.) @register.register(v-tutor) diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat index c07c661f5..133655f93 100644 --- a/P3D/Content/Data/maps/liberty/garden.dat +++ b/P3D/Content/Data/maps/liberty/garden.dat @@ -181,8 +181,8 @@ Trash: Fences: {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[12,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,13]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} -{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,20]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} -{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[26,2.9,20]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} +{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,20.25]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} +{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[26,2.9,20.25]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,7]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[16.6,2.9,13.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[1]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,7]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[28.4,2.9,13.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[3]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[19.35,2.9,19.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[3]}}]}} @@ -491,4 +491,4 @@ NPC: {"NPC"{NPC[{"Position"{sngArr[41,-1,8]}}{"TextureID"{str[50]}}{"ID"{int[40]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Unova has many cool Pokémon.*Do you also have cool Pokémon~in your home region?]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}} {"NPC"{NPC[{"Position"{sngArr[33,-2,26]}}{"TextureID"{str[95]}}{"ID"{int[41]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're keeping our own~watercraft to secure the~island now.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} -{"NPC"{NPC[{"Position"{sngArr[29,-2,22]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Civilian]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file +{"NPC"{NPC[{"Position"{sngArr[19,2,9]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Civilian]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 5386f41fc..c2d9ca40a 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -25757,6 +25757,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -25796,6 +25799,18 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -25874,9 +25889,150 @@ PreserveNewest + + PreserveNewest + PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -25955,6 +26111,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest From 171bd27a348a0caf055bc87f955d8a3f9a5cec9e Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Wed, 30 Jan 2019 00:02:22 -0600 Subject: [PATCH 02/11] Revert "Slight modification of tutor situation" This reverts commit 3817f73935949751def51af3853fc2e564326521. --- P3D/Content/Data/Scripts/liberty/room.dat | 2 +- P3D/Content/Data/Scripts/liberty/tutor.dat | 4 - P3D/Content/Data/maps/liberty/garden.dat | 6 +- P3D/P3D.vbproj | 162 --------------------- 4 files changed, 4 insertions(+), 170 deletions(-) diff --git a/P3D/Content/Data/Scripts/liberty/room.dat b/P3D/Content/Data/Scripts/liberty/room.dat index ba8ff1a7c..6450f9c46 100644 --- a/P3D/Content/Data/Scripts/liberty/room.dat +++ b/P3D/Content/Data/Scripts/liberty/room.dat @@ -42,7 +42,7 @@ version=2 @npc.register(liberty\garden.dat|39|position|33,2,17) @npc.register(liberty\garden.dat|40|position|41,1,8) @npc.register(liberty\garden.dat|41|position|33,2,26) -@npc.register(liberty\garden.dat|42|position|28,2,24) +@npc.register(liberty\garden.dat|42|position|29,2,22) @npc.register(liberty\garden.dat|1|remove|0) @npc.register(liberty\garden.dat|2|remove|0) diff --git a/P3D/Content/Data/Scripts/liberty/tutor.dat b/P3D/Content/Data/Scripts/liberty/tutor.dat index 77ae78ebd..ffa5bdaee 100644 --- a/P3D/Content/Data/Scripts/liberty/tutor.dat +++ b/P3D/Content/Data/Scripts/liberty/tutor.dat @@ -1,8 +1,4 @@ version=2 -:if:=false - @text.show(I'm looking for the~strongest Pokémon to~pass down my teachings,~but those grunts want~to use the same power~for their greedy interests.) - :end -:endif :if:=false @text.show(I seek a strong Pokémon~to pass down my teachings.*I don't, however, seek~just raw power, but~instead a Pokémon whose~body overflows with energy~and a burning passion~for victory!*Only such a creature~could use V-Create.) @register.register(v-tutor) diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat index 133655f93..c07c661f5 100644 --- a/P3D/Content/Data/maps/liberty/garden.dat +++ b/P3D/Content/Data/maps/liberty/garden.dat @@ -181,8 +181,8 @@ Trash: Fences: {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[12,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,13]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} -{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,20.25]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} -{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[26,2.9,20.25]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} +{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,20]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} +{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[26,2.9,20]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,7]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[16.6,2.9,13.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[1]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,7]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[28.4,2.9,13.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[3]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[19.35,2.9,19.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[3]}}]}} @@ -491,4 +491,4 @@ NPC: {"NPC"{NPC[{"Position"{sngArr[41,-1,8]}}{"TextureID"{str[50]}}{"ID"{int[40]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Unova has many cool Pokémon.*Do you also have cool Pokémon~in your home region?]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}} {"NPC"{NPC[{"Position"{sngArr[33,-2,26]}}{"TextureID"{str[95]}}{"ID"{int[41]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're keeping our own~watercraft to secure the~island now.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} -{"NPC"{NPC[{"Position"{sngArr[19,2,9]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Civilian]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file +{"NPC"{NPC[{"Position"{sngArr[29,-2,22]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Civilian]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index c2d9ca40a..5386f41fc 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -25757,9 +25757,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -25799,18 +25796,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -25889,150 +25874,9 @@ PreserveNewest - - PreserveNewest - PreserveNewest - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -26111,12 +25955,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest From cd1bcf190797fb09282bc2aac8c9bebcc9d9b7f8 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Wed, 30 Jan 2019 00:07:31 -0600 Subject: [PATCH 03/11] lets try this again without the extra file........... --- P3D/Content/Data/Scripts/liberty/room.dat | 2 +- P3D/Content/Data/Scripts/liberty/tutor.dat | 4 ++++ P3D/Content/Data/maps/liberty/garden.dat | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/P3D/Content/Data/Scripts/liberty/room.dat b/P3D/Content/Data/Scripts/liberty/room.dat index 6450f9c46..ba8ff1a7c 100644 --- a/P3D/Content/Data/Scripts/liberty/room.dat +++ b/P3D/Content/Data/Scripts/liberty/room.dat @@ -42,7 +42,7 @@ version=2 @npc.register(liberty\garden.dat|39|position|33,2,17) @npc.register(liberty\garden.dat|40|position|41,1,8) @npc.register(liberty\garden.dat|41|position|33,2,26) -@npc.register(liberty\garden.dat|42|position|29,2,22) +@npc.register(liberty\garden.dat|42|position|28,2,24) @npc.register(liberty\garden.dat|1|remove|0) @npc.register(liberty\garden.dat|2|remove|0) diff --git a/P3D/Content/Data/Scripts/liberty/tutor.dat b/P3D/Content/Data/Scripts/liberty/tutor.dat index ffa5bdaee..77ae78ebd 100644 --- a/P3D/Content/Data/Scripts/liberty/tutor.dat +++ b/P3D/Content/Data/Scripts/liberty/tutor.dat @@ -1,4 +1,8 @@ version=2 +:if:=false + @text.show(I'm looking for the~strongest Pokémon to~pass down my teachings,~but those grunts want~to use the same power~for their greedy interests.) + :end +:endif :if:=false @text.show(I seek a strong Pokémon~to pass down my teachings.*I don't, however, seek~just raw power, but~instead a Pokémon whose~body overflows with energy~and a burning passion~for victory!*Only such a creature~could use V-Create.) @register.register(v-tutor) diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat index c07c661f5..60107a8f0 100644 --- a/P3D/Content/Data/maps/liberty/garden.dat +++ b/P3D/Content/Data/maps/liberty/garden.dat @@ -181,8 +181,8 @@ Trash: Fences: {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[12,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,13]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} -{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,20]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} -{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[26,2.9,20]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} +{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[17,2.9,20.25]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} +{"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[26,2.9,20.25]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[2]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,7]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[16.6,2.9,13.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[1]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,7]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[28.4,2.9,13.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[3]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.8,1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[19.35,2.9,19.6]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[112,32,16,16][128,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[]}}{"Rotation"{int[3]}}]}} @@ -491,4 +491,4 @@ NPC: {"NPC"{NPC[{"Position"{sngArr[41,-1,8]}}{"TextureID"{str[50]}}{"ID"{int[40]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Unova has many cool Pokémon.*Do you also have cool Pokémon~in your home region?]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}} {"NPC"{NPC[{"Position"{sngArr[33,-2,26]}}{"TextureID"{str[95]}}{"ID"{int[41]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're keeping our own~watercraft to secure the~island now.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} -{"NPC"{NPC[{"Position"{sngArr[29,-2,22]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Civilian]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file +{"NPC"{NPC[{"Position"{sngArr[19,-2,9]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Civilian]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file From 74ef66cc28825138ecaac902309680caf6ce59cb Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 30 Jan 2019 16:57:18 +0200 Subject: [PATCH 04/11] Updated all medicine to GenVII --- P3D/Pokemon/Items/Medicine/EnergyPowder.vb | 4 +-- P3D/Pokemon/Items/Medicine/EnergyRoot.vb | 4 +-- P3D/Pokemon/Items/Medicine/FreshWater.vb | 2 +- P3D/Pokemon/Items/Medicine/HyperPotion.vb | 2 +- P3D/Pokemon/Items/Medicine/Lemonade.vb | 2 +- P3D/Pokemon/Items/Medicine/RageCandyBar.vb | 35 ++++++++++++++++++++-- P3D/Pokemon/Items/Medicine/SodaPop.vb | 2 +- P3D/Pokemon/Items/Medicine/SuperPotion.vb | 2 +- 8 files changed, 42 insertions(+), 11 deletions(-) diff --git a/P3D/Pokemon/Items/Medicine/EnergyPowder.vb b/P3D/Pokemon/Items/Medicine/EnergyPowder.vb index 3f8592216..c0cc8d002 100644 --- a/P3D/Pokemon/Items/Medicine/EnergyPowder.vb +++ b/P3D/Pokemon/Items/Medicine/EnergyPowder.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 500 - Public Overrides ReadOnly Property Description As String = "A bitter medicine powder. When consumed, it restores 50 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A bitter medicine powder. When consumed, it restores 60 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() @@ -25,7 +25,7 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Dim success As Boolean = HealPokemon(PokeIndex, 50) + Dim success As Boolean = HealPokemon(PokeIndex, 60) If success Then Core.Player.Pokemons(PokeIndex).ChangeFriendShip(Pokemon.FriendShipCauses.EnergyPowder) End If diff --git a/P3D/Pokemon/Items/Medicine/EnergyRoot.vb b/P3D/Pokemon/Items/Medicine/EnergyRoot.vb index 599c383ef..fa8e74f9f 100644 --- a/P3D/Pokemon/Items/Medicine/EnergyRoot.vb +++ b/P3D/Pokemon/Items/Medicine/EnergyRoot.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 800 - Public Overrides ReadOnly Property Description As String = "An extremely bitter medicinal root. When consumed, it restores 200 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "An extremely bitter medicinal root. When consumed, it restores 120 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() @@ -25,7 +25,7 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Dim r As Boolean = HealPokemon(PokeIndex, 200) + Dim r As Boolean = HealPokemon(PokeIndex, 120) If r = True Then Core.Player.Pokemons(PokeIndex).ChangeFriendShip(Pokemon.FriendShipCauses.EnergyRoot) End If diff --git a/P3D/Pokemon/Items/Medicine/FreshWater.vb b/P3D/Pokemon/Items/Medicine/FreshWater.vb index 5db2abed2..138422a83 100644 --- a/P3D/Pokemon/Items/Medicine/FreshWater.vb +++ b/P3D/Pokemon/Items/Medicine/FreshWater.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 - Public Overrides ReadOnly Property Description As String = "Water with a high mineral content. When consumed, it restores 50 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "Water with a high mineral content. When consumed, it restores 30 HP to an injured Pokémon." Public Overrides ReadOnly Property IsHealingItem As Boolean = True Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/HyperPotion.vb b/P3D/Pokemon/Items/Medicine/HyperPotion.vb index 352ef04bd..d8a3547b0 100644 --- a/P3D/Pokemon/Items/Medicine/HyperPotion.vb +++ b/P3D/Pokemon/Items/Medicine/HyperPotion.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 200 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 120 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 1500 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/Lemonade.vb b/P3D/Pokemon/Items/Medicine/Lemonade.vb index d87b9de10..34a9c3533 100644 --- a/P3D/Pokemon/Items/Medicine/Lemonade.vb +++ b/P3D/Pokemon/Items/Medicine/Lemonade.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A very sweet and refreshing drink. When consumed, it restores 80 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A very sweet and refreshing drink. When consumed, it restores 70 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 350 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/RageCandyBar.vb b/P3D/Pokemon/Items/Medicine/RageCandyBar.vb index 13076e66c..fe5098d00 100644 --- a/P3D/Pokemon/Items/Medicine/RageCandyBar.vb +++ b/P3D/Pokemon/Items/Medicine/RageCandyBar.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A famous Mahogany Town candy tourists like to buy and take home. It restores the HP of one Pokémon by 20 points." + Public Overrides ReadOnly Property Description As String = "A famous Mahogany Town candy tourists like to buy and take home. It can be used once to heal all the status conditions of a Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 Public Sub New() @@ -25,7 +25,38 @@ Namespace Items.Medicine End Sub Public Overrides Function UseOnPokemon(ByVal PokeIndex As Integer) As Boolean - Return HealPokemon(PokeIndex, 20) + Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex) + + If Pokemon.Status = P3D.Pokemon.StatusProblems.Fainted Then + Screen.TextBox.reDelay = 0.0F + Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fainted!", {}) + + Return False + Else + If Pokemon.Status <> P3D.Pokemon.StatusProblems.None Or Pokemon.HasVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) = True Then + Pokemon.Status = P3D.Pokemon.StatusProblems.None + + If Pokemon.HasVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) = True Then + Pokemon.RemoveVolatileStatus(P3D.Pokemon.VolatileStatus.Confusion) + End If + + Screen.TextBox.reDelay = 0.0F + + Dim t As String = Pokemon.GetDisplayName() & "~gets healed up!" + t &= RemoveItem() + + SoundManager.PlaySound("single_heal", False) + Screen.TextBox.Show(t, {}) + PlayerStatistics.Track("[17]Medicine Items used", 1) + + Return True + Else + Screen.TextBox.reDelay = 0.0F + Screen.TextBox.Show(Pokemon.GetDisplayName() & "~is fully healed!", {}, True, True) + + Return False + End If + End If End Function End Class diff --git a/P3D/Pokemon/Items/Medicine/SodaPop.vb b/P3D/Pokemon/Items/Medicine/SodaPop.vb index 696f5f405..90a005dbd 100644 --- a/P3D/Pokemon/Items/Medicine/SodaPop.vb +++ b/P3D/Pokemon/Items/Medicine/SodaPop.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A highly carbonated soda drink. When consumed, it restores 60 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A highly carbonated soda drink. When consumed, it restores 50 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 300 Public Sub New() diff --git a/P3D/Pokemon/Items/Medicine/SuperPotion.vb b/P3D/Pokemon/Items/Medicine/SuperPotion.vb index 6cb6cffa5..14887d122 100644 --- a/P3D/Pokemon/Items/Medicine/SuperPotion.vb +++ b/P3D/Pokemon/Items/Medicine/SuperPotion.vb @@ -6,7 +6,7 @@ Namespace Items.Medicine Inherits MedicineItem Public Overrides ReadOnly Property IsHealingItem As Boolean = True - Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 50 HP to an injured Pokémon." + Public Overrides ReadOnly Property Description As String = "A spray-type medicine for treating wounds. It can be used to restore 60 HP to an injured Pokémon." Public Overrides ReadOnly Property PokeDollarPrice As Integer = 700 Public Sub New() From 1b48590ebd5bb6a5a72b62f3b3bfda49304dd10c Mon Sep 17 00:00:00 2001 From: FantaX1911 Date: Wed, 30 Jan 2019 17:28:03 +0200 Subject: [PATCH 05/11] Implemented the item flame orb(battle effect was already implemented). --- P3D/P3D.vbproj | 3 +++ P3D/Pokemon/Items/Standard/FlameOrb.vb | 19 +++++++++++++++++++ P3D/Pokemon/Items/_itemList.txt | Bin 58300 -> 58296 bytes 3 files changed, 22 insertions(+) create mode 100644 P3D/Pokemon/Items/Standard/FlameOrb.vb diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 5386f41fc..71c6647c2 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -25702,6 +25702,9 @@ + + PreserveNewest + diff --git a/P3D/Pokemon/Items/Standard/FlameOrb.vb b/P3D/Pokemon/Items/Standard/FlameOrb.vb new file mode 100644 index 000000000..14911e7bd --- /dev/null +++ b/P3D/Pokemon/Items/Standard/FlameOrb.vb @@ -0,0 +1,19 @@ +Namespace Items.Standard + + + Public Class FlameOrb + + Inherits Item + + Public Overrides ReadOnly Property Description As String = "An item to be held by a Pokémon. It is a bizarre orb that inflicts a burn on the holder in battle." + Public Overrides ReadOnly Property PokeDollarPrice As Integer = 200 + Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False + Public Overrides ReadOnly Property CanBeUsed As Boolean = False + + Public Sub New() + _textureRectangle = New Rectangle(480, 264, 24, 24) + End Sub + + End Class + +End Namespace diff --git a/P3D/Pokemon/Items/_itemList.txt b/P3D/Pokemon/Items/_itemList.txt index 69219fb2282650142f1267c8e0a463d90925d550..e5212e6b12171923b9983c94d5bfcd6af40bb446 100644 GIT binary patch delta 30 ocmV+(0O9|<#{;;>1F(<5lWi#qlbgW|lQ{+=lP?Yuv)#epA=uarUH||9 delta 26 kcmV+#0OkL<#{;~_1F(<5ll{dGlbgW`ljX)Zv)jSlA<7RAC;$Ke From e0ec22c487d0a5b618e420f69436479e4445b719 Mon Sep 17 00:00:00 2001 From: Ruan Pablo Date: Wed, 30 Jan 2019 16:06:01 -0200 Subject: [PATCH 06/11] fix garden tutor --- P3D/Content/Data/Scripts/liberty/room.dat | 1 - P3D/Content/Data/maps/liberty/garden.dat | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/P3D/Content/Data/Scripts/liberty/room.dat b/P3D/Content/Data/Scripts/liberty/room.dat index ba8ff1a7c..abb4c60b4 100644 --- a/P3D/Content/Data/Scripts/liberty/room.dat +++ b/P3D/Content/Data/Scripts/liberty/room.dat @@ -42,7 +42,6 @@ version=2 @npc.register(liberty\garden.dat|39|position|33,2,17) @npc.register(liberty\garden.dat|40|position|41,1,8) @npc.register(liberty\garden.dat|41|position|33,2,26) -@npc.register(liberty\garden.dat|42|position|28,2,24) @npc.register(liberty\garden.dat|1|remove|0) @npc.register(liberty\garden.dat|2|remove|0) diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat index 60107a8f0..cc5a85d61 100644 --- a/P3D/Content/Data/maps/liberty/garden.dat +++ b/P3D/Content/Data/maps/liberty/garden.dat @@ -491,4 +491,4 @@ NPC: {"NPC"{NPC[{"Position"{sngArr[41,-1,8]}}{"TextureID"{str[50]}}{"ID"{int[40]}}{"Name"{str[Civilian]}}{"Action"{int[0]}}{"AdditionalValue"{str[Unova has many cool Pokémon.*Do you also have cool Pokémon~in your home region?]}}{"Rotation"{int[0]}}{"Movement"{str[Looking]}}{"MoveRectangles"{recArr[]}}]}} {"NPC"{NPC[{"Position"{sngArr[33,-2,26]}}{"TextureID"{str[95]}}{"ID"{int[41]}}{"Name"{str[Officer]}}{"Action"{int[0]}}{"AdditionalValue"{str[We're keeping our own~watercraft to secure the~island now.]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} -{"NPC"{NPC[{"Position"{sngArr[19,-2,9]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Civilian]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file +{"NPC"{NPC[{"Position"{sngArr[19,2,8]}}{"TextureID"{str[Elder]}}{"ID"{int[42]}}{"Name"{str[Tutor]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\tutor]}}{"Rotation"{int[3]}}{"Movement"{str[looking]}}{"MoveRectangles"{recArr[]}}]}} \ No newline at end of file From 69c570b205d4b619327b44188be779265c5d066d Mon Sep 17 00:00:00 2001 From: Ruan Pablo Date: Wed, 30 Jan 2019 20:10:29 -0200 Subject: [PATCH 07/11] Draco Meteor tutor --- .../Data/Scripts/dragonsden/dracotutor.dat | 19 ++++++++++++++++++ P3D/Content/Data/maps/dragonsden/main.dat | Bin 190992 -> 191464 bytes P3D/P3D.vbproj | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 P3D/Content/Data/Scripts/dragonsden/dracotutor.dat diff --git a/P3D/Content/Data/Scripts/dragonsden/dracotutor.dat b/P3D/Content/Data/Scripts/dragonsden/dracotutor.dat new file mode 100644 index 000000000..52d7f1322 --- /dev/null +++ b/P3D/Content/Data/Scripts/dragonsden/dracotutor.dat @@ -0,0 +1,19 @@ +version=2 +@text.show(If you've come to Dragon's~Den, you must be looking~to master the Dragon-type.) +:if:=dragon =dragon =493 =773 + :if:=false + @text.show(Your ~seems capable.*Do you want it to learn~Draco Meteor, the most~powerful Dragon move?) + @options.show(Yes,No) + :when:Yes + @text.show(I shall teach it, then.) + @pokemon.learnattack(0,434) + :when:No + @text.show(Such a waste of potential.) + :endwhen + :else + @text.show(Now that ~masters the draconic power,~nothing stands a chance!) + :endif +:else + @text.show(But your ~is no Dragon-type.*If you catch any,~show it to me.) +:endif +:end \ No newline at end of file diff --git a/P3D/Content/Data/maps/dragonsden/main.dat b/P3D/Content/Data/maps/dragonsden/main.dat index a516b64dd99e24af87ebd0dbb0f068970aa4a287..69a2a32f42e5f8bc54c240a6b35bbe15a121843e 100644 GIT binary patch delta 120 zcmbPmh5N;I?uHh|Eld&DrX6RpnVztfkz=x#h}86i<4gj~mJBA-15YwZPqvfinLg_{ zlL%)BLn%WELq0>% PreserveNewest + + PreserveNewest + PreserveNewest From 12dffd0649dc4c7d676551ac87cbba9d37b3f13c Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Wed, 30 Jan 2019 20:34:02 -0600 Subject: [PATCH 08/11] Bruno was slightly overleveled --- .../Scripts/trainer/league/true/bruno.trainer | Bin 6550 -> 6548 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/P3D/Content/Data/Scripts/trainer/league/true/bruno.trainer b/P3D/Content/Data/Scripts/trainer/league/true/bruno.trainer index 4f56b08c0f18f7304f28c0e9e04e0c51f65c71e1..e2891470d31fc33b079ba47d2cbeea8e7100fa3f 100644 GIT binary patch delta 37 ocmbPcJjHlJjL_r_qI{EcgibJ;Og_(Qx;aZ&jv30_Cw7Ag00AxyLI3~& delta 35 mcmbPYJk5ARj1Z&3 Date: Wed, 30 Jan 2019 22:24:58 -0600 Subject: [PATCH 09/11] extra megas and red rematches --- P3D/Content/Data/Scripts/cerulean/novenu.dat | Bin 0 -> 176 bytes P3D/Content/Data/Scripts/mtsilver/red.dat | Bin 1148 -> 2276 bytes P3D/Content/Data/Scripts/route25/nochar.dat | Bin 0 -> 176 bytes .../Scripts/trainer/mtsilver/red1.trainer | Bin 0 -> 5832 bytes .../Scripts/trainer/mtsilver/red2.trainer | Bin 0 -> 5834 bytes .../Scripts/trainer/mtsilver/red3.trainer | Bin 0 -> 5832 bytes .../Data/Scripts/vermilion/snorlaxawake.dat | Bin 1734 -> 1882 bytes P3D/Content/Data/maps/cerulean/3.dat | Bin 24490 -> 25242 bytes P3D/Content/Data/maps/routes/route25.dat | Bin 111348 -> 112098 bytes P3D/Content/Data/maps/vermilion/main.dat | Bin 143730 -> 144414 bytes P3D/P3D.vbproj | 15 +++++++++++++++ 11 files changed, 15 insertions(+) create mode 100644 P3D/Content/Data/Scripts/cerulean/novenu.dat create mode 100644 P3D/Content/Data/Scripts/route25/nochar.dat create mode 100644 P3D/Content/Data/Scripts/trainer/mtsilver/red1.trainer create mode 100644 P3D/Content/Data/Scripts/trainer/mtsilver/red2.trainer create mode 100644 P3D/Content/Data/Scripts/trainer/mtsilver/red3.trainer diff --git a/P3D/Content/Data/Scripts/cerulean/novenu.dat b/P3D/Content/Data/Scripts/cerulean/novenu.dat new file mode 100644 index 0000000000000000000000000000000000000000..b619950b42130cbd942e9f05e2f8d43dcd3d60ce GIT binary patch literal 176 zcmezOpP`H)m7$2Cm?4uPpCOOImcfXDmw}7H3dm0bk~ToOREBgQub80(tWpm{B$XkB zL4zS1tRfL83sGmtpvhndG%o}wQVP@wGL@6T0m#Y&s>lT5N(P8oxj>siuFznx1VT-y P{UCKIU{^rg1Lgw&wd5Z% literal 0 HcmV?d00001 diff --git a/P3D/Content/Data/Scripts/mtsilver/red.dat b/P3D/Content/Data/Scripts/mtsilver/red.dat index 0ecc6793b8dde442eb44999862f170215290bfe9..9f1ebf2f718b347fb66601b2b0ea916666480cf3 100644 GIT binary patch delta 450 zcmeyv@kDTfs@B@CJj zb_})*X+W_YhGL)yF9R0?=R^rlek-sNxX|PPMq~ACppp`x(jp+43M37o+Dm}!QkZ6t zc4ujj6xb{VG=ms8K}Kn!8)byuD6nDjAW4W}oS4Qz4Ae$9&={A2U?Y`5(l8^j8VU{t zZ%zgf1bHEkAq5zmX>d)LV(21h{E0C;C+-bk1_sQ;ZQ;y7F99ibs53V6G3GG?0PY({ AxBvhE delta 23 fcmaDN_=jVHIoqC>|RN__0(_h6iVYnA!RJU>tOE14cmA59d>w&9&QAE&Psa_9l&M6G7 Oj{WV=+*DH3JVo!eIUh3s literal 0 HcmV?d00001 diff --git a/P3D/Content/Data/Scripts/trainer/mtsilver/red1.trainer b/P3D/Content/Data/Scripts/trainer/mtsilver/red1.trainer new file mode 100644 index 0000000000000000000000000000000000000000..97e99911fe9fdae1ac855fd37ddb6a97a91cf0a8 GIT binary patch literal 5832 zcmeI0TW=CU6vxlAiQj?rxoNtvPnARJzhyZc^$cqTkmqq5l6fd-hBV zyMP#8Y&Ieq%Sw}6B>Q=mS826q`f28lgL*{N3tbl*~G=3189sO z--k@%>|IFPdESux>qkM~hO>JjcZGK8dl!D*<8uMY>E0>Tgv1v}++man#=CnjDvVDX zQQ^$T@)EWII~z*_U%@UBPx&2C1)e zd~4(;=VCS{^)4}Doi#O|x%rQLySJb_*=MpnJtNNsoZnd%aIOU|7O;+hiJCt6j4cF>GnbIfot!&)<|kn$@Gq0 z`O5Q%});Ch?oYxJGE-d-9fi|#f&F;XqOJtC)DaapjA zr>gk7dJARCsh96q4O*mBE&b-q z%h~Ge%9~W)kF)4bACpX#bD3i1M46}6QWayq8k6~{st38g2vt!q&w07B?6bW7pQ);% z;?Cm4GgZY~Y~8VEF$~G`G&Mje?J@Ux*K7zSJxk(mP zAU{{hlivv$%Zm_YYqSVaF|t8dY+j56mdvR&9J$ztWOOkad6t8a^NRl|B{H0R}tYp6Pp zT#>5^F7Cg$|FhVH+3%T(AVs;!>Lmf!2?$r{glqjcx%_rI|_xd>0}#_-G244yGln&aTJ oo%NpLl<6bRmGlg7j1y>{8TW9~lprE@>TEhqoFDP*kQO8P0|gVaVgLXD literal 0 HcmV?d00001 diff --git a/P3D/Content/Data/Scripts/trainer/mtsilver/red2.trainer b/P3D/Content/Data/Scripts/trainer/mtsilver/red2.trainer new file mode 100644 index 0000000000000000000000000000000000000000..ca7c7519fbe8791d4ae557e20fdd4fd1969cef9e GIT binary patch literal 5834 zcmeI0+iu!G5QgWvQr`jPI;vu92wbK)RB3al8q}Mpic;c|G@MFE4=U~Z_9fc>|E`DG z1Z+T5+!R?DygNHHJ3Ak<-ao(3r6F%*M-Jsg_VKGE2Xczp%manvm;4q7<}fByQk`Nxg&=NA~0bqpqR5BmKmLiObDUrGG+Xruv-&O@k6Jh69BW-cR{e0j z`-o&8b_Vc1h5t?5z09^GxK!?i>!qgy*S|IH*+(>6a)zj+&~*2x_t3R>Tx%p%iO1tk zT;y-ZnN6!|?FhO)c~v(ImPNzlG*An?b(s{(AdUjh^(eeeLRZZF{ii+p&e4C zdBpZ8@Nd`kakY*R_ojRDSw+bcc=rVvbBy->*p7{PNE}CaZq-|plOcvS$QV48dH9kXFI>}`CnG6 zN-j^9pR47GE2G)E3Z879Yo3gSMc=5l-0p7{PYE(Vc9~!F=H+>!?DWbLvge7ar*wCCwp^WB~KOn%h-v>B0L#|i`6HqhHIXd;c1@wG~b(4f*jx( zMn0XMBEFsI9?n-M<-#}$>yW32RZK@MzuVKZHJGgfnQK8h3HlltQf-^WF-f$ciVR&C&0{H*#si{uJ z+sMclqLIg*?%KM#zUg-V`F$oWc_Z6$Ajh(YUnSX>6MP?`ttIc|sXRf?h4dtm3EC66 zbZspeq4iq&Xc@_lbn$eHYa*{@AUE<08Uyr}U?r5Ky(8C?$TvtwvLzKM<6_SNG{%r0 zKqhhaE~Mi;Ka<(l&pCb1oZS<-n`@W8cj4y)J{ORj?wwLCNPLCF9imJS@9w>K1(+xk6hH7WmYLTptppphYurjW|r|C8Vf1kaK8V!FErEsjqW< zYv%G}F&lZkOGK=rrsi`u{xRk=x##`k9PiZgv!0~09${49W#d8XhMZxpYpALpu6GZa z9Kz2C(I<$%jk}lGk{FlDy>PvZbmaQWSNWD_3Y?<}dd8*FgDGus$ zojm!Skg;5ZD4U}qM8&8Eov~$!ss!12WXiAI+_5a8Kv$~R)%E;U&9gO&m^@pwMso5T zhIBRDYNn(zV*ai`%TuS7usU7wOuB3rwobBYs9D=l7U8Oq@lk}UI_5*Oxhz+lL)CfY zidBB*2xq1oJK|wo-E#CJel4jPsT#ge^h0+`&-0QjLNUN%Afbo%kxCp=_^mjo+pZL zVe<6Qs_~?|Kff;d9iaWzx8v&TQ+*~+_RoEtJT-&&+d60}zUzBjo$}`s<)v1q<^D&- z;DRR@v)S|v@xO`g;QZR8R2W6!D&!gB8m3yS@AdR#jpw~ly7Tq>-`Jg8geP_r_~mH^ v&zLFAIQVR5y{9;3`h;^OJp-KJ1e#~YeVjBU$cUXfn@$VoM?5>E#Yp}FBEPd_ literal 0 HcmV?d00001 diff --git a/P3D/Content/Data/Scripts/vermilion/snorlaxawake.dat b/P3D/Content/Data/Scripts/vermilion/snorlaxawake.dat index 05cb4f0aee6ab810a6286a498d50f5130b3f9665..7dfbe84e41bead22cc31a9bfdef25741bcf97752 100644 GIT binary patch delta 35 ocmX@cdy8+vBf)HjVuliiM1~?DnF=J0Cng#*TQXQ~oNCAh0LHlq`2YX_ delta 11 Scmcb`cZ_$!qs?WEPgnsVwgo`| diff --git a/P3D/Content/Data/maps/cerulean/3.dat b/P3D/Content/Data/maps/cerulean/3.dat index 9a645b06cbefe7c72c6bbbad7e07fa895df45d6d..2cf29762865bb79a441123b6811a2fea2b64d89a 100644 GIT binary patch delta 199 zcmZ3rpK;bv#tn-Y1$`M3844JJ8Il=_7&3vZlF8>|fqnj3@W&i*7Cox8MK(%!o6{ delta 19 bcmbPrlyTL5#tn-YH@{%K5V|=j%7Oy`T}KFx diff --git a/P3D/Content/Data/maps/routes/route25.dat b/P3D/Content/Data/maps/routes/route25.dat index 9e9131acd96eab9d69ff0357e6a42d47dc54b755..eb289cf24ecddc441c0360e699954ddc7d82318d 100644 GIT binary patch delta 174 zcmezJl2XUL^_VRgEGK_d)}Nj=n~`g> zk&3}&gPS(fkF8)lHa#Gb(TvlSL5IPV!H~gx@x0HON}qyPW_ diff --git a/P3D/Content/Data/maps/vermilion/main.dat b/P3D/Content/Data/maps/vermilion/main.dat index 481d0ae176c70a1db6fd56a0d5e57d05a8e754ad..6e5c7d8b3c3525cc488aa15724057b8226d65f98 100644 GIT binary patch delta 157 zcmezLh-2Ohj)oS-Eldfrg1!u?4CxGs3 PreserveNewest + + PreserveNewest + PreserveNewest @@ -25877,6 +25880,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -25952,6 +25958,15 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest From c1b0bedc61ba2ef0784067411e6a9914d5269095 Mon Sep 17 00:00:00 2001 From: Ruan Pablo Date: Thu, 31 Jan 2019 02:31:54 -0200 Subject: [PATCH 10/11] minor fixes --- P3D/Content/Data/maps/mtsilver/exterior.dat | Bin 140042 -> 140040 bytes P3D/Content/Data/maps/mtsilver/side.dat | Bin 73572 -> 73568 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/P3D/Content/Data/maps/mtsilver/exterior.dat b/P3D/Content/Data/maps/mtsilver/exterior.dat index df9e6e1eed9e7cb78548e4253d3eb319f76a95c2..c570b1cab1d43c603d6022b0e839de3c2f159ca9 100644 GIT binary patch delta 32 mcmeA=#?f(%V}lnHry+w5g8>j*Hit5`hcYp44`pK7ssI3$%?LyQ delta 36 pcmeA;#?f_*V}lnHrvZZw0|*;VHe4p$oWj(e!o;{eg^6j20sz3U3Df`p diff --git a/P3D/Content/Data/maps/mtsilver/side.dat b/P3D/Content/Data/maps/mtsilver/side.dat index 131733f01a50c30bbd3225e66934aa5b7fb0d170..ea1f23137435e8c14b55ceedaaa3a9d677b1d469 100644 GIT binary patch delta 46 zcmV+}0MY;Cz69XD1c0;wniK&tlhHaalOPoYmrfS}NS8nw0X&!95&=MyFb)Q{oD~7c E369qfL;wH) delta 31 ncmaE`kLAfemWC~ivqV@;87vtLCttMEpR6Ftvi+P0<0LKszk&*% From 2bc4ef9ee47f6b93039f2f7608fa7cdab4db1852 Mon Sep 17 00:00:00 2001 From: darkfire006 Date: Thu, 31 Jan 2019 00:11:36 -0600 Subject: [PATCH 11/11] fix adds --- P3D/P3D.vbproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 1c96b0aba..9634414c9 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -25702,6 +25702,7 @@ + @@ -25799,6 +25800,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest