diff --git a/P3D/Content/Data/Scripts/kolben/tornado.dat b/P3D/Content/Data/Scripts/kolben/tornado.dat index 0cadbaeae..7dd822dd9 100644 --- a/P3D/Content/Data/Scripts/kolben/tornado.dat +++ b/P3D/Content/Data/Scripts/kolben/tornado.dat @@ -1,24 +1,24 @@ version=2 - :if:=False - @text.show(Tornado: Hi there! You may be~wondering... why is there a*Pokémon on the website staff?~Well... I'm no ordinary Pokémon.*Want to see something rather~barbaric?) - @options.show(Yes,No) - :when:Yes - @text.show(Then take a sneak peek at what~my forum league team will be!) - @battle.setvar(canblackout,false) - @battle.trainer(kolben\tornado) - :if:=true - @text.show(I'm not exactly a competitive~battler, as you can see.) - :else - @text.show(Pretty tough, huh?) - :endif - @pokemon.heal - @register.registertime(tornadobattle,1,day) - :end - :when:No - @text.show(Well, I'll see you on the website~then.) - :end - :endwhen - :else - @text.show(I'm not exactly a competitive~battler, as you can see.) - :endif +:if:=false + @text.show(Tornado: Hi there!~You may be wondering...~Why is there a Pokémon~on the website staff?*Well... I'm no ordinary Pokémon!*Want to see something rather~barbaric?) + @options.show(Yes,No) + :when:Yes + @text.show(Then take a sneak peek at what~my forum league team will be!) + @battle.setvar(canblackout,false) + @battle.trainer(kolben\tornado) + :if:=true + @text.show(I'm not exactly a competitive~battler, as you can see.) + :else + @text.show(Pretty tough, huh?) + :endif + @pokemon.heal + @register.registertime(tornadobattle,1,day) + :end + :when:No + @text.show(Well, I'll see you on the website~then.) + :end + :endwhen +:else + @text.show(I'm not exactly a competitive~battler, as you can see.) +:endif :end \ No newline at end of file diff --git a/P3D/Content/Data/maps/kolben/basement.dat b/P3D/Content/Data/maps/kolben/basement.dat index 7484114af..efb94f78a 100644 --- a/P3D/Content/Data/maps/kolben/basement.dat +++ b/P3D/Content/Data/maps/kolben/basement.dat @@ -201,7 +201,6 @@ Posters: {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Scale"{sngArr[1.75,0.7,0.1]}}{"EntityID"{str[AnimatedBlock]}}{"ID"{int[53]}}{"Visible"{bool[0]}}{"Position"{sngArr[15.5,0.5,11.495]}}{"TexturePath"{str[TVs\BearAnimated]}}{"Textures"{recArr[[0,0,356,158][0,158,356,158]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[TVs\BearAnimated]}}{"AnimationData"{intArr2D[[0,0,356,158,2,1,3,0,0]]}}{"Rotation"{int[2]}}]}} -{"EntityField"{ENT[{"Scale"{sngArr[1.75,0.7,0.1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[Cube]}}{"ID"{int[50]}}{"Visible"{bool[1]}}{"Position"{sngArr[13.5,0.5,11.495]}}{"TexturePath"{str[TVs\F]}}{"Textures"{recArr[[0,0,328,124]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1.75,0.7,0.1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[Cube]}}{"ID"{int[50]}}{"Visible"{bool[1]}}{"Position"{sngArr[3.2,1.2,11.495]}}{"TexturePath"{str[TVs\nile]}}{"Textures"{recArr[[0,0,600,334]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[2]}}]}} @@ -217,7 +216,7 @@ NPCs: {"NPC"{NPC[{"Position"{sngArr[3,-0.05,11]}}{"TextureID"{str[[POKEMON|S]196]}}{"ID"{int[2]}}{"Name"{str[Espeon]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\chachamaru]}}{"RotationXYZ"{sngArr[1.57,2.61,3.14]}}{"Movement"{str[Walk]}}{"MoveRectangles"{recArr[[2,10,4,11]]}}]}} -{"NPC"{NPC[{"Position"{sngArr[3,0,7]}}{"TextureID"{str[darkfire]}}{"ID"{int[2]}}{"Name"{str[bot]}}{"Action"{int[0]}}{"AdditionalValue"{str[BEEP BOOP CRASH WHIRRR*It's a 'Soonbot v0.55',~an annoying and extremely~overused roadblock.*This one appears to be~malfunctioning.]}}{"RotationXYZ"{sngArr[1.57,2.61,3.14]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} +{"NPC"{NPC[{"Position"{sngArr[3,0,7]}}{"TextureID"{str[Kratos]}}{"ID"{int[2]}}{"Name"{str[bot]}}{"Action"{int[0]}}{"AdditionalValue"{str[BEEP BOOP CRASH WHIRRR*It's a 'Soonbot v0.54',~an annoying and extremely~overused roadblock.*This one appears to be~malfunctioning.]}}{"RotationXYZ"{sngArr[1.57,2.61,3.14]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} Figures: {"NPC"{NPC[{"Scale"{sngArr[0.4,0.4,0.4]}}{"Position"{sngArr[7,0.05,12.8]}}{"TextureID"{str[[POKEMON|N]494]}}{"ID"{int[62]}}{"Name"{str[Figure]}}{"Action"{int[0]}}{"AdditionalValue"{str[It's a rare collection~of Pokémon figures.]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} diff --git a/P3D/Content/Data/maps/poke/fortune/patternbush/main.poke b/P3D/Content/Data/maps/poke/fortune/patternbush/main.poke index da355af7c..cd90c6257 100644 --- a/P3D/Content/Data/maps/poke/fortune/patternbush/main.poke +++ b/P3D/Content/Data/maps/poke/fortune/patternbush/main.poke @@ -1,9 +1,11 @@ name=Pattern Bush type=Grassland {0|010|10|-1|15,20} -{0|011|12|-1|44,44} -{0|013|10|-1|49,49} -{0|014|13|-1|43,43} -{0|165|17|-1|18,18} -{0|167|18|-1|15,15} -{0|214|20|-1|15,15} \ No newline at end of file +{0|011|10|-1|18,22} +{0|013|10|-1|15,20} +{0|014|10|-1|18,22} +{0|165|30|1,2,3|15,18} +{0|167|30|0|15,18} +{0|214|20|-1|22,25} +(0|588|5|-1|17,19) +(0|616|5|-1|17,19) \ No newline at end of file diff --git a/P3D/Content/GUI/Logos/Pokemon_Small.png b/P3D/Content/GUI/Logos/Pokemon_Small.png index 8caee341c..ec9c0a608 100644 Binary files a/P3D/Content/GUI/Logos/Pokemon_Small.png and b/P3D/Content/GUI/Logos/Pokemon_Small.png differ diff --git a/P3D/Content/Pokemon/Overworld/Normal/616.png b/P3D/Content/Pokemon/Overworld/Normal/616.png index 818ede08c..211a92379 100644 Binary files a/P3D/Content/Pokemon/Overworld/Normal/616.png and b/P3D/Content/Pokemon/Overworld/Normal/616.png differ diff --git a/P3D/Content/Textures/NPC/14.png b/P3D/Content/Textures/NPC/14.png index 386dacaf7..87324cd7f 100644 Binary files a/P3D/Content/Textures/NPC/14.png and b/P3D/Content/Textures/NPC/14.png differ diff --git a/P3D/Content/Textures/NPC/18.png b/P3D/Content/Textures/NPC/18.png index d7dd97baf..d36d7d77c 100644 Binary files a/P3D/Content/Textures/NPC/18.png and b/P3D/Content/Textures/NPC/18.png differ diff --git a/P3D/Content/Textures/NPC/19.png b/P3D/Content/Textures/NPC/19.png index 9ee8af560..c96a34cd4 100644 Binary files a/P3D/Content/Textures/NPC/19.png and b/P3D/Content/Textures/NPC/19.png differ diff --git a/P3D/Content/Textures/NPC/24.png b/P3D/Content/Textures/NPC/24.png index 559796854..484867e7a 100644 Binary files a/P3D/Content/Textures/NPC/24.png and b/P3D/Content/Textures/NPC/24.png differ diff --git a/P3D/Content/Textures/NPC/6.png b/P3D/Content/Textures/NPC/6.png index 56294fed8..344d87de9 100644 Binary files a/P3D/Content/Textures/NPC/6.png and b/P3D/Content/Textures/NPC/6.png differ diff --git a/P3D/Content/Textures/NPC/85.png b/P3D/Content/Textures/NPC/85.png index f9c690b5f..796d30c93 100644 Binary files a/P3D/Content/Textures/NPC/85.png and b/P3D/Content/Textures/NPC/85.png differ diff --git a/P3D/Content/Textures/NPC/86.png b/P3D/Content/Textures/NPC/86.png index 92efa15d4..5196ea7d8 100644 Binary files a/P3D/Content/Textures/NPC/86.png and b/P3D/Content/Textures/NPC/86.png differ diff --git a/P3D/Content/Textures/NPC/91.png b/P3D/Content/Textures/NPC/91.png index a4c56a1fd..013d92b4b 100644 Binary files a/P3D/Content/Textures/NPC/91.png and b/P3D/Content/Textures/NPC/91.png differ diff --git a/P3D/Content/Textures/NPC/Archer.png b/P3D/Content/Textures/NPC/Archer.png index b799bf3b0..c1fd84b82 100644 Binary files a/P3D/Content/Textures/NPC/Archer.png and b/P3D/Content/Textures/NPC/Archer.png differ diff --git a/P3D/Content/Textures/NPC/Ariana.png b/P3D/Content/Textures/NPC/Ariana.png index de56fbbb0..f5ea36726 100644 Binary files a/P3D/Content/Textures/NPC/Ariana.png and b/P3D/Content/Textures/NPC/Ariana.png differ diff --git a/P3D/Content/Textures/NPC/Enethil.png b/P3D/Content/Textures/NPC/Enethil.png index 01f483b43..eae921f5d 100644 Binary files a/P3D/Content/Textures/NPC/Enethil.png and b/P3D/Content/Textures/NPC/Enethil.png differ diff --git a/P3D/Content/Textures/NPC/Kratos.png b/P3D/Content/Textures/NPC/Kratos.png new file mode 100644 index 000000000..5dd689408 Binary files /dev/null and b/P3D/Content/Textures/NPC/Kratos.png differ diff --git a/P3D/Content/Textures/NPC/Petrel.png b/P3D/Content/Textures/NPC/Petrel.png index 26797f40e..99a18df31 100644 Binary files a/P3D/Content/Textures/NPC/Petrel.png and b/P3D/Content/Textures/NPC/Petrel.png differ diff --git a/P3D/Content/Textures/NPC/Proton.png b/P3D/Content/Textures/NPC/Proton.png index c8190cfd8..ad9ae4b0d 100644 Binary files a/P3D/Content/Textures/NPC/Proton.png and b/P3D/Content/Textures/NPC/Proton.png differ diff --git a/P3D/Content/Textures/NPC/Segis.png b/P3D/Content/Textures/NPC/Segis.png index 0eb2b366d..ef4183ecf 100644 Binary files a/P3D/Content/Textures/NPC/Segis.png and b/P3D/Content/Textures/NPC/Segis.png differ diff --git a/P3D/Content/Textures/NPC/darkfire.png b/P3D/Content/Textures/NPC/darkfire.png index 5dd689408..93827bf04 100644 Binary files a/P3D/Content/Textures/NPC/darkfire.png and b/P3D/Content/Textures/NPC/darkfire.png differ diff --git a/P3D/Content/Textures/TVs/inception.png b/P3D/Content/Textures/TVs/inception.png index 7d76a7eec..dfaf04f32 100644 Binary files a/P3D/Content/Textures/TVs/inception.png and b/P3D/Content/Textures/TVs/inception.png differ diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 1eb03147e..d3f621e80 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -13519,6 +13519,9 @@ Always + + PreserveNewest + Always