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

refactor: change abbreviations to full form

Browse Source
This commit is contained in:
k0t9i 2023-01-25 00:24:31 +04:00
parent d48e910603
commit d6c15ee0c2
5 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,8 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel = casted->m_EnchantLevel;
m_ArmorType = casted->m_ArmorType;
m_CrystalType = casted->m_CrystalType;
m_PDef = casted->m_PDef;
m_MDef = casted->m_MDef;
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;
@ -34,8 +34,8 @@ namespace L2Bot::Domain::Entities
{
m_IsEquipped,
m_EnchantLevel,
m_PDef,
m_MDef,
m_PDefense,
m_MDefense,
false
};
}
@ -47,8 +47,8 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel == casted->m_EnchantLevel &&
m_ArmorType == casted->m_ArmorType &&
m_CrystalType == casted->m_CrystalType &&
m_PDef == casted->m_PDef &&
m_MDef == casted->m_MDef &&
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;
@ -75,13 +75,13 @@ namespace L2Bot::Domain::Entities
{
result.push_back({ "enchantLevel", std::to_string(m_EnchantLevel) });
}
if (m_PrevState.isNewState || m_PDef != m_PrevState.pDef)
if (m_PrevState.isNewState || m_PDefense != m_PrevState.pDefense)
{
result.push_back({ "pDef", std::to_string(m_PDef) });
result.push_back({ "pDefense", std::to_string(m_PDefense) });
}
if (m_PrevState.isNewState || m_MDef != m_PrevState.mDef)
if (m_PrevState.isNewState || m_MDefense != m_PrevState.mDefense)
{
result.push_back({ "mDef", std::to_string(m_MDef) });
result.push_back({ "mDefense", std::to_string(m_MDefense) });
}
return result;
@ -99,8 +99,8 @@ namespace L2Bot::Domain::Entities
const uint16_t enchantLevel,
const Enums::ArmorType armorType,
const Enums::CrystalType crystalType,
const uint32_t pDef,
const uint32_t mDef,
const uint32_t pDefense,
const uint32_t mDefense,
const std::string& setEffect,
const std::string& addSetEffect,
const std::string& enchantEffect
@ -120,8 +120,8 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel(enchantLevel),
m_ArmorType(armorType),
m_CrystalType(crystalType),
m_PDef(pDef),
m_MDef(mDef),
m_PDefense(pDefense),
m_MDefense(mDefense),
m_SetEffect(setEffect),
m_AddSetEffect(addSetEffect),
m_EnchantEffect(enchantEffect)
@ -134,8 +134,8 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel(other->m_EnchantLevel),
m_ArmorType(other->m_ArmorType),
m_CrystalType(other->m_CrystalType),
m_PDef(other->m_PDef),
m_MDef(other->m_MDef),
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)
@ -150,8 +150,8 @@ namespace L2Bot::Domain::Entities
{
bool isEquipped = 0;
uint16_t enchantLevel = 0;
uint32_t pDef = 0;
uint32_t mDef = 0;
uint32_t pDefense = 0;
uint32_t mDefense = 0;
bool isNewState = true;
};
@ -161,8 +161,8 @@ namespace L2Bot::Domain::Entities
uint16_t m_EnchantLevel = 0;
Enums::ArmorType m_ArmorType = Enums::ArmorType::none;
Enums::CrystalType m_CrystalType = Enums::CrystalType::none;
uint32_t m_PDef = 0;
uint32_t m_MDef = 0;
uint32_t m_PDefense = 0;
uint32_t m_MDefense = 0;
std::string m_SetEffect = "";
std::string m_AddSetEffect = "";
std::string m_EnchantEffect = "";

20
L2BotCore/Domain/Entities/ShieldItem.h
View File

