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

P3D/Content/Data/Scripts/ilex/shrine.dat

@@ -7,7 +7,7 @@ version=2
 		@text.show(Something seems wrong.*Maybe you should come~back with less Pokémon?)
 		:end
 	:else
-		@script.start(ilex/spiky)
+		@script.start(ilex\spiky)
 		:end
 	:endif
 :endif

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

@@ -76,7 +76,7 @@ version=2
 			@text.show(Omega: It's a pleasure~to see you once again.*Say, do you want a real~battle now?)
 			@options.show(Yes,No)
 				:when:Yes
-					@script.start(kolben/omega2)
+					@script.start(kolben\omega2)
 				:when:No			
 					@text.show(Oke.)
 					:end

P3D/Content/Data/Scripts/nationalpark/contest_prize.dat

@@ -1,6 +1,6 @@
 version=2
 
-#Warp Player/NPCs
+#Warp Player\NPCs
 @screen.fadeout
 @player.warp(18,0.1,25)
 @player.turnto(0)

P3D/Content/Data/maps/kolben/devoffices.dat

@@ -65,7 +65,8 @@ Monitore:
 NPCs:
 {"NPC"{NPC[{"Position"{sngArr[16,0,3]}}{"TextureID"{str[nilllzz]}}{"ID"{int[0]}}{"Name"{str[nilllzz]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\nilllzz]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 {"NPC"{NPC[{"Position"{sngArr[2,0,3]}}{"TextureID"{str[darkfire]}}{"ID"{int[1]}}{"Name"{str[darkfire]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\darkfire]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"EntityField"{ENT[{"EntityID"{str[ScriptBlock]}}{"Size"{intArr[1,7]}}{"Position"{sngArr[15,0,0]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[kolben\nilllzzhide]}}{"Rotation"{int[0]}}]}}
+{"EntityField"{ENT[{"EntityID"{str[ScriptBlock]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[15,0,0]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[kolben\nilllzzhide]}}{"Rotation"{int[0]}}]}}
+{"EntityField"{ENT[{"EntityID"{str[ScriptBlock]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[15,0,5]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[kolben\nilllzzhide]}}{"Rotation"{int[0]}}]}}
 {"EntityField"{ENT[{"EntityID"{str[ScriptBlock]}}{"Size"{intArr[1,7]}}{"Position"{sngArr[14,0,0]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[kolben\nilllzzunhide]}}{"Rotation"{int[0]}}]}}
 
 shelf:

P3D/Content/Data/maps/liberty/room.dat

@@ -84,5 +84,5 @@ Warps:
 {"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[4,0,10]}}{"TexturePath"{str[park]}}{"Textures"{recArr[[64,48,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[liberty\interior.dat,4,-1.9,0,0]}}{"Rotation"{int[0]}}]}}
 
 NPC:
-{"NPC"{NPC[{"Position"{sngArr[4,0,3]}}{"TextureID"{str[[POKEMON|N]494]}}{"AnimateIdle"{bool[1]}}{"ID"{int[0]}}{"Name"{str[Rival]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty/victini]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[4,0,3]}}{"TextureID"{str[[POKEMON|N]494]}}{"AnimateIdle"{bool[1]}}{"ID"{int[0]}}{"Name"{str[Rival]}}{"Action"{int[1]}}{"AdditionalValue"{str[liberty\victini]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 {"NPC"{NPC[{"Position"{sngArr[4,-3,5]}}{"TextureID"{str[Petrel]}}{"ID"{int[6]}}{"Name"{str[Petrel]}}{"Action"{int[0]}}{"AdditionalValue"{str[Derp]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}