pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Quest] QuestReward should now summon item to the inventory instead of the cursor. (#3996)

Browse Source 
* [forage rule feature] add a rule to disabled using common_food_ids from the list in forage.cpp.  currently set to enabled.

* [Quest] change QuestReward summonitem to SummonItemToInventory.

* add closing brackets in QuestReward functions.
This commit is contained in:
regneq 2024-01-22 14:35:15 -08:00 committed by GitHub
parent ca1299bf1d
commit f6148b9b8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
zone/client.cpp
View File

@ -8113,7 +8113,8 @@ void Client::SendColoredText(uint32 color, std::string message)
} }
void Client::QuestReward(Mob* target, uint32 copper, uint32 silver, uint32 gold, uint32 platinum, uint32 itemid, uint32 exp, bool faction) { void Client::QuestReward(Mob* target, uint32 copper, uint32 silver, uint32 gold, uint32 platinum, uint32 itemid, uint32 exp, bool faction)
{
auto outapp = new EQApplicationPacket(OP_Sound, sizeof(QuestReward_Struct)); auto outapp = new EQApplicationPacket(OP_Sound, sizeof(QuestReward_Struct));
memset(outapp->pBuffer, 0, sizeof(QuestReward_Struct)); memset(outapp->pBuffer, 0, sizeof(QuestReward_Struct));
@ -8128,16 +8129,16 @@ void Client::QuestReward(Mob* target, uint32 copper, uint32 silver, uint32 gold,
qr->item_id[0] = itemid; qr->item_id[0] = itemid;
qr->exp_reward = exp; qr->exp_reward = exp;
if (copper > 0 || silver > 0 || gold > 0 || platinum > 0) if (copper > 0 || silver > 0 || gold > 0 || platinum > 0) {
AddMoneyToPP(copper, silver, gold, platinum); AddMoneyToPP(copper, silver, gold, platinum);
}
if (itemid > 0) if (itemid > 0) {
SummonItem(itemid, -1, 0, 0, 0, 0, 0, 0, false, EQ::invslot::slotCursor); SummonItemIntoInventory(itemid, -1, 0, 0, 0, 0, 0, 0, false);
}
if (faction) if (faction) {
{ if (target && target->IsNPC() && !target->IsCharmed()) {
if (target && target->IsNPC() && !target->IsCharmed())
{
int32 nfl_id = target->CastToNPC()->GetNPCFactionID(); int32 nfl_id = target->CastToNPC()->GetNPCFactionID();
SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true); SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true);
qr->faction = target->CastToNPC()->GetPrimaryFaction(); qr->faction = target->CastToNPC()->GetPrimaryFaction();
@ -8145,8 +8146,9 @@ void Client::QuestReward(Mob* target, uint32 copper, uint32 silver, uint32 gold,
} }
} }
if (exp > 0) if (exp > 0) {
AddEXP(exp); AddEXP(exp);
}
QueuePacket(outapp, true, Client::CLIENT_CONNECTED); QueuePacket(outapp, true, Client::CLIENT_CONNECTED);
safe_delete(outapp); safe_delete(outapp);
@ -8163,23 +8165,25 @@ void Client::QuestReward(Mob* target, const QuestReward_Struct &reward, bool fac
// not set in caller because reasons // not set in caller because reasons
qr->mob_id = target ? target->GetID() : 0; // Entity ID for the from mob name, tasks won't set this qr->mob_id = target ? target->GetID() : 0; // Entity ID for the from mob name, tasks won't set this
if (reward.copper > 0 || reward.silver > 0 || reward.gold > 0 || reward.platinum > 0) if (reward.copper > 0 || reward.silver > 0 || reward.gold > 0 || reward.platinum > 0) {
AddMoneyToPP(reward.copper, reward.silver, reward.gold, reward.platinum); AddMoneyToPP(reward.copper, reward.silver, reward.gold, reward.platinum);
}
for (int i = 0; i < QUESTREWARD_COUNT; ++i) for (int i = 0; i < QUESTREWARD_COUNT; ++i) {
if (reward.item_id[i] > 0) if (reward.item_id[i] > 0) {
SummonItem(reward.item_id[i], -1, 0, 0, 0, 0, 0, 0, false, EQ::invslot::slotCursor); SummonItemIntoInventory(reward.item_id[i], -1, 0, 0, 0, 0, 0, 0, false);
}
}
// only process if both are valid // only process if both are valid
// if we don't have a target here, we want to just reward, but if there is a target, need to check charm // if we don't have a target here, we want to just reward, but if there is a target, need to check charm
if (reward.faction && reward.faction_mod && (target == nullptr || !target->IsCharmed())) if (reward.faction && reward.faction_mod && (target == nullptr || !target->IsCharmed())) {
RewardFaction(reward.faction, reward.faction_mod); RewardFaction(reward.faction, reward.faction_mod);
}
// legacy support // legacy support
if (faction) if (faction) {
{ if (target && target->IsNPC() && !target->IsCharmed()) {
if (target && target->IsNPC() && !target->IsCharmed())
{
int32 nfl_id = target->CastToNPC()->GetNPCFactionID(); int32 nfl_id = target->CastToNPC()->GetNPCFactionID();
SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true); SetFactionLevel(CharacterID(), nfl_id, GetBaseClass(), GetBaseRace(), GetDeity(), true);
qr->faction = target->CastToNPC()->GetPrimaryFaction(); qr->faction = target->CastToNPC()->GetPrimaryFaction();
@ -8187,8 +8191,9 @@ void Client::QuestReward(Mob* target, const QuestReward_Struct &reward, bool fac
} }
} }
if (reward.exp_reward > 0) if (reward.exp_reward > 0) {
AddEXP(reward.exp_reward); AddEXP(reward.exp_reward);
}
QueuePacket(outapp, true, Client::CLIENT_CONNECTED); QueuePacket(outapp, true, Client::CLIENT_CONNECTED);
safe_delete(outapp); safe_delete(outapp);