]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/content_sao.cpp
Add time_from_last_punch to Lua API
[dragonfireclient.git] / src / content_sao.cpp
index 8c9761740db01ab2aa89d9214f2c8591e10d3c76..171e315af87ea40791c48da49603440eb8a3e9e6 100644 (file)
@@ -21,6 +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;
 
@@ -48,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)
@@ -84,7 +89,6 @@ void TestSAO::step(float dtime, bool send_recommended)
        if(m_timer1 < 0.0)
        {
                m_timer1 += 0.125;
-               //dstream<<"TestSAO: id="<<getId()<<" sending data"<<std::endl;
 
                std::string data;
 
@@ -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);
@@ -131,13 +135,15 @@ ServerActiveObject* ItemSAO::create(ServerEnvironment *env, u16 id, v3f pos,
        if(version != 0)
                return NULL;
        std::string inventorystring = deSerializeString(is);
-       dstream<<"ItemSAO::create(): Creating item \""
+       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)
 {
+       ScopeProfiler sp2(g_profiler, "ItemSAO::step avg", SPT_AVG);
+
        assert(m_env);
 
        const float interval = 0.2;
@@ -156,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;
@@ -206,7 +213,7 @@ std::string ItemSAO::getClientInitializationData()
 
 std::string ItemSAO::getStaticData()
 {
-       dstream<<__FUNCTION_NAME<<std::endl;
+       infostream<<__FUNCTION_NAME<<std::endl;
        std::ostringstream os(std::ios::binary);
        char buf[1];
        // version
@@ -221,36 +228,29 @@ InventoryItem * ItemSAO::createInventoryItem()
 {
        try{
                std::istringstream is(m_inventorystring, std::ios_base::binary);
-               InventoryItem *item = InventoryItem::deSerialize(is);
-               dstream<<__FUNCTION_NAME<<": m_inventorystring=\""
+               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)
        {
-               dstream<<__FUNCTION_NAME<<": serialization error: "
+               infostream<<__FUNCTION_NAME<<": serialization error: "
                                <<"m_inventorystring=\""<<m_inventorystring<<"\""<<std::endl;
                return NULL;
        }
 }
 
-void ItemSAO::rightClick(Player *player)
+void ItemSAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
 {
-       dstream<<__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;
 }
 
 /*
@@ -258,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)
 {
@@ -276,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);
@@ -287,11 +287,13 @@ 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)
 {
+       ScopeProfiler sp2(g_profiler, "RatSAO::step avg", SPT_AVG);
+
        assert(m_env);
 
        if(m_is_active == false)
@@ -386,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);
@@ -424,18 +427,23 @@ std::string RatSAO::getClientInitializationData()
 
 std::string RatSAO::getStaticData()
 {
-       //dstream<<__FUNCTION_NAME<<std::endl;
+       //infostream<<__FUNCTION_NAME<<std::endl;
        std::ostringstream os(std::ios::binary);
        // version
        writeU8(os, 0);
        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;
 }
 
 /*
@@ -443,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)
 {
@@ -463,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);
@@ -474,13 +482,15 @@ 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;
 }
 
 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)
@@ -523,13 +533,14 @@ void Oerkki1SAO::step(float dtime, bool send_recommended)
                Player *player = *i;
                v3f playerpos = player->getPosition();
                f32 dist = m_base_position.getDistanceFrom(playerpos);
-               if(dist < BS*1.45)
+               if(dist < BS*0.6)
                {
+                       m_removed = true;
+                       return;
                        player_is_too_close = true;
                        near_player_pos = playerpos;
-                       break;
                }
-               else if(dist < BS*15.0)
+               else if(dist < BS*15.0 && !player_is_too_close)
                {
                        player_is_close = true;
                        near_player_pos = playerpos;
@@ -615,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
@@ -668,7 +680,7 @@ std::string Oerkki1SAO::getClientInitializationData()
 
 std::string Oerkki1SAO::getStaticData()
 {
-       //dstream<<__FUNCTION_NAME<<std::endl;
+       //infostream<<__FUNCTION_NAME<<std::endl;
        std::ostringstream os(std::ios::binary);
        // version
        writeU8(os, 0);
@@ -677,18 +689,33 @@ std::string Oerkki1SAO::getStaticData()
        return os.str();
 }
 
-u16 Oerkki1SAO::punch(const std::string &toolname, v3f dir)
+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;
-       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)
 {
-       dstream<<"oerkki damage: "<<d<<std::endl;
+       infostream<<"oerkki damage: "<<d<<std::endl;
        
        if(d < m_hp)
        {
@@ -718,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)
 {
@@ -736,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);
@@ -747,11 +774,13 @@ 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)
 {
+       ScopeProfiler sp2(g_profiler, "FireflySAO::step avg", SPT_AVG);
+
        assert(m_env);
 
        if(m_is_active == false)
@@ -838,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);
@@ -876,7 +906,7 @@ std::string FireflySAO::getClientInitializationData()
 
 std::string FireflySAO::getStaticData()
 {
-       //dstream<<__FUNCTION_NAME<<std::endl;
+       //infostream<<__FUNCTION_NAME<<std::endl;
        std::ostringstream os(std::ios::binary);
        // version
        writeU8(os, 0);
@@ -886,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;
 }
 
@@ -895,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),
@@ -916,7 +947,10 @@ MobV2SAO::MobV2SAO(ServerEnvironment *env, u16 id, v3f pos,
        m_shoot_reload_timer(0),
        m_shooting(false),
        m_shooting_timer(0),
-       m_falling(false)
+       m_falling(false),
+       m_disturb_timer(100000),
+       m_random_disturb_timer(0),
+       m_shoot_y(0)
 {
        ServerActiveObject::registerType(getType(), create);
        
@@ -935,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;
 }
 
@@ -956,7 +990,7 @@ std::string MobV2SAO::getStaticData()
 
 std::string MobV2SAO::getClientInitializationData()
 {
-       //dstream<<__FUNCTION_NAME<<std::endl;
+       //infostream<<__FUNCTION_NAME<<std::endl;
 
        updateProperties();
 
@@ -1062,6 +1096,8 @@ static void explodeSquare(Map *map, v3s16 p0, v3s16 size)
 
 void MobV2SAO::step(float dtime, bool send_recommended)
 {
+       ScopeProfiler sp2(g_profiler, "MobV2SAO::step avg", SPT_AVG);
+
        assert(m_env);
        Map *map = &m_env->getMap();
 
@@ -1071,6 +1107,52 @@ void MobV2SAO::step(float dtime, bool send_recommended)
                m_removed = true;
                return;
        }
+
+       m_random_disturb_timer += dtime;
+       if(m_random_disturb_timer >= 5.0)
+       {
+               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;
+                               }
+                       }
+               }
+       }
+
+       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);
+       }
+
+       m_disturb_timer += dtime;
        
        if(!m_falling)
        {
@@ -1083,39 +1165,58 @@ void MobV2SAO::step(float dtime, bool send_recommended)
                        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;
-                               dstream<<__FUNCTION_NAME<<": Shooting fireball from "<<PP(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.set("texture_name", "fireball.png");
-                               properties.setV3F("sprite_pos", v3f(0.0, 0.0, 0.0));
-                               properties.setV2F("sprite_size", v2f(1.0, 1.0));
-                               properties.set("sprite_type", "simple");
-                               properties.set("simple_anim_frames", "3");
-                               properties.set("simple_anim_frametime", "0.1");
                                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, 0,
+                               ServerActiveObject *obj = new MobV2SAO(m_env,
                                                pos, &properties);
                                //m_env->addActiveObjectAsStatic(obj);
                                m_env->addActiveObject(obj);
                        } else {
-                               dstream<<__FUNCTION_NAME<<": Unknown shoot_type="<<shoot_type
+                               infostream<<__FUNCTION_NAME<<": Mob id="<<m_id
+                                               <<": Unknown shoot_type="<<shoot_type
                                                <<std::endl;
                        }
                }
 
                m_shoot_reload_timer += dtime;
 
-               if(m_shoot_reload_timer >= 5.0 && !m_next_pos_exists)
+               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))
                {
+                       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;
@@ -1153,7 +1254,7 @@ void MobV2SAO::step(float dtime, bool send_recommended)
                        v3f next_pos_f = intToFloat(m_next_pos_i, BS);
 
                        v3f v = next_pos_f - pos_f;
-                       m_yaw = atan2(v.Z, v.X) / M_PI * 180;
+                       m_yaw = atan2(v.Z, v.X) / PI * 180;
                        
                        v3f diff = next_pos_f - pos_f;
                        v3f dir = diff;
@@ -1171,7 +1272,6 @@ void MobV2SAO::step(float dtime, bool send_recommended)
                        m_base_position = pos_f;
 
                        if((pos_f - next_pos_f).getLength() < 0.1 || arrived){
-                               //dstream<<"id="<<m_id<<": arrived to "<<PP(m_next_pos_i)<<std::endl;
                                m_next_pos_exists = false;
                        }
                }
@@ -1213,16 +1313,10 @@ void MobV2SAO::step(float dtime, bool send_recommended)
                                }
                                u32 order[3*3*3];
                                get_random_u32_array(order, num_dps);
-                               /*dstream<<"At pos "<<PP(pos_i)<<"; Random array: ";
-                               for(int i=0; i<num_dps; i++){
-                                       dstream<<order[i]<<" ";
-                               }
-                               dstream<<std::endl;*/
                                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);
-                                       //dstream<<PP(p)<<" is_free="<<is_free<<std::endl;
                                        if(!is_free)
                                                continue;
                                        m_next_pos_i = p;
@@ -1252,7 +1346,7 @@ void MobV2SAO::step(float dtime, bool send_recommended)
        }
        else
        {
-               dstream<<"MobV2SAO::step(): id="<<m_id<<" unknown move_type=\""
+               errorstream<<"MobV2SAO::step(): id="<<m_id<<" unknown move_type=\""
                                <<m_move_type<<"\""<<std::endl;
        }
 
