diff --git a/P3D/Content/Data/maps/kolben/servers.dat b/P3D/Content/Data/maps/kolben/servers.dat index b1778e9eb..f64c955b2 100644 --- a/P3D/Content/Data/maps/kolben/servers.dat +++ b/P3D/Content/Data/maps/kolben/servers.dat @@ -52,7 +52,7 @@ Desktops: {"EntityField"{ENT[{"Scale"{sngArr[0.05,0.75,0.05]}}{"Size"{intArr[6,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[3,0,5]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[16,0,1,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.5,0.2]}}{"Size"{intArr[1,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[18,1.2,5]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[16,0,32,16][16,16,32,4][48,0,4,16][100,16,32,16]]}}{"TextureIndex"{intArr[3,3,2,2,2,2,-1,-1,1,1,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"RotationXYZ"{sngArr[0,0.8,0]}}]}} -{"EntityField"{ENT[{"Scale"{sngArr[1,0.5,0.2]}}{"Size"{intArr[1,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[Cube]}}{"ID"{int[10]}}{"Visible"{bool[1]}}{"Position"{sngArr[17.929,1.2,4.931]}}{"TexturePath"{str[TVs\PSwebCode]}}{"Textures"{recArr[[0,0,1030,515]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"RotationXYZ"{sngArr[0,3.94,0]}}]}} +{"EntityField"{ENT[{"Scale"{sngArr[1,0.5,0.2]}}{"Size"{intArr[1,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[Cube]}}{"ID"{int[10]}}{"Visible"{bool[1]}}{"Position"{sngArr[17.929,1.2,4.931]}}{"TexturePath"{str[TVs\code_editor]}}{"Textures"{recArr[[0,0,1000,500]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"RotationXYZ"{sngArr[0,3.94,0]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.5,0.2]}}{"Size"{intArr[1,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[Cube]}}{"ID"{int[20]}}{"Visible"{bool[0]}}{"Position"{sngArr[17.929,1.2,4.931]}}{"TexturePath"{str[TVs\BSOD]}}{"Textures"{recArr[[0,0,980,490]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"RotationXYZ"{sngArr[0,3.94,0]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[1,0.5,0.2]}}{"Size"{intArr[1,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[ScriptBlock]}}{"Visible"{bool[0]}}{"Position"{sngArr[18,1,5]}}{"TexturePath"{str[TVs\BSOD]}}{"Textures"{recArr[[0,0,980,490]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\BSODPorygon]}}{"RotationXYZ"{sngArr[0,-1,0]}}]}} {"EntityField"{ENT[{"Scale"{sngArr[0.05,0.75,0.05]}}{"Size"{intArr[1,1]}}{"Steps"{sngArr[2,1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[18,1,5]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[16,0,1,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}} @@ -91,8 +91,8 @@ PC: Monitore: {"Entity"{ENT[{"Scale"{sngArr[2,1,0.2]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[18.4,1.75,3]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[48,80,32,16][48,96,32,4][80,80,4,16]]}}{"TextureIndex"{intArr[-1,-1,2,2,2,2,-1,-1,1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}} {"Entity"{ENT[{"Scale"{sngArr[2,1,0.2]}}{"EntityID"{str[Cube]}}{"Position"{sngArr[18.4,1.75,6]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[48,80,32,16][48,96,32,4][80,80,4,16]]}}{"TextureIndex"{intArr[-1,-1,2,2,2,2,-1,-1,1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[12]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}} -{"Entity"{ENT[{"Scale"{sngArr[2,1,0.2]}}{"EntityID"{str[Cube]}}{"ID"{int[10]}}{"Visible"{bool[1]}}{"Position"{sngArr[18.3,1.75,3]}}{"TexturePath"{str[TVs\webcode]}}{"Textures"{recArr[[0,0,1030,515]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}} -{"Entity"{ENT[{"Scale"{sngArr[2,1,0.2]}}{"EntityID"{str[Cube]}}{"ID"{int[10]}}{"Visible"{bool[1]}}{"Position"{sngArr[18.3,1.75,6]}}{"TexturePath"{str[TVs\website]}}{"Textures"{recArr[[0,0,500,250]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}} +{"Entity"{ENT[{"Scale"{sngArr[2,1,0.2]}}{"EntityID"{str[Cube]}}{"ID"{int[10]}}{"Visible"{bool[1]}}{"Position"{sngArr[18.3,1.75,3]}}{"TexturePath"{str[TVs\website2]}}{"Textures"{recArr[[0,0,1000,500]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}} +{"Entity"{ENT[{"Scale"{sngArr[2,1,0.2]}}{"EntityID"{str[Cube]}}{"ID"{int[10]}}{"Visible"{bool[1]}}{"Position"{sngArr[18.3,1.75,6]}}{"TexturePath"{str[TVs\website]}}{"Textures"{recArr[[0,0,1000,500]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}} {"Entity"{ENT[{"Scale"{sngArr[2,1,0.2]}}{"EntityID"{str[Cube]}}{"ID"{int[20]}}{"Visible"{bool[0]}}{"Position"{sngArr[18.3,1.75,3]}}{"TexturePath"{str[TVs\BSOD]}}{"Textures"{recArr[[0,0,980,490]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}} {"Entity"{ENT[{"Scale"{sngArr[2,1,0.2]}}{"EntityID"{str[Cube]}}{"ID"{int[20]}}{"Visible"{bool[0]}}{"Position"{sngArr[18.3,1.75,6]}}{"TexturePath"{str[TVs\BSOD]}}{"Textures"{recArr[[0,0,980,490]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}]}} diff --git a/P3D/Content/Textures/TVs/PSwebCode.png b/P3D/Content/Textures/TVs/PSwebCode.png deleted file mode 100644 index 25b3f4791..000000000 Binary files a/P3D/Content/Textures/TVs/PSwebCode.png and /dev/null differ diff --git a/P3D/Content/Textures/TVs/code_editor.png b/P3D/Content/Textures/TVs/code_editor.png new file mode 100644 index 000000000..d08d83996 Binary files /dev/null and b/P3D/Content/Textures/TVs/code_editor.png differ diff --git a/P3D/Content/Textures/TVs/webcode.png b/P3D/Content/Textures/TVs/webcode.png deleted file mode 100644 index 023b0acf9..000000000 Binary files a/P3D/Content/Textures/TVs/webcode.png and /dev/null differ diff --git a/P3D/Content/Textures/TVs/website.png b/P3D/Content/Textures/TVs/website.png index 9f2aa2470..1c8d257de 100644 Binary files a/P3D/Content/Textures/TVs/website.png and b/P3D/Content/Textures/TVs/website.png differ diff --git a/P3D/Content/Textures/TVs/website2.png b/P3D/Content/Textures/TVs/website2.png new file mode 100644 index 000000000..e05028249 Binary files /dev/null and b/P3D/Content/Textures/TVs/website2.png differ diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index bcf949483..e735b6fd1 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -15784,6 +15784,9 @@ <Content Include="Content\Textures\TVs\blank.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="Content\Textures\TVs\code_editor.png"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </Content> <Content Include="Content\Textures\TVs\derp.png"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -27418,9 +27421,6 @@ <Content Include="Content\Textures\TVs\Pong.png"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> - <Content Include="Content\Textures\TVs\PSwebCode.png"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> <Content Include="Content\Textures\TVs\Red.png"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> @@ -27439,10 +27439,10 @@ <Content Include="Content\Textures\TVs\Silver.png"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> - <Content Include="Content\Textures\TVs\webcode.png"> + <Content Include="Content\Textures\TVs\website.png"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> - <Content Include="Content\Textures\TVs\website.png"> + <Content Include="Content\Textures\TVs\website2.png"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> <Content Include="Content\Textures\TVs\webwork.png">