X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcontent_sao.cpp;h=85340981db7c64be614e1cbfdbd709d118e857a5;hb=db4911f9565cae6d982e5fac2627fe45048fab8f;hp=414d63f2d38ee03d8e1ac35afe5eaf24a7502d36;hpb=d6b30dd3a5df4b84a287305f807442064f4cf68d;p=oweals%2Fminetest.git

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 414d63f2d..85340981d 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -24,1497 +24,311 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "main.h" // For g_profiler
 #include "profiler.h"
 #include "serialization.h" // For compressZlib
+#include "tool.h" // For ToolCapabilities
+#include "gamedef.h"
 
 core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
 
-/* Some helper functions */
-
-// Y is copied, X and Z change is limited
-void accelerate_xz(v3f &speed, v3f target_speed, f32 max_increase)
-{
-	v3f d_wanted = target_speed - speed;
-	d_wanted.Y = 0;
-	f32 dl_wanted = d_wanted.getLength();
-	f32 dl = dl_wanted;
-	if(dl > max_increase)
-		dl = max_increase;
-	
-	v3f d = d_wanted.normalize() * dl;
-
-	speed.X += d.X;
-	speed.Z += d.Z;
-	speed.Y = target_speed.Y;
-}
-
-/*
-	TestSAO
-*/
-
-// Prototype
-TestSAO proto_TestSAO(NULL, v3f(0,0,0));
-
-TestSAO::TestSAO(ServerEnvironment *env, v3f pos):
-	ServerActiveObject(env, pos),
-	m_timer1(0),
-	m_age(0)
-{
-	ServerActiveObject::registerType(getType(), create);
-}
-
-ServerActiveObject* TestSAO::create(ServerEnvironment *env, v3f pos,
-		const std::string &data)
-{
-	return new TestSAO(env, pos);
-}
-
-void TestSAO::step(float dtime, bool send_recommended)
-{
-	m_age += dtime;
-	if(m_age > 10)
-	{
-		m_removed = true;
-		return;
-	}
-
-	m_base_position.Y += dtime * BS * 2;
-	if(m_base_position.Y > 8*BS)
-		m_base_position.Y = 2*BS;
-
-	if(send_recommended == false)
-		return;
-
-	m_timer1 -= dtime;
-	if(m_timer1 < 0.0)
-	{
-		m_timer1 += 0.125;
-
-		std::string data;
-
-		data += itos(0); // 0 = position
-		data += " ";
-		data += itos(m_base_position.X);
-		data += " ";
-		data += itos(m_base_position.Y);
-		data += " ";
-		data += itos(m_base_position.Z);
-
-		ActiveObjectMessage aom(getId(), false, data);
-		m_messages_out.push_back(aom);
-	}
-}
-
-
-/*
-	ItemSAO
-*/
-
-// Prototype
-ItemSAO proto_ItemSAO(NULL, v3f(0,0,0), "");
-
-ItemSAO::ItemSAO(ServerEnvironment *env, v3f pos,
-		const std::string inventorystring):
-	ServerActiveObject(env, pos),
-	m_inventorystring(inventorystring),
-	m_speed_f(0,0,0),
-	m_last_sent_position(0,0,0)
-{
-	ServerActiveObject::registerType(getType(), create);
-}
-
-ServerActiveObject* ItemSAO::create(ServerEnvironment *env, v3f pos,
-		const std::string &data)
-{
-	std::istringstream is(data, std::ios::binary);
-	char buf[1];
-	// read version
-	is.read(buf, 1);
-	u8 version = buf[0];
-	// check if version is supported
-	if(version != 0)
-		return NULL;
-	std::string inventorystring = deSerializeString(is);
-	infostream<<"ItemSAO::create(): Creating item \""
-			<<inventorystring<<"\""<<std::endl;
-	return new ItemSAO(env, pos, inventorystring);
-}
-
-void ItemSAO::step(float dtime, bool send_recommended)
-{
-	ScopeProfiler sp2(g_profiler, "ItemSAO::step avg", SPT_AVG);
-
-	assert(m_env);
-
-	const float interval = 0.2;
-	if(m_move_interval.step(dtime, interval)==false)
-		return;
-	dtime = interval;
-	
-	core::aabbox3d<f32> box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.);
-	collisionMoveResult moveresult;
-	// Apply gravity
-	m_speed_f += v3f(0, -dtime*9.81*BS, 0);
-	// Maximum movement without glitches
-	f32 pos_max_d = BS*0.25;
-	// Limit speed
-	if(m_speed_f.getLength()*dtime > pos_max_d)
-		m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
-	v3f pos_f = getBasePosition();
-	v3f pos_f_old = pos_f;
-	IGameDef *gamedef = m_env->getGameDef();
-	moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
-			pos_max_d, box, dtime, pos_f, m_speed_f);
-	
-	if(send_recommended == false)
-		return;
-
-	if(pos_f.getDistanceFrom(m_last_sent_position) > 0.05*BS)
-	{
-		setBasePosition(pos_f);
-		m_last_sent_position = pos_f;
-
-		std::ostringstream os(std::ios::binary);
-		char buf[6];
-		// command (0 = update position)
-		buf[0] = 0;
-		os.write(buf, 1);
-		// pos
-		writeS32((u8*)buf, m_base_position.X*1000);
-		os.write(buf, 4);
-		writeS32((u8*)buf, m_base_position.Y*1000);
-		os.write(buf, 4);
-		writeS32((u8*)buf, m_base_position.Z*1000);
-		os.write(buf, 4);
-		// create message and add to list
-		ActiveObjectMessage aom(getId(), false, os.str());
-		m_messages_out.push_back(aom);
-	}
-}
-
-std::string ItemSAO::getClientInitializationData()
-{
-	std::ostringstream os(std::ios::binary);
-	char buf[6];
-	// version
-	buf[0] = 0;
-	os.write(buf, 1);
-	// pos
-	writeS32((u8*)buf, m_base_position.X*1000);
-	os.write(buf, 4);
-	writeS32((u8*)buf, m_base_position.Y*1000);
-	os.write(buf, 4);
-	writeS32((u8*)buf, m_base_position.Z*1000);
-	os.write(buf, 4);
-	// inventorystring
-	os<<serializeString(m_inventorystring);
-	return os.str();
-}
-
-std::string ItemSAO::getStaticData()
-{
-	infostream<<__FUNCTION_NAME<<std::endl;
-	std::ostringstream os(std::ios::binary);
-	char buf[1];
-	// version
-	buf[0] = 0;
-	os.write(buf, 1);
-	// inventorystring
-	os<<serializeString(m_inventorystring);
-	return os.str();
-}
-
-InventoryItem * ItemSAO::createInventoryItem()
-{
-	try{
-		std::istringstream is(m_inventorystring, std::ios_base::binary);
-		IGameDef *gamedef = m_env->getGameDef();
-		InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
-		infostream<<__FUNCTION_NAME<<": m_inventorystring=\""
-				<<m_inventorystring<<"\" -> item="<<item
-				<<std::endl;
-		return item;
-	}
-	catch(SerializationError &e)
-	{
-		infostream<<__FUNCTION_NAME<<": serialization error: "
-				<<"m_inventorystring=\""<<m_inventorystring<<"\""<<std::endl;
-		return NULL;
-	}
-}
-
-void ItemSAO::punch(ServerActiveObject *puncher)
-{
-	InventoryItem *item = createInventoryItem();
-	bool fits = puncher->addToInventory(item);
-	if(fits)
-		m_removed = true;
-	else
-		delete item;
-}
-
-/*
-	RatSAO
-*/
-
-// Prototype
-RatSAO proto_RatSAO(NULL, v3f(0,0,0));
-
-RatSAO::RatSAO(ServerEnvironment *env, v3f pos):
-	ServerActiveObject(env, pos),
-	m_is_active(false),
-	m_speed_f(0,0,0)
-{
-	ServerActiveObject::registerType(getType(), create);
-
-	m_oldpos = v3f(0,0,0);
-	m_last_sent_position = v3f(0,0,0);
-	m_yaw = myrand_range(0,PI*2);
-	m_counter1 = 0;
-	m_counter2 = 0;
-	m_age = 0;
-	m_touching_ground = false;
-}
-
-ServerActiveObject* RatSAO::create(ServerEnvironment *env, v3f pos,
-		const std::string &data)
-{
-	std::istringstream is(data, std::ios::binary);
-	char buf[1];
-	// read version
-	is.read(buf, 1);
-	u8 version = buf[0];
-	// check if version is supported
-	if(version != 0)
-		return NULL;
-	return new RatSAO(env, pos);
-}
-
-void RatSAO::step(float dtime, bool send_recommended)
-{
-	ScopeProfiler sp2(g_profiler, "RatSAO::step avg", SPT_AVG);
-
-	assert(m_env);
-
-	if(m_is_active == false)
-	{
-		if(m_inactive_interval.step(dtime, 0.5)==false)
-			return;
-	}
-
-	/*
-		The AI
-	*/
-
-	/*m_age += dtime;
-	if(m_age > 60)
-	{
-		// Die
-		m_removed = true;
-		return;
-	}*/
-
-	// Apply gravity
-	m_speed_f.Y -= dtime*9.81*BS;
-
-	/*
-		Move around if some player is close
-	*/
-	bool player_is_close = false;
-	// Check connected players
-	core::list<Player*> players = m_env->getPlayers(true);
-	core::list<Player*>::Iterator i;
-	for(i = players.begin();
-			i != players.end(); i++)
-	{
-		Player *player = *i;
-		v3f playerpos = player->getPosition();
-		if(m_base_position.getDistanceFrom(playerpos) < BS*10.0)
-		{
-			player_is_close = true;
-			break;
-		}
-	}
-
-	m_is_active = player_is_close;
-	
-	if(player_is_close == false)
-	{
-		m_speed_f.X = 0;
-		m_speed_f.Z = 0;
-	}
-	else
-	{
-		// Move around
-		v3f dir(cos(m_yaw/180*PI),0,sin(m_yaw/180*PI));
-		f32 speed = 2*BS;
-		m_speed_f.X = speed * dir.X;
-		m_speed_f.Z = speed * dir.Z;
-
-		if(m_touching_ground && (m_oldpos - m_base_position).getLength()
-				< dtime*speed/2)
-		{
-			m_counter1 -= dtime;
-			if(m_counter1 < 0.0)
-			{
-				m_counter1 += 1.0;
-				m_speed_f.Y = 5.0*BS;
-			}
-		}
-
-		{
-			m_counter2 -= dtime;
-			if(m_counter2 < 0.0)
-			{
-				m_counter2 += (float)(myrand()%100)/100*3.0;
-				m_yaw += ((float)(myrand()%200)-100)/100*180;
-				m_yaw = wrapDegrees(m_yaw);
-			}
-		}
-	}
-	
-	m_oldpos = m_base_position;
-
-	/*
-		Move it, with collision detection
-	*/
-
-	core::aabbox3d<f32> box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.);
-	collisionMoveResult moveresult;
-	// Maximum movement without glitches
-	f32 pos_max_d = BS*0.25;
-	// Limit speed
-	if(m_speed_f.getLength()*dtime > pos_max_d)
-		m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
-	v3f pos_f = getBasePosition();
-	v3f pos_f_old = pos_f;
-	IGameDef *gamedef = m_env->getGameDef();
-	moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
-			pos_max_d, box, dtime, pos_f, m_speed_f);
-	m_touching_ground = moveresult.touching_ground;
-	
-	setBasePosition(pos_f);
-
-	if(send_recommended == false)
-		return;
-
-	if(pos_f.getDistanceFrom(m_last_sent_position) > 0.05*BS)
-	{
-		m_last_sent_position = pos_f;
-
-		std::ostringstream os(std::ios::binary);
-		// command (0 = update position)
-		writeU8(os, 0);
-		// pos
-		writeV3F1000(os, m_base_position);
-		// yaw
-		writeF1000(os, m_yaw);
-		// create message and add to list
-		ActiveObjectMessage aom(getId(), false, os.str());
-		m_messages_out.push_back(aom);
-	}
-}
-
-std::string RatSAO::getClientInitializationData()
-{
-	std::ostringstream os(std::ios::binary);
-	// version
-	writeU8(os, 0);
-	// pos
-	writeV3F1000(os, m_base_position);
-	return os.str();
-}
-
-std::string RatSAO::getStaticData()
-{
-	//infostream<<__FUNCTION_NAME<<std::endl;
-	std::ostringstream os(std::ios::binary);
-	// version
-	writeU8(os, 0);
-	return os.str();
-}
-
-void RatSAO::punch(ServerActiveObject *puncher)
-{
-	std::istringstream is("CraftItem rat 1", std::ios_base::binary);
-	IGameDef *gamedef = m_env->getGameDef();
-	InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
-	bool fits = puncher->addToInventory(item);
-	if(fits)
-		m_removed = true;
-	else
-		delete item;
-}
-
-/*
-	Oerkki1SAO
-*/
-
-// Prototype
-Oerkki1SAO proto_Oerkki1SAO(NULL, v3f(0,0,0));
-
-Oerkki1SAO::Oerkki1SAO(ServerEnvironment *env, v3f pos):
-	ServerActiveObject(env, pos),
-	m_is_active(false),
-	m_speed_f(0,0,0)
-{
-	ServerActiveObject::registerType(getType(), create);
-
-	m_oldpos = v3f(0,0,0);
-	m_last_sent_position = v3f(0,0,0);
-	m_yaw = 0;
-	m_counter1 = 0;
-	m_counter2 = 0;
-	m_age = 0;
-	m_touching_ground = false;
-	m_hp = 20;
-	m_after_jump_timer = 0;
-}
-
-ServerActiveObject* Oerkki1SAO::create(ServerEnvironment *env, v3f pos,
-		const std::string &data)
-{
-	std::istringstream is(data, std::ios::binary);
-	// read version
-	u8 version = readU8(is);
-	// read hp
-	u8 hp = readU8(is);
-	// check if version is supported
-	if(version != 0)
-		return NULL;
-	Oerkki1SAO *o = new Oerkki1SAO(env, pos);
-	o->m_hp = hp;
-	return o;
-}
-
-void Oerkki1SAO::step(float dtime, bool send_recommended)
-{
-	ScopeProfiler sp2(g_profiler, "Oerkki1SAO::step avg", SPT_AVG);
-
-	assert(m_env);
-
-	if(m_is_active == false)
-	{
-		if(m_inactive_interval.step(dtime, 0.5)==false)
-			return;
-	}
-
-	/*
-		The AI
-	*/
-
-	m_age += dtime;
-	if(m_age > 120)
-	{
-		// Die
-		m_removed = true;
-		return;
-	}
-
-	m_after_jump_timer -= dtime;
-
-	v3f old_speed = m_speed_f;
-
-	// Apply gravity
-	m_speed_f.Y -= dtime*9.81*BS;
-
-	/*
-		Move around if some player is close
-	*/
-	bool player_is_close = false;
-	bool player_is_too_close = false;
-	v3f near_player_pos;
-	// Check connected players
-	core::list<Player*> players = m_env->getPlayers(true);
-	core::list<Player*>::Iterator i;
-	for(i = players.begin();
-			i != players.end(); i++)
-	{
-		Player *player = *i;
-		v3f playerpos = player->getPosition();
-		f32 dist = m_base_position.getDistanceFrom(playerpos);
-		if(dist < BS*0.6)
-		{
-			m_removed = true;
-			return;
-			player_is_too_close = true;
-			near_player_pos = playerpos;
-		}
-		else if(dist < BS*15.0 && !player_is_too_close)
-		{
-			player_is_close = true;
-			near_player_pos = playerpos;
-		}
-	}
-
-	m_is_active = player_is_close;
-
-	v3f target_speed = m_speed_f;
-
-	if(!player_is_close)
-	{
-		target_speed = v3f(0,0,0);
-	}
-	else
-	{
-		// Move around
-
-		v3f ndir = near_player_pos - m_base_position;
-		ndir.Y = 0;
-		ndir.normalize();
-
-		f32 nyaw = 180./PI*atan2(ndir.Z,ndir.X);
-		if(nyaw < m_yaw - 180)
-			nyaw += 360;
-		else if(nyaw > m_yaw + 180)
-			nyaw -= 360;
-		m_yaw = 0.95*m_yaw + 0.05*nyaw;
-		m_yaw = wrapDegrees(m_yaw);
-		
-		f32 speed = 2*BS;
-
-		if((m_touching_ground || m_after_jump_timer > 0.0)
-				&& !player_is_too_close)
-		{
-			v3f dir(cos(m_yaw/180*PI),0,sin(m_yaw/180*PI));
-			target_speed.X = speed * dir.X;
-			target_speed.Z = speed * dir.Z;
-		}
-
-		if(m_touching_ground && (m_oldpos - m_base_position).getLength()
-				< dtime*speed/2)
-		{
-			m_counter1 -= dtime;
-			if(m_counter1 < 0.0)
-			{
-				m_counter1 += 0.2;
-				// Jump
-				target_speed.Y = 5.0*BS;
-				m_after_jump_timer = 1.0;
-			}
-		}
-
-		{
-			m_counter2 -= dtime;
-			if(m_counter2 < 0.0)
-			{
-				m_counter2 += (float)(myrand()%100)/100*3.0;
-				//m_yaw += ((float)(myrand()%200)-100)/100*180;
-				m_yaw += ((float)(myrand()%200)-100)/100*90;
-				m_yaw = wrapDegrees(m_yaw);
-			}
-		}
-	}
-	
-	if((m_speed_f - target_speed).getLength() > BS*4 || player_is_too_close)
-		accelerate_xz(m_speed_f, target_speed, dtime*BS*8);
-	else
-		accelerate_xz(m_speed_f, target_speed, dtime*BS*4);
-	
-	m_oldpos = m_base_position;
-
-	/*
-		Move it, with collision detection
-	*/
-
-	core::aabbox3d<f32> box(-BS/3.,0.0,-BS/3., BS/3.,BS*5./3.,BS/3.);
-	collisionMoveResult moveresult;
-	// Maximum movement without glitches
-	f32 pos_max_d = BS*0.25;
-	/*// Limit speed
-	if(m_speed_f.getLength()*dtime > pos_max_d)
-		m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);*/
-	v3f pos_f = getBasePosition();
-	v3f pos_f_old = pos_f;
-	IGameDef *gamedef = m_env->getGameDef();
-	moveresult = collisionMovePrecise(&m_env->getMap(), gamedef,
-			pos_max_d, box, dtime, pos_f, m_speed_f);
-	m_touching_ground = moveresult.touching_ground;
-	
-	// Do collision damage
-	float tolerance = BS*30;
-	float factor = BS*0.5;
-	v3f speed_diff = old_speed - m_speed_f;
-	// Increase effect in X and Z
-	speed_diff.X *= 2;
-	speed_diff.Z *= 2;
-	float vel = speed_diff.getLength();
-	if(vel > tolerance)
-	{
-		f32 damage_f = (vel - tolerance)/BS*factor;
-		u16 damage = (u16)(damage_f+0.5);
-		doDamage(damage);
-	}
-
-	setBasePosition(pos_f);
-
-	if(send_recommended == false && m_speed_f.getLength() < 3.0*BS)
-		return;
-
-	if(pos_f.getDistanceFrom(m_last_sent_position) > 0.05*BS)
-	{
-		m_last_sent_position = pos_f;
-
-		std::ostringstream os(std::ios::binary);
-		// command (0 = update position)
-		writeU8(os, 0);
-		// pos
-		writeV3F1000(os, m_base_position);
-		// yaw
-		writeF1000(os, m_yaw);
-		// create message and add to list
-		ActiveObjectMessage aom(getId(), false, os.str());
-		m_messages_out.push_back(aom);
-	}
-}
-
-std::string Oerkki1SAO::getClientInitializationData()
-{
-	std::ostringstream os(std::ios::binary);
-	// version
-	writeU8(os, 0);
-	// pos
-	writeV3F1000(os, m_base_position);
-	return os.str();
-}
-
-std::string Oerkki1SAO::getStaticData()
-{
-	//infostream<<__FUNCTION_NAME<<std::endl;
-	std::ostringstream os(std::ios::binary);
-	// version
-	writeU8(os, 0);
-	// hp
-	writeU8(os, m_hp);
-	return os.str();
-}
-
-void Oerkki1SAO::punch(ServerActiveObject *puncher)
-{
-	v3f dir = (getBasePosition() - puncher->getBasePosition()).normalize();
-
-	std::string toolname = "";
-	InventoryItem *item = puncher->getWieldedItem();
-	if(item && (std::string)item->getName() == "ToolItem"){
-		ToolItem *titem = (ToolItem*)item;
-		toolname = titem->getToolName();
-	}
-
-	m_speed_f += dir*12*BS;
-
-	u16 amount = 5;
-	/* See tool names in inventory.h */
-	if(toolname == "WSword")
-		amount = 10;
-	if(toolname == "STSword")
-		amount = 12;
-	if(toolname == "SteelSword")
-		amount = 16;
-	if(toolname == "STAxe")
-		amount = 7;
-	if(toolname == "SteelAxe")
-		amount = 9;
-	if(toolname == "SteelPick")
-		amount = 7;
-	doDamage(amount);
-	
-	puncher->damageWieldedItem(65536/100);
-}
-
-void Oerkki1SAO::doDamage(u16 d)
-{
-	infostream<<"oerkki damage: "<<d<<std::endl;
-	
-	if(d < m_hp)
-	{
-		m_hp -= d;
-	}
-	else
-	{
-		// Die
-		m_hp = 0;
-		m_removed = true;
-	}
-
-	{
-		std::ostringstream os(std::ios::binary);
-		// command (1 = damage)
-		writeU8(os, 1);
-		// amount
-		writeU8(os, d);
-		// create message and add to list
-		ActiveObjectMessage aom(getId(), false, os.str());
-		m_messages_out.push_back(aom);
-	}
-}
-
-/*
-	FireflySAO
-*/
-
-// Prototype
-FireflySAO proto_FireflySAO(NULL, v3f(0,0,0));
-
-FireflySAO::FireflySAO(ServerEnvironment *env, v3f pos):
-	ServerActiveObject(env, pos),
-	m_is_active(false),
-	m_speed_f(0,0,0)
-{
-	ServerActiveObject::registerType(getType(), create);
-
-	m_oldpos = v3f(0,0,0);
-	m_last_sent_position = v3f(0,0,0);
-	m_yaw = 0;
-	m_counter1 = 0;
-	m_counter2 = 0;
-	m_age = 0;
-	m_touching_ground = false;
-}
-
-ServerActiveObject* FireflySAO::create(ServerEnvironment *env, v3f pos,
-		const std::string &data)
-{
-	std::istringstream is(data, std::ios::binary);
-	char buf[1];
-	// read version
-	is.read(buf, 1);
-	u8 version = buf[0];
-	// check if version is supported
-	if(version != 0)
-		return NULL;
-	return new FireflySAO(env, pos);
-}
-
-void FireflySAO::step(float dtime, bool send_recommended)
-{
-	ScopeProfiler sp2(g_profiler, "FireflySAO::step avg", SPT_AVG);
-
-	assert(m_env);
-
-	if(m_is_active == false)
-	{
-		if(m_inactive_interval.step(dtime, 0.5)==false)
-			return;
-	}
-
-	/*
-		The AI
-	*/
-
-	// Apply (less) gravity
-	m_speed_f.Y -= dtime*3*BS;
-
-	/*
-		Move around if some player is close
-	*/
-	bool player_is_close = false;
-	// Check connected players
-	core::list<Player*> players = m_env->getPlayers(true);
-	core::list<Player*>::Iterator i;
-	for(i = players.begin();
-			i != players.end(); i++)
-	{
-		Player *player = *i;
-		v3f playerpos = player->getPosition();
-		if(m_base_position.getDistanceFrom(playerpos) < BS*10.0)
-		{
-			player_is_close = true;
-			break;
-		}
-	}
-
-	m_is_active = player_is_close;
-	
-	if(player_is_close == false)
-	{
-		m_speed_f.X = 0;
-		m_speed_f.Z = 0;
-	}
-	else
-	{
-		// Move around
-		v3f dir(cos(m_yaw/180*PI),0,sin(m_yaw/180*PI));
-		f32 speed = BS/2;
-		m_speed_f.X = speed * dir.X;
-		m_speed_f.Z = speed * dir.Z;
-
-		if(m_touching_ground && (m_oldpos - m_base_position).getLength()
-				< dtime*speed/2)
-		{
-			m_counter1 -= dtime;
-			if(m_counter1 < 0.0)
-			{
-				m_counter1 += 1.0;
-				m_speed_f.Y = 5.0*BS;
-			}
-		}
-
-		{
-			m_counter2 -= dtime;
-			if(m_counter2 < 0.0)
-			{
-				m_counter2 += (float)(myrand()%100)/100*3.0;
-				m_yaw += ((float)(myrand()%200)-100)/100*180;
-				m_yaw = wrapDegrees(m_yaw);
-			}
-		}
-	}
-	
-	m_oldpos = m_base_position;
-
-	/*
-		Move it, with collision detection
-	*/
-
-	core::aabbox3d<f32> box(-BS/3.,-BS*2/3.0,-BS/3., BS/3.,BS*4./3.,BS/3.);
-	collisionMoveResult moveresult;
-	// Maximum movement without glitches
-	f32 pos_max_d = BS*0.25;
-	// Limit speed
-	if(m_speed_f.getLength()*dtime > pos_max_d)
-		m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
-	v3f pos_f = getBasePosition();
-	v3f pos_f_old = pos_f;
-	IGameDef *gamedef = m_env->getGameDef();
-	moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
-			pos_max_d, box, dtime, pos_f, m_speed_f);
-	m_touching_ground = moveresult.touching_ground;
-	
-	setBasePosition(pos_f);
-
-	if(send_recommended == false)
-		return;
-
-	if(pos_f.getDistanceFrom(m_last_sent_position) > 0.05*BS)
-	{
-		m_last_sent_position = pos_f;
-
-		std::ostringstream os(std::ios::binary);
-		// command (0 = update position)
-		writeU8(os, 0);
-		// pos
-		writeV3F1000(os, m_base_position);
-		// yaw
-		writeF1000(os, m_yaw);
-		// create message and add to list
-		ActiveObjectMessage aom(getId(), false, os.str());
-		m_messages_out.push_back(aom);
-	}
-}
-
-std::string FireflySAO::getClientInitializationData()
-{
-	std::ostringstream os(std::ios::binary);
-	// version
-	writeU8(os, 0);
-	// pos
-	writeV3F1000(os, m_base_position);
-	return os.str();
-}
-
-std::string FireflySAO::getStaticData()
-{
-	//infostream<<__FUNCTION_NAME<<std::endl;
-	std::ostringstream os(std::ios::binary);
-	// version
-	writeU8(os, 0);
-	return os.str();
-}
-
-InventoryItem* FireflySAO::createPickedUpItem()
-{
-	std::istringstream is("CraftItem firefly 1", std::ios_base::binary);
-	IGameDef *gamedef = m_env->getGameDef();
-	InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
-	return item;
-}
-
 /*
-	MobV2SAO
+	DummyLoadSAO
 */
 
