X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_cao.cpp;h=01f13df4ef2d0244b5b9fc9377fc30420d632d40;hb=989aba1966373885d4cac306daea25e102f8d68d;hp=dfeaea85ab09babf8d62f7a07b22a058046ea353;hpb=112b85d0fb97b896da977a3915dab73015681896;p=dragonfireclient.git

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index dfeaea85a..01f13df4e 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -20,18 +20,156 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_cao.h"
 #include "tile.h"
 #include "environment.h"
+#include "collision.h"
+#include "settings.h"
+#include <ICameraSceneNode.h>
+#include <ITextSceneNode.h>
+#include <IBillboardSceneNode.h>
+#include "serialization.h" // For decompressZlib
+#include "gamedef.h"
+#include "clientobject.h"
+#include "content_object.h"
+#include "mesh.h"
+#include "utility.h" // For IntervalLimiter
+#include "itemdef.h"
+#include "tool.h"
+class Settings;
+struct ToolCapabilities;
 
 core::map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;
 
+/*
+	SmoothTranslator
+*/
+
+struct SmoothTranslator
+{
+	v3f vect_old;
+	v3f vect_show;
+	v3f vect_aim;
+	f32 anim_counter;
+	f32 anim_time;
+	f32 anim_time_counter;
+	bool aim_is_end;
+
+	SmoothTranslator():
+		vect_old(0,0,0),
+		vect_show(0,0,0),
+		vect_aim(0,0,0),
+		anim_counter(0),
+		anim_time(0),
+		anim_time_counter(0),
+		aim_is_end(true)
+	{}
+
+	void init(v3f vect)
+	{
+		vect_old = vect;
+		vect_show = vect;
+		vect_aim = vect;
+		anim_counter = 0;
+		anim_time = 0;
+		anim_time_counter = 0;
+		aim_is_end = true;
+	}
+
+	void sharpen()
+	{
+		init(vect_show);
+	}
+
+	void update(v3f vect_new, bool is_end_position=false, float update_interval=-1)
+	{
+		aim_is_end = is_end_position;
+		vect_old = vect_show;
+		vect_aim = vect_new;
+		if(update_interval > 0){
+			anim_time = update_interval;
+		} else {
+			if(anim_time < 0.001 || anim_time > 1.0)
+				anim_time = anim_time_counter;
+			else
+				anim_time = anim_time * 0.9 + anim_time_counter * 0.1;
+		}
+		anim_time_counter = 0;
+		anim_counter = 0;
+	}
+
+	void translate(f32 dtime)
+	{
+		anim_time_counter = anim_time_counter + dtime;
+		anim_counter = anim_counter + dtime;
+		v3f vect_move = vect_aim - vect_old;
+		f32 moveratio = 1.0;
+		if(anim_time > 0.001)
+			moveratio = anim_time_counter / anim_time;
+		// Move a bit less than should, to avoid oscillation
+		moveratio = moveratio * 0.8;
+		float move_end = 1.5;
+		if(aim_is_end)
+			move_end = 1.0;
+		if(moveratio > move_end)
+			moveratio = move_end;
+		vect_show = vect_old + vect_move * moveratio;
+	}
+
+	bool is_moving()
+	{
+		return ((anim_time_counter / anim_time) < 1.4);
+	}
+};
+
+/*
+	Other stuff
+*/
+
+static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill,
+		float txs, float tys, int col, int row)
+{
+	video::SMaterial& material = bill->getMaterial(0);
+	core::matrix4& matrix = material.getTextureMatrix(0);
+	matrix.setTextureTranslate(txs*col, tys*row);
+	matrix.setTextureScale(txs, tys);
+}
+
 /*
 	TestCAO
 */
 
+class TestCAO : public ClientActiveObject
+{
+public:
+	TestCAO(IGameDef *gamedef, ClientEnvironment *env);
+	virtual ~TestCAO();
+	
+	u8 getType() const
+	{
+		return ACTIVEOBJECT_TYPE_TEST;
+	}
+	
+	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env);
+
+	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr);
+	void removeFromScene();
+	void updateLight(u8 light_at_pos);
+	v3s16 getLightPosition();
+	void updateNodePos();
+
+	void step(float dtime, ClientEnvironment *env);
+
+	void processMessage(const std::string &data);
+
+private:
+	scene::IMeshSceneNode *m_node;
+	v3f m_position;
+};
+
 // Prototype
-TestCAO proto_TestCAO;
+TestCAO proto_TestCAO(NULL, NULL);
 
-TestCAO::TestCAO():
-	ClientActiveObject(0),
+TestCAO::TestCAO(IGameDef *gamedef, ClientEnvironment *env):
+	ClientActiveObject(0, gamedef, env),
 	m_node(NULL),
 	m_position(v3f(0,10*BS,0))
 {
@@ -42,17 +180,18 @@ TestCAO::~TestCAO()
 {
 }
 
-ClientActiveObject* TestCAO::create()
+ClientActiveObject* TestCAO::create(IGameDef *gamedef, ClientEnvironment *env)
 {
-	return new TestCAO();
+	return new TestCAO(gamedef, env);
 }
 
-void TestCAO::addToScene(scene::ISceneManager *smgr)
+void TestCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr)
 {
 	if(m_node != NULL)
 		return;
 	
-	video::IVideoDriver* driver = smgr->getVideoDriver();
+	//video::IVideoDriver* driver = smgr->getVideoDriver();
 	
 	scene::SMesh *mesh = new scene::SMesh();
 	scene::IMeshBuffer *buf = new scene::SMeshBuffer();
@@ -69,8 +208,7 @@ void TestCAO::addToScene(scene::ISceneManager *smgr)
 	// Set material
 	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
 	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	buf->getMaterial().setTexture
-			(0, driver->getTexture(getTexturePath("rat.png").c_str()));
+	buf->getMaterial().setTexture(0, tsrc->getTextureRaw("rat.png"));
 	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
 	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
 	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -114,7 +252,7 @@ void TestCAO::step(float dtime, ClientEnvironment *env)
 	if(m_node)
 	{
 		v3f rot = m_node->getRotation();
-		//dstream<<"dtime="<<dtime<<", rot.Y="<<rot.Y<<std::endl;
+		//infostream<<"dtime="<<dtime<<", rot.Y="<<rot.Y<<std::endl;
 		rot.Y += dtime * 180;
 		m_node->setRotation(rot);
 	}
@@ -122,7 +260,7 @@ void TestCAO::step(float dtime, ClientEnvironment *env)
 
 void TestCAO::processMessage(const std::string &data)
 {
-	dstream<<"TestCAO: Got data: "<<data<<std::endl;
+	infostream<<"TestCAO: Got data: "<<data<<std::endl;
 	std::istringstream is(data, std::ios::binary);
 	u16 cmd;
 	is>>cmd;
@@ -141,35 +279,83 @@ void TestCAO::processMessage(const std::string &data)
 	ItemCAO
 */
 
+class ItemCAO : public ClientActiveObject
+{
+public:
+	ItemCAO(IGameDef *gamedef, ClientEnvironment *env);
+	virtual ~ItemCAO();
+	
+	u8 getType() const
+	{
+		return ACTIVEOBJECT_TYPE_ITEM;
+	}
+	
+	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env);
+
+	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr);
+	void removeFromScene();
+	void updateLight(u8 light_at_pos);
+	v3s16 getLightPosition();
+	void updateNodePos();
+	void updateInfoText();
+	void updateTexture();
+
+	void step(float dtime, ClientEnvironment *env);
+
+	void processMessage(const std::string &data);
+
+	void initialize(const std::string &data);
+	
+	core::aabbox3d<f32>* getSelectionBox()
+		{return &m_selection_box;}
+	v3f getPosition()
+		{return m_position;}
+	
+	std::string infoText()
+		{return m_infotext;}
+
+private:
+	core::aabbox3d<f32> m_selection_box;
+	scene::IMeshSceneNode *m_node;
+	v3f m_position;
+	std::string m_itemstring;
+	std::string m_infotext;
+};
+
 #include "inventory.h"
 
 // Prototype
