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

feat: change dtos to entities

Browse Source
This commit is contained in:
k0t9i
2023-01-21 13:15:11 +04:00
parent 3c20df7683
commit 7637260d19
58 changed files with 704 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
L2BotCore/Domain/DTO/BaseItem.h
View File

@@ -1,21 +0,0 @@
#pragma once
#include <cstdint>
#include <string>
#include "WorldObject.h"
namespace L2Bot::Domain::DTO
{
struct BaseItem
{
public:
const uint32_t itemId = 0;
const uint32_t amount = 0;
const bool isEquipped = 0;
const uint16_t enchantLevel = 0;
const int32_t mana = -1;
const std::string name = "";
const std::string iconName = "";
const std::string description = "";
const uint16_t weight = 0;
};
}

16
L2BotCore/Domain/DTO/Drop.h
View File

@@ -1,16 +0,0 @@
#pragma once
#include <cstdint>
#include <string>
#include "WorldObject.h"
namespace L2Bot::Domain::DTO
{
struct Drop : public WorldObject
{
public:
const uint32_t itemId = 0;
const uint32_t amount = 0;
const std::string name = "";
const std::string iconName = "";
};
}

43
L2BotCore/Domain/DTO/EntityState.h Normal file
View File

@@ -0,0 +1,43 @@
#pragma once
#include "../Entities/EntityInterface.h"
#include "../Enums/EntityStateEnum.h"
namespace L2Bot::Domain::DTO
{
class EntityState
{
public:
Entities::EntityInterface* GetEntity() const
{
return m_Entity;
}
const Enums::EntityStateEnum GetState() const
{
return m_State;
}
void UpdateState(const Enums::EntityStateEnum state)
{
m_State = state;
}
EntityState(Entities::EntityInterface* object, Enums::EntityStateEnum state) :
m_Entity(object),
m_State(state)
{
}
EntityState() = default;
virtual ~EntityState()
{
if (m_Entity != nullptr)
{
delete m_Entity;
}
}
private:
Entities::EntityInterface* m_Entity = nullptr;
Enums::EntityStateEnum m_State = Enums::EntityStateEnum::none;
};
}

29
L2BotCore/Domain/DTO/Hero.h
View File

@@ -1,29 +0,0 @@
#pragma once
#include "WorldObject.h"
#include "../ValueObjects/FullName.h"
#include "../ValueObjects/VitalStats.h"
#include "../ValueObjects/Phenotype.h"
#include "../ValueObjects/ExperienceInfo.h"
#include "../ValueObjects/PermanentStats.h"
#include "../ValueObjects/VariableStats.h"
#include "../ValueObjects/Reputation.h"
#include "../ValueObjects/InventoryInfo.h"
#include <cstdint>
namespace L2Bot::Domain::DTO
{
struct Hero : public WorldObject
{
public:
const ValueObjects::FullName fullName = ValueObjects::FullName();
const ValueObjects::VitalStats vitalStats = ValueObjects::VitalStats();
const ValueObjects::Phenotype phenotype = ValueObjects::Phenotype();
const ValueObjects::ExperienceInfo experienceInfo = ValueObjects::ExperienceInfo();
const ValueObjects::PermanentStats permanentStats = ValueObjects::PermanentStats();
const ValueObjects::VariableStats variableStats = ValueObjects::VariableStats();
const ValueObjects::Reputation reputation = ValueObjects::Reputation();
const ValueObjects::InventoryInfo inventoryInfo = ValueObjects::InventoryInfo();
const uint32_t targetId = 0;
const bool isStanding = true;
};
}

19
L2BotCore/Domain/DTO/NPC.h
View File

@@ -1,19 +0,0 @@
#pragma once
#include <cstdint>
#include "WorldObject.h"
#include "../ValueObjects/FullName.h"
#include "../ValueObjects/VitalStats.h"
#include "../Enums/SpoilStateEnum.h"
namespace L2Bot::Domain::DTO
{
struct NPC : public WorldObject
{
public:
const bool isHostile = false;
const uint32_t npcId = 0;
const Enums::SpoilStateEnum spoilState = Enums::SpoilStateEnum::none;
const ValueObjects::FullName fullName = ValueObjects::FullName();
const ValueObjects::VitalStats vitalStats = ValueObjects::VitalStats();
};
}

13
L2BotCore/Domain/DTO/ObjectState.h
View File

@@ -1,13 +0,0 @@
#pragma once
#include "../Enums/ObjectStateEnum.h"
namespace L2Bot::Domain::DTO
{
template <typename T>
struct ObjectState
{
public:
T object;
Enums::ObjectStateEnum state = Enums::ObjectStateEnum::none;
};
}

14
L2BotCore/Domain/DTO/Player.h
View File

@@ -1,14 +0,0 @@
#pragma once
#include "WorldObject.h"
#include "../ValueObjects/FullName.h"
#include "../ValueObjects/VitalStats.h"
#include "../ValueObjects/Phenotype.h"
namespace L2Bot::Domain::DTO
{
struct Player : public WorldObject
{
public:
const ValueObjects::FullName fullName = ValueObjects::FullName();
const ValueObjects::Phenotype phenotype = ValueObjects::Phenotype();
};
}

22
L2BotCore/Domain/DTO/Skill.h
View File

@@ -1,22 +0,0 @@
#pragma once
#include <cstdint>
#include <string>
namespace L2Bot::Domain::DTO
{
struct Skill
{
public:
const uint32_t skillId = 0;
const uint8_t level = 0;
const bool isActive = false;
const uint8_t cost = 0;
const int16_t range = 0;
const std::string name = "";
const std::string description = "";
const std::string iconName = "";
const bool isToggled = false;
const bool isCasting = false;
const bool isReloading = false;
};
}

13
L2BotCore/Domain/DTO/WorldObject.h
View File

