X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_sao.cpp;h=171e315af87ea40791c48da49603440eb8a3e9e6;hb=e8b0722137b47b9b17cef94a9a9f0f52d03f4ea8;hp=f226371852c5ff22c2250e1fce75663487b06b68;hpb=3daaff3a42df987934bc4a53b17a7d264465b204;p=dragonfireclient.git

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index f22637185..171e315af 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -21,7 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "collision.h"
 #include "environment.h"
 #include "settings.h"
+#include "main.h" // For g_profiler
 #include "profiler.h"
+#include "serialization.h" // For compressZlib
+#include "materials.h" // For MaterialProperties
+#include "tooldef.h" // ToolDiggingProperties
 
 core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
 
@@ -49,20 +53,20 @@ void accelerate_xz(v3f &speed, v3f target_speed, f32 max_increase)
 */
 
 // Prototype
-TestSAO proto_TestSAO(NULL, 0, v3f(0,0,0));
+TestSAO proto_TestSAO(NULL, v3f(0,0,0));
 
-TestSAO::TestSAO(ServerEnvironment *env, u16 id, v3f pos):
-	ServerActiveObject(env, id, pos),
+TestSAO::TestSAO(ServerEnvironment *env, v3f pos):
+	ServerActiveObject(env, pos),
 	m_timer1(0),
 	m_age(0)
 {
 	ServerActiveObject::registerType(getType(), create);
 }
 
