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

refactor: switch to wide string

Browse Source
This commit is contained in:
k0t9i
2023-01-25 19:53:02 +04:00
parent f7198a13ef
commit eb7bfc779b
46 changed files with 284 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
L2BotCore/Domain/ValueObjects/ChatMessage.h
View File

@ -13,18 +13,18 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "objectId", std::to_string(m_ObjectId) },
{ "channel", std::to_string(static_cast<uint8_t>(m_Channel)) },
{ "name", m_Name },
{ "text", m_Text }
{ L"objectId", std::to_wstring(m_ObjectId) },
{ L"channel", std::to_wstring(static_cast<uint8_t>(m_Channel)) },
{ L"name", m_Name },
{ L"text", m_Text }
};
}
ChatMessage(
const uint32_t objectId,
const Enums::ChatChannelEnum channel,
const std::string& name,
const std::string& text
const std::wstring& name,
const std::wstring& text
) :
m_ObjectId(objectId),
m_Channel(channel),
@ -39,7 +39,7 @@ namespace L2Bot::Domain::ValueObjects
private:
uint32_t m_ObjectId = 0;
Enums::ChatChannelEnum m_Channel = Enums::ChatChannelEnum::all;
std::string m_Name = "";
std::string m_Text = "";
std::wstring m_Name = L"";
std::wstring m_Text = L"";
};
}

6
L2BotCore/Domain/ValueObjects/ExperienceInfo.h
View File

@ -28,9 +28,9 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "level", std::to_string(m_Level) },
{ "exp", std::to_string(m_Exp) },
{ "sp", std::to_string(m_Sp) }
{ L"level", std::to_wstring(m_Level) },
{ L"exp", std::to_wstring(m_Exp) },
{ L"sp", std::to_wstring(m_Sp) }
};
}

16
L2BotCore/Domain/ValueObjects/FullName.h
View File

@ -7,11 +7,11 @@ namespace L2Bot::Domain::ValueObjects
class FullName : public Serializers::Serializable
{
public:
const std::string& GetNickname() const
const std::wstring& GetNickname() const
{
return m_Nickname;
}
const std::string& GetTitle() const
const std::wstring& GetTitle() const
{
return m_Title;
}
@ -24,14 +24,14 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "nickname", m_Nickname },
{ "title", m_Title }
{ L"nickname", m_Nickname },
{ L"title", m_Title }
};
}
FullName(
const std::string& nickname,
const std::string& title
const std::wstring& nickname,
const std::wstring& title
) :
m_Nickname(nickname),
m_Title(title)
@ -41,7 +41,7 @@ namespace L2Bot::Domain::ValueObjects
FullName() = default;
virtual ~FullName() = default;
private:
std::string m_Nickname = "";
std::string m_Title = "";
std::wstring m_Nickname = L"";
std::wstring m_Title = L"";
};
}

6
L2BotCore/Domain/ValueObjects/InventoryInfo.h
View File

@ -34,9 +34,9 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "maxWeight", std::to_string(m_MaxWeight) },
{ "weight", std::to_string(m_Weight) },
{ "slots", std::to_string(m_Slots) }
{ L"maxWeight", std::to_wstring(m_MaxWeight) },
{ L"weight", std::to_wstring(m_Weight) },
{ L"slots", std::to_wstring(m_Slots) }
};
}

12
L2BotCore/Domain/ValueObjects/PermanentStats.h
View File

@ -45,12 +45,12 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "str", std::to_string(m_Str) },
{ "dex", std::to_string(m_Dex) },
{ "con", std::to_string(m_Con) },
{ "int", std::to_string(m_Int) },
{ "men", std::to_string(m_Men) },
{ "wit", std::to_string(m_Wit) }
{ L"str", std::to_wstring(m_Str) },
{ L"dex", std::to_wstring(m_Dex) },
{ L"con", std::to_wstring(m_Con) },
{ L"int", std::to_wstring(m_Int) },
{ L"men", std::to_wstring(m_Men) },
{ L"wit", std::to_wstring(m_Wit) }
};
}

8
L2BotCore/Domain/ValueObjects/Phenotype.h
View File