-// Prototype
-MobV2SAO proto_MobV2SAO(NULL, v3f(0,0,0), NULL);
-
-MobV2SAO::MobV2SAO(ServerEnvironment *env, v3f pos,
-		Settings *init_properties):
-	ServerActiveObject(env, pos),
-	m_move_type("ground_nodes"),
-	m_speed(0,0,0),
-	m_last_sent_position(0,0,0),
-	m_oldpos(0,0,0),
-	m_yaw(0),
-	m_counter1(0),
-	m_counter2(0),
-	m_age(0),
-	m_touching_ground(false),
-	m_hp(10),
-	m_walk_around(false),
-	m_walk_around_timer(0),
-	m_next_pos_exists(false),
-	m_shoot_reload_timer(0),
-	m_shooting(false),
-	m_shooting_timer(0),
-	m_falling(false),
-	m_disturb_timer(100000),
-	m_random_disturb_timer(0),
-	m_shoot_y(0)
+class DummyLoadSAO : public ServerActiveObject
 {
-	ServerActiveObject::registerType(getType(), create);
-	
-	m_properties = new Settings();
-	if(init_properties)
-		m_properties->update(*init_properties);
-	
-	m_properties->setV3F("pos", pos);
-	
-	setPropertyDefaults();
-	readProperties();
-}
+public:
+	DummyLoadSAO(ServerEnvironment *env, v3f pos, u8 type):
+		ServerActiveObject(env, pos)
+	{
+		ServerActiveObject::registerType(type, create);
+	}
+	// Pretend to be the test object (to fool the client)
+	u8 getType() const
+	{ return ACTIVEOBJECT_TYPE_TEST; }
+	// And never save to disk
+	bool isStaticAllowed() const
+	{ return false; }
 	
