pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-09 21:42:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement stack counts

Browse Source
This commit is contained in:
Akkadius 2022-09-27 15:32:21 -05:00
parent 1b27b43a6b
commit 462f1a2f45
4 changed files with 57 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/strings.cpp
View File

@ -64,7 +64,7 @@ std::vector<std::string> Strings::Split(const std::string &str, const char delim
} }
// this one takes delimiter length into consideration // this one takes delimiter length into consideration
std::vector<std::string> Strings::Split(std::string s, std::string delimiter) std::vector<std::string> Strings::Split(const std::string& s, const std::string& delimiter)
{ {
size_t pos_start = 0, pos_end, delim_len = delimiter.length(); size_t pos_start = 0, pos_end, delim_len = delimiter.length();
std::string token; std::string token;
@ -674,3 +674,7 @@ std::string Strings::ConvertToDigit(int n, std::string suffix)
return NUM_TO_ENGLISH_X[n] + suffix; return NUM_TO_ENGLISH_X[n] + suffix;
} }
} }
bool Strings::Contains(const std::string& subject, const std::string& search)
{
return subject.find(search) != std::string::npos;
}

3
common/strings.h
View File

@ -84,6 +84,7 @@ namespace EQ {
class Strings { class Strings {
public: public:
static bool Contains(std::vector<std::string> container, std::string element); static bool Contains(std::vector<std::string> container, std::string element);
static bool Contains(const std::string& subject, const std::string& search);
static bool IsNumber(const std::string &s); static bool IsNumber(const std::string &s);
static const std::string ToLower(std::string s); static const std::string ToLower(std::string s);
static const std::string ToUpper(std::string s); static const std::string ToUpper(std::string s);
@ -105,7 +106,7 @@ public:
static std::string SecondsToTime(int duration, bool is_milliseconds = false); static std::string SecondsToTime(int duration, bool is_milliseconds = false);
static std::string::size_type SearchDelim(const std::string &haystack, const std::string &needle, const char deliminator = ','); static std::string::size_type SearchDelim(const std::string &haystack, const std::string &needle, const char deliminator = ',');
static std::vector<std::string> Split(const std::string &s, const char delim = ','); static std::vector<std::string> Split(const std::string &s, const char delim = ',');
static std::vector<std::string> Split(std::string s, std::string delimiter); static std::vector<std::string> Split(const std::string& s, const std::string& delimiter);
static std::vector<std::string> Wrap(std::vector<std::string> &src, std::string character); static std::vector<std::string> Wrap(std::vector<std::string> &src, std::string character);
static void FindReplace(std::string &string_subject, const std::string &search_string, const std::string &replace_string); static void FindReplace(std::string &string_subject, const std::string &search_string, const std::string &replace_string);

89
zone/task_client_state.cpp
View File

@ -959,61 +959,70 @@ void ClientTaskState::DispatchEventTaskComplete(Client* client, ClientTaskInform
parse->EventPlayer(EVENT_TASK_COMPLETE, client, export_string, 0); parse->EventPlayer(EVENT_TASK_COMPLETE, client, export_string, 0);
} }
void ClientTaskState::RewardTask(Client *client, const TaskInformation *task_information, ClientTaskInformation& client_task) void ClientTaskState::RewardTask(Client *c, const TaskInformation *ti, ClientTaskInformation& client_task)
{ {
if (!ti || !c || client_task.was_rewarded) {
if (!task_information || !client || client_task.was_rewarded) {
return; return;
} }
client_task.was_rewarded = true; client_task.was_rewarded = true;
client_task.updated = true; client_task.updated = true;
if (!task_information->completion_emote.empty()) { if (!ti->completion_emote.empty()) {
client->Message(Chat::Yellow, task_information->completion_emote.c_str()); c->Message(Chat::Yellow, ti->completion_emote.c_str());
} }
// TODO: this function should sometimes use QuestReward_Struct and CashReward_Struct // TODO: this function should sometimes use QuestReward_Struct and CashReward_Struct
// assumption is they use QuestReward_Struct when there is more than 1 thing getting rewarded // assumption is they use QuestReward_Struct when there is more than 1 thing getting rewarded
const EQ::ItemData *item_data; const EQ::ItemData *item_data;
std::vector<int> reward_list; std::vector<int> reward_list;
if (ti->reward_method != METHODQUEST) {
for (auto &i: Strings::Split(task_information->reward_id_list, "|")) { for (const auto &i: Strings::Split(ti->reward_id_list, "|")) {
auto item_id = Strings::IsNumber(i) ? std::stoi(i) : 0; // handle charges
if (item_id > 0) { int16 charges = -1;
EQ::ItemInstance *inst = database.CreateItem(item_id); uint32 item_id = Strings::IsNumber(i) ? std::stoi(i) : 0;
bool stacked = client->TryStacking(inst); if (Strings::Contains(i, ",")) {
if (!stacked) { auto s = Strings::Split(i, ",");
int16_t slot = client->GetInv().FindFreeSlot(inst->IsClassBag(), true, inst->GetItem()->Size); if (!s.empty() && s.size() == 2) {
client->SummonItem(item_id, -1, 0, 0, 0, 0, 0, 0, false, slot); item_id = Strings::IsNumber(s[0]) ? std::stoi(s[0]) : 0;
if (item_data) { charges = Strings::IsNumber(s[1]) ? std::stoi(s[1]) : 0;
client->MessageString(Chat::Yellow, YOU_HAVE_BEEN_GIVEN, inst->GetItem()->Name); }
}
if (item_id > 0) {
EQ::ItemInstance *inst = database.CreateItem(item_id, charges);
bool stacked = c->TryStacking(inst);
if (!stacked) {
int16_t slot = c->GetInv().FindFreeSlot(inst->IsClassBag(), true, inst->GetItem()->Size);
c->SummonItem(item_id, charges, 0, 0, 0, 0, 0, 0, false, slot);
if (item_data) {
c->MessageString(Chat::Yellow, YOU_HAVE_BEEN_GIVEN, inst->GetItem()->Name);
}
} }
} }
} }
} }
// just use normal NPC faction ID stuff // just use normal NPC faction ID stuff
if (task_information->faction_reward && task_information->faction_amount == 0) { if (ti->faction_reward && ti->faction_amount == 0) {
client->SetFactionLevel( c->SetFactionLevel(
client->CharacterID(), c->CharacterID(),
task_information->faction_reward, ti->faction_reward,
client->GetBaseClass(), c->GetBaseClass(),
client->GetBaseRace(), c->GetBaseRace(),
client->GetDeity() c->GetDeity()
); );
} else if (task_information->faction_reward != 0 && task_information->faction_amount != 0) { } else if (ti->faction_reward != 0 && ti->faction_amount != 0) {
client->RewardFaction( c->RewardFaction(
task_information->faction_reward, ti->faction_reward,
task_information->faction_amount ti->faction_amount
); );
} }
if (task_information->cash_reward) { if (ti->cash_reward) {
int platinum, gold, silver, copper; int platinum, gold, silver, copper;
copper = task_information->cash_reward; copper = ti->cash_reward;
platinum = copper / 1000; platinum = copper / 1000;
copper = copper - (platinum * 1000); copper = copper - (platinum * 1000);
@ -1022,11 +1031,11 @@ void ClientTaskState::RewardTask(Client *client, const TaskInformation *task_inf
silver = copper / 10; silver = copper / 10;
copper = copper - (silver * 10); copper = copper - (silver * 10);
client->CashReward(copper, silver, gold, platinum); c->CashReward(copper, silver, gold, platinum);
} }
int32 experience_reward = task_information->experience_reward; int32 experience_reward = ti->experience_reward;
if (experience_reward > 0) { if (experience_reward > 0) {
client->AddEXP(experience_reward); c->AddEXP(experience_reward);
} }
if (experience_reward < 0) { if (experience_reward < 0) {
uint32 pos_reward = experience_reward * -1; uint32 pos_reward = experience_reward * -1;
@ -1034,19 +1043,19 @@ void ClientTaskState::RewardTask(Client *client, const TaskInformation *task_inf
if (pos_reward > 100 && pos_reward < 25700) { if (pos_reward > 100 && pos_reward < 25700) {
uint8 max_level = pos_reward / 100; uint8 max_level = pos_reward / 100;
uint8 exp_percent = pos_reward - (max_level * 100); uint8 exp_percent = pos_reward - (max_level * 100);
client->AddLevelBasedExp(exp_percent, max_level); c->AddLevelBasedExp(exp_percent, max_level);
} }
} }
if (task_information->reward_points > 0) if (ti->reward_points > 0)
{ {
if (task_information->reward_point_type == AltCurrencyType::RadiantCrystal) if (ti->reward_point_type == AltCurrencyType::RadiantCrystal)
{ {
client->AddCrystals(task_information->reward_points, 0); c->AddCrystals(ti->reward_points, 0);
} }
else if (task_information->reward_point_type == AltCurrencyType::EbonCrystal) else if (ti->reward_point_type == AltCurrencyType::EbonCrystal)
{ {
client->AddCrystals(0, task_information->reward_points); c->AddCrystals(0, ti->reward_points);
} }
} }
} }

2
zone/task_client_state.h
View File

@ -65,7 +65,7 @@ public:
bool TaskOutOfTime(TaskType task_type, int index); bool TaskOutOfTime(TaskType task_type, int index);
void TaskPeriodicChecks(Client *client); void TaskPeriodicChecks(Client *client);
void SendTaskHistory(Client *client, int task_index); void SendTaskHistory(Client *client, int task_index);
void RewardTask(Client* client, const TaskInformation* task_information, ClientTaskInformation& client_task); void RewardTask(Client* c, const TaskInformation* ti, ClientTaskInformation& client_task);
void EnableTask(int character_id, int task_count, int *task_list); void EnableTask(int character_id, int task_count, int *task_list);
void DisableTask(int character_id, int task_count, int *task_list); void DisableTask(int character_id, int task_count, int *task_list);
bool IsTaskEnabled(int task_id); bool IsTaskEnabled(int task_id);