@@ -1,13 +0,0 @@
#pragma once
#include <cstdint>
#include "../ValueObjects/Transform.h"
namespace L2Bot::Domain::DTO
{
struct WorldObject
{
public:
const uint32_t id = 0;
const ValueObjects::Transform transform = ValueObjects::Transform();
};
}

49
L2BotCore/Domain/Entities/Drop.h
View File

@@ -2,55 +2,34 @@
#include <cstdint>
#include <string>
#include "WorldObject.h"
#include "../DTO/Drop.h"
namespace L2Bot::Domain::Entities
{
class Drop : public WorldObject
{
public:
const uint32_t GetItemId() const
void Update(const EntityInterface* other) override
{
return m_ItemId;
}
const uint32_t GetAmount() const
{
return m_Amount;
}
const std::string GetName() const
{
return m_Name;
}
const std::string GetIconName() const
{
return m_IconName;
}
void UpdateFromDTO(const DTO::WorldObject* dto) override
{
const DTO::Drop* castedDto = static_cast<const DTO::Drop*>(dto);
WorldObject::UpdateFromDTO(dto);
m_ItemId = castedDto->itemId;
m_Amount = castedDto->amount;
m_Name = castedDto->name;
m_IconName = castedDto->iconName;
const Drop* casted = static_cast<const Drop*>(other);
WorldObject::Update(other);
m_ItemId = casted->m_ItemId;
m_Amount = casted->m_Amount;
m_Name = casted->m_Name;
m_IconName = casted->m_IconName;
}
void SaveState() override
{
WorldObject::SaveState();
m_IsNewState = false;
}
const static Drop CreateFromDTO(const DTO::Drop& dto)
const bool IsEqual(const EntityInterface* other) const override
{
return Drop(dto.id, dto.transform, dto.itemId, dto.amount, dto.name, dto.iconName);
}
const bool IsEqual(const DTO::WorldObject* dto) const override
{
const DTO::Drop* castedDto = static_cast<const DTO::Drop*>(dto);
return WorldObject::IsEqual(dto) &&
m_ItemId == castedDto->itemId &&
m_Amount == castedDto->amount &&
m_Name == castedDto->name &&
m_IconName == castedDto->iconName;
const Drop* casted = static_cast<const Drop*>(other);
return WorldObject::IsEqual(other) &&
m_ItemId == casted->m_ItemId &&
m_Amount == casted->m_Amount &&
m_Name == casted->m_Name &&
m_IconName == casted->m_IconName;
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override

19
L2BotCore/Domain/Entities/EntityInterface.h Normal file
View File

@@ -0,0 +1,19 @@
#pragma once
#include <cstdint>
#include "../Serializers/Serializable.h"
namespace L2Bot::Domain::Entities
{
class EntityInterface : public Serializers::Serializable
{
public:
virtual const uint32_t GetId() const = 0;
virtual void Update(const EntityInterface* other) = 0;
virtual void SaveState() = 0;
virtual const bool IsEqual(const EntityInterface* other) const = 0;
EntityInterface() = default;
virtual ~EntityInterface() = default;
};
}

114
L2BotCore/Domain/Entities/Hero.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include "WorldObject.h"
#include "../DTO/Hero.h"
#include "../ValueObjects/FullName.h"
#include "../ValueObjects/VitalStats.h"
#include "../ValueObjects/Phenotype.h"
@@ -16,60 +15,20 @@ namespace L2Bot::Domain::Entities
class Hero : public WorldObject
{
public:
const ValueObjects::FullName& GetFullName() const
void Update(const EntityInterface* other) override
{
return m_FullName;
}
const ValueObjects::VitalStats& GetVitalStats() const
{
return m_VitalStats;
}
const ValueObjects::Phenotype& GetPhenotype() const
{
return m_Phenotype;
}
const ValueObjects::ExperienceInfo& GetExperienceInfo() const
{
return m_ExperienceInfo;
}
const ValueObjects::PermanentStats& GetPermanentStats() const
{
return m_PermanentStats;
}
const ValueObjects::VariableStats& GetVariableStats() const
{
return m_VariableStats;
}
const ValueObjects::Reputation& GetReputation() const
{
return m_Reputation;
}
const ValueObjects::InventoryInfo& GetInventoryInfo() const
{
return m_InventoryInfo;
}
const uint32_t GetTargetId() const
{
return m_TargetId;
}
const bool IsStanding() const
{
return m_IsStanding;
}
void UpdateFromDTO(const DTO::WorldObject* dto) override
{
const DTO::Hero* castedDto = static_cast<const DTO::Hero*>(dto);
WorldObject::UpdateFromDTO(dto);
m_FullName = castedDto->fullName;
m_VitalStats = castedDto->vitalStats;
m_Phenotype = castedDto->phenotype;
m_ExperienceInfo = castedDto->experienceInfo;
m_PermanentStats = castedDto->permanentStats;
m_VariableStats = castedDto->variableStats;
m_Reputation = castedDto->reputation;
m_InventoryInfo = castedDto->inventoryInfo;
m_TargetId = castedDto->targetId;
m_IsStanding = castedDto->isStanding;
const Hero* casted = static_cast<const Hero*>(other);
WorldObject::Update(other);
m_FullName = casted->m_FullName;
m_VitalStats = casted->m_VitalStats;
m_Phenotype = casted->m_Phenotype;
m_ExperienceInfo = casted->m_ExperienceInfo;
m_PermanentStats = casted->m_PermanentStats;
m_VariableStats = casted->m_VariableStats;
m_Reputation = casted->m_Reputation;
m_InventoryInfo = casted->m_InventoryInfo;
m_TargetId = casted->m_TargetId;
m_IsStanding = casted->m_IsStanding;
}
void SaveState() override
{
@@ -89,37 +48,20 @@ namespace L2Bot::Domain::Entities
false
};
}
const static Hero CreateFromDTO(const DTO::Hero& dto)
const bool IsEqual(const EntityInterface* other) const override
{
return Hero(
dto.id,
dto.transform,
dto.fullName,
dto.vitalStats,
dto.phenotype,
dto.experienceInfo,
dto.permanentStats,
dto.variableStats,
dto.reputation,
dto.inventoryInfo,
dto.targetId,
dto.isStanding
);
}
const bool IsEqual(const DTO::WorldObject* dto) const override
{
const DTO::Hero* castedDto = static_cast<const DTO::Hero*>(dto);
return WorldObject::IsEqual(dto) &&
m_FullName.IsEqual(&castedDto->fullName) &&
m_VitalStats.IsEqual(&castedDto->vitalStats) &&
m_Phenotype.IsEqual(&castedDto->phenotype) &&
m_ExperienceInfo.IsEqual(&castedDto->experienceInfo) &&
m_PermanentStats.IsEqual(&castedDto->permanentStats) &&
m_VariableStats.IsEqual(&castedDto->variableStats) &&
m_Reputation.IsEqual(&castedDto->reputation) &&
m_InventoryInfo.IsEqual(&castedDto->inventoryInfo) &&
m_TargetId == castedDto->targetId &&
m_IsStanding == castedDto->isStanding;
const Hero* casted = static_cast<const Hero*>(other);
return WorldObject::IsEqual(other) &&
m_FullName.IsEqual(&casted->m_FullName) &&
m_VitalStats.IsEqual(&casted->m_VitalStats) &&
m_Phenotype.IsEqual(&casted->m_Phenotype) &&
m_ExperienceInfo.IsEqual(&casted->m_ExperienceInfo) &&
m_PermanentStats.IsEqual(&casted->m_PermanentStats) &&
m_VariableStats.IsEqual(&casted->m_VariableStats) &&
m_Reputation.IsEqual(&casted->m_Reputation) &&
m_InventoryInfo.IsEqual(&casted->m_InventoryInfo) &&
m_TargetId == casted->m_TargetId &&
m_IsStanding == casted->m_IsStanding;
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override
@@ -203,7 +145,7 @@ namespace L2Bot::Domain::Entities
virtual ~Hero() = default;
private:
struct State
struct GetState
{
ValueObjects::FullName fullName = ValueObjects::FullName();
ValueObjects::VitalStats vitalStats = ValueObjects::VitalStats();
@@ -230,6 +172,6 @@ namespace L2Bot::Domain::Entities
ValueObjects::InventoryInfo m_InventoryInfo = ValueObjects::InventoryInfo();
uint32_t m_TargetId = 0;
bool m_IsStanding = true;
State m_PrevState = State();
GetState m_PrevState = GetState();
};
}

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

@@ -1,7 +1,6 @@
#pragma once
#include <cstdint>
#include "WorldObject.h"
#include "../DTO/NPC.h"
#include "../ValueObjects/FullName.h"
#include "../ValueObjects/VitalStats.h"
#include "../Serializers/Serializable.h"
@@ -12,40 +11,15 @@ namespace L2Bot::Domain::Entities
class NPC : public WorldObject
{
public:
const bool IsHostile() const
void Update(const EntityInterface* other) override
{
return m_IsHostile;
}
const uint32_t GetNpcId() const
{
return m_NpcId;
}
const bool IsSpoiled() const
{
return m_SpoilState == Enums::SpoilStateEnum::spoiled;
}
const bool CanBeSweeped() const
{
return !m_VitalStats.IsAlive() && m_SpoilState == Enums::SpoilStateEnum::sweepable;
}
const ValueObjects::FullName& GetFullName() const
{
return m_FullName;
}
const ValueObjects::VitalStats& GetVitalStats() const
{
return m_VitalStats;
}
void UpdateFromDTO(const DTO::WorldObject* dto) override
{
const DTO::NPC* castedDto = static_cast<const DTO::NPC*>(dto);
WorldObject::UpdateFromDTO(dto);
m_IsHostile = castedDto->isHostile;
m_NpcId = castedDto->npcId;
m_SpoilState = castedDto->spoilState;
m_FullName = castedDto->fullName;
m_VitalStats = castedDto->vitalStats;
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;
}
void SaveState() override
{
@@ -58,27 +32,15 @@ namespace L2Bot::Domain::Entities
false
};
}
const static NPC CreateFromDTO(const DTO::NPC& dto)
const bool IsEqual(const EntityInterface* other) const override
{
return NPC(
dto.id,
dto.transform,
dto.isHostile,
dto.npcId,
dto.spoilState,
dto.fullName,
dto.vitalStats
);
}
const bool IsEqual(const DTO::WorldObject* dto) const override
{
const DTO::NPC* castedDto = static_cast<const DTO::NPC*>(dto);
return WorldObject::IsEqual(dto) &&
m_IsHostile == castedDto->isHostile &&
m_NpcId == castedDto->npcId &&
m_SpoilState == castedDto->spoilState &&
m_FullName.IsEqual(&castedDto->fullName) &&
m_VitalStats.IsEqual(&castedDto->vitalStats);
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);
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override
@@ -129,7 +91,7 @@ namespace L2Bot::Domain::Entities
virtual ~NPC() = default;
private:
struct State
struct GetState
{
ValueObjects::FullName fullName = ValueObjects::FullName();
Enums::SpoilStateEnum spoilState = Enums::SpoilStateEnum::none;
@@ -144,6 +106,6 @@ namespace L2Bot::Domain::Entities
Enums::SpoilStateEnum m_SpoilState = Enums::SpoilStateEnum::none;
ValueObjects::FullName m_FullName = ValueObjects::FullName();
ValueObjects::VitalStats m_VitalStats = ValueObjects::VitalStats();
State m_PrevState = State();
GetState m_PrevState = GetState();
};
}

43
L2BotCore/Domain/Entities/Player.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include "WorldObject.h"
#include "../DTO/Player.h"
#include "../ValueObjects/FullName.h"
#include "../ValueObjects/VitalStats.h"
#include "../ValueObjects/Phenotype.h"
@@ -10,21 +9,12 @@ namespace L2Bot::Domain::Entities
class Player : public WorldObject
{
public:
const ValueObjects::FullName& GetFullName() const
void Update(const EntityInterface* other) override
{
return m_FullName;
}
const ValueObjects::Phenotype& GetPhenotype() const
{
return m_Phenotype;
}
void UpdateFromDTO(const DTO::WorldObject* dto) override
{
const DTO::Player* castedDto = static_cast<const DTO::Player*>(dto);
WorldObject::UpdateFromDTO(dto);
m_FullName = castedDto->fullName;
m_Phenotype = castedDto->phenotype;
const Player* casted = static_cast<const Player*>(other);
WorldObject::Update(other);
m_FullName = casted->m_FullName;
m_Phenotype = casted->m_Phenotype;
}
void SaveState() override
{
@@ -35,21 +25,12 @@ namespace L2Bot::Domain::Entities
m_Phenotype
};
}
const static Player CreateFromDTO(const DTO::Player& dto)
const bool IsEqual(const EntityInterface* other) const override
{
return Player(
dto.id,
dto.transform,
dto.fullName,
dto.phenotype
);
}
const bool IsEqual(const DTO::WorldObject* dto) const override
{
const DTO::Player* castedDto = static_cast<const DTO::Player*>(dto);
return WorldObject::IsEqual(dto) &&
m_FullName.IsEqual(&castedDto->fullName) &&
m_Phenotype.IsEqual(&castedDto->phenotype);
const Player* casted = static_cast<const Player*>(other);
return WorldObject::IsEqual(other) &&
m_FullName.IsEqual(&casted->m_FullName) &&
m_Phenotype.IsEqual(&casted->m_Phenotype);
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override
@@ -85,7 +66,7 @@ namespace L2Bot::Domain::Entities
virtual ~Player() = default;
private:
struct State
struct GetState
{
ValueObjects::FullName fullName = ValueObjects::FullName();
ValueObjects::Phenotype phenotype = ValueObjects::Phenotype();
@@ -96,6 +77,6 @@ namespace L2Bot::Domain::Entities
private:
ValueObjects::FullName m_FullName = ValueObjects::FullName();
ValueObjects::Phenotype m_Phenotype = ValueObjects::Phenotype();
State m_PrevState = State();
GetState m_PrevState = GetState();
};
}

119
L2BotCore/Domain/ValueObjects/Skill.h → L2BotCore/Domain/Entities/Skill.h
View File

@@ -2,16 +2,14 @@
#include <cstdint>
#include <string>
#include <vector>
#include "../DTO/Skill.h"
#include "../Serializers/Serializable.h"
#include "../Serializers/Node.h"
#include "WorldObject.h"
namespace L2Bot::Domain::ValueObjects
namespace L2Bot::Domain::Entities
{
class Skill : public Serializers::Serializable
class Skill : public EntityInterface
{
public:
const uint32_t GetId() const
const uint32_t GetId() const override
{
return m_SkillId;
}
@@ -19,23 +17,46 @@ namespace L2Bot::Domain::ValueObjects
{
return !m_IsCasting && !m_IsReloading;
}
void UpdateFromDTO(const DTO::Skill* dto)
const bool IsToggled() const
{
return m_IsToggled;
}
void UpdateReloadingState(const bool isReloading)
{
m_IsReloading = isReloading;
}
void UpdateCastingState(const bool isCasting)
{
m_IsCasting = isCasting;
}
void UpdateToggle(const bool isToggled)
{
m_IsToggled = isToggled;
}
void UpdateLevel(const uint8_t level)
{
m_Level = level;
}
void Update(const EntityInterface* other) override
{
const Skill* casted = static_cast<const Skill*>(other);
SaveState();
m_SkillId = dto->skillId;
m_Level = dto->level;
m_IsActive = dto->isActive;
m_Cost = dto->cost;
m_Range = dto->range;
m_Name = dto->name;
m_Description = dto->description;
m_IconName = dto->iconName;
m_IsToggled = dto->isToggled;
m_IsCasting = dto->isCasting;
m_IsReloading = dto->isReloading;
m_SkillId = casted->m_SkillId;
m_Level = casted->m_Level;
m_IsActive = casted->m_IsActive;
m_Cost = casted->m_Cost;
m_Range = casted->m_Range;
m_Name = casted->m_Name;
m_Description = casted->m_Description;
m_IconName = casted->m_IconName;
m_IsToggled = casted->m_IsToggled;
m_IsCasting = casted->m_IsCasting;
m_IsReloading = casted->m_IsReloading;
}
void SaveState()
void SaveState() override
{
m_PrevState =
{
@@ -49,35 +70,20 @@ namespace L2Bot::Domain::ValueObjects
false
};
}
const static Skill CreateFromDTO(const DTO::Skill& dto)
const bool IsEqual(const EntityInterface* other) const override
{
return Skill(
dto.skillId,
dto.level,
dto.isActive,
dto.cost,
dto.range,
dto.name,
dto.description,
dto.iconName,
dto.isToggled,
dto.isCasting,
dto.isReloading
);
}
const bool IsEqual(const DTO::Skill* dto) const
{
return m_SkillId == dto->skillId &&
m_Level == dto->level &&
m_IsActive == dto->isActive &&
m_Cost == dto->cost &&
m_Range == dto->range &&
m_Name == dto->name &&
m_Description == dto->description &&
m_IconName == dto->iconName &&
m_IsToggled == dto->isToggled &&
m_IsCasting == dto->isCasting &&
m_IsReloading == dto->isReloading;
const Skill* casted = static_cast<const Skill*>(other);
return m_SkillId == casted->m_SkillId &&
m_Level == casted->m_Level &&
m_IsActive == casted->m_IsActive &&
m_Cost == casted->m_Cost &&
m_Range == casted->m_Range &&
m_Name == casted->m_Name &&
m_Description == casted->m_Description &&
m_IconName == casted->m_IconName &&
m_IsToggled == casted->m_IsToggled &&
m_IsCasting == casted->m_IsCasting &&
m_IsReloading == casted->m_IsReloading;
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override
@@ -154,11 +160,26 @@ namespace L2Bot::Domain::ValueObjects
}
Skill(const Skill* other) :
m_SkillId(other->m_SkillId),
m_Level(other->m_Level),
m_IsActive(other->m_IsActive),
m_Cost(other->m_Cost),
m_Range(other->m_Range),
m_Name(other->m_Name),
m_Description(other->m_Description),
m_IconName(other->m_IconName),
m_IsToggled(other->m_IsToggled),
m_IsCasting(other->m_IsCasting),
m_IsReloading(other->m_IsReloading)
{
}
Skill() = default;
virtual ~Skill() = default;
private:
struct State
struct GetState
{
uint8_t cost = 0;
int16_t range = 0;
@@ -183,6 +204,6 @@ namespace L2Bot::Domain::ValueObjects
bool m_IsToggled = false;
bool m_IsCasting = false;
bool m_IsReloading = false;
State m_PrevState = State();
GetState m_PrevState = GetState();
};
}

43
L2BotCore/Domain/Entities/WorldObject.h
View File

@@ -1,54 +1,43 @@
#pragma once
#include <cstdint>
#include "../ValueObjects/Transform.h"
#include "../DTO/WorldObject.h"
#include "../Serializers/Serializable.h"
#include "EntityInterface.h"
namespace L2Bot::Domain::Entities
{
class WorldObject : public Serializers::Serializable
class WorldObject : public EntityInterface
{
public:
const uint32_t GetId() const
virtual const uint32_t GetId() const override
{
return m_Id;
}
const ValueObjects::Transform& GetTransform() const
{
return m_Transform;
}
virtual void UpdateFromDTO(const DTO::WorldObject* dto)
virtual void Update(const EntityInterface* other) override
{
SaveState();
m_Id = dto->id;
m_Transform = dto->transform;
const WorldObject* casted = static_cast<const WorldObject*>(other);
m_Id = casted->m_Id;
m_Transform = casted->m_Transform;
}
virtual void SaveState()
virtual void SaveState() override
{
m_PrevState = { m_Transform, false };
}
virtual const bool IsEqual(const DTO::WorldObject* dto) const
virtual const bool IsEqual(const EntityInterface* other) const override
{
return m_Id == dto->id && m_Transform.IsEqual(&dto->transform);
}
const float_t GetSqrDistance(const WorldObject& other) const
{
return m_Transform.GetSqrDistance(other.m_Transform);
}
const float_t GetHorizontalSqrDistance(const WorldObject& other) const
{
return m_Transform.GetHorizontalSqrDistance(other.m_Transform);
const WorldObject* casted = static_cast<const WorldObject*>(other);
return m_Id == casted->m_Id && m_Transform.IsEqual(&casted->m_Transform);
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override
virtual const std::vector<Serializers::Node> BuildSerializationNodes() const override
{
std::vector<Serializers::Node> result;
result.push_back({ "id", std::to_string(GetId()) });
if (m_PrevState.isNewState || !GetTransform().IsEqual(&m_PrevState.transform))
if (m_PrevState.isNewState || !m_Transform.IsEqual(&m_PrevState.transform))
{
result.push_back({ "transform", GetTransform().BuildSerializationNodes() });
result.push_back({ "transform", m_Transform.BuildSerializationNodes() });
}
return result;
@@ -64,7 +53,7 @@ namespace L2Bot::Domain::Entities
virtual ~WorldObject() = default;
private:
private:
struct State
struct GetState
{
ValueObjects::Transform transform = ValueObjects::Transform();
@@ -74,6 +63,6 @@ namespace L2Bot::Domain::Entities
private:
uint32_t m_Id = 0;
ValueObjects::Transform m_Transform = ValueObjects::Transform();
State m_PrevState = State();
GetState m_PrevState = GetState();
};
}

2
L2BotCore/Domain/Enums/ObjectStateEnum.h → L2BotCore/Domain/Enums/EntityStateEnum.h
View File

@@ -2,7 +2,7 @@
namespace L2Bot::Domain::Enums
{
enum class ObjectStateEnum
enum class EntityStateEnum
{
none,
created,

14
L2BotCore/Domain/Repositories/DropRepositoryInterface.h
View File

@@ -1,14 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectRepositoryInterface.h"
#include "../DTO/Drop.h"
namespace L2Bot::Domain::Repositories
{
class DropRepositoryInterface : public ObjectRepositoryInterface<DTO::Drop>
{
public:
virtual const std::map<uint32_t, DTO::Drop> GetObjects() override = 0;
};
}

14
L2BotCore/Domain/Repositories/EntityRepositoryInterface.h Normal file
View File

@@ -0,0 +1,14 @@
#pragma once
#include <vector>
#include "../Entities/WorldObject.h"
#include "../DTO/EntityState.h"
namespace L2Bot::Domain::Repositories
{
class EntityRepositoryInterface
{
public:
virtual const std::vector<DTO::EntityState*> GetEntities() = 0;
virtual void Reset() = 0;
};
}

14
L2BotCore/Domain/Repositories/HeroRepositoryInterface.h
View File

@@ -1,14 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectRepositoryInterface.h"
#include "../DTO/Hero.h"
namespace L2Bot::Domain::Repositories
{
class HeroRepositoryInterface : public ObjectRepositoryInterface<DTO::Hero>
{
public:
virtual const std::map<uint32_t, DTO::Hero> GetObjects() override = 0;
};
}

14
L2BotCore/Domain/Repositories/ItemRepositoryInterface.h
View File

@@ -1,14 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectRepositoryInterface.h"
#include "../DTO/BaseItem.h"
namespace L2Bot::Domain::Repositories
{
class ItemRepositoryInterface : public ObjectRepositoryInterface<DTO::BaseItem>
{
public:
virtual const std::map<uint32_t, DTO::BaseItem> GetObjects() override = 0;
};
}

14
L2BotCore/Domain/Repositories/NPCRepositoryInterface.h
View File

@@ -1,14 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectRepositoryInterface.h"
#include "../DTO/NPC.h"
namespace L2Bot::Domain::Repositories
{
class NPCRepositoryInterface : public ObjectRepositoryInterface<DTO::NPC>
{
public:
virtual const std::map<uint32_t, DTO::NPC> GetObjects() override = 0;
};
}

13
L2BotCore/Domain/Repositories/ObjectRepositoryInterface.h
View File

@@ -1,13 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
namespace L2Bot::Domain::Repositories
{
template <typename T>
class ObjectRepositoryInterface
{
public:
virtual const std::map<uint32_t, T> GetObjects() = 0;
};
}

14
L2BotCore/Domain/Repositories/PlayerRepositoryInterface.h
View File

@@ -1,14 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectRepositoryInterface.h"
#include "../DTO/Player.h"
namespace L2Bot::Domain::Repositories
{
class PlayerRepositoryInterface : public ObjectRepositoryInterface<DTO::Player>
{
public:
virtual const std::map<uint32_t, DTO::Player> GetObjects() override = 0;
};
}

14
L2BotCore/Domain/Repositories/SkillRepositoryInterface.h
View File

@@ -1,14 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectRepositoryInterface.h"
#include "../DTO/Skill.h"
namespace L2Bot::Domain::Repositories
{
class SkillRepositoryInterface : public ObjectRepositoryInterface<DTO::Skill>
{
public:
virtual const std::map<uint32_t, DTO::Skill> GetObjects() override = 0;
};
}

17
L2BotCore/Domain/Serializers/SerializableStateContainer.h
View File

@@ -1,11 +1,10 @@
#pragma once
#include <vector>
#include "../DTO/ObjectState.h"
#include "../DTO/EntityState.h"
#include "Serializable.h"
namespace L2Bot::Domain::Serializers
{
template <typename T>
class SerializableStateContainer : public Serializers::Serializable
{
public:
@@ -16,15 +15,15 @@ namespace L2Bot::Domain::Serializers
for (const auto& kvp : m_Objects)
{
std::string operationName = "";
switch (kvp.state)
switch (kvp->GetState())
{
case Enums::ObjectStateEnum::created:
case Enums::EntityStateEnum::created:
operationName = "created";
break;
case Enums::ObjectStateEnum::updated:
case Enums::EntityStateEnum::updated:
operationName = "updated";
break;
case Enums::ObjectStateEnum::deleted:
case Enums::EntityStateEnum::deleted:
operationName = "deleted";
break;
}
@@ -34,7 +33,7 @@ namespace L2Bot::Domain::Serializers
result.push_back(
{
m_ContainerName,
std::vector<Serializers::Node>{ { operationName, kvp.object.BuildSerializationNodes() } }
std::vector<Serializers::Node>{ { operationName, kvp->GetEntity()->BuildSerializationNodes() } }
}
);
}
@@ -43,7 +42,7 @@ namespace L2Bot::Domain::Serializers
return result;
}
SerializableStateContainer(const std::vector<DTO::ObjectState<T>> objects, const std::string containerName) :
SerializableStateContainer(const std::vector<DTO::EntityState*> objects, const std::string containerName) :
m_Objects(objects), m_ContainerName(containerName)
{
@@ -51,7 +50,7 @@ namespace L2Bot::Domain::Serializers
SerializableStateContainer() = delete;
virtual ~SerializableStateContainer() = default;
private:
const std::vector<DTO::ObjectState<T>> m_Objects;
const std::vector<DTO::EntityState*> m_Objects;
const std::string m_ContainerName;
};
}

57
L2BotCore/Domain/Serializers/SerializableStateContainerPtr.h
View File

@@ -1,57 +0,0 @@
#pragma once
#include <vector>
#include "../DTO/ObjectState.h"
#include "Serializable.h"
namespace L2Bot::Domain::Serializers
{
template <typename T>
class SerializableStateContainerPtr : public Serializers::Serializable
{
public:
const std::vector<Serializers::Node> BuildSerializationNodes() const override
{
std::vector<Serializers::Node> result;
for (const auto& kvp : m_Objects)
{
std::string operationName = "";
switch (kvp.state)
{
case Enums::ObjectStateEnum::created:
operationName = "created";
break;
case Enums::ObjectStateEnum::updated:
operationName = "updated";
break;
case Enums::ObjectStateEnum::deleted:
operationName = "deleted";
break;
}
if (operationName != "")
{
result.push_back(
{
m_ContainerName,
std::vector<Serializers::Node>{ { operationName, kvp.object->BuildSerializationNodes() } }
}
);
}
}
return result;
}
SerializableStateContainerPtr(const std::vector<DTO::ObjectState<T>> objects, const std::string containerName) :
m_Objects(objects), m_ContainerName(containerName)
{
}
SerializableStateContainerPtr() = delete;
virtual ~SerializableStateContainerPtr() = default;
private:
const std::vector<DTO::ObjectState<T>> m_Objects;
const std::string m_ContainerName;
};
}

20
L2BotCore/Domain/Services/DropService.h
View File

@@ -1,20 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectService.h"
#include "../DTO/Drop.h"
#include "../Entities/Drop.h"
#include "../Repositories/DropRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
class DropService : public ObjectService<Entities::Drop, DTO::Drop>
{
public:
DropService(Repositories::DropRepositoryInterface& repository) : ObjectService(repository)
{
}
virtual ~DropService() override = default;
};
}

34
L2BotCore/Domain/Services/EntityService.h Normal file
View File

@@ -0,0 +1,34 @@
#pragma once
#include <cstdint>
#include <map>
#include <vector>
#include <math.h>
#include "../DTO/EntityState.h"
#include "../Entities/WorldObject.h"
#include "../Repositories/EntityRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
class EntityService
{
public:
EntityService(Repositories::EntityRepositoryInterface& repository) : m_Repository(repository)
{
}
EntityService() = delete;
virtual ~EntityService() = default;
virtual const std::vector<DTO::EntityState*> GetEntities()
{
return m_Repository.GetEntities();
}
void Invalidate()
{
m_Repository.Reset();
}
private:
Repositories::EntityRepositoryInterface& m_Repository;
};
}

31
L2BotCore/Domain/Services/HeroService.h
View File

@@ -1,31 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectService.h"
#include "../DTO/Hero.h"
#include "../Entities/Hero.h"
#include "../Repositories/HeroRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
class HeroService : public ObjectService<Entities::Hero, DTO::Hero>
{
public:
const DTO::ObjectState<Entities::Hero> GetHero()
{
const auto map = GetObjects();
if (map.size() == 0)
{
return DTO::ObjectState <Entities::Hero>{};
}
return map[0];
}
HeroService(Repositories::HeroRepositoryInterface& repository) : ObjectService(repository)
{
}
virtual ~HeroService() override = default;
};
}

20
L2BotCore/Domain/Services/ItemService.h
View File

@@ -1,20 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectService.h"
#include "../DTO/BaseItem.h"
#include "../ValueObjects/BaseItem.h"
#include "../Repositories/ItemRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
class ItemService : public ObjectService<ValueObjects::BaseItem, DTO::BaseItem>
{
public:
ItemService(Repositories::ItemRepositoryInterface& repository) : ObjectService(repository)
{
}
virtual ~ItemService() override = default;
};
}

20
L2BotCore/Domain/Services/NPCService.h
View File

@@ -1,20 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectService.h"
#include "../DTO/NPC.h"
#include "../Entities/NPC.h"
#include "../Repositories/NPCRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
class NPCService : public ObjectService<Entities::NPC, DTO::NPC>
{
public:
NPCService(Repositories::NPCRepositoryInterface& repository) : ObjectService(repository)
{
}
virtual ~NPCService() override = default;
};
}

100
L2BotCore/Domain/Services/ObjectService.h
View File

@@ -1,100 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include <vector>
#include <math.h>
#include "../DTO/ObjectState.h"
#include "../Entities/Hero.h"
#include "../Repositories/ObjectRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
template <typename T, typename U>
class ObjectService
{
public:
ObjectService(Repositories::ObjectRepositoryInterface<U>& repository) : m_Repository(repository)
{
}
ObjectService() = delete;
virtual ~ObjectService() = default;
virtual const std::vector<DTO::ObjectState<T>> GetObjects()
{
UpdateObjectsFromRepository();
std::vector<DTO::ObjectState<T>> objects;
for (const auto& kvp : m_ObjectStates) {
objects.push_back(kvp.second);
}
return objects;
}
void Invalidate()
{
m_ObjectStates.clear();
}
protected:
virtual void UpdateObjectsFromRepository()
{
auto objects = m_Repository.GetObjects();
RemoveOutdatedStates();
for (const auto& kvp : objects)
{
const auto& dto = kvp.second;
if (m_ObjectStates.contains(kvp.first))
{
if (!m_ObjectStates[kvp.first].object.IsEqual(&dto)) {
m_ObjectStates[kvp.first].object.UpdateFromDTO(&dto);
m_ObjectStates[kvp.first].state = Enums::ObjectStateEnum::updated;
}
else
{
m_ObjectStates[kvp.first].state = Enums::ObjectStateEnum::none;
}
}
else
{
m_ObjectStates.emplace(kvp.first, DTO::ObjectState<T>{ T::CreateFromDTO(dto), Enums::ObjectStateEnum::created });
}
}
for (auto& kvp : m_ObjectStates)
{
if (!objects.contains(kvp.second.object.GetId()))
{
m_ObjectStates[kvp.first].object.SaveState();
kvp.second.state = Enums::ObjectStateEnum::deleted;
}
}
}
private:
void RemoveOutdatedStates()
{
auto it = m_ObjectStates.begin();
while (it != m_ObjectStates.end())
{
if (it->second.state == Enums::ObjectStateEnum::deleted)
{
m_ObjectStates.erase(it++);
}
else
{
it++;
}
}
}
private:
Repositories::ObjectRepositoryInterface<U>& m_Repository;
std::map<uint32_t, DTO::ObjectState<T>> m_ObjectStates;
};
}

99
L2BotCore/Domain/Services/ObjectServicePtr.h
View File

@@ -1,99 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include <vector>
#include <math.h>
#include "../DTO/ObjectState.h"
#include "../Entities/Hero.h"
#include "../Repositories/ObjectRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
template <typename T, typename U>
class ObjectServicePtr
{
public:
ObjectServicePtr(Repositories::ObjectRepositoryInterface<U>& repository) : m_Repository(repository)
{
}ObjectServicePtr() = delete;
virtual ~ObjectServicePtr() = default;
virtual const std::vector<DTO::ObjectState<T>> GetObjects()
{
UpdateObjectsFromRepository();
std::vector<DTO::ObjectState<T>> objects;
for (const auto& kvp : m_ObjectStates) {
objects.push_back(kvp.second);
}
return objects;
}
void Invalidate()
{
m_ObjectStates.clear();
}
protected:
virtual void UpdateObjectsFromRepository()
{
auto objects = m_Repository.GetObjects();
RemoveOutdatedStates();
for (const auto& kvp : objects)
{
const auto& dto = kvp.second;
if (m_ObjectStates.contains(kvp.first))
{
if (!m_ObjectStates[kvp.first].object->IsEqual(dto.get())) {
m_ObjectStates[kvp.first].object->UpdateFromDTO(dto.get());
m_ObjectStates[kvp.first].state = Enums::ObjectStateEnum::updated;
}
else
{
m_ObjectStates[kvp.first].state = Enums::ObjectStateEnum::none;
}
}
else
{
//m_ObjectStates.emplace(kvp.first, DTO::ObjectState<T>{ T::CreateFromDTO(dto), Enums::ObjectStateEnum::created });
}
}
for (auto& kvp : m_ObjectStates)
{
if (!objects.contains(kvp.second.object->GetId()))
{
m_ObjectStates[kvp.first].object->SaveState();
kvp.second.state = Enums::ObjectStateEnum::deleted;
}
}
}
private:
void RemoveOutdatedStates()
{
auto it = m_ObjectStates.begin();
while (it != m_ObjectStates.end())
{
if (it->second.state == Enums::ObjectStateEnum::deleted)
{
m_ObjectStates.erase(it++);
}
else
{
it++;
}
}
}
private:
Repositories::ObjectRepositoryInterface<U>& m_Repository;
std::map<uint32_t, DTO::ObjectState<T>> m_ObjectStates;
};
}

20
L2BotCore/Domain/Services/PlayerService.h
View File

@@ -1,20 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectService.h"
#include "../DTO/Player.h"
#include "../Entities/Player.h"
#include "../Repositories/PlayerRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
class PlayerService : public ObjectService<Entities::Player, DTO::Player>
{
public:
PlayerService(Repositories::PlayerRepositoryInterface& repository) : ObjectService(repository)
{
}
virtual ~PlayerService() override = default;
};
}

