pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-22 06:22:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Quest API] Add attuned/augment support to client->SummonBaggedItems() in Perl/Lua. (#1580)

Browse Source 
Perl Example:
```pl
my @bag_items = (
      { item_id => 33649, charges => 1, attuned => 1, augment_one => 32940 }
    );
```

Lua Example:
```lua
local bag_items = {
	{ item_id = 33649, charges = 1, attuned = 1, augment_one = 32940 }
}
This commit is contained in:
Kinglykrab 2021-10-02 19:35:35 -04:00 committed by GitHub
parent b3e9e2099a
commit 5720a5020d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/client.cpp
View File

@ -10660,7 +10660,17 @@ void Client::SummonBaggedItems(uint32 bag_item_id, const std::vector<ServerLootI
}
else
{
EQ::ItemInstance* summoned_bag_item = database.CreateItem(item.item_id, item.charges);
EQ::ItemInstance* summoned_bag_item = database.CreateItem(
item.item_id,
item.charges,
item.aug_1,
item.aug_2,
item.aug_3,
item.aug_4,
item.aug_5,
item.aug_6,
item.attuned
);
if (summoned_bag_item)
{
summoned_bag->PutItem(open_slot, *summoned_bag_item);

7
zone/lua_client.cpp
View File

@ -2267,6 +2267,13 @@ void Lua_Client::SummonBaggedItems(uint32 bag_item_id, luabind::adl::object bag_
ServerLootItem_Struct item{};
item.item_id = luabind::object_cast<uint32>((*it)["item_id"]);
item.charges = luabind::object_cast<int16>((*it)["charges"]);
item.attuned = luabind::type((*it)["attuned"]) != LUA_TNIL ? luabind::object_cast<uint8>((*it)["attuned"]) : 0;
item.aug_1 = luabind::type((*it)["augment_one"]) != LUA_TNIL ? luabind::object_cast<uint32>((*it)["augment_one"]) : 0;
item.aug_2 = luabind::type((*it)["augment_two"]) != LUA_TNIL ? luabind::object_cast<uint32>((*it)["augment_two"]) : 0;
item.aug_3 = luabind::type((*it)["augment_three"]) != LUA_TNIL ? luabind::object_cast<uint32>((*it)["augment_three"]) : 0;
item.aug_4 = luabind::type((*it)["augment_four"]) != LUA_TNIL ? luabind::object_cast<uint32>((*it)["augment_four"]) : 0;
item.aug_5 = luabind::type((*it)["augment_five"]) != LUA_TNIL ? luabind::object_cast<uint32>((*it)["augment_five"]) : 0;
item.aug_6 = luabind::type((*it)["augment_six"]) != LUA_TNIL ? luabind::object_cast<uint32>((*it)["augment_six"]) : 0;
bagged_items.emplace_back(item);
}
}

26
zone/perl_client.cpp
View File

@ -5790,8 +5790,7 @@ XS(XS_Client_SummonBaggedItems) {
// verify we're receiving a reference to an array type
SV* bag_items_avref = ST(2);
if (!bag_items_avref || !SvROK(bag_items_avref) || SvTYPE(SvRV(bag_items_avref)) != SVt_PVAV)
{
if (!bag_items_avref || !SvROK(bag_items_avref) || SvTYPE(SvRV(bag_items_avref)) != SVt_PVAV) {
Perl_croak(aTHX_ "Client::SummonBaggedItems second argument is not a reference to an array");
}
@ -5801,22 +5800,33 @@ XS(XS_Client_SummonBaggedItems) {
std::vector<ServerLootItem_Struct> bagged_items;
auto count = av_len(bag_items_av) + 1;
for (int i = 0; i < count; ++i)
{
for (int i = 0; i < count; ++i) {
SV** element = av_fetch(bag_items_av, i, 0);
// verify array element is a hash reference containing item details
if (element && SvROK(*element) && SvTYPE(SvRV(*element)) == SVt_PVHV)
{
if (element && SvROK(*element) && SvTYPE(SvRV(*element)) == SVt_PVHV) {
HV* hash = (HV*)SvRV(*element); // dereference
SV** item_id_ptr = hv_fetchs(hash, "item_id", false);
SV** item_charges_ptr = hv_fetchs(hash, "charges", false);
if (item_id_ptr && item_charges_ptr)
{
SV** attuned_ptr = hv_fetchs(hash, "attuned", false);
SV** augment_one_ptr = hv_fetchs(hash, "augment_one", false);
SV** augment_two_ptr = hv_fetchs(hash, "augment_two", false);
SV** augment_three_ptr = hv_fetchs(hash, "augment_three", false);
SV** augment_four_ptr = hv_fetchs(hash, "augment_four", false);
SV** augment_five_ptr = hv_fetchs(hash, "augment_five", false);
SV** augment_six_ptr = hv_fetchs(hash, "augment_six", false);
if (item_id_ptr && item_charges_ptr) {
ServerLootItem_Struct item{};
item.item_id = static_cast<uint32>(SvUV(*item_id_ptr));
item.charges = static_cast<int16>(SvIV(*item_charges_ptr));
item.attuned = attuned_ptr ? static_cast<uint8>(SvUV(*attuned_ptr)) : 0;
item.aug_1 = augment_one_ptr ? static_cast<uint32>(SvUV(*augment_one_ptr)) : 0;
item.aug_2 = augment_two_ptr ? static_cast<uint32>(SvUV(*augment_two_ptr)) : 0;
item.aug_3 = augment_three_ptr ? static_cast<uint32>(SvUV(*augment_three_ptr)) : 0;
item.aug_4 = augment_four_ptr ? static_cast<uint32>(SvUV(*augment_four_ptr)) : 0;
item.aug_5 = augment_five_ptr ? static_cast<uint32>(SvUV(*augment_five_ptr)) : 0;
item.aug_6 = augment_six_ptr ? static_cast<uint32>(SvUV(*augment_six_ptr)) : 0;
bagged_items.emplace_back(item);
}
}