-ItemCAO proto_ItemCAO;
+ItemCAO proto_ItemCAO(NULL, NULL);
 
-ItemCAO::ItemCAO():
-	ClientActiveObject(0),
+ItemCAO::ItemCAO(IGameDef *gamedef, ClientEnvironment *env):
+	ClientActiveObject(0, gamedef, env),
 	m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.),
 	m_node(NULL),
 	m_position(v3f(0,10*BS,0))
 {
-	ClientActiveObject::registerType(getType(), create);
+	if(!gamedef && !env)
+	{
+		ClientActiveObject::registerType(getType(), create);
+	}
 }
 
 ItemCAO::~ItemCAO()
 {
 }
 
-ClientActiveObject* ItemCAO::create()
+ClientActiveObject* ItemCAO::create(IGameDef *gamedef, ClientEnvironment *env)
 {
-	return new ItemCAO();
+	return new ItemCAO(gamedef, env);
 }
 
-void ItemCAO::addToScene(scene::ISceneManager *smgr)
+void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr)
 {
 	if(m_node != NULL)
 		return;
 	
-	video::IVideoDriver* driver = smgr->getVideoDriver();
+	//video::IVideoDriver* driver = smgr->getVideoDriver();
 	
 	scene::SMesh *mesh = new scene::SMesh();
 	scene::IMeshBuffer *buf = new scene::SMeshBuffer();
@@ -190,10 +376,8 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr)
 	// Set material
 	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
 	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	// Initialize with the stick texture
-	buf->getMaterial().setTexture
-			(0, driver->getTexture(getTexturePath("stick.png").c_str()));
+	// Initialize with a generated placeholder texture
+	buf->getMaterial().setTexture(0, tsrc->getTextureRaw(""));
 	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
 	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
 	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
@@ -202,10 +386,13 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr)
 	buf->drop();
 	m_node = smgr->addMeshSceneNode(mesh, NULL);
 	mesh->drop();
-	// Set it to use the materials of the meshbuffers directly.
-	// This is needed for changing the texture in the future
-	m_node->setReadOnlyMaterials(true);
 	updateNodePos();
+
+	/*
+		Update image of node
+	*/
+
+	updateTexture();
 }
 
 void ItemCAO::removeFromScene()
@@ -224,27 +411,12 @@ void ItemCAO::updateLight(u8 light_at_pos)
 
 	u8 li = decode_light(light_at_pos);
 	video::SColor color(255,li,li,li);
-
-	scene::IMesh *mesh = m_node->getMesh();
-	if(mesh == NULL)
-		return;
-	
-	u16 mc = mesh->getMeshBufferCount();
-	for(u16 j=0; j<mc; j++)
-	{
-		scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-		video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
-		u16 vc = buf->getVertexCount();
-		for(u16 i=0; i<vc; i++)
-		{
-			vertices[i].Color = color;
-		}
-	}
+	setMeshColor(m_node->getMesh(), color);
 }
 
 v3s16 ItemCAO::getLightPosition()
 {
-	return floatToInt(m_position, BS);
+	return floatToInt(m_position + v3f(0,0.5*BS,0), BS);
 }
 
 void ItemCAO::updateNodePos()
@@ -255,6 +427,51 @@ void ItemCAO::updateNodePos()
 	m_node->setPosition(m_position);
 }
 