@ -20,7 +20,7 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel = casted->m_EnchantLevel;
m_CrystalType = casted->m_CrystalType;
m_Evasion = casted->m_Evasion;
m_PDef = casted->m_PDef;
m_PDefense = casted->m_PDefense;
m_DefRate = casted->m_DefRate;
}
void SaveState() override
@ -30,7 +30,7 @@ namespace L2Bot::Domain::Entities
{
m_IsEquipped,
m_EnchantLevel,
m_PDef,
m_PDefense,
false
};
}
@ -42,7 +42,7 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel == casted->m_EnchantLevel &&
m_CrystalType == casted->m_CrystalType &&
m_Evasion == casted->m_Evasion &&
m_PDef == casted->m_PDef &&
m_PDefense == casted->m_PDefense &&
m_DefRate == casted->m_DefRate;
}
@ -65,9 +65,9 @@ namespace L2Bot::Domain::Entities
{
result.push_back({ "enchantLevel", std::to_string(m_EnchantLevel) });
}
if (m_PrevState.isNewState || m_PDef != m_PrevState.pDef)
if (m_PrevState.isNewState || m_PDefense != m_PrevState.pDefense)
{
result.push_back({ "pDef", std::to_string(m_PDef) });
result.push_back({ "pDefense", std::to_string(m_PDefense) });
}
return result;
@ -85,7 +85,7 @@ namespace L2Bot::Domain::Entities
const uint16_t enchantLevel,
const Enums::CrystalType crystalType,
const int16_t evasion,
const uint32_t pDef,
const uint32_t pDefense,
const uint16_t defRate
) :
BaseItem
@ -103,7 +103,7 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel(enchantLevel),
m_CrystalType(crystalType),
m_Evasion(evasion),
m_PDef(pDef),
m_PDefense(pDefense),
m_DefRate(defRate)
{
}
@ -114,7 +114,7 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel(other->m_EnchantLevel),
m_CrystalType(other->m_CrystalType),
m_Evasion(other->m_Evasion),
m_PDef(other->m_PDef),
m_PDefense(other->m_PDefense),
m_DefRate(other->m_DefRate)
{
@ -128,7 +128,7 @@ namespace L2Bot::Domain::Entities
{
bool isEquipped = 0;
uint16_t enchantLevel = 0;
uint32_t pDef = 0;
uint32_t pDefense = 0;
bool isNewState = true;
};
@ -138,7 +138,7 @@ namespace L2Bot::Domain::Entities
uint16_t m_EnchantLevel = 0;
Enums::CrystalType m_CrystalType = Enums::CrystalType::none;
int16_t m_Evasion = 0;
uint32_t m_PDef = 0;
uint32_t m_PDefense = 0;
uint16_t m_DefRate = 0;
GetState m_PrevState = GetState();

52
L2BotCore/Domain/Entities/WeaponItem.h
View File

@ -21,12 +21,12 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel = casted->m_EnchantLevel;
m_WeaponType = casted->m_WeaponType;
m_CrystalType = casted->m_CrystalType;
m_PAtk = casted->m_PAtk;
m_MAtk = casted->m_MAtk;
m_PAttack = casted->m_PAttack;
m_MAttack = casted->m_MAttack;
m_RndDamage = casted->m_RndDamage;
m_Critical = casted->m_Critical;
m_HitModify = casted->m_HitModify;
m_AtkSpd = casted->m_AtkSpd;
m_AttackSpeed = casted->m_AttackSpeed;
m_MpConsume = casted->m_MpConsume;
m_SoulshotCount = casted->m_SoulshotCount;
m_SpiritshotCount = casted->m_SpiritshotCount;
@ -38,8 +38,8 @@ namespace L2Bot::Domain::Entities
{
m_IsEquipped,
m_EnchantLevel,
m_PAtk,
m_MAtk,
m_PAttack,
m_MAttack,
false
};
}
@ -51,12 +51,12 @@ namespace L2Bot::Domain::Entities
m_EnchantLevel == casted->m_EnchantLevel &&
m_WeaponType == casted->m_WeaponType &&
m_CrystalType == casted->m_CrystalType &&
m_PAtk == casted->m_PAtk &&
m_MAtk == casted->m_MAtk &&
m_PAttack == casted->m_PAttack &&
m_MAttack == casted->m_MAttack &&
m_RndDamage == casted->m_RndDamage &&
m_Critical == casted->m_Critical &&
m_HitModify == casted->m_HitModify &&
m_AtkSpd == casted->m_AtkSpd &&
m_AttackSpeed == casted->m_AttackSpeed &&
m_MpConsume == casted->m_MpConsume &&
m_SoulshotCount == casted->m_SoulshotCount &&
m_SpiritshotCount == casted->m_SpiritshotCount;
@ -73,7 +73,7 @@ namespace L2Bot::Domain::Entities
result.push_back({ "rndDamage", std::to_string(m_RndDamage) });
result.push_back({ "critical", std::to_string(m_Critical) });
result.push_back({ "hitModify", std::to_string(m_HitModify) });
result.push_back({ "atkSpd", std::to_string(m_AtkSpd) });
result.push_back({ "attackSpeed", std::to_string(m_AttackSpeed) });
result.push_back({ "mpConsume", std::to_string(m_MpConsume) });
result.push_back({ "soulshotCount", std::to_string(m_SoulshotCount) });
result.push_back({ "spiritshotCount", std::to_string(m_SpiritshotCount) });
@ -87,13 +87,13 @@ namespace L2Bot::Domain::Entities
{
result.push_back({ "enchantLevel", std::to_string(m_EnchantLevel) });
}
if (m_PrevState.isNewState || m_PAtk != m_PrevState.pAtk)
if (m_PrevState.isNewState || m_PAttack != m_PrevState.pAttack)
{
result.push_back({ "pAtk", std::to_string(m_PAtk) });
result.push_back({ "pAttack", std::to_string(m_PAttack) });
}
if (m_PrevState.isNewState || m_MAtk != m_PrevState.mAtk)
if (m_PrevState.isNewState || m_MAttack != m_PrevState.mAttack)
{
result.push_back({ "mAtk", std::to_string(m_MAtk) });
result.push_back({ "mAttack", std::to_string(m_MAttack) });
}
return result;
@ -112,8 +112,8 @@ namespace L2Bot::Domain::Entities
const Enums::WeaponType weaponType,
const Enums::CrystalType crystalType,
const uint8_t rndDamage,
const uint32_t pAtk,
const uint32_t mAtk,
const uint32_t pAttack,
const uint32_t mAttack,
const uint16_t critical,
const int8_t hitModify,
const uint16_t atkSpd,
@ -137,11 +137,11 @@ namespace L2Bot::Domain::Entities
m_WeaponType(weaponType),
m_CrystalType(crystalType),
m_RndDamage(rndDamage),
m_PAtk(pAtk),
m_MAtk(mAtk),
m_PAttack(pAttack),
m_MAttack(mAttack),
m_Critical(critical),
m_HitModify(hitModify),
m_AtkSpd(atkSpd),
m_AttackSpeed(atkSpd),
m_MpConsume(mpConsume),
m_SoulshotCount(soulshotCount),
m_SpiritshotCount(spiritshotCount)
@ -155,11 +155,11 @@ namespace L2Bot::Domain::Entities
m_WeaponType(other->m_WeaponType),
m_CrystalType(other->m_CrystalType),
m_RndDamage(other->m_RndDamage),
m_PAtk(other->m_PAtk),
m_MAtk(other->m_MAtk),
m_PAttack(other->m_PAttack),
m_MAttack(other->m_MAttack),
m_Critical(other->m_Critical),
m_HitModify(other->m_HitModify),
m_AtkSpd(other->m_AtkSpd),
m_AttackSpeed(other->m_AttackSpeed),
m_MpConsume(other->m_MpConsume),
m_SoulshotCount(other->m_SoulshotCount),
m_SpiritshotCount(other->m_SpiritshotCount)
@ -175,8 +175,8 @@ namespace L2Bot::Domain::Entities
{
bool isEquipped = 0;
uint16_t enchantLevel = 0;
uint32_t pAtk = 0;
uint32_t mAtk = 0;
uint32_t pAttack = 0;
uint32_t mAttack = 0;
bool isNewState = true;
};
@ -187,11 +187,11 @@ namespace L2Bot::Domain::Entities
Enums::WeaponType m_WeaponType = Enums::WeaponType::none;
Enums::CrystalType m_CrystalType = Enums::CrystalType::none;
uint8_t m_RndDamage = 0;
uint32_t m_PAtk = 0;
uint32_t m_MAtk = 0;
uint32_t m_PAttack = 0;
uint32_t m_MAttack = 0;
uint16_t m_Critical = 0;
int8_t m_HitModify = 0;
uint16_t m_AtkSpd = 0;
uint16_t m_AttackSpeed = 0;
uint8_t m_MpConsume = 0;
uint8_t m_SoulshotCount = 0;
uint8_t m_SpiritshotCount = 0;