-MobV2SAO::~MobV2SAO()
-{
-	delete m_properties;
-}
+	static ServerActiveObject* create(ServerEnvironment *env, v3f pos,
+			const std::string &data)
+	{
+		return new DummyLoadSAO(env, pos, 0);
+	}
 
-ServerActiveObject* MobV2SAO::create(ServerEnvironment *env, v3f pos,
-		const std::string &data)
-{
-	std::istringstream is(data, std::ios::binary);
-	Settings properties;
-	properties.parseConfigLines(is, "MobArgsEnd");
-	MobV2SAO *o = new MobV2SAO(env, pos, &properties);
-	return o;
-}
+	void step(float dtime, bool send_recommended)
+	{
+		m_removed = true;
+		infostream<<"DummyLoadSAO step"<<std::endl;
+	}
 
-std::string MobV2SAO::getStaticData()
-{
-	updateProperties();
+private:
+};
 
-	std::ostringstream os(std::ios::binary);
-	m_properties->writeLines(os);
-	return os.str();
-}
+// Prototype (registers item for deserialization)
+DummyLoadSAO proto1_DummyLoadSAO(NULL, v3f(0,0,0), ACTIVEOBJECT_TYPE_RAT);
+DummyLoadSAO proto2_DummyLoadSAO(NULL, v3f(0,0,0), ACTIVEOBJECT_TYPE_OERKKI1);
+DummyLoadSAO proto3_DummyLoadSAO(NULL, v3f(0,0,0), ACTIVEOBJECT_TYPE_FIREFLY);
+DummyLoadSAO proto4_DummyLoadSAO(NULL, v3f(0,0,0), ACTIVEOBJECT_TYPE_MOBV2);
+
+/*
+	TestSAO
+*/
 