+void ItemCAO::updateInfoText()
+{
+	try{
+		IItemDefManager *idef = m_gamedef->idef();
+		ItemStack item;
+		item.deSerialize(m_itemstring, idef);
+		if(item.isKnown(idef))
+			m_infotext = item.getDefinition(idef).description;
+		else
+			m_infotext = "Unknown item: '" + m_itemstring + "'";
+		if(item.count >= 2)
+			m_infotext += " (" + itos(item.count) + ")";
+	}
+	catch(SerializationError &e)
+	{
+		m_infotext = "Unknown item: '" + m_itemstring + "'";
+	}
+}
+
+void ItemCAO::updateTexture()
+{
+	if(m_node == NULL)
+		return;
+
+	// Create an inventory item to see what is its image
+	std::istringstream is(m_itemstring, std::ios_base::binary);
+	video::ITexture *texture = NULL;
+	try{
+		IItemDefManager *idef = m_gamedef->idef();
+		ItemStack item;
+		item.deSerialize(is, idef);
+		texture = item.getDefinition(idef).inventory_texture;
+	}
+	catch(SerializationError &e)
+	{
+		infostream<<"WARNING: "<<__FUNCTION_NAME
+				<<": error deSerializing itemstring \""
+				<<m_itemstring<<std::endl;
+	}
+	
+	// Set meshbuffer texture
+	m_node->getMaterial(0).setTexture(0, texture);
+}
+
+
 void ItemCAO::step(float dtime, ClientEnvironment *env)
 {
 	if(m_node)
@@ -272,7 +489,7 @@ void ItemCAO::step(float dtime, ClientEnvironment *env)
 
 void ItemCAO::processMessage(const std::string &data)
 {
-	dstream<<"ItemCAO: Got message"<<std::endl;
+	//infostream<<"ItemCAO: Got message"<<std::endl;
 	std::istringstream is(data, std::ios::binary);
 	// command
 	u8 cmd = readU8(is);
@@ -282,11 +499,18 @@ void ItemCAO::processMessage(const std::string &data)
 		m_position = readV3F1000(is);
 		updateNodePos();
 	}
+	if(cmd == 1)
+	{
+		// itemstring
+		m_itemstring = deSerializeString(is);
+		updateInfoText();
+		updateTexture();
+	}
 }
 
 void ItemCAO::initialize(const std::string &data)
 {
-	dstream<<"ItemCAO: Got init data"<<std::endl;
+	infostream<<"ItemCAO: Got init data"<<std::endl;
 	
 	{
 		std::istringstream is(data, std::ios::binary);
@@ -297,616 +521,745 @@ void ItemCAO::initialize(const std::string &data)
 			return;
 		// pos
 		m_position = readV3F1000(is);
-		// inventorystring
-		m_inventorystring = deSerializeString(is);
+		// itemstring
+		m_itemstring = deSerializeString(is);
 	}
 	
 	updateNodePos();
-
-	/*
-		Update image of node
-	*/
-
-	if(m_node == NULL)
-		return;
-
-	scene::IMesh *mesh = m_node->getMesh();
-
-	if(mesh == NULL)
-		return;
-	
-	scene::IMeshBuffer *buf = mesh->getMeshBuffer(0);
-
-	if(buf == NULL)
-		return;
-
-	// Create an inventory item to see what is its image
-	std::istringstream is(m_inventorystring, std::ios_base::binary);
-	video::ITexture *texture = NULL;
-	try{
-		InventoryItem *item = NULL;
-		item = InventoryItem::deSerialize(is);
-		dstream<<__FUNCTION_NAME<<": m_inventorystring=\""
-				<<m_inventorystring<<"\" -> item="<<item
-				<<std::endl;
-		if(item)
-		{
-			texture = item->getImage();
-			delete item;
-		}
-	}
-	catch(SerializationError &e)
-	{
-		dstream<<"WARNING: "<<__FUNCTION_NAME
-				<<": error deSerializing inventorystring \""
-				<<m_inventorystring<<"\""<<std::endl;
-	}
-	
-	// Set meshbuffer texture
-	buf->getMaterial().setTexture(0, texture);
-	
+	updateInfoText();
 }
 
 /*
-	RatCAO
+	LuaEntityCAO
 */
 
-#include "inventory.h"
-
-// Prototype
-RatCAO proto_RatCAO;
-
-RatCAO::RatCAO():
-	ClientActiveObject(0),
-	m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS/2.,BS/3.),
-	m_node(NULL),
-	m_position(v3f(0,10*BS,0)),
-	m_yaw(0)
-{
-	ClientActiveObject::registerType(getType(), create);
-}
-
-RatCAO::~RatCAO()
-{
-}
-
-ClientActiveObject* RatCAO::create()
-{
-	return new RatCAO();
-}
-
-void RatCAO::addToScene(scene::ISceneManager *smgr)
-{
-	if(m_node != NULL)
-		return;
-	
-	video::IVideoDriver* driver = smgr->getVideoDriver();
-	
-	scene::SMesh *mesh = new scene::SMesh();
-	scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-	video::SColor c(255,255,255,255);
-	video::S3DVertex vertices[4] =
-	{
-		video::S3DVertex(-BS/2,0,0, 0,0,0, c, 0,1),
-		video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1),
-		video::S3DVertex(BS/2,BS/2,0, 0,0,0, c, 1,0),
-		video::S3DVertex(-BS/2,BS/2,0, 0,0,0, c, 0,0),
-	};
-	u16 indices[] = {0,1,2,2,3,0};
-	buf->append(vertices, 4, indices, 6);
-	// Set material
-	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	buf->getMaterial().setTexture
-			(0, driver->getTexture(getTexturePath("rat.png").c_str()));
-	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	// Add to mesh
-	mesh->addMeshBuffer(buf);
-	buf->drop();
-	m_node = smgr->addMeshSceneNode(mesh, NULL);
-	mesh->drop();
-	// Set it to use the materials of the meshbuffers directly.
-	// This is needed for changing the texture in the future
-	m_node->setReadOnlyMaterials(true);
-	updateNodePos();
-}
-
-void RatCAO::removeFromScene()
-{
-	if(m_node == NULL)
-		return;
-
-	m_node->remove();
-	m_node = NULL;
-}
-
-void RatCAO::updateLight(u8 light_at_pos)
-{
-	if(m_node == NULL)
-		return;
-
-	u8 li = decode_light(light_at_pos);
-	video::SColor color(255,li,li,li);
-
-	scene::IMesh *mesh = m_node->getMesh();
-	if(mesh == NULL)
-		return;
-	
-	u16 mc = mesh->getMeshBufferCount();
-	for(u16 j=0; j<mc; j++)
-	{
-		scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-		video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
-		u16 vc = buf->getVertexCount();
-		for(u16 i=0; i<vc; i++)
-		{
-			vertices[i].Color = color;
-		}
-	}
-}
-
-v3s16 RatCAO::getLightPosition()
-{
-	return floatToInt(m_position+v3f(0,BS*0.5,0), BS);
-}
-
-void RatCAO::updateNodePos()
-{
-	if(m_node == NULL)
-		return;
-
-	//m_node->setPosition(m_position);
-	m_node->setPosition(pos_translator.vect_show);
-
-	v3f rot = m_node->getRotation();
-	rot.Y = 180.0 - m_yaw;
-	m_node->setRotation(rot);
-}
-
-void RatCAO::step(float dtime, ClientEnvironment *env)
-{
-	pos_translator.translate(dtime);
-	updateNodePos();
-}
+#include "luaentity_common.h"
 
-void RatCAO::processMessage(const std::string &data)
+class LuaEntityCAO : public ClientActiveObject
 {
-	//dstream<<"RatCAO: Got message"<<std::endl;
-	std::istringstream is(data, std::ios::binary);
-	// command
-	u8 cmd = readU8(is);
-	if(cmd == 0)
+private:
+	core::aabbox3d<f32> m_selection_box;
+	scene::IMeshSceneNode *m_meshnode;
+	scene::IBillboardSceneNode *m_spritenode;
+	v3f m_position;
+	v3f m_velocity;
+	v3f m_acceleration;
+	float m_yaw;
+	s16 m_hp;
+	struct LuaEntityProperties *m_prop;
+	SmoothTranslator pos_translator;
+	// Spritesheet/animation stuff
+	v2f m_tx_size;
+	v2s16 m_tx_basepos;
+	bool m_tx_select_horiz_by_yawpitch;
+	int m_anim_frame;
+	int m_anim_num_frames;
+	float m_anim_framelength;
+	float m_anim_timer;
+	ItemGroupList m_armor_groups;
+	float m_reset_textures_timer;
+
+public:
+	LuaEntityCAO(IGameDef *gamedef, ClientEnvironment *env):
+		ClientActiveObject(0, gamedef, env),
+		m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.),
+		m_meshnode(NULL),
+		m_spritenode(NULL),
+		m_position(v3f(0,10*BS,0)),
+		m_velocity(v3f(0,0,0)),
+		m_acceleration(v3f(0,0,0)),
+		m_yaw(0),
+		m_hp(1),
+		m_prop(new LuaEntityProperties),
+		m_tx_size(1,1),
+		m_tx_basepos(0,0),
+		m_tx_select_horiz_by_yawpitch(false),
+		m_anim_frame(0),
+		m_anim_num_frames(1),
+		m_anim_framelength(0.2),
+		m_anim_timer(0),
+		m_reset_textures_timer(-1)
 	{
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.update(m_position);
-		// yaw
-		m_yaw = readF1000(is);
-		updateNodePos();
+		if(gamedef == NULL)
+			ClientActiveObject::registerType(getType(), create);
 	}