20
L2BotCore/Domain/Services/SkillService.h
View File

@@ -1,20 +0,0 @@
#pragma once
#include <cstdint>
#include <map>
#include "ObjectService.h"
#include "../DTO/Skill.h"
#include "../ValueObjects/Skill.h"
#include "../Repositories/SkillRepositoryInterface.h"
namespace L2Bot::Domain::Services
{
class SkillService : public ObjectService<ValueObjects::Skill, DTO::Skill>
{
public:
SkillService(Repositories::SkillRepositoryInterface& repository) : ObjectService(repository)
{
}
virtual ~SkillService() override = default;
};
}

58
L2BotCore/Domain/ValueObjects/BaseItem.h
View File

@@ -15,19 +15,19 @@ namespace L2Bot::Domain::ValueObjects
{
return m_ItemId;
}
void UpdateFromDTO(const DTO::BaseItem* dto)
void Update(const BaseItem* other)
{
SaveState();
m_ItemId = dto->itemId;
m_Amount = dto->amount;
m_IsEquipped = dto->isEquipped;
m_EnchantLevel = dto->enchantLevel;
m_Mana = dto->mana;
m_Name = dto->name;
m_IconName = dto->iconName;
m_Description = dto->description;
m_Weight = dto->weight;
m_ItemId = other->m_ItemId;
m_Amount = other->m_Amount;
m_IsEquipped = other->m_IsEquipped;
m_EnchantLevel = other->m_EnchantLevel;
m_Mana = other->m_Mana;
m_Name = other->m_Name;
m_IconName = other->m_IconName;
m_Description = other->m_Description;
m_Weight = other->m_Weight;
}
void SaveState()
{
@@ -41,31 +41,17 @@ namespace L2Bot::Domain::ValueObjects
false
};
}
const static BaseItem CreateFromDTO(const DTO::BaseItem& dto)
const bool IsEqual(const BaseItem* other) const
{
return BaseItem(
dto.itemId,
dto.amount,
dto.isEquipped,
dto.enchantLevel,
dto.mana,
dto.name,
dto.iconName,
dto.description,
dto.weight
);
}
const bool IsEqual(const DTO::BaseItem* dto) const
{
return m_ItemId == dto->itemId &&
m_Amount == dto->amount &&
m_IsEquipped == dto->isEquipped &&
m_EnchantLevel == dto->enchantLevel &&
m_Mana == dto->mana &&
m_Name == dto->name &&
m_IconName == dto->iconName &&
m_Description == dto->description &&
m_Weight == dto->weight;
return m_ItemId == other->m_ItemId &&
m_Amount == other->m_Amount &&
m_IsEquipped == other->m_IsEquipped &&
m_EnchantLevel == other->m_EnchantLevel &&
m_Mana == other->m_Mana &&
m_Name == other->m_Name &&
m_IconName == other->m_IconName &&
m_Description == other->m_Description &&
m_Weight == other->m_Weight;
}
const std::vector<Serializers::Node> BuildSerializationNodes() const override
@@ -132,7 +118,7 @@ namespace L2Bot::Domain::ValueObjects
virtual ~BaseItem() = default;
private:
struct State
struct GetState
{
uint32_t amount = 0;
bool isEquipped = 0;
@@ -153,6 +139,6 @@ namespace L2Bot::Domain::ValueObjects
std::string m_IconName = "";
std::string m_Description = "";
uint16_t m_Weight = 0;
State m_PrevState = State();
GetState m_PrevState = GetState();
};
}