-std::string MobV2SAO::getClientInitializationData()
+class TestSAO : public ServerActiveObject
 {
-	//infostream<<__FUNCTION_NAME<<std::endl;
+public:
+	TestSAO(ServerEnvironment *env, v3f pos):
+		ServerActiveObject(env, pos),
+		m_timer1(0),
+		m_age(0)
+	{
+		ServerActiveObject::registerType(getType(), create);
+	}
+	u8 getType() const
+	{ return ACTIVEOBJECT_TYPE_TEST; }
+	
+	static ServerActiveObject* create(ServerEnvironment *env, v3f pos,
+			const std::string &data)
+	{
+		return new TestSAO(env, pos);
+	}
 
-	updateProperties();
+	void step(float dtime, bool send_recommended)
+	{
+		m_age += dtime;
+		if(m_age > 10)
+		{
+			m_removed = true;
+			return;
+		}
 
-	std::ostringstream os(std::ios::binary);
+		m_base_position.Y += dtime * BS * 2;
+		if(m_base_position.Y > 8*BS)
+			m_base_position.Y = 2*BS;
 
-	// version
-	writeU8(os, 0);
-	
-	Settings client_properties;
-	
-	/*client_properties.set("version", "0");
-	client_properties.updateValue(*m_properties, "pos");
-	client_properties.updateValue(*m_properties, "yaw");
-	client_properties.updateValue(*m_properties, "hp");*/
+		if(send_recommended == false)
+			return;
 
-	// Just send everything for simplicity
-	client_properties.update(*m_properties);
+		m_timer1 -= dtime;
+		if(m_timer1 < 0.0)
+		{
+			m_timer1 += 0.125;
 
-	std::ostringstream os2(std::ios::binary);
-	client_properties.writeLines(os2);
-	compressZlib(os2.str(), os);
+			std::string data;
 
-	return os.str();
-}
+			data += itos(0); // 0 = position
+			data += " ";
+			data += itos(m_base_position.X);
+			data += " ";
+			data += itos(m_base_position.Y);
+			data += " ";
+			data += itos(m_base_position.Z);
 
-bool checkFreePosition(Map *map, v3s16 p0, v3s16 size)
-{
-	for(int dx=0; dx<size.X; dx++)
-	for(int dy=0; dy<size.Y; dy++)
-	for(int dz=0; dz<size.Z; dz++){
-		v3s16 dp(dx, dy, dz);
-		v3s16 p = p0 + dp;
-		MapNode n = map->getNodeNoEx(p);
-		if(n.getContent() != CONTENT_AIR)
-			return false;
+			ActiveObjectMessage aom(getId(), false, data);
+			m_messages_out.push_back(aom);
+		}
 	}
-	return true;
-}
-
-bool checkWalkablePosition(Map *map, v3s16 p0)
-{
-	v3s16 p = p0 + v3s16(0,-1,0);
-	MapNode n = map->getNodeNoEx(p);
-	if(n.getContent() != CONTENT_AIR)
-		return true;
-	return false;
-}
 
-bool checkFreeAndWalkablePosition(Map *map, v3s16 p0, v3s16 size)
-{
-	if(!checkFreePosition(map, p0, size))
-		return false;
-	if(!checkWalkablePosition(map, p0))
-		return false;
-	return true;
-}
+private:
+	float m_timer1;
+	float m_age;
+};
 
