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

140
L2BotCore/Domain/Entities/ArmorItem.h
View File

@@ -2,87 +2,75 @@
#include <cstdint>
#include <string>
#include <vector>
#include <functional>
#include "BaseItem.h"
#include "../Enums/ArmorTypeEnum.h"
#include "../Enums/CrystalTypeEnum.h"
#include "../Helpers/HashCombiner.h"
namespace L2Bot::Domain::Entities
{
class ArmorItem : public BaseItem
{
public:
void Update(const EntityInterface* other) override
{
const ArmorItem* casted = static_cast<const ArmorItem*>(other);
void Update(
const uint32_t itemId,
const int32_t mana,
const std::wstring& name,
const std::wstring& iconName,
const std::wstring& description,
const uint16_t weight,
const bool isEquipped,
const uint16_t enchantLevel,
const Enums::ArmorTypeEnum armorType,
const Enums::CrystalTypeEnum crystalType,
const uint32_t pDefense,
const uint32_t mDefense,
const std::wstring& setEffect,
const std::wstring& addSetEffect,
const std::wstring& enchantEffect
) {
BaseItem::Update(itemId, mana, name, iconName, description, weight);
BaseItem::Update(other);
m_IsEquipped = casted->m_IsEquipped;
m_EnchantLevel = casted->m_EnchantLevel;
m_ArmorType = casted->m_ArmorType;
m_CrystalType = casted->m_CrystalType;
m_PDefense = casted->m_PDefense;
m_MDefense = casted->m_MDefense;
m_SetEffect = casted->m_SetEffect;
m_AddSetEffect = casted->m_AddSetEffect;
m_EnchantEffect = casted->m_EnchantEffect;
m_IsEquipped = isEquipped;
m_EnchantLevel = enchantLevel;
m_ArmorType = armorType;
m_CrystalType = crystalType;
m_PDefense = pDefense;
m_MDefense = mDefense;
m_SetEffect = setEffect;
m_AddSetEffect = addSetEffect;
m_EnchantEffect = enchantEffect;
}
void SaveState() override
const size_t GetHash() const override
{
BaseItem::SaveState();
m_PrevState =
{
m_IsEquipped,
m_EnchantLevel,
m_PDefense,
m_MDefense,
false
};
}
const bool IsEqual(const EntityInterface* other) const override
{
const ArmorItem* casted = static_cast<const ArmorItem*>(other);
return BaseItem::IsEqual(other) &&
m_IsEquipped == casted->m_IsEquipped &&
m_EnchantLevel == casted->m_EnchantLevel &&
m_ArmorType == casted->m_ArmorType &&
m_CrystalType == casted->m_CrystalType &&
m_PDefense == casted->m_PDefense &&
m_MDefense == casted->m_MDefense &&
m_SetEffect == casted->m_SetEffect &&
m_AddSetEffect == casted->m_AddSetEffect &&
m_EnchantEffect == casted->m_EnchantEffect;
return Helpers::CombineHashes({
BaseItem::GetHash(),
std::hash<bool>{}(m_IsEquipped),
std::hash<uint16_t>{}(m_EnchantLevel),
std::hash<Enums::ArmorTypeEnum>{}(m_ArmorType),
std::hash<Enums::CrystalTypeEnum>{}(m_CrystalType),
std::hash<uint32_t>{}(m_PDefense),
std::hash<uint32_t>{}(m_MDefense),
std::hash<std::wstring>{}(m_SetEffect),
std::hash<std::wstring>{}(m_AddSetEffect),
std::hash<std::wstring>{}(m_EnchantEffect)
});
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override
{
std::vector<Serializers::Node> result = BaseItem::BuildSerializationNodes();
if (m_PrevState.isNewState)
{
result.push_back({ L"armorType", std::to_wstring(static_cast<uint8_t>(m_ArmorType)) });
result.push_back({ L"crystalType", std::to_wstring(static_cast<int8_t>(m_CrystalType)) });
result.push_back({ L"setEffect", m_SetEffect });
result.push_back({ L"addSetEffect", m_AddSetEffect });
result.push_back({ L"enchantEffect", m_EnchantEffect });
}
if (m_PrevState.isNewState || m_IsEquipped != m_PrevState.isEquipped)
{
result.push_back({ L"isEquipped", std::to_wstring(m_IsEquipped) });
}
if (m_PrevState.isNewState || m_EnchantLevel != m_PrevState.enchantLevel)
{
result.push_back({ L"enchantLevel", std::to_wstring(m_EnchantLevel) });
}
if (m_PrevState.isNewState || m_PDefense != m_PrevState.pDefense)
{
result.push_back({ L"pDefense", std::to_wstring(m_PDefense) });
}
if (m_PrevState.isNewState || m_MDefense != m_PrevState.mDefense)
{
result.push_back({ L"mDefense", std::to_wstring(m_MDefense) });
}
result.push_back({ L"armorType", std::to_wstring(static_cast<uint8_t>(m_ArmorType)) });
result.push_back({ L"crystalType", std::to_wstring(static_cast<int8_t>(m_CrystalType)) });
result.push_back({ L"setEffect", m_SetEffect });
result.push_back({ L"addSetEffect", m_AddSetEffect });
result.push_back({ L"enchantEffect", m_EnchantEffect });
result.push_back({ L"isEquipped", std::to_wstring(m_IsEquipped) });
result.push_back({ L"enchantLevel", std::to_wstring(m_EnchantLevel) });
result.push_back({ L"pDefense", std::to_wstring(m_PDefense) });
result.push_back({ L"mDefense", std::to_wstring(m_MDefense) });
return result;
}
@@ -128,34 +116,9 @@ namespace L2Bot::Domain::Entities
{
}
ArmorItem(const ArmorItem* other) :
BaseItem(other),
m_IsEquipped(other->m_IsEquipped),
m_EnchantLevel(other->m_EnchantLevel),
m_ArmorType(other->m_ArmorType),
m_CrystalType(other->m_CrystalType),
m_PDefense(other->m_PDefense),
m_MDefense(other->m_MDefense),
m_SetEffect(other->m_SetEffect),
m_AddSetEffect(other->m_AddSetEffect),
m_EnchantEffect(other->m_EnchantEffect)
{
}
ArmorItem() = default;
virtual ~ArmorItem() = default;
private:
struct GetState
{
bool isEquipped = 0;
uint16_t enchantLevel = 0;
uint32_t pDefense = 0;
uint32_t mDefense = 0;
bool isNewState = true;
};
private:
bool m_IsEquipped = 0;
uint16_t m_EnchantLevel = 0;
@@ -166,6 +129,5 @@ namespace L2Bot::Domain::Entities
std::wstring m_SetEffect = L"";
std::wstring m_AddSetEffect = L"";
std::wstring m_EnchantEffect = L"";
GetState m_PrevState = GetState();
};
}