-}
 
-void RatCAO::initialize(const std::string &data)
-{
-	//dstream<<"RatCAO: Got init data"<<std::endl;
-	
+	void initialize(const std::string &data)
 	{
+		infostream<<"LuaEntityCAO: Got init data"<<std::endl;
+		
 		std::istringstream is(data, std::ios::binary);
 		// version
 		u8 version = readU8(is);
 		// check version
-		if(version != 0)
+		if(version != 1)
 			return;
 		// pos
 		m_position = readV3F1000(is);
+		// yaw
+		m_yaw = readF1000(is);
+		// hp
+		m_hp = readS16(is);
+		// properties
+		std::istringstream prop_is(deSerializeLongString(is), std::ios::binary);
+		m_prop->deSerialize(prop_is);
+
+		infostream<<"m_prop: "<<m_prop->dump()<<std::endl;
+
+		m_selection_box = m_prop->collisionbox;
+		m_selection_box.MinEdge *= BS;
+		m_selection_box.MaxEdge *= BS;
+			
 		pos_translator.init(m_position);
-	}
-	
-	updateNodePos();
-}
-
-/*
-	Oerkki1CAO
-*/
-
-#include "inventory.h"
-
-// Prototype
-Oerkki1CAO proto_Oerkki1CAO;
-
-Oerkki1CAO::Oerkki1CAO():
-	ClientActiveObject(0),
-	m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS*2.,BS/3.),
-	m_node(NULL),
-	m_position(v3f(0,10*BS,0)),
-	m_yaw(0),
-	m_damage_visual_timer(0),
-	m_damage_texture_enabled(false)
-{
-	ClientActiveObject::registerType(getType(), create);
-}
-
-Oerkki1CAO::~Oerkki1CAO()
-{
-}
 
-ClientActiveObject* Oerkki1CAO::create()
-{
-	return new Oerkki1CAO();
-}
+		m_tx_size.X = 1.0 / m_prop->spritediv.X;
+		m_tx_size.Y = 1.0 / m_prop->spritediv.Y;
+		m_tx_basepos.X = m_tx_size.X * m_prop->initial_sprite_basepos.X;
+		m_tx_basepos.Y = m_tx_size.Y * m_prop->initial_sprite_basepos.Y;
+		
+		updateNodePos();
+	}
 
-void Oerkki1CAO::addToScene(scene::ISceneManager *smgr)
-{
-	if(m_node != NULL)
-		return;
-	
-	video::IVideoDriver* driver = smgr->getVideoDriver();
-	
-	scene::SMesh *mesh = new scene::SMesh();
-	scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-	video::SColor c(255,255,255,255);
-	video::S3DVertex vertices[4] =
+	~LuaEntityCAO()
 	{
-		video::S3DVertex(-BS/2-BS,0,0, 0,0,0, c, 0,1),
-		video::S3DVertex(BS/2+BS,0,0, 0,0,0, c, 1,1),
-		video::S3DVertex(BS/2+BS,BS*2,0, 0,0,0, c, 1,0),
-		video::S3DVertex(-BS/2-BS,BS*2,0, 0,0,0, c, 0,0),
-	};
-	u16 indices[] = {0,1,2,2,3,0};
-	buf->append(vertices, 4, indices, 6);
-	// Set material
-	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	buf->getMaterial().setTexture
-			(0, driver->getTexture(getTexturePath("oerkki1.png").c_str()));
-	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	// Add to mesh
-	mesh->addMeshBuffer(buf);
-	buf->drop();
-	m_node = smgr->addMeshSceneNode(mesh, NULL);
-	mesh->drop();
-	// Set it to use the materials of the meshbuffers directly.
-	// This is needed for changing the texture in the future
-	m_node->setReadOnlyMaterials(true);
-	updateNodePos();
-}
-
-void Oerkki1CAO::removeFromScene()
-{
-	if(m_node == NULL)
-		return;
-
-	m_node->remove();
-	m_node = NULL;
-}
+		delete m_prop;
+	}
 
-void Oerkki1CAO::updateLight(u8 light_at_pos)
-{
-	if(m_node == NULL)
-		return;
-	
-	if(light_at_pos <= 2)
+	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env)
 	{
-		m_node->setVisible(false);
-		return;
+		return new LuaEntityCAO(gamedef, env);
 	}
 
-	m_node->setVisible(true);
-
-	u8 li = decode_light(light_at_pos);
-	video::SColor color(255,li,li,li);
+	u8 getType() const
+	{
+		return ACTIVEOBJECT_TYPE_LUAENTITY;
+	}
+	core::aabbox3d<f32>* getSelectionBox()
+	{
+		return &m_selection_box;
+	}
+	v3f getPosition()
+	{
+		return pos_translator.vect_show;
+	}
+		
+	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr)
+	{
+		if(m_meshnode != NULL || m_spritenode != NULL)
+			return;
+		
+		//video::IVideoDriver* driver = smgr->getVideoDriver();
+
+		if(m_prop->visual == "sprite"){
+			infostream<<"LuaEntityCAO::addToScene(): single_sprite"<<std::endl;
+			m_spritenode = smgr->addBillboardSceneNode(
+					NULL, v2f(1, 1), v3f(0,0,0), -1);
+			m_spritenode->setMaterialTexture(0,
+					tsrc->getTextureRaw("unknown_block.png"));
+			m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false);
+			m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false);
+			m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF);
+			m_spritenode->setMaterialFlag(video::EMF_FOG_ENABLE, true);
+			m_spritenode->setColor(video::SColor(255,0,0,0));
+			m_spritenode->setVisible(false); /* Set visible when brightness is known */
+			m_spritenode->setSize(m_prop->visual_size*BS);
+			{
+				const float txs = 1.0 / 1;
+				const float tys = 1.0 / 1;
+				setBillboardTextureMatrix(m_spritenode,
+						txs, tys, 0, 0);
+			}
+		} else if(m_prop->visual == "cube"){
+			infostream<<"LuaEntityCAO::addToScene(): cube"<<std::endl;
+			scene::IMesh *mesh = createCubeMesh(v3f(BS,BS,BS));
+			m_meshnode = smgr->addMeshSceneNode(mesh, NULL);
+			mesh->drop();
+			
+			m_meshnode->setScale(v3f(1));
+			// Will be shown when we know the brightness
+			m_meshnode->setVisible(false);
+		} else {
+			infostream<<"LuaEntityCAO::addToScene(): \""<<m_prop->visual
+					<<"\" not supported"<<std::endl;
+		}
+		updateTextures("");
+		updateNodePos();
+	}
 