-static void get_random_u32_array(u32 a[], u32 len)
-{
-	u32 i, n;
-	for(i=0; i<len; i++)
-		a[i] = i;
-	n = len;
-	while(n > 1){
-		u32 k = myrand() % n;
-		n--;
-		u32 temp = a[n];
-		a[n] = a[k];
-		a[k] = temp;
-	}
-}
+// Prototype (registers item for deserialization)
+TestSAO proto_TestSAO(NULL, v3f(0,0,0));
 
-#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
+/*
+	ItemSAO
+*/
 
-static void explodeSquare(Map *map, v3s16 p0, v3s16 size)
+class ItemSAO : public ServerActiveObject
 {
-	core::map<v3s16, MapBlock*> modified_blocks;
-
-	for(int dx=0; dx<size.X; dx++)
-	for(int dy=0; dy<size.Y; dy++)
-	for(int dz=0; dz<size.Z; dz++){
-		v3s16 dp(dx - size.X/2, dy - size.Y/2, dz - size.Z/2);
-		v3s16 p = p0 + dp;
-		MapNode n = map->getNodeNoEx(p);
-		if(n.getContent() == CONTENT_IGNORE)
-			continue;
-		//map->removeNodeWithEvent(p);
-		map->removeNodeAndUpdate(p, modified_blocks);
+public:
+	u8 getType() const
+	{ return ACTIVEOBJECT_TYPE_ITEM; }
+	
+	float getMinimumSavedMovement()
+	{ return 0.1*BS; }
+
+	static ServerActiveObject* create(ServerEnvironment *env, v3f pos,
+			const std::string &data)
+	{
+		std::istringstream is(data, std::ios::binary);
+		char buf[1];
+		// read version
+		is.read(buf, 1);
+		u8 version = buf[0];
+		// check if version is supported
+		if(version != 0)
+			return NULL;
+		std::string itemstring = deSerializeString(is);
+		infostream<<"create(): Creating item \""
+				<<itemstring<<"\""<<std::endl;
+		return new ItemSAO(env, pos, itemstring);
 	}
 
-	// Send a MEET_OTHER event
-	MapEditEvent event;
-	event.type = MEET_OTHER;
-	for(core::map<v3s16, MapBlock*>::Iterator
-		  i = modified_blocks.getIterator();
-		  i.atEnd() == false; i++)
+	ItemSAO(ServerEnvironment *env, v3f pos,
+			const std::string itemstring):
+		ServerActiveObject(env, pos),
+		m_itemstring(itemstring),
+		m_itemstring_changed(false),
+		m_speed_f(0,0,0),
+		m_last_sent_position(0,0,0)
 	{
-		v3s16 p = i.getNode()->getKey();
-		event.modified_blocks.insert(p, true);
+		ServerActiveObject::registerType(getType(), create);
 	}
-	map->dispatchEvent(&event);
-}
 
-void MobV2SAO::step(float dtime, bool send_recommended)
-{
-	ScopeProfiler sp2(g_profiler, "MobV2SAO::step avg", SPT_AVG);
+	void step(float dtime, bool send_recommended)
+	{
+		ScopeProfiler sp2(g_profiler, "step avg", SPT_AVG);
 
-	assert(m_env);
-	Map *map = &m_env->getMap();
+		assert(m_env);
 
-	m_age += dtime;
+		const float interval = 0.2;
+		if(m_move_interval.step(dtime, interval)==false)
+			return;
+		dtime = interval;
+		
+		core::aabbox3d<f32> box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.);
+		collisionMoveResult moveresult;
+		// Apply gravity
+		m_speed_f += v3f(0, -dtime*9.81*BS, 0);
+		// Maximum movement without glitches
+		f32 pos_max_d = BS*0.25;
+		// Limit speed
+		if(m_speed_f.getLength()*dtime > pos_max_d)
+			m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
+		v3f pos_f = getBasePosition();
+		v3f pos_f_old = pos_f;
+		IGameDef *gamedef = m_env->getGameDef();
+		moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
+				pos_max_d, box, dtime, pos_f, m_speed_f);
+		
+		if(send_recommended == false)
+			return;
 
-	if(m_die_age >= 0.0 && m_age >= m_die_age){
-		m_removed = true;
-		return;
+		if(pos_f.getDistanceFrom(m_last_sent_position) > 0.05*BS)
+		{
+			setBasePosition(pos_f);
+			m_last_sent_position = pos_f;
+
+			std::ostringstream os(std::ios::binary);
+			// command (0 = update position)
+			writeU8(os, 0);
+			// pos
+			writeV3F1000(os, m_base_position);
+			// create message and add to list
+			ActiveObjectMessage aom(getId(), false, os.str());
+			m_messages_out.push_back(aom);
+		}
+		if(m_itemstring_changed)
+		{
+			m_itemstring_changed = false;
+
+			std::ostringstream os(std::ios::binary);
+			// command (1 = update itemstring)
+			writeU8(os, 1);
+			// itemstring
+			os<<serializeString(m_itemstring);
+			// create message and add to list
+			ActiveObjectMessage aom(getId(), false, os.str());
+			m_messages_out.push_back(aom);
+		}
 	}
 
-	m_random_disturb_timer += dtime;
-	if(m_random_disturb_timer >= 5.0)
+	std::string getClientInitializationData()
 	{
-		m_random_disturb_timer = 0;
-		// Check connected players
-		core::list<Player*> players = m_env->getPlayers(true);
-		core::list<Player*>::Iterator i;
-		for(i = players.begin();
-				i != players.end(); i++)
-		{
-			Player *player = *i;
-			v3f playerpos = player->getPosition();
-			f32 dist = m_base_position.getDistanceFrom(playerpos);
-			if(dist < BS*16)
-			{
-				if(myrand_range(0,3) == 0){
-					actionstream<<"Mob id="<<m_id<<" at "
-							<<PP(m_base_position/BS)
-							<<" got randomly disturbed by "
-							<<player->getName()<<std::endl;
-					m_disturbing_player = player->getName();
-					m_disturb_timer = 0;
-					break;
-				}
-			}
-		}
+		std::ostringstream os(std::ios::binary);
+		// version
+		writeU8(os, 0);
+		// pos
+		writeV3F1000(os, m_base_position);
+		// itemstring
+		os<<serializeString(m_itemstring);
+		return os.str();
 	}
 
-	Player *disturbing_player =
-			m_env->getPlayer(m_disturbing_player.c_str());
-	v3f disturbing_player_off = v3f(0,1,0);
-	v3f disturbing_player_norm = v3f(0,1,0);
-	float disturbing_player_distance = 1000000;
-	float disturbing_player_dir = 0;
-	if(disturbing_player){
-		disturbing_player_off =
-				disturbing_player->getPosition() - m_base_position;
-		disturbing_player_distance = disturbing_player_off.getLength();
-		disturbing_player_norm = disturbing_player_off;
-		disturbing_player_norm.normalize();
-		disturbing_player_dir = 180./PI*atan2(disturbing_player_norm.Z,
-				disturbing_player_norm.X);
+	std::string getStaticData()
+	{
+		infostream<<__FUNCTION_NAME<<std::endl;
+		std::ostringstream os(std::ios::binary);
+		// version
+		writeU8(os, 0);
+		// itemstring
+		os<<serializeString(m_itemstring);
+		return os.str();
 	}
 
-	m_disturb_timer += dtime;
-	
-	if(!m_falling)
+	ItemStack createItemStack()
 	{
-		m_shooting_timer -= dtime;
-		if(m_shooting_timer <= 0.0 && m_shooting){
-			m_shooting = false;
-			
-			std::string shoot_type = m_properties->get("shoot_type");
-			v3f shoot_pos(0,0,0);
-			shoot_pos.Y += m_properties->getFloat("shoot_y") * BS;
-			if(shoot_type == "fireball"){
-				v3f dir(cos(m_yaw/180*PI),0,sin(m_yaw/180*PI));
-				dir.Y = m_shoot_y;
-				dir.normalize();
-				v3f speed = dir * BS * 10.0;
-				v3f pos = m_base_position + shoot_pos;
-				infostream<<__FUNCTION_NAME<<": Mob id="<<m_id
-						<<" shooting fireball from "<<PP(pos)
-						<<" at speed "<<PP(speed)<<std::endl;
-				Settings properties;
-				properties.set("looks", "fireball");
-				properties.setV3F("speed", speed);
-				properties.setFloat("die_age", 5.0);
-				properties.set("move_type", "constant_speed");
-				properties.setFloat("hp", 1000);
-				properties.set("lock_full_brightness", "true");
-				properties.set("player_hit_damage", "9");
-				properties.set("player_hit_distance", "2");
-				properties.set("player_hit_interval", "1");
-				ServerActiveObject *obj = new MobV2SAO(m_env,
-						pos, &properties);
-				//m_env->addActiveObjectAsStatic(obj);
-				m_env->addActiveObject(obj);
-			} else {
-				infostream<<__FUNCTION_NAME<<": Mob id="<<m_id
-						<<": Unknown shoot_type="<<shoot_type
-						<<std::endl;
-			}
+		try{
+			IItemDefManager *idef = m_env->getGameDef()->idef();
+			ItemStack item;
+			item.deSerialize(m_itemstring, idef);
+			infostream<<__FUNCTION_NAME<<": m_itemstring=\""<<m_itemstring
+					<<"\" -> item=\""<<item.getItemString()<<"\""
+					<<std::endl;
+			return item;
 		}
-
-		m_shoot_reload_timer += dtime;
-
-		float reload_time = 15.0;
-		if(m_disturb_timer <= 15.0)
-			reload_time = 3.0;
-
-		bool shoot_without_player = false;
-		if(m_properties->getBool("mindless_rage"))
-			shoot_without_player = true;
-
-		if(!m_shooting && m_shoot_reload_timer >= reload_time &&
-				!m_next_pos_exists &&
-				(m_disturb_timer <= 60.0 || shoot_without_player))
+		catch(SerializationError &e)
 		{
-			m_shoot_y = 0;
-			if(m_disturb_timer < 60.0 && disturbing_player &&
-					disturbing_player_distance < 16*BS &&
-					fabs(disturbing_player_norm.Y) < 0.8){
-				m_yaw = disturbing_player_dir;
-				sendPosition();
-				m_shoot_y += disturbing_player_norm.Y;
-			} else {
-				m_shoot_y = 0.01 * myrand_range(-30,10);
-			}
-			m_shoot_reload_timer = 0.0;
-			m_shooting = true;
-			m_shooting_timer = 1.5;
-			{
-				std::ostringstream os(std::ios::binary);
-				// command (2 = shooting)
-				writeU8(os, 2);
-				// time
-				writeF1000(os, m_shooting_timer + 0.1);
-				// bright?
-				writeU8(os, true);
-				// create message and add to list
-				ActiveObjectMessage aom(getId(), false, os.str());
-				m_messages_out.push_back(aom);
-			}
+			infostream<<__FUNCTION_NAME<<": serialization error: "
+					<<"m_itemstring=\""<<m_itemstring<<"\""<<std::endl;
+			return ItemStack();
 		}
 	}
-	
-	if(m_move_type == "ground_nodes")
-	{
-		if(!m_shooting){
-			m_walk_around_timer -= dtime;
-			if(m_walk_around_timer <= 0.0){
-				m_walk_around = !m_walk_around;
-				if(m_walk_around)
-					m_walk_around_timer = 0.1*myrand_range(10,50);
-				else
-					m_walk_around_timer = 0.1*myrand_range(30,70);
-			}
-		}
 
-		/* Move */
-		if(m_next_pos_exists){
-			v3f pos_f = m_base_position;
-			v3f next_pos_f = intToFloat(m_next_pos_i, BS);
-
-			v3f v = next_pos_f - pos_f;
-			m_yaw = atan2(v.Z, v.X) / PI * 180;
-			
-			v3f diff = next_pos_f - pos_f;
-			v3f dir = diff;
-			dir.normalize();
-			float speed = BS * 0.5;
-			if(m_falling)
-				speed = BS * 3.0;
-			dir *= dtime * speed;
-			bool arrived = false;
-			if(dir.getLength() > diff.getLength()){
-				dir = diff;
-				arrived = true;
-			}
-			pos_f += dir;
-			m_base_position = pos_f;
-
-			if((pos_f - next_pos_f).getLength() < 0.1 || arrived){
-				m_next_pos_exists = false;
-			}
-		}
-
-		v3s16 pos_i = floatToInt(m_base_position, BS);
-		v3s16 size_blocks = v3s16(m_size.X+0.5,m_size.Y+0.5,m_size.X+0.5);
-		v3s16 pos_size_off(0,0,0);
-		if(m_size.X >= 2.5){
-			pos_size_off.X = -1;
-			pos_size_off.Y = -1;
+	int punch(v3f dir,
+			const ToolCapabilities *toolcap,
+			ServerActiveObject *puncher,
+			float time_from_last_punch)
+	{
+		// Directly delete item in creative mode
+		if(g_settings->getBool("creative_mode") == true)
+		{
+			m_removed = true;
+			return 0;
 		}
 		
-		if(!m_next_pos_exists){
-			/* Check whether to drop down */
-			if(checkFreePosition(map,
-					pos_i + pos_size_off + v3s16(0,-1,0), size_blocks)){
-				m_next_pos_i = pos_i + v3s16(0,-1,0);
-				m_next_pos_exists = true;
-				m_falling = true;
-			} else {
-				m_falling = false;
-			}
-		}
-
-		if(m_walk_around)
+		// Take item into inventory
+		ItemStack item = createItemStack();
+		Inventory *inv = puncher->getInventory();
+		if(inv != NULL)
 		{
-			if(!m_next_pos_exists){
-				/* Find some position where to go next */
-				v3s16 dps[3*3*3];
-				int num_dps = 0;
-				for(int dx=-1; dx<=1; dx++)
-				for(int dy=-1; dy<=1; dy++)
-				for(int dz=-1; dz<=1; dz++){
-					if(dx == 0 && dy == 0)
-						continue;
-					if(dx != 0 && dz != 0 && dy != 0)
-						continue;
-					dps[num_dps++] = v3s16(dx,dy,dz);
-				}
-				u32 order[3*3*3];
-				get_random_u32_array(order, num_dps);
-				for(int i=0; i<num_dps; i++){
-					v3s16 p = dps[order[i]] + pos_i;
-					bool is_free = checkFreeAndWalkablePosition(map,
-							p + pos_size_off, size_blocks);
-					if(!is_free)
-						continue;
-					m_next_pos_i = p;
-					m_next_pos_exists = true;
-					break;
-				}
+			std::string wieldlist = puncher->getWieldList();
+			ItemStack leftover = inv->addItem(wieldlist, item);
+			puncher->setInventoryModified();
+			if(leftover.empty())
+			{
+				m_removed = true;
+			}
+			else
+			{
+				m_itemstring = leftover.getItemString();
+				m_itemstring_changed = true;
 			}
 		}
-	}
-	else if(m_move_type == "constant_speed")
-	{
-		m_base_position += m_speed * dtime;
 		
-		v3s16 pos_i = floatToInt(m_base_position, BS);
-		v3s16 size_blocks = v3s16(m_size.X+0.5,m_size.Y+0.5,m_size.X+0.5);
-		v3s16 pos_size_off(0,0,0);
-		if(m_size.X >= 2.5){
-			pos_size_off.X = -1;
-			pos_size_off.Y = -1;
-		}
-		bool free = checkFreePosition(map, pos_i + pos_size_off, size_blocks);
-		if(!free){
-			explodeSquare(map, pos_i, v3s16(3,3,3));
-			m_removed = true;
-			return;
-		}
-	}
-	else
-	{
-		errorstream<<"MobV2SAO::step(): id="<<m_id<<" unknown move_type=\""
-				<<m_move_type<<"\""<<std::endl;
-	}
-
-	if(send_recommended == false)
-		return;
-
-	if(m_base_position.getDistanceFrom(m_last_sent_position) > 0.05*BS)
-	{
-		sendPosition();
-	}
-}
-
-void MobV2SAO::punch(ServerActiveObject *puncher)
-{
-	v3f dir = (getBasePosition() - puncher->getBasePosition()).normalize();
-
-	std::string toolname = "";
-	InventoryItem *item = puncher->getWieldedItem();
-	if(item && (std::string)item->getName() == "ToolItem"){
-		ToolItem *titem = (ToolItem*)item;
-		toolname = titem->getToolName();
-	}
-	
-	// A quick hack; SAO description is player name for player
-	std::string playername = puncher->getDescription();
-
-	Map *map = &m_env->getMap();
-	
-	actionstream<<playername<<" punches mob id="<<m_id
-			<<" with a \""<<toolname<<"\" at "
-			<<PP(m_base_position/BS)<<std::endl;
-
-	m_disturb_timer = 0;
-	m_disturbing_player = playername;
-	m_next_pos_exists = false; // Cancel moving immediately
-	
-	m_yaw = wrapDegrees_180(180./PI*atan2(dir.Z, dir.X) + 180.);
-	v3f new_base_position = m_base_position + dir * BS;
-	{
-		v3s16 pos_i = floatToInt(new_base_position, BS);
-		v3s16 size_blocks = v3s16(m_size.X+0.5,m_size.Y+0.5,m_size.X+0.5);
-		v3s16 pos_size_off(0,0,0);
-		if(m_size.X >= 2.5){
-			pos_size_off.X = -1;
-			pos_size_off.Y = -1;
-		}
-		bool free = checkFreePosition(map, pos_i + pos_size_off, size_blocks);
-		if(free)
-			m_base_position = new_base_position;
+		return 0;
 	}
-	sendPosition();
-	
-	u16 amount = 2;
-	/* See tool names in inventory.h */
-	if(toolname == "WSword")
-		amount = 4;
-	if(toolname == "STSword")
-		amount = 6;
-	if(toolname == "SteelSword")
-		amount = 8;
-	if(toolname == "STAxe")
-		amount = 3;
-	if(toolname == "SteelAxe")
-		amount = 4;
-	if(toolname == "SteelPick")
-		amount = 3;
-	doDamage(amount);
-	
-	puncher->damageWieldedItem(65536/100);
-}
 
-bool MobV2SAO::isPeaceful()
-{
-	return m_properties->getBool("is_peaceful");
-}
-
-void MobV2SAO::sendPosition()
-{
-	m_last_sent_position = m_base_position;
 
-	std::ostringstream os(std::ios::binary);
-	// command (0 = update position)
-	writeU8(os, 0);
-	// pos
-	writeV3F1000(os, m_base_position);
-	// yaw
-	writeF1000(os, m_yaw);
-	// create message and add to list
-	ActiveObjectMessage aom(getId(), false, os.str());
-	m_messages_out.push_back(aom);
-}
+private:
+	std::string m_itemstring;
+	bool m_itemstring_changed;
+	v3f m_speed_f;
+	v3f m_last_sent_position;
+	IntervalLimiter m_move_interval;
+};
 
-void MobV2SAO::setPropertyDefaults()
-{
-	m_properties->setDefault("is_peaceful", "false");
-	m_properties->setDefault("move_type", "ground_nodes");
-	m_properties->setDefault("speed", "(0,0,0)");
-	m_properties->setDefault("age", "0");
-	m_properties->setDefault("yaw", "0");
-	m_properties->setDefault("pos", "(0,0,0)");
-	m_properties->setDefault("hp", "0");
-	m_properties->setDefault("die_age", "-1");
-	m_properties->setDefault("size", "(1,2)");
-	m_properties->setDefault("shoot_type", "fireball");
-	m_properties->setDefault("shoot_y", "0");
-	m_properties->setDefault("mindless_rage", "false");
-}
-void MobV2SAO::readProperties()
-{
-	m_move_type = m_properties->get("move_type");
-	m_speed = m_properties->getV3F("speed");
-	m_age = m_properties->getFloat("age");
-	m_yaw = m_properties->getFloat("yaw");
-	m_base_position = m_properties->getV3F("pos");
-	m_hp = m_properties->getS32("hp");
-	m_die_age = m_properties->getFloat("die_age");
-	m_size = m_properties->getV2F("size");
-}
-void MobV2SAO::updateProperties()
-{
-	m_properties->set("move_type", m_move_type);
-	m_properties->setV3F("speed", m_speed);
-	m_properties->setFloat("age", m_age);
-	m_properties->setFloat("yaw", m_yaw);
-	m_properties->setV3F("pos", m_base_position);
-	m_properties->setS32("hp", m_hp);
-	m_properties->setFloat("die_age", m_die_age);
-	m_properties->setV2F("size", m_size);
-
-	m_properties->setS32("version", 0);
-}
+// Prototype (registers item for deserialization)
+ItemSAO proto_ItemSAO(NULL, v3f(0,0,0), "");
 
-void MobV2SAO::doDamage(u16 d)
+ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
+		const std::string itemstring)
 {
-	infostream<<"MobV2 hp="<<m_hp<<" damage="<<d<<std::endl;
-	
-	if(d < m_hp)
-	{
-		m_hp -= d;
-	}
-	else
-	{
-		actionstream<<"A "<<(isPeaceful()?"peaceful":"non-peaceful")
-				<<" mob id="<<m_id<<" dies at "<<PP(m_base_position)<<std::endl;
-		// Die
-		m_hp = 0;
-		m_removed = true;
-	}
-
-	{
-		std::ostringstream os(std::ios::binary);
-		// command (1 = damage)
-		writeU8(os, 1);
-		// amount
-		writeU16(os, d);
-		// create message and add to list
-		ActiveObjectMessage aom(getId(), false, os.str());
-		m_messages_out.push_back(aom);
-	}
+	return new ItemSAO(env, pos, itemstring);
 }
 
-
 /*
 	LuaEntitySAO
 */
@@ -1522,7 +336,7 @@ void MobV2SAO::doDamage(u16 d)
 #include "scriptapi.h"
 #include "luaentity_common.h"
 
-// Prototype
+// Prototype (registers item for deserialization)
 LuaEntitySAO proto_LuaEntitySAO(NULL, v3f(0,0,0), "_prototype", "");
 
 LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
@@ -1532,6 +346,7 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
 	m_init_state(state),
 	m_registered(false),
 	m_prop(new LuaEntityProperties),
+	m_hp(-1),
 	m_velocity(0,0,0),
 	m_acceleration(0,0,0),
 	m_yaw(0),
@@ -1539,13 +354,18 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
 	m_last_sent_position(0,0,0),
 	m_last_sent_velocity(0,0,0),
 	m_last_sent_position_timer(0),
-	m_last_sent_move_precision(0)
+	m_last_sent_move_precision(0),
+	m_armor_groups_sent(false)
 {
 	// Only register type if no environment supplied
 	if(env == NULL){
 		ServerActiveObject::registerType(getType(), create);
 		return;
 	}
+	
+	// Initialize something to armor groups
+	m_armor_groups["fleshy"] = 3;
+	m_armor_groups["snappy"] = 2;
 }
 
 LuaEntitySAO::~LuaEntitySAO()
@@ -1561,34 +381,54 @@ void LuaEntitySAO::addedToEnvironment()
 {
 	ServerActiveObject::addedToEnvironment();
 	
-	// Create entity from name and state
+	// Create entity from name
 	lua_State *L = m_env->getLua();
-	m_registered = scriptapi_luaentity_add(L, m_id, m_init_name.c_str(),
-			m_init_state.c_str());
+	m_registered = scriptapi_luaentity_add(L, m_id, m_init_name.c_str());
 	
 	if(m_registered){
 		// Get properties
 		scriptapi_luaentity_get_properties(L, m_id, m_prop);
+		// Initialize HP from properties
+		m_hp = m_prop->hp_max;
 	}
+	
+	// Activate entity, supplying serialized state
+	scriptapi_luaentity_activate(L, m_id, m_init_state.c_str());
 }
 
 ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
 		const std::string &data)
 {
-	std::istringstream is(data, std::ios::binary);
-	// read version
-	u8 version = readU8(is);
-	// check if version is supported
-	if(version != 0)
-		return NULL;
-	// read name
-	std::string name = deSerializeString(is);
-	// read state
-	std::string state = deSerializeLongString(is);
+	std::string name;
+	std::string state;
+	s16 hp = 1;
+	v3f velocity;
+	float yaw = 0;
+	if(data != ""){
+		std::istringstream is(data, std::ios::binary);
+		// read version
+		u8 version = readU8(is);
+		// check if version is supported
+		if(version == 0){
+			name = deSerializeString(is);
+			state = deSerializeLongString(is);
+		}
+		else if(version == 1){
+			name = deSerializeString(is);
+			state = deSerializeLongString(is);
+			hp = readS16(is);
+			velocity = readV3F1000(is);
+			yaw = readF1000(is);
+		}
+	}
 	// create object
 	infostream<<"LuaEntitySAO::create(name=\""<<name<<"\" state=\""
 			<<state<<"\")"<<std::endl;
-	return new LuaEntitySAO(env, pos, name, state);
+	LuaEntitySAO *sao = new LuaEntitySAO(env, pos, name, state);
+	sao->m_hp = hp;
+	sao->m_velocity = velocity;
+	sao->m_yaw = yaw;
+	return sao;
 }
 
 void LuaEntitySAO::step(float dtime, bool send_recommended)
@@ -1639,17 +479,34 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 			fabs(m_yaw - m_last_sent_yaw) > 1.0){
 		sendPosition(true, false);
 	}
+
+	if(m_armor_groups_sent == false){
+		m_armor_groups_sent = true;
+		std::ostringstream os(std::ios::binary);
+		writeU8(os, LUAENTITY_CMD_UPDATE_ARMOR_GROUPS);
+		writeU16(os, m_armor_groups.size());
+		for(ItemGroupList::const_iterator i = m_armor_groups.begin();
+				i != m_armor_groups.end(); i++){
+			os<<serializeString(i->first);
+			writeS16(os, i->second);
+		}
+		// create message and add to list
+		ActiveObjectMessage aom(getId(), true, os.str());
+		m_messages_out.push_back(aom);
+	}
 }
 
 std::string LuaEntitySAO::getClientInitializationData()
 {
 	std::ostringstream os(std::ios::binary);
 	// version
-	writeU8(os, 0);
+	writeU8(os, 1);
 	// pos
 	writeV3F1000(os, m_base_position);
 	// yaw
 	writeF1000(os, m_yaw);
+	// hp
+	writeS16(os, m_hp);
 	// properties
 	std::ostringstream prop_os(std::ios::binary);
 	m_prop->serialize(prop_os);
@@ -1660,10 +517,10 @@ std::string LuaEntitySAO::getClientInitializationData()
 
 std::string LuaEntitySAO::getStaticData()
 {
-	infostream<<__FUNCTION_NAME<<std::endl;
+	verbosestream<<__FUNCTION_NAME<<std::endl;
 	std::ostringstream os(std::ios::binary);
 	// version
-	writeU8(os, 0);
+	writeU8(os, 1);
 	// name
 	os<<serializeString(m_init_name);
 	// state
@@ -1674,24 +531,69 @@ std::string LuaEntitySAO::getStaticData()
 	} else {
 		os<<serializeLongString(m_init_state);
 	}
+	// hp
+	writeS16(os, m_hp);
+	// velocity
+	writeV3F1000(os, m_velocity);
+	// yaw
+	writeF1000(os, m_yaw);
 	return os.str();
 }
 