8
L2BotDll/Versions/Interlude/Factories/ItemFactory.h
View File

@ -134,8 +134,8 @@ namespace Interlude
itemInfo.enchantLevel,
casted ? static_cast<Enums::ArmorType>(casted->armorType) : Enums::ArmorType::none,
casted ? static_cast<Enums::CrystalType>(casted->crystalType) : Enums::CrystalType::none,
GetEnchantValue(casted ? casted->pDef : 0, itemInfo.enchantLevel, 1, 3),
GetEnchantValue(casted ? casted->mDef : 0, itemInfo.enchantLevel, 1, 3),
GetEnchantValue(casted ? casted->pDefense : 0, itemInfo.enchantLevel, 1, 3),
GetEnchantValue(casted ? casted->mDefense : 0, itemInfo.enchantLevel, 1, 3),
setEffect,
addSetEffect,
enchantEffect
@ -167,8 +167,8 @@ namespace Interlude
casted ? static_cast<Enums::WeaponType>(casted->weaponType) : Enums::WeaponType::none,
casted ? static_cast<Enums::CrystalType>(casted->crystalType) : Enums::CrystalType::none,
casted ? casted->rndDamage : 0,
GetEnchantValue(casted ? casted->pAtk : 0, itemInfo.enchantLevel, 3, 6),
GetEnchantValue(casted ? casted->mAtk : 0, itemInfo.enchantLevel, 3, 6),
GetEnchantValue(casted ? casted->pAttack : 0, itemInfo.enchantLevel, 3, 6),
GetEnchantValue(casted ? casted->mAttack : 0, itemInfo.enchantLevel, 3, 6),
casted ? casted->critical : 0,
casted ? casted->hitModify : 0,
casted ? casted->atkSpd : 0,

8
L2BotDll/Versions/Interlude/GameStructs/GameStructs.h
View File

@ -186,8 +186,8 @@ namespace Interlude
L2::ArmorType armorType; //0x05E4
L2::CrystalType crystalType; //0x05E8
char pad_05EC[4]; //0x05EC
int32_t pDef; //0x05F0
int32_t mDef; //0x05F4
int32_t pDefense; //0x05F0
int32_t mDefense; //0x05F4
char pad_05F8[8]; //0x05F8
};
@ -208,8 +208,8 @@ namespace Interlude
int32_t wtfNameIndex9; //0x011C
char pad_0120[4]; //0x0120
int32_t rndDamage; //0x0124
int32_t pAtk; //0x0128
int32_t mAtk; //0x012C
int32_t pAttack; //0x0128
int32_t mAttack; //0x012C
L2::WeaponType weaponType; //0x0130
L2::CrystalType crystalType; //0x0134
int32_t critical; //0x0138