-	scene::IMesh *mesh = m_node->getMesh();
-	if(mesh == NULL)
-		return;
-	
-	u16 mc = mesh->getMeshBufferCount();
-	for(u16 j=0; j<mc; j++)
+	void removeFromScene()
 	{
-		scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-		video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
-		u16 vc = buf->getVertexCount();
-		for(u16 i=0; i<vc; i++)
-		{
-			vertices[i].Color = color;
+		if(m_meshnode){
+			m_meshnode->remove();
+			m_meshnode = NULL;
+		}
+		if(m_spritenode){
+			m_spritenode->remove();
+			m_spritenode = NULL;
 		}
 	}
-}
 
-v3s16 Oerkki1CAO::getLightPosition()
-{
-	return floatToInt(m_position+v3f(0,BS*1.5,0), BS);
-}
+	void updateLight(u8 light_at_pos)
+	{
+		u8 li = decode_light(light_at_pos);
+		video::SColor color(255,li,li,li);
+		if(m_meshnode){
+			setMeshColor(m_meshnode->getMesh(), color);
+			m_meshnode->setVisible(true);
+		}
+		if(m_spritenode){
+			m_spritenode->setColor(color);
+			m_spritenode->setVisible(true);
+		}
+	}
 
-void Oerkki1CAO::updateNodePos()
-{
-	if(m_node == NULL)
-		return;
+	v3s16 getLightPosition()
+	{
+		return floatToInt(m_position, BS);
+	}
 
-	//m_node->setPosition(m_position);
-	m_node->setPosition(pos_translator.vect_show);
+	void updateNodePos()
+	{
+		if(m_meshnode){
+			m_meshnode->setPosition(pos_translator.vect_show);
+		}
+		if(m_spritenode){
+			m_spritenode->setPosition(pos_translator.vect_show);
+		}
+	}
 
-	v3f rot = m_node->getRotation();
-	rot.Y = 180.0 - m_yaw + 90.0;
-	m_node->setRotation(rot);
-}
+	void step(float dtime, ClientEnvironment *env)
+	{
+		if(m_prop->physical){
+			core::aabbox3d<f32> box = m_prop->collisionbox;
+			box.MinEdge *= BS;
+			box.MaxEdge *= BS;
+			collisionMoveResult moveresult;
+			f32 pos_max_d = BS*0.25; // Distance per iteration
+			v3f p_pos = m_position;
+			v3f p_velocity = m_velocity;
+			IGameDef *gamedef = env->getGameDef();
+			moveresult = collisionMovePrecise(&env->getMap(), gamedef,
+					pos_max_d, box, dtime, p_pos, p_velocity);
+			// Apply results
+			m_position = p_pos;
+			m_velocity = p_velocity;
+			
+			bool is_end_position = moveresult.collides;
+			pos_translator.update(m_position, is_end_position, dtime);
+			pos_translator.translate(dtime);
+			updateNodePos();
+
+			m_velocity += dtime * m_acceleration;
+		} else {
+			m_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration;
+			m_velocity += dtime * m_acceleration;
+			pos_translator.update(m_position, pos_translator.aim_is_end, pos_translator.anim_time);
+			pos_translator.translate(dtime);
+			updateNodePos();
+		}
 
-void Oerkki1CAO::step(float dtime, ClientEnvironment *env)
-{
-	pos_translator.translate(dtime);
-	updateNodePos();
+		m_anim_timer += dtime;
+		if(m_anim_timer >= m_anim_framelength){
+			m_anim_timer -= m_anim_framelength;
+			m_anim_frame++;
+			if(m_anim_frame >= m_anim_num_frames)
+				m_anim_frame = 0;
+		}
 
-	LocalPlayer *player = env->getLocalPlayer();
-	assert(player);
-	
-	v3f playerpos = player->getPosition();
-	v2f playerpos_2d(playerpos.X,playerpos.Z);
-	v2f objectpos_2d(m_position.X,m_position.Z);
+		updateTexturePos();
 
-	if(fabs(m_position.Y - playerpos.Y) < 3.0*BS &&
-			objectpos_2d.getDistanceFrom(playerpos_2d) < 1.5*BS)
-	{
-		if(m_attack_interval.step(dtime, 0.5))
-		{
-			env->damageLocalPlayer(2);
+		if(m_reset_textures_timer >= 0){
+			m_reset_textures_timer -= dtime;
+			if(m_reset_textures_timer <= 0){
+				m_reset_textures_timer = -1;
+				updateTextures("");
+			}
 		}
 	}
 
-	if(m_damage_visual_timer > 0)
+	void updateTexturePos()
 	{
-		if(!m_damage_texture_enabled)
-		{
-			// Enable damage texture
-			if(m_node)
+		if(m_spritenode){
+			scene::ICameraSceneNode* camera =
+					m_spritenode->getSceneManager()->getActiveCamera();
+			if(!camera)
+				return;
+			v3f cam_to_entity = m_spritenode->getAbsolutePosition()
+					- camera->getAbsolutePosition();
+			cam_to_entity.normalize();
+
+			int row = m_tx_basepos.Y;
+			int col = m_tx_basepos.X;
+			
+			if(m_tx_select_horiz_by_yawpitch)
 			{
-				video::IVideoDriver* driver =
-					m_node->getSceneManager()->getVideoDriver();
-				
-				scene::IMesh *mesh = m_node->getMesh();
-				if(mesh == NULL)
-					return;
-				
-				u16 mc = mesh->getMeshBufferCount();
-				for(u16 j=0; j<mc; j++)
-				{
-					scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-					buf->getMaterial().setTexture(0, driver->getTexture(
-							getTexturePath("oerkki1_damaged.png").c_str()));
+				if(cam_to_entity.Y > 0.75)
+					col += 5;
+				else if(cam_to_entity.Y < -0.75)
+					col += 4;
+				else{
+					float mob_dir = atan2(cam_to_entity.Z, cam_to_entity.X) / PI * 180.;
+					float dir = mob_dir - m_yaw;
+					dir = wrapDegrees_180(dir);
+					//infostream<<"id="<<m_id<<" dir="<<dir<<std::endl;
+					if(fabs(wrapDegrees_180(dir - 0)) <= 45.1)
+						col += 2;
+					else if(fabs(wrapDegrees_180(dir - 90)) <= 45.1)
+						col += 3;
+					else if(fabs(wrapDegrees_180(dir - 180)) <= 45.1)
+						col += 0;
+					else if(fabs(wrapDegrees_180(dir + 90)) <= 45.1)
+						col += 1;
+					else
+						col += 4;
 				}
 			}
-			m_damage_texture_enabled = true;
+			
+			// Animation goes downwards
+			row += m_anim_frame;
+
+			float txs = m_tx_size.X;
+			float tys = m_tx_size.Y;
+			setBillboardTextureMatrix(m_spritenode,
+					txs, tys, col, row);
 		}
-		m_damage_visual_timer -= dtime;
 	}
-	else
+
+	void updateTextures(const std::string &mod)
 	{
-		if(m_damage_texture_enabled)
-		{
-			// Disable damage texture
-			if(m_node)
+		ITextureSource *tsrc = m_gamedef->tsrc();
+
+		if(m_spritenode){
+			std::string texturestring = "unknown_block.png";
+			if(m_prop->textures.size() >= 1)
+				texturestring = m_prop->textures[0];
+			texturestring += mod;
+			m_spritenode->setMaterialTexture(0,
+					tsrc->getTextureRaw(texturestring));
+		}
+		if(m_meshnode){
+			for (u32 i = 0; i < 6; ++i)
 			{
-				video::IVideoDriver* driver =
-					m_node->getSceneManager()->getVideoDriver();
-				
-				scene::IMesh *mesh = m_node->getMesh();
-				if(mesh == NULL)
-					return;
-				
-				u16 mc = mesh->getMeshBufferCount();
-				for(u16 j=0; j<mc; j++)
-				{
-					scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-					buf->getMaterial().setTexture(0, driver->getTexture(
-							getTexturePath("oerkki1.png").c_str()));
-				}
+				std::string texturestring = "unknown_block.png";
+				if(m_prop->textures.size() > i)
+					texturestring = m_prop->textures[i];
+				texturestring += mod;
+				AtlasPointer ap = tsrc->getTexture(texturestring);
+
+				// Get the tile texture and atlas transformation
+				video::ITexture* atlas = ap.atlas;
+				v2f pos = ap.pos;
+				v2f size = ap.size;
+
+				// Set material flags and texture
+				video::SMaterial& material = m_meshnode->getMaterial(i);
+				material.setFlag(video::EMF_LIGHTING, false);
+				material.setFlag(video::EMF_BILINEAR_FILTER, false);
+				material.setTexture(0, atlas);
+				material.getTextureMatrix(0).setTextureTranslate(pos.X, pos.Y);
+				material.getTextureMatrix(0).setTextureScale(size.X, size.Y);
 			}
-			m_damage_texture_enabled = false;
 		}
 	}
-}
 
-void Oerkki1CAO::processMessage(const std::string &data)
-{
-	//dstream<<"Oerkki1CAO: Got message"<<std::endl;
-	std::istringstream is(data, std::ios::binary);
-	// command
-	u8 cmd = readU8(is);
-	if(cmd == 0)
+	void processMessage(const std::string &data)
 	{
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.update(m_position);
-		// yaw
-		m_yaw = readF1000(is);
-		updateNodePos();
+		//infostream<<"LuaEntityCAO: Got message"<<std::endl;
+		std::istringstream is(data, std::ios::binary);
+		// command
+		u8 cmd = readU8(is);
+		if(cmd == LUAENTITY_CMD_UPDATE_POSITION) // update position
+		{
+			// do_interpolate
+			bool do_interpolate = readU8(is);
+			// pos
+			m_position = readV3F1000(is);
+			// velocity
+			m_velocity = readV3F1000(is);
+			// acceleration
+			m_acceleration = readV3F1000(is);
+			// yaw
+			m_yaw = readF1000(is);
+			// is_end_position (for interpolation)
+			bool is_end_position = readU8(is);
+			// update_interval
+			float update_interval = readF1000(is);
+			
+			if(do_interpolate){
+				if(!m_prop->physical)
+					pos_translator.update(m_position, is_end_position, update_interval);
+			} else {
+				pos_translator.init(m_position);
+			}
+			updateNodePos();
+		}
+		else if(cmd == LUAENTITY_CMD_SET_TEXTURE_MOD) // set texture modification
+		{
+			std::string mod = deSerializeString(is);
+			updateTextures(mod);
+		}
+		else if(cmd == LUAENTITY_CMD_SET_SPRITE) // set sprite
+		{
+			v2s16 p = readV2S16(is);
+			int num_frames = readU16(is);
+			float framelength = readF1000(is);
+			bool select_horiz_by_yawpitch = readU8(is);
+			
+			m_tx_basepos = p;
+			m_anim_num_frames = num_frames;
+			m_anim_framelength = framelength;
+			m_tx_select_horiz_by_yawpitch = select_horiz_by_yawpitch;
+
+			updateTexturePos();
+		}
+		else if(cmd == LUAENTITY_CMD_PUNCHED)
+		{
+			/*s16 damage =*/ readS16(is);
+			s16 result_hp = readS16(is);
+			
+			m_hp = result_hp;
+			// TODO: Execute defined fast response
+		}
+		else if(cmd == LUAENTITY_CMD_UPDATE_ARMOR_GROUPS)
+		{
+			m_armor_groups.clear();
+			int armor_groups_size = readU16(is);
+			for(int i=0; i<armor_groups_size; i++){
+				std::string name = deSerializeString(is);
+				int rating = readS16(is);
+				m_armor_groups[name] = rating;
+			}
+		}
 	}
-	else if(cmd == 1)
+	
+	bool directReportPunch(v3f dir, const ItemStack *punchitem=NULL,
+			float time_from_last_punch=1000000)
 	{
-		u16 damage = readU8(is);
-		m_damage_visual_timer = 1.0;
+		assert(punchitem);
+		const ToolCapabilities *toolcap =
+				&punchitem->getToolCapabilities(m_gamedef->idef());
+		PunchDamageResult result = getPunchDamage(
+				m_armor_groups,
+				toolcap,
+				punchitem,
+				time_from_last_punch);
+		
+		if(result.did_punch && result.damage != 0)
+		{
+			if(result.damage < m_hp)
+				m_hp -= result.damage;
+			else
+				m_hp = 0;
+			// TODO: Execute defined fast response
+			// I guess flashing is fine as of now
+			updateTextures("^[brighten");
+			m_reset_textures_timer = 0.1;
+		}
+		
+		return false;
 	}
-}
+	
+	std::string debugInfoText()
+	{
+		std::ostringstream os(std::ios::binary);
+		os<<"LuaEntityCAO hp="<<m_hp<<"\n";
+		os<<"armor={";
+		for(ItemGroupList::const_iterator i = m_armor_groups.begin();
+				i != m_armor_groups.end(); i++){
+			os<<i->first<<"="<<i->second<<", ";
+		}
+		os<<"}";
+		return os.str();
+	}
+};
+
+// Prototype
+LuaEntityCAO proto_LuaEntityCAO(NULL, NULL);
+
+/*
+	PlayerCAO
+*/
 
-void Oerkki1CAO::initialize(const std::string &data)
+class PlayerCAO : public ClientActiveObject
 {
-	//dstream<<"Oerkki1CAO: Got init data"<<std::endl;
-	
+private:
+	core::aabbox3d<f32> m_selection_box;
+	scene::IMeshSceneNode *m_node;
+	scene::ITextSceneNode* m_text;
+	std::string m_name;
+	v3f m_position;
+	float m_yaw;
+	SmoothTranslator pos_translator;
+	bool m_is_local_player;
+	LocalPlayer *m_local_player;
+	float m_damage_visual_timer;
+	bool m_dead;
+
+public:
+	PlayerCAO(IGameDef *gamedef, ClientEnvironment *env):
+		ClientActiveObject(0, gamedef, env),
+		m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS*2.0,BS/3.),
+		m_node(NULL),
+		m_text(NULL),
+		m_position(v3f(0,10*BS,0)),
+		m_yaw(0),
+		m_is_local_player(false),
+		m_local_player(NULL),
+		m_damage_visual_timer(0),
+		m_dead(false)
+	{
+		if(gamedef == NULL)
+			ClientActiveObject::registerType(getType(), create);
+	}
+
+	void initialize(const std::string &data)
 	{
+		infostream<<"PlayerCAO: Got init data"<<std::endl;
+		
 		std::istringstream is(data, std::ios::binary);
 		// version
 		u8 version = readU8(is);
 		// check version
 		if(version != 0)
 			return;
+		// name
+		m_name = deSerializeString(is);
 		// pos
 		m_position = readV3F1000(is);
+		// yaw
+		m_yaw = readF1000(is);
+		// dead
+		m_dead = readU8(is);
+
 		pos_translator.init(m_position);
-	}
-	
-	updateNodePos();
-}
 
-/*
-	FireflyCAO
-*/
+		Player *player = m_env->getPlayer(m_name.c_str());
+		if(player && player->isLocal()){
+			m_is_local_player = true;
+			m_local_player = (LocalPlayer*)player;
+		}
+	}
 
-// Prototype
-FireflyCAO proto_FireflyCAO;
+	~PlayerCAO()
+	{
+		if(m_node)
+			m_node->remove();
+	}
 
-FireflyCAO::FireflyCAO():
-	ClientActiveObject(0),
-	m_selection_box(-BS/3.,0.0,-BS/3., BS/3.,BS/2.,BS/3.),
-	m_node(NULL),
-	m_position(v3f(0,10*BS,0)),
-	m_yaw(0)
-{
-	ClientActiveObject::registerType(getType(), create);
-}
+	static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env)
+	{
+		return new PlayerCAO(gamedef, env);
+	}
 
-FireflyCAO::~FireflyCAO()
-{
-}
+	u8 getType() const
+	{
+		return ACTIVEOBJECT_TYPE_PLAYER;
+	}
+	core::aabbox3d<f32>* getSelectionBox()
+	{
+		if(m_is_local_player)
+			return NULL;
+		if(m_dead)
+			return NULL;
+		return &m_selection_box;
+	}
+	v3f getPosition()
+	{
+		return pos_translator.vect_show;
+	}
+		
+	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
+			IrrlichtDevice *irr)
+	{
+		if(m_node != NULL)
+			return;
+		if(m_is_local_player)
+			return;
+		
+		//video::IVideoDriver* driver = smgr->getVideoDriver();
+		gui::IGUIEnvironment* gui = irr->getGUIEnvironment();
+		
+		scene::SMesh *mesh = new scene::SMesh();
+		{ // Front
+		scene::IMeshBuffer *buf = new scene::SMeshBuffer();
+		video::SColor c(255,255,255,255);
+		video::S3DVertex vertices[4] =
+		{
+			video::S3DVertex(-BS/2,0,0, 0,0,0, c, 0,1),
+			video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1),
+			video::S3DVertex(BS/2,BS*2,0, 0,0,0, c, 1,0),
+			video::S3DVertex(-BS/2,BS*2,0, 0,0,0, c, 0,0),
+		};
+		u16 indices[] = {0,1,2,2,3,0};
+		buf->append(vertices, 4, indices, 6);
+		// Set material
+		buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
+		buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
+		buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
+		buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+		// Add to mesh
+		mesh->addMeshBuffer(buf);
+		buf->drop();
+		}
+		{ // Back
+		scene::IMeshBuffer *buf = new scene::SMeshBuffer();
+		video::SColor c(255,255,255,255);
+		video::S3DVertex vertices[4] =
+		{
+			video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1),
+			video::S3DVertex(-BS/2,0,0, 0,0,0, c, 0,1),
+			video::S3DVertex(-BS/2,BS*2,0, 0,0,0, c, 0,0),
+			video::S3DVertex(BS/2,BS*2,0, 0,0,0, c, 1,0),
+		};
+		u16 indices[] = {0,1,2,2,3,0};
+		buf->append(vertices, 4, indices, 6);
+		// Set material
+		buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
+		buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
+		buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
+		buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+		// Add to mesh
+		mesh->addMeshBuffer(buf);
+		buf->drop();
+		}
+		m_node = smgr->addMeshSceneNode(mesh, NULL);
+		mesh->drop();
+		// Set it to use the materials of the meshbuffers directly.
+		// This is needed for changing the texture in the future
+		m_node->setReadOnlyMaterials(true);
+		updateNodePos();
 