-InventoryItem* LuaEntitySAO::createPickedUpItem()
+int LuaEntitySAO::punch(v3f dir,
+		const ToolCapabilities *toolcap,
+		ServerActiveObject *puncher,
+		float time_from_last_punch)
 {
-	// TODO: Ask item from scriptapi
-	std::istringstream is("CraftItem testobject1 1", std::ios_base::binary);
-	IGameDef *gamedef = m_env->getGameDef();
-	InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
-	return item;
-}
+	if(!m_registered){
+		// Delete unknown LuaEntities when punched
+		m_removed = true;
+		return 0;
+	}
+	
+	ItemStack *punchitem = NULL;
+	ItemStack punchitem_static;
+	if(puncher){
+		punchitem_static = puncher->getWieldedItem();
+		punchitem = &punchitem_static;
+	}
+
+	PunchDamageResult result = getPunchDamage(
+			m_armor_groups,
+			toolcap,
+			punchitem,
+			time_from_last_punch);
+	
+	if(result.did_punch)
+	{
+		setHP(getHP() - result.damage);
+		
+		actionstream<<getDescription()<<" punched by "
+				<<puncher->getDescription()<<", damage "<<result.damage
+				<<" hp, health now "<<getHP()<<" hp"<<std::endl;
+		
+		{
+			std::ostringstream os(std::ios::binary);
+			// command 
+			writeU8(os, LUAENTITY_CMD_PUNCHED);
+			// damage
+			writeS16(os, result.damage);
+			// result_hp
+			writeS16(os, getHP());
+			// create message and add to list
+			ActiveObjectMessage aom(getId(), true, os.str());
+			m_messages_out.push_back(aom);
+		}
+
+		if(getHP() == 0)
+			m_removed = true;
+	}
 
