X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_sao.cpp;h=171e315af87ea40791c48da49603440eb8a3e9e6;hb=e8b0722137b47b9b17cef94a9a9f0f52d03f4ea8;hp=8c9761740db01ab2aa89d9214f2c8591e10d3c76;hpb=43a28f04fa3ddf4b612f58c25a896293a01567e3;p=dragonfireclient.git diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 8c9761740..171e315af 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -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 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="<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<getGameDef(); + InventoryItem *item = InventoryItem::deSerialize(is, gamedef); + infostream<<__FUNCTION_NAME<<": m_inventorystring=\"" < 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<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<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: "<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<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<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 players = m_env->getPlayers(true); + core::list::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="<getName()<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 "<addActiveObjectAsStatic(obj); m_env->addActiveObject(obj); } else { - dstream<<__FUNCTION_NAME<<": Unknown shoot_type="<= 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="< 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<= 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="<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="<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=\""<physical){ + core::aabbox3d 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<getLua(); + std::string state = scriptapi_luaentity_get_staticdata(L, m_id); + os<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<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); +} +