-ClientActiveObject* FireflyCAO::create()
-{
-	return new FireflyCAO();
-}
+		// Add a text node for showing the name
+		std::wstring wname = narrow_to_wide(m_name);
+		m_text = smgr->addTextSceneNode(gui->getBuiltInFont(),
+				wname.c_str(), video::SColor(255,255,255,255), m_node);
+		m_text->setPosition(v3f(0, (f32)BS*2.1, 0));
+		
+		updateTextures("");
+		updateVisibility();
+		updateNodePos();
+	}
 
-void FireflyCAO::addToScene(scene::ISceneManager *smgr)
-{
-	if(m_node != NULL)
-		return;
-	
-	video::IVideoDriver* driver = smgr->getVideoDriver();
-	
-	scene::SMesh *mesh = new scene::SMesh();
-	scene::IMeshBuffer *buf = new scene::SMeshBuffer();
-	video::SColor c(255,255,255,255);
-	video::S3DVertex vertices[4] =
+	void removeFromScene()
 	{
-		video::S3DVertex(0,0,0, 0,0,0, c, 0,1),
-		video::S3DVertex(BS/2,0,0, 0,0,0, c, 1,1),
-		video::S3DVertex(BS/2,BS/2,0, 0,0,0, c, 1,0),
-		video::S3DVertex(0,BS/2,0, 0,0,0, c, 0,0),
-	};
-	u16 indices[] = {0,1,2,2,3,0};
-	buf->append(vertices, 4, indices, 6);
-	// Set material
-	buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
-	buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
-	//buf->getMaterial().setTexture(0, NULL);
-	buf->getMaterial().setTexture
-			(0, driver->getTexture(getTexturePath("firefly.png").c_str()));
-	buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
-	buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
-	buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	// Add to mesh
-	mesh->addMeshBuffer(buf);
-	buf->drop();
-	m_node = smgr->addMeshSceneNode(mesh, NULL);
-	mesh->drop();
-	// Set it to use the materials of the meshbuffers directly.
-	// This is needed for changing the texture in the future
-	m_node->setReadOnlyMaterials(true);
-	updateNodePos();
-}
-
-void FireflyCAO::removeFromScene()
-{
-	if(m_node == NULL)
-		return;
+		if(m_node == NULL)
+			return;
 
-	m_node->remove();
-	m_node = NULL;
-}
+		m_node->remove();
+		m_node = NULL;
+	}
 