@ -40,10 +40,10 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "race", std::to_string(static_cast<uint8_t>(m_Race)) },
{ "isMale", std::to_string(m_IsMale) },
{ "class", std::to_string(static_cast<uint8_t>(m_Class)) },
{ "activeClass", std::to_string(static_cast<uint8_t>(m_ActiveClass)) }
{ L"race", std::to_wstring(static_cast<uint8_t>(m_Race)) },
{ L"isMale", std::to_wstring(m_IsMale) },
{ L"class", std::to_wstring(static_cast<uint8_t>(m_Class)) },
{ L"activeClass", std::to_wstring(static_cast<uint8_t>(m_ActiveClass)) }
};
}

10
L2BotCore/Domain/ValueObjects/Reputation.h
View File

@ -44,11 +44,11 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "karma", std::to_string(m_Karma) },
{ "pkKills", std::to_string(m_PkKills) },
{ "pvpKills", std::to_string(m_PvpKills) },
{ "recRemaining", std::to_string(m_RecRemaining) },
{ "evalScore", std::to_string(m_EvalScore) }
{ L"karma", std::to_wstring(m_Karma) },
{ L"pkKills", std::to_wstring(m_PkKills) },
{ L"pvpKills", std::to_wstring(m_PvpKills) },
{ L"recRemaining", std::to_wstring(m_RecRemaining) },
{ L"evalScore", std::to_wstring(m_EvalScore) }
};
}

8
L2BotCore/Domain/ValueObjects/Transform.h
View File

@ -43,10 +43,10 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "position", m_Position.BuildSerializationNodes() },
{ "rotation", m_Rotation.BuildSerializationNodes() },
{ "velocity", m_Velocity.BuildSerializationNodes() },
{ "acceleration", m_Acceleration.BuildSerializationNodes() }
{ L"position", m_Position.BuildSerializationNodes() },
{ L"rotation", m_Rotation.BuildSerializationNodes() },
{ L"velocity", m_Velocity.BuildSerializationNodes() },
{ L"acceleration", m_Acceleration.BuildSerializationNodes() }
};
}

18
L2BotCore/Domain/ValueObjects/VariableStats.h
View File

@ -60,15 +60,15 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "accuracy", std::to_string(m_Accuracy) },
{ "critRate", std::to_string(m_CritRate) },
{ "pAttack", std::to_string(m_PAttack) },
{ "attackSpeed", std::to_string(m_AttackSpeed) },
{ "pDefense", std::to_string(m_PDefense) },
{ "evasion", std::to_string(m_Evasion) },
{ "mAttack", std::to_string(m_MAttack) },
{ "mDefense", std::to_string(m_MDefense) },
{ "castingSpeed", std::to_string(m_CastingSpeed) }
{ L"accuracy", std::to_wstring(m_Accuracy) },
{ L"critRate", std::to_wstring(m_CritRate) },
{ L"pAttack", std::to_wstring(m_PAttack) },
{ L"attackSpeed", std::to_wstring(m_AttackSpeed) },
{ L"pDefense", std::to_wstring(m_PDefense) },
{ L"evasion", std::to_wstring(m_Evasion) },
{ L"mAttack", std::to_wstring(m_MAttack) },
{ L"mDefense", std::to_wstring(m_MDefense) },
{ L"castingSpeed", std::to_wstring(m_CastingSpeed) }
};
}

6
L2BotCore/Domain/ValueObjects/Vector3.h
View File

@ -42,9 +42,9 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "x", std::to_string(m_X) },
{ "y", std::to_string(m_Y) },
{ "z", std::to_string(m_Z) }
{ L"x", std::to_wstring(m_X) },
{ L"y", std::to_wstring(m_Y) },
{ L"z", std::to_wstring(m_Z) }
};
}

12
L2BotCore/Domain/ValueObjects/VitalStats.h
View File

@ -49,12 +49,12 @@ namespace L2Bot::Domain::ValueObjects
{
return std::vector<Serializers::Node>
{
{ "maxHp", std::to_string(m_MaxHp) },
{ "hp", std::to_string(m_Hp) },
{ "maxMp", std::to_string(m_MaxMp) },
{ "mp", std::to_string(m_Mp) },
{ "maxCp", std::to_string(m_MaxCp) },
{ "cp", std::to_string(m_Cp) }
{ L"maxHp", std::to_wstring(m_MaxHp) },
{ L"hp", std::to_wstring(m_Hp) },
{ L"maxMp", std::to_wstring(m_MaxMp) },
{ L"mp", std::to_wstring(m_Mp) },
{ L"maxCp", std::to_wstring(m_MaxCp) },
{ L"cp", std::to_wstring(m_Cp) }
};
}