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

Fix 95% of food/water consumption issues, if there are additional modifiers for race/class combos - those will need to be applied

Browse Source 
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!
This commit is contained in:
Akkadius 2017-09-17 09:48:10 -05:00
parent b71f3031bc
commit e88cd61097
5 changed files with 81 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/eqemu_logsys.h
View File

@ -88,6 +88,7 @@ enum LogCategory {
Headless_Client, Headless_Client,
HP_Update, HP_Update,
FixZ, FixZ,
Food,
MaxCategoryID /* Don't Remove this*/ MaxCategoryID /* Don't Remove this*/
}; };
@ -140,7 +141,8 @@ static const char* LogCategoryName[LogCategory::MaxCategoryID] = {
"Client Login", "Client Login",
"Headless Client", "Headless Client",
"HP Update", "HP Update",
"FixZ" "FixZ",
"Food"
}; };
} }

73
zone/client.cpp
View File

@ -124,6 +124,7 @@ Client::Client(EQStreamInterface* ieqs)
camp_timer(29000), camp_timer(29000),
process_timer(100), process_timer(100),
stamina_timer(40000), stamina_timer(40000),
consume_food_timer(60000),
zoneinpacket_timer(1000), zoneinpacket_timer(1000),
linkdead_timer(RuleI(Zone,ClientLinkdeadMS)), linkdead_timer(RuleI(Zone,ClientLinkdeadMS)),
dead_timer(2000), dead_timer(2000),
@ -658,13 +659,18 @@ bool Client::Save(uint8 iCommitNow) {
m_pp.tribute_time_remaining = 0xFFFFFFFF; m_pp.tribute_active = 0; 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); p_timers.Store(&database);
database.SaveCharacterTribute(this->CharacterID(), &m_pp); database.SaveCharacterTribute(this->CharacterID(), &m_pp);
SaveTaskState(); /* Save Character Task */ SaveTaskState(); /* Save Character Task */
m_pp.hunger_level = EQEmu::Clamp(m_pp.hunger_level, 0, 50000); Log(Logs::General, Logs::Food, "Client::Save - hunger_level: %i thirst_level: %i", m_pp.hunger_level, m_pp.thirst_level);
m_pp.thirst_level = EQEmu::Clamp(m_pp.thirst_level, 0, 50000);
// perform snapshot before SaveCharacterData() so that m_epp will contain the updated time // perform snapshot before SaveCharacterData() so that m_epp will contain the updated time
if (RuleB(Character, ActiveInvSnapshots) && time(nullptr) >= GetNextInvSnapshotTime()) { 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) 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) float metabolism_mod = 1 + spell_bonus + item_bonus + aa_bonus;
cons_mod = cons_mod * metabolism_bonus * RuleI(Character, ConsumptionMultiplier) / 10000;
else
cons_mod = cons_mod * RuleI(Character, ConsumptionMultiplier) / 100;
if (type == EQEmu::item::ItemTypeFood) Log(Logs::General, Logs::Food, "Client::Consume() Metabolism bonuses spell_bonus: (%.2f) item_bonus: (%.2f) aa_bonus: (%.2f) final: (%.2f)",
{ spell_bonus,
int hchange = item->CastTime_ * cons_mod; item_bonus,
hchange = mod_food_value(item, hchange); 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); DeleteItemInInventory(slot, 1, false);
if(!auto_consume) //no message if the client consumed for us if(!auto_consume) //no message if the client consumed for us
entity_list.MessageClose_StringID(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name); entity_list.MessageClose_StringID(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name);
#if EQDEBUG >= 5 Log(Logs::General, Logs::Food, "Eating from slot: %i", (int)slot);
Log(Logs::General, Logs::None, "Eating from slot:%i", (int)slot);
#endif
} }
else else {
{ int thirst_change = item->CastTime_ * metabolism_mod;
int tchange = item->CastTime_ * cons_mod; thirst_change = mod_drink_value(item, thirst_change);
tchange = mod_drink_value(item, tchange);
if(tchange < 0) { return; } if(thirst_change < 0)
return;
m_pp.thirst_level += thirst_change;
m_pp.thirst_level += tchange;
DeleteItemInInventory(slot, 1, false); 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 if(!auto_consume) //no message if the client consumed for us
entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name); entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
#if EQDEBUG >= 5 Log(Logs::General, Logs::Food, "Drinking from slot: %i", (int)slot);
Log(Logs::General, Logs::None, "Drinking from slot:%i", (int)slot);
#endif
} }
} }