-void FireflyCAO::updateLight(u8 light_at_pos)
-{
-	if(m_node == NULL)
-		return;
+	void updateLight(u8 light_at_pos)
+	{
+		if(m_node == NULL)
+			return;
+		
+		u8 li = decode_light(light_at_pos);
+		video::SColor color(255,li,li,li);
+		setMeshColor(m_node->getMesh(), color);
 
-	u8 li = 255;
-	video::SColor color(255,li,li,li);
+		updateVisibility();
+	}
 
-	scene::IMesh *mesh = m_node->getMesh();
-	if(mesh == NULL)
-		return;
-	
-	u16 mc = mesh->getMeshBufferCount();
-	for(u16 j=0; j<mc; j++)
+	v3s16 getLightPosition()
 	{
-		scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-		video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
-		u16 vc = buf->getVertexCount();
-		for(u16 i=0; i<vc; i++)
-		{
-			vertices[i].Color = color;
-		}
+		return floatToInt(m_position+v3f(0,BS*1.5,0), BS);
 	}
-}
 
-v3s16 FireflyCAO::getLightPosition()
-{
-	return floatToInt(m_position+v3f(0,BS*0.5,0), BS);
-}
+	void updateVisibility()
+	{
+		if(m_node == NULL)
+			return;
 
-void FireflyCAO::updateNodePos()
-{
-	if(m_node == NULL)
-		return;
+		m_node->setVisible(!m_dead);
+	}
 
-	//m_node->setPosition(m_position);
-	m_node->setPosition(pos_translator.vect_show);
+	void updateNodePos()
+	{
+		if(m_node == NULL)
+			return;
 
-	v3f rot = m_node->getRotation();
-	rot.Y = 180.0 - m_yaw;
-	m_node->setRotation(rot);
-}
+		m_node->setPosition(pos_translator.vect_show);
 
-void FireflyCAO::step(float dtime, ClientEnvironment *env)
-{
-	pos_translator.translate(dtime);
-	updateNodePos();
-}
+		v3f rot = m_node->getRotation();
+		rot.Y = -m_yaw;
+		m_node->setRotation(rot);
+	}
 