-void LuaEntitySAO::punch(ServerActiveObject *puncher)
-{
-	if(!m_registered)
-		return;
 	lua_State *L = m_env->getLua();
-	scriptapi_luaentity_punch(L, m_id, puncher);
+	scriptapi_luaentity_punch(L, m_id, puncher,
+			time_from_last_punch, toolcap, dir);
+
+	return result.wear;
 }
 
 void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
@@ -1702,6 +604,17 @@ void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
 	scriptapi_luaentity_rightclick(L, m_id, clicker);
 }
 
+void LuaEntitySAO::setHP(s16 hp)
+{
+	if(hp < 0) hp = 0;
+	m_hp = hp;
+}
+
+s16 LuaEntitySAO::getHP()
+{
+	return m_hp;
+}
+
 void LuaEntitySAO::setPos(v3f pos)
 {
 	m_base_position = pos;
@@ -1720,11 +633,27 @@ float LuaEntitySAO::getMinimumSavedMovement()
 	return 0.1 * BS;
 }
 
+std::string LuaEntitySAO::getDescription()
+{
+	std::ostringstream os(std::ios::binary);
+	os<<"LuaEntitySAO at (";
+	os<<(m_base_position.X/BS)<<",";
+	os<<(m_base_position.Y/BS)<<",";
+	os<<(m_base_position.Z/BS);
+	os<<")";
+	return os.str();
+}
+
 void LuaEntitySAO::setVelocity(v3f velocity)
 {
 	m_velocity = velocity;
 }
 
