diff --git a/P3D/Content/Data/Scripts/kolben/jappa_bowl.dat b/P3D/Content/Data/Scripts/kolben/jappa_bowl.dat new file mode 100644 index 000000000..82166738c Binary files /dev/null and b/P3D/Content/Data/Scripts/kolben/jappa_bowl.dat differ diff --git a/P3D/Content/Data/Scripts/kolben/jappa_tepig.dat b/P3D/Content/Data/Scripts/kolben/jappa_tepig.dat new file mode 100644 index 000000000..2c3504a02 Binary files /dev/null and b/P3D/Content/Data/Scripts/kolben/jappa_tepig.dat differ diff --git a/P3D/Content/Data/maps/kolben/assoffices.dat b/P3D/Content/Data/maps/kolben/assoffices.dat index b2c28504e..64208a35b 100644 --- a/P3D/Content/Data/maps/kolben/assoffices.dat +++ b/P3D/Content/Data/maps/kolben/assoffices.dat @@ -135,6 +135,7 @@ NPCs: {"NPC"{NPC[{"Position"{sngArr[2,0,3]}}{"TextureID"{str[TornadoBot]}}{"ID"{int[6]}}{"Name"{str[Tornado]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\tornado]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} {"NPC"{NPC[{"Position"{sngArr[9,0,5]}}{"TextureID"{str[JappaWakka]}}{"ID"{int[9]}}{"Name"{str[JappaWakka]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\jappa]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}} +{"NPC"{NPC[{"Position"{sngArr[8,0,5]}}{"TextureID"{str[[POKEMON|N]498]}}{"ID"{int[10]}}{"Name"{str[Alex]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\jappa_tepig]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"AnimateIdle"{bool[1]}}{"MoveRectangles"{recArr[]}}]}} jappawakka Shelves @@ -167,6 +168,9 @@ Monitor {"Structure"{STR[{"Map"{str[structures\kolben\monitor_jappa]}}{"Offset"{sngArr[9.025,0,4]}}]}} PC {"Entity"{ENT[{"Scale"{sngArr[0.3,0.45,0.5]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[8.476,0.125,3.875]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[200,11,8,10][208,11,11,10][200,0,8,11][208,22,11,10][200,22,8,10]]}}{"TextureIndex"{intArr[0,0,1,1,3,3,4,4,2,2]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} +Food Bowl +{"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBill]}}{"Scale"{sngArr[0.5,0.5,0.5]}}{"Position"{sngArr[7,-0.25,5]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[272,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}} +{"Entity"{ENT[{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[7,0,5]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[0,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben\jappa_bowl]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} Glass: {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Scale"{sngArr[1,1,0.2]}}{"Position"{sngArr[5.4,0,1]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[224,32,16,16][240,32,4,16]]}}{"TextureIndex"{intArr[0,0,1,1,-1,-1,0,0,-1,-1]}}{"Collision"{bool[0]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[1]}}]}} diff --git a/P3D/Content/Textures/kolben.png b/P3D/Content/Textures/kolben.png index a4ee58e4d..c9a890a2c 100644 Binary files a/P3D/Content/Textures/kolben.png and b/P3D/Content/Textures/kolben.png differ