-void FireflyCAO::processMessage(const std::string &data)
-{
-	//dstream<<"FireflyCAO: Got message"<<std::endl;
-	std::istringstream is(data, std::ios::binary);
-	// command
-	u8 cmd = readU8(is);
-	if(cmd == 0)
+	void step(float dtime, ClientEnvironment *env)
 	{
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.update(m_position);
-		// yaw
-		m_yaw = readF1000(is);
+		pos_translator.translate(dtime);
+		updateVisibility();
 		updateNodePos();
+
+		if(m_damage_visual_timer > 0){
+			m_damage_visual_timer -= dtime;
+			if(m_damage_visual_timer <= 0){
+				updateTextures("");
+			}
+		}
 	}
-}
 
-void FireflyCAO::initialize(const std::string &data)
-{
-	//dstream<<"FireflyCAO: Got init data"<<std::endl;
-	
+	void processMessage(const std::string &data)
 	{
+		//infostream<<"PlayerCAO: Got message"<<std::endl;
 		std::istringstream is(data, std::ios::binary);
-		// version
-		u8 version = readU8(is);
-		// check version
-		if(version != 0)
+		// command
+		u8 cmd = readU8(is);
+		if(cmd == 0) // update position
+		{
+			// pos
+			m_position = readV3F1000(is);
+			// yaw
+			m_yaw = readF1000(is);
+
+			pos_translator.update(m_position, false);
+
+			updateNodePos();
+		}
+		else if(cmd == 1) // punched
+		{
+			// damage
+			s16 damage = readS16(is);
+			m_damage_visual_timer = 0.05;
+			if(damage >= 2)
+				m_damage_visual_timer += 0.05 * damage;
+			updateTextures("^[brighten");
+		}
+		else if(cmd == 2) // died or respawned
+		{
+			m_dead = readU8(is);
+			updateVisibility();
+		}
+	}
+
+	void updateTextures(const std::string &mod)
+	{
+		if(!m_node)
 			return;
-		// pos
-		m_position = readV3F1000(is);
-		pos_translator.init(m_position);
+		ITextureSource *tsrc = m_gamedef->tsrc();
+		scene::IMesh *mesh = m_node->getMesh();
+		if(mesh){
+			{
+				std::string tname = "player.png";
+				tname += mod;
+				scene::IMeshBuffer *buf = mesh->getMeshBuffer(0);
+				buf->getMaterial().setTexture(0,
+						tsrc->getTextureRaw(tname));
+			}
+			{
+				std::string tname = "player_back.png";
+				tname += mod;
+				scene::IMeshBuffer *buf = mesh->getMeshBuffer(1);
+				buf->getMaterial().setTexture(0,
+						tsrc->getTextureRaw(tname));
+			}
+		}
 	}
-	
-	updateNodePos();
-}
+};
+
+// Prototype
+PlayerCAO proto_PlayerCAO(NULL, NULL);
+
+