+v3f LuaEntitySAO::getVelocity()
+{
+	return m_velocity;
+}
+
 void LuaEntitySAO::setAcceleration(v3f acceleration)
 {
 	m_acceleration = acceleration;
@@ -1735,11 +664,21 @@ v3f LuaEntitySAO::getAcceleration()
 	return m_acceleration;
 }
 
+void LuaEntitySAO::setYaw(float yaw)
+{
+	m_yaw = yaw;
+}
+
+float LuaEntitySAO::getYaw()
+{
+	return m_yaw;
+}
+
 void LuaEntitySAO::setTextureMod(const std::string &mod)
 {
 	std::ostringstream os(std::ios::binary);
-	// command (1 = set texture modification)
-	writeU8(os, 1);
+	// command 
+	writeU8(os, LUAENTITY_CMD_SET_TEXTURE_MOD);
 	// parameters
 	os<<serializeString(mod);
 	// create message and add to list
@@ -1751,8 +690,8 @@ void LuaEntitySAO::setSprite(v2s16 p, int num_frames, float framelength,
 		bool select_horiz_by_yawpitch)
 {
 	std::ostringstream os(std::ios::binary);
-	// command (2 = set sprite)
-	writeU8(os, 2);
+	// command
+	writeU8(os, LUAENTITY_CMD_SET_SPRITE);
 	// parameters
 	writeV2S16(os, p);
 	writeU16(os, num_frames);
@@ -1763,6 +702,17 @@ void LuaEntitySAO::setSprite(v2s16 p, int num_frames, float framelength,
 	m_messages_out.push_back(aom);
 }
 
+std::string LuaEntitySAO::getName()
+{
+	return m_init_name;
+}
+
+void LuaEntitySAO::setArmorGroups(const ItemGroupList &armor_groups)
+{
+	m_armor_groups = armor_groups;
+	m_armor_groups_sent = false;
+}
+
 void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 {
 	m_last_sent_move_precision = m_base_position.getDistanceFrom(
@@ -1776,8 +726,8 @@ void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 	float update_interval = m_env->getSendRecommendedInterval();
 
 	std::ostringstream os(std::ios::binary);
-	// command (0 = update position)
-	writeU8(os, 0);
+	// command
+	writeU8(os, LUAENTITY_CMD_UPDATE_POSITION);
 
 	// do_interpolate
 	writeU8(os, do_interpolate);
@@ -1799,4 +749,3 @@ void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
 	m_messages_out.push_back(aom);
 }
 
-