lineage2/L2Bot2.0
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove unnecessary classes

Browse Source
This commit is contained in:
k0t9i
2023-10-16 00:03:43 +04:00
parent a7a9b626f4
commit 787f4969ed
57 changed files with 1651 additions and 1600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
L2BotCore/Domain/Entities/NPC.h
View File

@@ -11,76 +11,66 @@ namespace L2Bot::Domain::Entities
class NPC : public WorldObject
{
public:
void Update(const EntityInterface* other) override
void UpdateSpoilState(const Enums::SpoilStateEnum spoilState)
{
const NPC* casted = static_cast<const NPC*>(other);
WorldObject::Update(other);
m_IsHostile = casted->m_IsHostile;
m_NpcId = casted->m_NpcId;
m_SpoilState = casted->m_SpoilState;
m_FullName = casted->m_FullName;
m_VitalStats = casted->m_VitalStats;
m_SpoilState = spoilState;
}
void SaveState() override
{
WorldObject::SaveState();
m_PrevState =
{
m_FullName,
m_SpoilState,
m_VitalStats,
false
};
void Update(
const ValueObjects::Transform& transform,
const bool isHostile,
const uint32_t npcId,
const ValueObjects::FullName& fullName,
const ValueObjects::VitalStats& vitalStats
) {
WorldObject::Update(transform);
m_IsHostile = isHostile;
m_NpcId = npcId;
m_FullName = fullName;
m_VitalStats = vitalStats;
}
const bool IsEqual(const EntityInterface* other) const override
const size_t GetHash() const override
{
const NPC* casted = static_cast<const NPC*>(other);
return WorldObject::IsEqual(other) &&
m_IsHostile == casted->m_IsHostile &&
m_NpcId == casted->m_NpcId &&
m_SpoilState == casted->m_SpoilState &&
m_FullName.IsEqual(&casted->m_FullName) &&
m_VitalStats.IsEqual(&casted->m_VitalStats);
return Helpers::CombineHashes({
WorldObject::GetHash(),
std::hash<bool>{}(m_IsHostile),
std::hash<uint32_t>{}(m_NpcId),
std::hash<Enums::SpoilStateEnum>{}(m_SpoilState),
m_FullName.GetHash(),
m_VitalStats.GetHash()
});
}
const std::string GetEntityName() const override
{
return "npc";
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override
{
std::vector<Serializers::Node> result = WorldObject::BuildSerializationNodes();
if (m_PrevState.isNewState || !m_FullName.IsEqual(&m_PrevState.fullName))
{
result.push_back({ L"fullName", m_FullName.BuildSerializationNodes() });
}
if (m_PrevState.isNewState)
{
result.push_back({ L"isHostile", std::to_wstring(m_IsHostile) });
result.push_back({ L"npcId", std::to_wstring(m_NpcId) });
}
if (m_PrevState.isNewState || m_SpoilState != m_PrevState.spoilState)
{
result.push_back({ L"spoilState", std::to_wstring(static_cast<uint32_t>(m_SpoilState)) });
}
if (m_PrevState.isNewState || !m_VitalStats.IsEqual(&m_PrevState.vitalStats))
{
result.push_back({ L"vitalStats", m_VitalStats.BuildSerializationNodes() });
}
result.push_back({ L"fullName", m_FullName.BuildSerializationNodes() });
result.push_back({ L"isHostile", std::to_wstring(m_IsHostile) });
result.push_back({ L"npcId", std::to_wstring(m_NpcId) });
result.push_back({ L"spoilState", std::to_wstring(static_cast<uint32_t>(m_SpoilState)) });
result.push_back({ L"vitalStats", m_VitalStats.BuildSerializationNodes() });
return result;
}
NPC(
const uint32_t id,
const ValueObjects::Transform transform,
const ValueObjects::Transform& transform,
const bool isHostile,
const uint32_t npcId,
const Enums::SpoilStateEnum spoilState,
const ValueObjects::FullName fullName,
const ValueObjects::VitalStats vitalStats
const ValueObjects::FullName& fullName,
const ValueObjects::VitalStats& vitalStats
) :
WorldObject(id, transform),
m_IsHostile(isHostile),
m_NpcId(npcId),
m_SpoilState(spoilState),
m_FullName(fullName),
m_VitalStats(vitalStats)
{
@@ -90,22 +80,11 @@ namespace L2Bot::Domain::Entities
NPC() = default;
virtual ~NPC() = default;
private:
struct GetState
{
ValueObjects::FullName fullName = ValueObjects::FullName();
Enums::SpoilStateEnum spoilState = Enums::SpoilStateEnum::none;
ValueObjects::VitalStats vitalStats = ValueObjects::VitalStats();
bool isNewState = true;
};
private:
bool m_IsHostile = false;
uint32_t m_NpcId = 0;
Enums::SpoilStateEnum m_SpoilState = Enums::SpoilStateEnum::none;
ValueObjects::FullName m_FullName = ValueObjects::FullName();
ValueObjects::VitalStats m_VitalStats = ValueObjects::VitalStats();
GetState m_PrevState = GetState();
};
}