From e88cd61097ff92be7cca4836866360416a4927e0 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 17 Sep 2017 09:48:10 -0500 Subject: [PATCH] Fix 95% of food/water consumption issues, if there are additional modifiers for race/class combos - those will need to be applied Mods properly calculated Stages should be put in place if not already: https://wiki.project1999.com/Food_and_drink#Stages_of_Hunger_and_Thirst Values stored in the database are 0-6000, previously we capped it at 6000 but previous math would have normal values in the 60k+ range in order for food to be consumed at a reasonable rate. We are now using more native logic where 1 = 1 minute, following logic: (Minutes) 0 - 5 - This is a snack. 6 - 20 - This is a meal. 21 - 30 - This is a hearty meal. 31 - 40 - This is a banquet size meal. 41 - 50 - This meal is a feast! 51 - 60 - This is an enduring meal! 61 - X - This is a miraculous meal! --- common/eqemu_logsys.h | 4 ++- zone/client.cpp | 73 ++++++++++++++++++++++++++--------------- zone/client.h | 3 +- zone/client_packet.cpp | 14 +++++--- zone/client_process.cpp | 31 +++++++++++------ 5 files changed, 81 insertions(+), 44 deletions(-) diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 56542c07d..10d9e460c 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -88,6 +88,7 @@ enum LogCategory { Headless_Client, HP_Update, FixZ, + Food, MaxCategoryID /* Don't Remove this*/ }; @@ -140,7 +141,8 @@ static const char* LogCategoryName[LogCategory::MaxCategoryID] = { "Client Login", "Headless Client", "HP Update", - "FixZ" + "FixZ", + "Food" }; } diff --git a/zone/client.cpp b/zone/client.cpp index 4866013a3..7a7c57861 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -124,6 +124,7 @@ Client::Client(EQStreamInterface* ieqs) camp_timer(29000), process_timer(100), stamina_timer(40000), + consume_food_timer(60000), zoneinpacket_timer(1000), linkdead_timer(RuleI(Zone,ClientLinkdeadMS)), dead_timer(2000), @@ -658,13 +659,18 @@ bool Client::Save(uint8 iCommitNow) { m_pp.tribute_time_remaining = 0xFFFFFFFF; m_pp.tribute_active = 0; } + if (m_pp.hunger_level < 0) + m_pp.hunger_level = 0; + + if (m_pp.thirst_level < 0) + m_pp.thirst_level = 0; + p_timers.Store(&database); database.SaveCharacterTribute(this->CharacterID(), &m_pp); SaveTaskState(); /* Save Character Task */ - m_pp.hunger_level = EQEmu::Clamp(m_pp.hunger_level, 0, 50000); - m_pp.thirst_level = EQEmu::Clamp(m_pp.thirst_level, 0, 50000); + Log(Logs::General, Logs::Food, "Client::Save - hunger_level: %i thirst_level: %i", m_pp.hunger_level, m_pp.thirst_level); // perform snapshot before SaveCharacterData() so that m_epp will contain the updated time if (RuleB(Character, ActiveInvSnapshots) && time(nullptr) >= GetNextInvSnapshotTime()) { @@ -8585,50 +8591,63 @@ void Client::SetConsumption(int32 in_hunger, int32 in_thirst) void Client::Consume(const EQEmu::ItemData *item, uint8 type, int16 slot, bool auto_consume) { - if(!item) { return; } + if(!item) { return; } - uint32 cons_mod = 180; + /* + Spell Bonuses 2 digit form - 10, 20, 25 etc. (10%, 20%, 25%) + AA Bonus Ranks, 110, 125, 150 etc. (10%, 25%, 50%) + */ - int32 metabolism_bonus = spellbonuses.Metabolism + itembonuses.Metabolism + aabonuses.Metabolism; + float aa_bonus = ((float) aabonuses.Metabolism - 100) / 100; + float item_bonus = (float) itembonuses.Metabolism / 100; + float spell_bonus = (float) spellbonuses.Metabolism / 100; - if (metabolism_bonus) - cons_mod = cons_mod * metabolism_bonus * RuleI(Character, ConsumptionMultiplier) / 10000; - else - cons_mod = cons_mod * RuleI(Character, ConsumptionMultiplier) / 100; + float metabolism_mod = 1 + spell_bonus + item_bonus + aa_bonus; - if (type == EQEmu::item::ItemTypeFood) - { - int hchange = item->CastTime_ * cons_mod; - hchange = mod_food_value(item, hchange); + Log(Logs::General, Logs::Food, "Client::Consume() Metabolism bonuses spell_bonus: (%.2f) item_bonus: (%.2f) aa_bonus: (%.2f) final: (%.2f)", + spell_bonus, + item_bonus, + aa_bonus, + metabolism_mod + ); - if(hchange < 0) { return; } + if (type == EQEmu::item::ItemTypeFood) { + int hunger_change = item->CastTime_ * metabolism_mod; + hunger_change = mod_food_value(item, hunger_change); + + if(hunger_change < 0) + return; + + m_pp.hunger_level += hunger_change; + + Log(Logs::General, Logs::Food, "Consuming food, points added to hunger_level: %i - current_hunger: %i", hunger_change, m_pp.hunger_level); - m_pp.hunger_level += hchange; DeleteItemInInventory(slot, 1, false); if(!auto_consume) //no message if the client consumed for us entity_list.MessageClose_StringID(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name); -#if EQDEBUG >= 5 - Log(Logs::General, Logs::None, "Eating from slot:%i", (int)slot); -#endif + Log(Logs::General, Logs::Food, "Eating from slot: %i", (int)slot); + } - else - { - int tchange = item->CastTime_ * cons_mod; - tchange = mod_drink_value(item, tchange); + else { + int thirst_change = item->CastTime_ * metabolism_mod; + thirst_change = mod_drink_value(item, thirst_change); - if(tchange < 0) { return; } + if(thirst_change < 0) + return; + + m_pp.thirst_level += thirst_change; - m_pp.thirst_level += tchange; DeleteItemInInventory(slot, 1, false); + Log(Logs::General, Logs::Food, "Consuming drink, points added to thirst_level: %i current_thirst: %i", thirst_change, m_pp.thirst_level); + if(!auto_consume) //no message if the client consumed for us entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name); -#if EQDEBUG >= 5 - Log(Logs::General, Logs::None, "Drinking from slot:%i", (int)slot); -#endif + Log(Logs::General, Logs::Food, "Drinking from slot: %i", (int)slot); + } } diff --git a/zone/client.h b/zone/client.h index ca43d6c91..b6098c6b3 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1351,7 +1351,7 @@ private: uint32 GetClassHPFactor(); void DoHPRegen(); void DoManaRegen(); - void DoStaminaUpdate(); + void DoStaminaHungerUpdate(); void CalcRestState(); uint32 pLastUpdate; @@ -1459,6 +1459,7 @@ private: Timer camp_timer; Timer process_timer; Timer stamina_timer; + Timer consume_food_timer; Timer zoneinpacket_timer; Timer linkdead_timer; Timer dead_timer; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 78dac9410..b72760e4f 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -8702,6 +8702,8 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) } else { + + /* //This is food/drink - consume it if (item->ItemType == EQEmu::item::ItemTypeFood && m_pp.hunger_level < 5000) { @@ -8723,19 +8725,21 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app) //CheckIncreaseSkill(ALCOHOL_TOLERANCE, nullptr, 25); } - if (m_pp.hunger_level > 6000) - m_pp.hunger_level = 6000; - if (m_pp.thirst_level > 6000) - m_pp.thirst_level = 6000; - EQApplicationPacket *outapp2 = nullptr; outapp2 = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); Stamina_Struct* sta = (Stamina_Struct*)outapp2->pBuffer; + + if (m_pp.hunger_level > 6000) + sta->food = 6000; + if (m_pp.thirst_level > 6000) + sta->water = 6000; + sta->food = m_pp.hunger_level; sta->water = m_pp.thirst_level; QueuePacket(outapp2); safe_delete(outapp2); + */ } } diff --git a/zone/client_process.cpp b/zone/client_process.cpp index a0961038e..5ab5db7a8 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -38,6 +38,7 @@ #include #endif +#include "../common/data_verification.h" #include "../common/rulesys.h" #include "../common/skills.h" #include "../common/spdat.h" @@ -523,6 +524,11 @@ bool Client::Process() { DoEnduranceUpkeep(); } + if (consume_food_timer.Check()) { + m_pp.hunger_level = m_pp.hunger_level - 1; + m_pp.thirst_level = m_pp.thirst_level - 1; + } + if (tic_timer.Check() && !dead) { CalcMaxHP(); CalcMaxMana(); @@ -533,7 +539,7 @@ bool Client::Process() { DoManaRegen(); DoEnduranceRegen(); BuffProcess(); - DoStaminaUpdate(); + DoStaminaHungerUpdate(); if (tribute_timer.Check()) { ToggleTribute(true); //re-activate the tribute. @@ -1828,28 +1834,33 @@ void Client::DoManaRegen() { CheckManaEndUpdate(); } - -void Client::DoStaminaUpdate() { +void Client::DoStaminaHungerUpdate() { if(!stamina_timer.Check()) return; auto outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; - if(zone->GetZoneID() != 151) { - int loss = RuleI(Character, FoodLossPerUpdate); - if (m_pp.hunger_level > 0) - m_pp.hunger_level-=loss; - if (m_pp.thirst_level > 0) - m_pp.thirst_level-=loss; + Log(Logs::General, Logs::Food, "Client::DoStaminaHungerUpdate() hunger_level: %i thirst_level: %i before loss", m_pp.hunger_level, m_pp.thirst_level); + + if (zone->GetZoneID() != 151) { sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level; - sta->water = m_pp.thirst_level> 6000 ? 6000 : m_pp.thirst_level; + sta->water = m_pp.thirst_level > 6000 ? 6000 : m_pp.thirst_level; } else { // No auto food/drink consumption in the Bazaar sta->food = 6000; sta->water = 6000; } + + Log(Logs::General, Logs::Food, + "Client::DoStaminaHungerUpdate() Current hunger_level: %i = (%i minutes left) thirst_level: %i = (%i minutes left) - after loss", + m_pp.hunger_level, + m_pp.hunger_level, + m_pp.thirst_level, + m_pp.thirst_level + ); + FastQueuePacket(&outapp); }