@@ -1261,44 +1355,86 @@ void MobV2SAO::step(float dtime, bool send_recommended)
 
        if(m_base_position.getDistanceFrom(m_last_sent_position) > 0.05*BS)
        {
-               m_last_sent_position = m_base_position;
+               sendPosition();
+       }
+}
 
-               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);
+void MobV2SAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
+{
+       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
+                       <<" 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;
        }
+       sendPosition();
+       
+
+       // "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);
 }
 
-u16 MobV2SAO::punch(const std::string &toolname, v3f dir)
+bool MobV2SAO::isPeaceful()
 {
-       u16 amount = 2;
-       dstream<<"id="<<m_id<<": punch with \""<<toolname<<"\""<<std::endl;
-       /* See tool names in inventory.h */
-       if(toolname == "WSword")
-               amount = 4;
-       if(toolname == "STSword")
-               amount = 7;
-       if(toolname == "SteelSword")
-               amount = 10;
-       if(toolname == "STAxe")
-               amount = 3;
-       if(toolname == "SteelAxe")
-               amount = 4;
-       if(toolname == "SteelPick")
-               amount = 3;
-       doDamage(amount);
-       return 65536/100;
+       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);
 }
 
 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");
@@ -1309,6 +1445,7 @@ void MobV2SAO::setPropertyDefaults()
        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()
 {
@@ -1337,7 +1474,7 @@ void MobV2SAO::updateProperties()
 
 void MobV2SAO::doDamage(u16 d)
 {
-       dstream<<"MobV2 hp="<<m_hp<<" damage="<<d<<std::endl;
+       infostream<<"MobV2 hp="<<m_hp<<" damage="<<d<<std::endl;
        
        if(d < m_hp)
        {
@@ -1345,6 +1482,8 @@ void MobV2SAO::doDamage(u16 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;
@@ -1363,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);
+}
+