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

feat: add weapon and shield items

Browse Source
This commit is contained in:
k0t9i
2023-01-24 18:37:47 +04:00
parent 2b94f823f2
commit ca0183603f
11 changed files with 487 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,8 @@
#include "../../../Common/Common.h"
#include "Domain/Entities/EtcItem.h"
#include "Domain/Entities/ArmorItem.h"
#include "Domain/Entities/WeaponItem.h"
#include "Domain/Entities/ShieldItem.h"
#include "../../../DTO/ItemData.h"
using namespace L2Bot::Domain;
@ -43,7 +45,7 @@ namespace Interlude
case L2::ItemDataType::ARMOR:
return CreateArmor(itemInfo, data, name, icon, description);
case L2::ItemDataType::WEAPON:
return CreateEtc(itemInfo, data, name, icon, description);
return CreateWeaponOrShield(itemInfo, data, name, icon, description);
}
}
@ -66,6 +68,20 @@ namespace Interlude
return std::make_unique<Entities::ArmorItem>(object);
}
}
{
const auto object = dynamic_cast<const Entities::WeaponItem*>(other);
if (object)
{
return std::make_unique<Entities::WeaponItem>(object);
}
}
{
const auto object = dynamic_cast<const Entities::ShieldItem*>(other);
if (object)
{
return std::make_unique<Entities::ShieldItem>(object);
}
}
return std::make_unique<Entities::BaseItem>(other);
}
@ -126,6 +142,59 @@ namespace Interlude
);
}
std::unique_ptr<Entities::BaseItem> CreateWeaponOrShield(
const ItemData& itemInfo,
const FL2ItemDataBase* itemData,
const std::string& name,
const std::string& icon,
const std::string& description
) const
{
const auto casted = static_cast<const FL2WeaponItemData*>(itemData);
if (casted->weaponType != L2::WeaponType::SHIELD)
{
return std::make_unique<Entities::WeaponItem>(
itemInfo.objectId,
itemInfo.itemId,
itemInfo.mana,
name,
icon,
description,
itemData ? itemData->weight : 0,
itemInfo.isEquipped > 0,
itemInfo.enchantLevel,
casted ? static_cast<Enums::WeaponType>(casted->weaponType) : Enums::WeaponType::none,
casted ? static_cast<Enums::CrystalType>(casted->crystalType) : Enums::CrystalType::none,
casted ? casted->rndDamage : 0,
casted ? casted->pAtk : 0,
casted ? casted->mAtk : 0,
casted ? casted->critical : 0,
casted ? casted->hitModify : 0,
casted ? casted->atkSpd : 0,
casted ? casted->mpConsume : 0,
casted ? casted->soulshotCount : 0,
casted ? casted->spiritshotCount : 0
);
}
return std::make_unique<Entities::ShieldItem>(
itemInfo.objectId,
itemInfo.itemId,
itemInfo.mana,
name,
icon,
description,
itemData ? itemData->weight : 0,
itemInfo.isEquipped > 0,
itemInfo.enchantLevel,
casted ? static_cast<Enums::CrystalType>(casted->crystalType) : Enums::CrystalType::none,
casted ? casted->shieldEvasion : 0,
casted ? casted->shieldPdef : 0,
casted ? casted->shieldDefRate : 0
);
}
private:
const L2GameDataWrapper& m_L2GameData;
const FName& m_FName;