-ServerActiveObject* TestSAO::create(ServerEnvironment *env, u16 id, v3f pos,
+ServerActiveObject* TestSAO::create(ServerEnvironment *env, v3f pos,
 		const std::string &data)
 {
-	return new TestSAO(env, id, pos);
+	return new TestSAO(env, pos);
 }
 
 void TestSAO::step(float dtime, bool send_recommended)
@@ -107,11 +111,11 @@ void TestSAO::step(float dtime, bool send_recommended)
 */
 
 // Prototype
-ItemSAO proto_ItemSAO(NULL, 0, v3f(0,0,0), "");
+ItemSAO proto_ItemSAO(NULL, v3f(0,0,0), "");
 
-ItemSAO::ItemSAO(ServerEnvironment *env, u16 id, v3f pos,
+ItemSAO::ItemSAO(ServerEnvironment *env, v3f pos,
 		const std::string inventorystring):
-	ServerActiveObject(env, id, pos),
+	ServerActiveObject(env, pos),
 	m_inventorystring(inventorystring),
 	m_speed_f(0,0,0),
 	m_last_sent_position(0,0,0)
@@ -119,7 +123,7 @@ ItemSAO::ItemSAO(ServerEnvironment *env, u16 id, v3f pos,
 	ServerActiveObject::registerType(getType(), create);
 }
 
-ServerActiveObject* ItemSAO::create(ServerEnvironment *env, u16 id, v3f pos,
+ServerActiveObject* ItemSAO::create(ServerEnvironment *env, v3f pos,
 		const std::string &data)
 {
 	std::istringstream is(data, std::ios::binary);
@@ -133,7 +137,7 @@ ServerActiveObject* ItemSAO::create(ServerEnvironment *env, u16 id, v3f pos,
 	std::string inventorystring = deSerializeString(is);
 	infostream<<"ItemSAO::create(): Creating item \""
 			<<inventorystring<<"\""<<std::endl;
-	return new ItemSAO(env, id, pos, inventorystring);
+	return new ItemSAO(env, pos, inventorystring);
 }
 
 void ItemSAO::step(float dtime, bool send_recommended)
@@ -158,8 +162,9 @@ void ItemSAO::step(float dtime, bool send_recommended)
 		m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
 	v3f pos_f = getBasePosition();
 	v3f pos_f_old = pos_f;
-	moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-			box, dtime, pos_f, m_speed_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;
@@ -223,7 +228,8 @@ InventoryItem * ItemSAO::createInventoryItem()
 {
 	try{
 		std::istringstream is(m_inventorystring, std::ios_base::binary);
-		InventoryItem *item = InventoryItem::deSerialize(is);
+		IGameDef *gamedef = m_env->getGameDef();
+		InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
 		infostream<<__FUNCTION_NAME<<": m_inventorystring=\""
 				<<m_inventorystring<<"\" -> item="<<item
 				<<std::endl;
@@ -237,22 +243,14 @@ InventoryItem * ItemSAO::createInventoryItem()
 	}
 }
 
-void ItemSAO::rightClick(Player *player)
+void ItemSAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
 {
-	infostream<<__FUNCTION_NAME<<std::endl;
 	InventoryItem *item = createInventoryItem();
-	if(item == NULL)
-		return;
-	
-	bool to_be_deleted = item->use(m_env, player);
-
-	if(to_be_deleted)
+	bool fits = puncher->addToInventory(item);
+	if(fits)
 		m_removed = true;
 	else
-		// Reflect changes to the item here
-		m_inventorystring = item->getItemString();
-	
-	delete item;
+		delete item;
 }
 
 /*
@@ -260,10 +258,10 @@ void ItemSAO::rightClick(Player *player)
 */
 
 // Prototype
-RatSAO proto_RatSAO(NULL, 0, v3f(0,0,0));
+RatSAO proto_RatSAO(NULL, v3f(0,0,0));
 
-RatSAO::RatSAO(ServerEnvironment *env, u16 id, v3f pos):
-	ServerActiveObject(env, id, pos),
+RatSAO::RatSAO(ServerEnvironment *env, v3f pos):
+	ServerActiveObject(env, pos),
 	m_is_active(false),
 	m_speed_f(0,0,0)
 {
@@ -278,7 +276,7 @@ RatSAO::RatSAO(ServerEnvironment *env, u16 id, v3f pos):
 	m_touching_ground = false;
 }
 
-ServerActiveObject* RatSAO::create(ServerEnvironment *env, u16 id, v3f pos,
+ServerActiveObject* RatSAO::create(ServerEnvironment *env, v3f pos,
 		const std::string &data)
 {
 	std::istringstream is(data, std::ios::binary);
@@ -289,7 +287,7 @@ ServerActiveObject* RatSAO::create(ServerEnvironment *env, u16 id, v3f pos,
 	// check if version is supported
 	if(version != 0)
 		return NULL;
-	return new RatSAO(env, id, pos);
+	return new RatSAO(env, pos);
 }
 
 void RatSAO::step(float dtime, bool send_recommended)
@@ -390,8 +388,9 @@ void RatSAO::step(float dtime, bool send_recommended)
 		m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
 	v3f pos_f = getBasePosition();
 	v3f pos_f_old = pos_f;
-	moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-			box, dtime, pos_f, m_speed_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);
@@ -435,11 +434,16 @@ std::string RatSAO::getStaticData()
 	return os.str();
 }
 
-InventoryItem* RatSAO::createPickedUpItem()
+void RatSAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
 {
 	std::istringstream is("CraftItem rat 1", std::ios_base::binary);
-	InventoryItem *item = InventoryItem::deSerialize(is);
-	return item;
+	IGameDef *gamedef = m_env->getGameDef();
+	InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
+	bool fits = puncher->addToInventory(item);
+	if(fits)
+		m_removed = true;
+	else
+		delete item;
 }
 
 /*
@@ -447,10 +451,10 @@ InventoryItem* RatSAO::createPickedUpItem()
 */
 
 // Prototype
-Oerkki1SAO proto_Oerkki1SAO(NULL, 0, v3f(0,0,0));
+Oerkki1SAO proto_Oerkki1SAO(NULL, v3f(0,0,0));
 
-Oerkki1SAO::Oerkki1SAO(ServerEnvironment *env, u16 id, v3f pos):
-	ServerActiveObject(env, id, pos),
+Oerkki1SAO::Oerkki1SAO(ServerEnvironment *env, v3f pos):
+	ServerActiveObject(env, pos),
 	m_is_active(false),
 	m_speed_f(0,0,0)
 {
@@ -467,7 +471,7 @@ Oerkki1SAO::Oerkki1SAO(ServerEnvironment *env, u16 id, v3f pos):
 	m_after_jump_timer = 0;
 }
 
-ServerActiveObject* Oerkki1SAO::create(ServerEnvironment *env, u16 id, v3f pos,
+ServerActiveObject* Oerkki1SAO::create(ServerEnvironment *env, v3f pos,
 		const std::string &data)
 {
 	std::istringstream is(data, std::ios::binary);
@@ -478,7 +482,7 @@ ServerActiveObject* Oerkki1SAO::create(ServerEnvironment *env, u16 id, v3f pos,
 	// check if version is supported
 	if(version != 0)
 		return NULL;
-	Oerkki1SAO *o = new Oerkki1SAO(env, id, pos);
+	Oerkki1SAO *o = new Oerkki1SAO(env, pos);
 	o->m_hp = hp;
 	return o;
 }
@@ -622,8 +626,9 @@ void Oerkki1SAO::step(float dtime, bool send_recommended)
 		m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);*/
 	v3f pos_f = getBasePosition();
 	v3f pos_f_old = pos_f;
-	moveresult = collisionMovePrecise(&m_env->getMap(), pos_max_d,
-			box, dtime, pos_f, m_speed_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
@@ -684,27 +689,28 @@ std::string Oerkki1SAO::getStaticData()
 	return os.str();
 }
 
-u16 Oerkki1SAO::punch(const std::string &toolname, v3f dir,
-		const std::string &playername)
+void Oerkki1SAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
 {
+	if(!puncher)
+		return;
+	
+	v3f dir = (getBasePosition() - puncher->getBasePosition()).normalize();
 	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);
-	return 65536/100;
+	// "Material" properties of an oerkki
+	MaterialProperties mp;
+	mp.diggability = DIGGABLE_NORMAL;
+	mp.crackiness = -1.0;
+	mp.cuttability = 1.0;
+
+	ToolDiggingProperties tp;
+	puncher->getWieldDiggingProperties(&tp);
+
+	HittingProperties hitprop = getHittingProperties(&mp, &tp,
+			time_from_last_punch);
+
+	doDamage(hitprop.hp);
+	puncher->damageWieldedItem(hitprop.wear);
 }
 
 void Oerkki1SAO::doDamage(u16 d)
@@ -739,10 +745,10 @@ void Oerkki1SAO::doDamage(u16 d)
 */
 
 // Prototype
-FireflySAO proto_FireflySAO(NULL, 0, v3f(0,0,0));
+FireflySAO proto_FireflySAO(NULL, v3f(0,0,0));
 
-FireflySAO::FireflySAO(ServerEnvironment *env, u16 id, v3f pos):
-	ServerActiveObject(env, id, pos),
+FireflySAO::FireflySAO(ServerEnvironment *env, v3f pos):
+	ServerActiveObject(env, pos),
 	m_is_active(false),
 	m_speed_f(0,0,0)
 {
@@ -757,7 +763,7 @@ FireflySAO::FireflySAO(ServerEnvironment *env, u16 id, v3f pos):
 	m_touching_ground = false;
 }
 
-ServerActiveObject* FireflySAO::create(ServerEnvironment *env, u16 id, v3f pos,
+ServerActiveObject* FireflySAO::create(ServerEnvironment *env, v3f pos,
 		const std::string &data)
 {
 	std::istringstream is(data, std::ios::binary);
@@ -768,7 +774,7 @@ ServerActiveObject* FireflySAO::create(ServerEnvironment *env, u16 id, v3f pos,
 	// check if version is supported
 	if(version != 0)
 		return NULL;
-	return new FireflySAO(env, id, pos);
+	return new FireflySAO(env, pos);
 }
 
 void FireflySAO::step(float dtime, bool send_recommended)
@@ -861,8 +867,9 @@ void FireflySAO::step(float dtime, bool send_recommended)
 		m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
 	v3f pos_f = getBasePosition();
 	v3f pos_f_old = pos_f;
-	moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-			box, dtime, pos_f, m_speed_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);
@@ -909,7 +916,8 @@ std::string FireflySAO::getStaticData()
 InventoryItem* FireflySAO::createPickedUpItem()
 {
 	std::istringstream is("CraftItem firefly 1", std::ios_base::binary);
-	InventoryItem *item = InventoryItem::deSerialize(is);
+	IGameDef *gamedef = m_env->getGameDef();
+	InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
 	return item;
 }
 
@@ -918,11 +926,11 @@ InventoryItem* FireflySAO::createPickedUpItem()
 */
 
 // Prototype
-MobV2SAO proto_MobV2SAO(NULL, 0, v3f(0,0,0), NULL);
+MobV2SAO proto_MobV2SAO(NULL, v3f(0,0,0), NULL);
 
-MobV2SAO::MobV2SAO(ServerEnvironment *env, u16 id, v3f pos,
+MobV2SAO::MobV2SAO(ServerEnvironment *env, v3f pos,
 		Settings *init_properties):
-	ServerActiveObject(env, id, pos),
+	ServerActiveObject(env, pos),
 	m_move_type("ground_nodes"),
 	m_speed(0,0,0),
 	m_last_sent_position(0,0,0),
@@ -961,13 +969,13 @@ MobV2SAO::~MobV2SAO()
 	delete m_properties;
 }
 
-ServerActiveObject* MobV2SAO::create(ServerEnvironment *env, u16 id, v3f pos,
+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, id, pos, &properties);
+	MobV2SAO *o = new MobV2SAO(env, pos, &properties);
 	return o;
 }
 
@@ -1174,7 +1182,7 @@ void MobV2SAO::step(float dtime, bool send_recommended)
 				properties.set("player_hit_damage", "9");
 				properties.set("player_hit_distance", "2");
 				properties.set("player_hit_interval", "1");
-				ServerActiveObject *obj = new MobV2SAO(m_env, 0,
+				ServerActiveObject *obj = new MobV2SAO(m_env,
 						pos, &properties);
 				//m_env->addActiveObjectAsStatic(obj);
 				m_env->addActiveObject(obj);
@@ -1351,15 +1359,20 @@ void MobV2SAO::step(float dtime, bool send_recommended)
 	}
 }
 
-u16 MobV2SAO::punch(const std::string &toolname, v3f dir,
-		const std::string &playername)
+void MobV2SAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
 {
-	assert(m_env);
+	if(!puncher)
+		return;
+	
+	v3f dir = (getBasePosition() - puncher->getBasePosition()).normalize();
+
+	// 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;
+			<<" at "<<PP(m_base_position/BS)<<std::endl;
 
 	m_disturb_timer = 0;
 	m_disturbing_player = playername;
@@ -1381,22 +1394,21 @@ u16 MobV2SAO::punch(const std::string &toolname, v3f dir,
 	}
 	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);
-	return 65536/100;
+
+	// "Material" properties of the MobV2
+	MaterialProperties mp;
+	mp.diggability = DIGGABLE_NORMAL;
+	mp.crackiness = -1.0;
+	mp.cuttability = 1.0;
+
+	ToolDiggingProperties tp;
+	puncher->getWieldDiggingProperties(&tp);
+
+	HittingProperties hitprop = getHittingProperties(&mp, &tp,
+			time_from_last_punch);
+
+	doDamage(hitprop.hp);
+	puncher->damageWieldedItem(hitprop.wear);
 }
 
 bool MobV2SAO::isPeaceful()
@@ -1490,3 +1502,287 @@ void MobV2SAO::doDamage(u16 d)
 }
 
 
+/*
+	LuaEntitySAO
+*/
+
+#include "scriptapi.h"
+#include "luaentity_common.h"
+
+// Prototype
+LuaEntitySAO proto_LuaEntitySAO(NULL, v3f(0,0,0), "_prototype", "");
+
+LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
+		const std::string &name, const std::string &state):
+	ServerActiveObject(env, pos),
+	m_init_name(name),
+	m_init_state(state),
+	m_registered(false),
+	m_prop(new LuaEntityProperties),
+	m_velocity(0,0,0),
+	m_acceleration(0,0,0),
+	m_yaw(0),
+	m_last_sent_yaw(0),
+	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)
+{
+	// Only register type if no environment supplied
+	if(env == NULL){
+		ServerActiveObject::registerType(getType(), create);
+		return;
+	}
+}
+
+LuaEntitySAO::~LuaEntitySAO()
+{
+	if(m_registered){
+		lua_State *L = m_env->getLua();
+		scriptapi_luaentity_rm(L, m_id);
+	}
+	delete m_prop;
+}
+
+void LuaEntitySAO::addedToEnvironment()
+{
+	ServerActiveObject::addedToEnvironment();
+	
+	// Create entity from name and state
+	lua_State *L = m_env->getLua();
+	m_registered = scriptapi_luaentity_add(L, m_id, m_init_name.c_str(),
+			m_init_state.c_str());
+	
+	if(m_registered){
+		// Get properties
+		scriptapi_luaentity_get_properties(L, m_id, m_prop);
+	}
+}
+
+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);
+	// create object
+	infostream<<"LuaEntitySAO::create(name=\""<<name<<"\" state=\""
+			<<state<<"\")"<<std::endl;
+	return new LuaEntitySAO(env, pos, name, state);
+}
+
+void LuaEntitySAO::step(float dtime, bool send_recommended)
+{
+	m_last_sent_position_timer += dtime;
+	
+	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 = getBasePosition();
+		v3f p_velocity = m_velocity;
+		IGameDef *gamedef = m_env->getGameDef();
+		moveresult = collisionMovePrecise(&m_env->getMap(), gamedef,
+				pos_max_d, box, dtime, p_pos, p_velocity);
+		// Apply results
+		setBasePosition(p_pos);
+		m_velocity = p_velocity;
+
+		m_velocity += dtime * m_acceleration;
+	} else {
+		m_base_position += dtime * m_velocity + 0.5 * dtime
+				* dtime * m_acceleration;
+		m_velocity += dtime * m_acceleration;
+	}
+
+	if(m_registered){
+		lua_State *L = m_env->getLua();
+		scriptapi_luaentity_step(L, m_id, dtime);
+	}
+
+	if(send_recommended == false)
+		return;
+	
+	// TODO: force send when acceleration changes enough?
+	float minchange = 0.2*BS;
+	if(m_last_sent_position_timer > 1.0){
+		minchange = 0.01*BS;
+	} else if(m_last_sent_position_timer > 0.2){
+		minchange = 0.05*BS;
+	}
+	float move_d = m_base_position.getDistanceFrom(m_last_sent_position);
+	move_d += m_last_sent_move_precision;
+	float vel_d = m_velocity.getDistanceFrom(m_last_sent_velocity);
+	if(move_d > minchange || vel_d > minchange ||
+			fabs(m_yaw - m_last_sent_yaw) > 1.0){
+		sendPosition(true, false);
+	}
+}
+
+std::string LuaEntitySAO::getClientInitializationData()
+{
+	std::ostringstream os(std::ios::binary);
+	// version
+	writeU8(os, 0);
+	// pos
+	writeV3F1000(os, m_base_position);
+	// yaw
+	writeF1000(os, m_yaw);
+	// properties
+	std::ostringstream prop_os(std::ios::binary);
+	m_prop->serialize(prop_os);
+	os<<serializeLongString(prop_os.str());
+	// return result
+	return os.str();
+}
+
+std::string LuaEntitySAO::getStaticData()
+{
+	infostream<<__FUNCTION_NAME<<std::endl;
+	std::ostringstream os(std::ios::binary);
+	// version
+	writeU8(os, 0);
+	// name
+	os<<serializeString(m_init_name);
+	// state
+	if(m_registered){
+		lua_State *L = m_env->getLua();
+		std::string state = scriptapi_luaentity_get_staticdata(L, m_id);
+		os<<serializeLongString(state);
+	} else {
+		os<<serializeLongString(m_init_state);
+	}
+	return os.str();
+}
+
+InventoryItem* LuaEntitySAO::createPickedUpItem()
+{
+	// 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;
+}
+
+void LuaEntitySAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
+{
+	if(!m_registered)
+		return;
+	lua_State *L = m_env->getLua();
+	scriptapi_luaentity_punch(L, m_id, puncher, time_from_last_punch);
+}
+
+void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
+{
+	if(!m_registered)
+		return;
+	lua_State *L = m_env->getLua();
+	scriptapi_luaentity_rightclick(L, m_id, clicker);
+}
+
+void LuaEntitySAO::setPos(v3f pos)
+{
+	m_base_position = pos;
+	sendPosition(false, true);
+}
+
+void LuaEntitySAO::moveTo(v3f pos, bool continuous)
+{
+	m_base_position = pos;
+	if(!continuous)
+		sendPosition(true, true);
+}
+
+float LuaEntitySAO::getMinimumSavedMovement()
+{
+	return 0.1 * BS;
+}
+
+void LuaEntitySAO::setVelocity(v3f velocity)
+{
+	m_velocity = velocity;
+}
+
+void LuaEntitySAO::setAcceleration(v3f acceleration)
+{
+	m_acceleration = acceleration;
+}
+
+v3f LuaEntitySAO::getAcceleration()
+{
+	return m_acceleration;
+}
+
+void LuaEntitySAO::setTextureMod(const std::string &mod)
+{
+	std::ostringstream os(std::ios::binary);
+	// command (1 = set texture modification)
+	writeU8(os, 1);
+	// parameters
+	os<<serializeString(mod);
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), false, os.str());
+	m_messages_out.push_back(aom);
+}
+
+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);
+	// parameters
+	writeV2S16(os, p);
+	writeU16(os, num_frames);
+	writeF1000(os, framelength);
+	writeU8(os, select_horiz_by_yawpitch);
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), false, os.str());
+	m_messages_out.push_back(aom);
+}
+
+void LuaEntitySAO::sendPosition(bool do_interpolate, bool is_movement_end)
+{
+	m_last_sent_move_precision = m_base_position.getDistanceFrom(
+			m_last_sent_position);
+	m_last_sent_position_timer = 0;
+	m_last_sent_yaw = m_yaw;
+	m_last_sent_position = m_base_position;
+	m_last_sent_velocity = m_velocity;
+	//m_last_sent_acceleration = m_acceleration;
+
+	float update_interval = m_env->getSendRecommendedInterval();
+
+	std::ostringstream os(std::ios::binary);
+	// command (0 = update position)
+	writeU8(os, 0);
+
+	// do_interpolate
+	writeU8(os, do_interpolate);
+	// pos
+	writeV3F1000(os, m_base_position);
+	// velocity
+	writeV3F1000(os, m_velocity);
+	// acceleration
+	writeV3F1000(os, m_acceleration);
+	// yaw
+	writeF1000(os, m_yaw);
+	// is_end_position (for interpolation)
+	writeU8(os, is_movement_end);
+	// update_interval (for interpolation)
+	writeF1000(os, update_interval);
+
+	// create message and add to list
+	ActiveObjectMessage aom(getId(), false, os.str());
+	m_messages_out.push_back(aom);
+}
+