3
zone/client.h
View File

@ -1351,7 +1351,7 @@ private:
uint32 GetClassHPFactor(); uint32 GetClassHPFactor();
void DoHPRegen(); void DoHPRegen();
void DoManaRegen(); void DoManaRegen();
void DoStaminaUpdate(); void DoStaminaHungerUpdate();
void CalcRestState(); void CalcRestState();
uint32 pLastUpdate; uint32 pLastUpdate;
@ -1459,6 +1459,7 @@ private:
Timer camp_timer; Timer camp_timer;
Timer process_timer; Timer process_timer;
Timer stamina_timer; Timer stamina_timer;
Timer consume_food_timer;
Timer zoneinpacket_timer; Timer zoneinpacket_timer;
Timer linkdead_timer; Timer linkdead_timer;
Timer dead_timer; Timer dead_timer;

14
zone/client_packet.cpp
View File

@ -8702,6 +8702,8 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
} }
else else
{ {
/*
//This is food/drink - consume it //This is food/drink - consume it
if (item->ItemType == EQEmu::item::ItemTypeFood && m_pp.hunger_level < 5000) 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); //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; EQApplicationPacket *outapp2 = nullptr;
outapp2 = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); outapp2 = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp2->pBuffer; 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->food = m_pp.hunger_level;
sta->water = m_pp.thirst_level; sta->water = m_pp.thirst_level;
QueuePacket(outapp2); QueuePacket(outapp2);
safe_delete(outapp2); safe_delete(outapp2);
*/
} }
} }

31
zone/client_process.cpp
View File

@ -38,6 +38,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "../common/data_verification.h"
#include "../common/rulesys.h" #include "../common/rulesys.h"
#include "../common/skills.h" #include "../common/skills.h"
#include "../common/spdat.h" #include "../common/spdat.h"
@ -523,6 +524,11 @@ bool Client::Process() {
DoEnduranceUpkeep(); 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) { if (tic_timer.Check() && !dead) {
CalcMaxHP(); CalcMaxHP();
CalcMaxMana(); CalcMaxMana();
@ -533,7 +539,7 @@ bool Client::Process() {
DoManaRegen(); DoManaRegen();
DoEnduranceRegen(); DoEnduranceRegen();
BuffProcess(); BuffProcess();
DoStaminaUpdate(); DoStaminaHungerUpdate();
if (tribute_timer.Check()) { if (tribute_timer.Check()) {
ToggleTribute(true); //re-activate the tribute. ToggleTribute(true); //re-activate the tribute.
@ -1828,28 +1834,33 @@ void Client::DoManaRegen() {
CheckManaEndUpdate(); CheckManaEndUpdate();
} }
void Client::DoStaminaHungerUpdate() {
void Client::DoStaminaUpdate() {
if(!stamina_timer.Check()) if(!stamina_timer.Check())
return; return;
auto outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct)); auto outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer; Stamina_Struct* sta = (Stamina_Struct*)outapp->pBuffer;
if(zone->GetZoneID() != 151) { Log(Logs::General, Logs::Food, "Client::DoStaminaHungerUpdate() hunger_level: %i thirst_level: %i before loss", m_pp.hunger_level, m_pp.thirst_level);
int loss = RuleI(Character, FoodLossPerUpdate);
if (m_pp.hunger_level > 0) if (zone->GetZoneID() != 151) {
m_pp.hunger_level-=loss;
if (m_pp.thirst_level > 0)
m_pp.thirst_level-=loss;
sta->food = m_pp.hunger_level > 6000 ? 6000 : m_pp.hunger_level; 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 { else {
// No auto food/drink consumption in the Bazaar // No auto food/drink consumption in the Bazaar
sta->food = 6000; sta->food = 6000;
sta->water = 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); FastQueuePacket(&outapp);
} }