Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

P3D/Content/Data/Scripts/kolben/tornado.dat

@@ -1,24 +1,24 @@
 version=2
-	:if:<register.registered(tornadobattle)>=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:<battle.won>=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:<register.registered(tornadobattle)>=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:<battle.won>=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

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[]}}]}}

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}
+{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)

P3D/P3D.vbproj

@@ -13519,6 +13519,9 @@
     <Content Include="Content\Textures\NPC\Aragas.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\NPC\Kratos.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\NPC\Segis.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>