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

Added more information to Mercenary Logging.

Browse Source 
Added potential fix for Mercenaries that fail to unsuspend.
Added a new "statscale" field to the merc_stats table that can be used to quickly balance Mercenary Stats based on Level.
The new "statscale" field now combines with the Mercs::ScaleRate rule value (default 100 percent for both).
This commit is contained in:
Trevius 2015-01-29 23:04:41 -06:00
parent dd980ab8ad
commit 0aba2d578a
11 changed files with 242 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changelog.txt
View File

@ -1,5 +1,11 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 01/29/2015 ==
Trevius: Added more information to Mercenary Logging.
Trevius: Added potential fix for Mercenaries that fail to unsuspend.
Trevius: Added a new "statscale" field to the merc_stats table that can be used to quickly balance Mercenary Stats based on Level.
Trevius: The new "statscale" field now combines with the Mercs::ScaleRate rule value (default 100 percent for both).
== 01/28/2015 == == 01/28/2015 ==
Akkadius: Added Logs::DebugQuest category per request from Trevius (Great idea) Akkadius: Added Logs::DebugQuest category per request from Trevius (Great idea)
- Exported quest::debug(log_message, [debug_level = 1) - Exported quest::debug(log_message, [debug_level = 1)

2
common/database.cpp
View File

@ -1991,7 +1991,7 @@ void Database::SetRaidGroupLeaderInfo(uint32 gid, uint32 rid)
if (results.RowsAffected() != 0) if (results.RowsAffected() != 0)
return; return;
query = StringFormat("INSERT INTO raid_leaders(gid, rid, marknpc, leadershipaa, maintank, assist, puller, mentoree, mentor_percent) VALUES(%lu, %lu, '', '', '', '', '', '', 0)", query = StringFormat("REPLACE INTO raid_leaders(gid, rid, marknpc, leadershipaa, maintank, assist, puller, mentoree, mentor_percent) VALUES(%lu, %lu, '', '', '', '', '', '', 0)",
(unsigned long)gid, (unsigned long)rid); (unsigned long)gid, (unsigned long)rid);
results = QueryDatabase(query); results = QueryDatabase(query);

2
common/version.h
View File

@ -30,7 +30,7 @@
Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/ */
#define CURRENT_BINARY_DATABASE_VERSION 9070 #define CURRENT_BINARY_DATABASE_VERSION 9071
#define COMPILE_DATE __DATE__ #define COMPILE_DATE __DATE__
#define COMPILE_TIME __TIME__ #define COMPILE_TIME __TIME__
#ifndef WIN32 #ifndef WIN32

1
utils/sql/db_update_manifest.txt
View File

@ -324,6 +324,7 @@
9068|2015_01_15_logsys_categories_table.sql|SHOW TABLES LIKE 'logsys_categories'|empty| 9068|2015_01_15_logsys_categories_table.sql|SHOW TABLES LIKE 'logsys_categories'|empty|
9069|2015_01_25_logsys_Mercenaries_category.sql|SELECT * FROM `logsys_categories` WHERE `log_category_description` LIKE 'Mercenaries'|empty| 9069|2015_01_25_logsys_Mercenaries_category.sql|SELECT * FROM `logsys_categories` WHERE `log_category_description` LIKE 'Mercenaries'|empty|
9070|2015_01_28_quest_debug_log_category.sql|SELECT * FROM `logsys_categories` WHERE `log_category_description` LIKE 'Quest Debug'|empty| 9070|2015_01_28_quest_debug_log_category.sql|SELECT * FROM `logsys_categories` WHERE `log_category_description` LIKE 'Quest Debug'|empty|
9071|2015_01_29_merc_stats_table_update.sql|SHOW COLUMNS FROM `merc_stats` LIKE 'statscale'|empty|
# Upgrade conditions: # Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not # This won't be needed after this system is implemented, but it is used database that are not

1
utils/sql/git/required/2015_01_29_merc_stats_table_update.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `merc_stats` ADD `statscale` int( 11 ) NOT NULL DEFAULT '100' AFTER `runspeed`;

6
zone/client.cpp
View File

@ -7277,7 +7277,7 @@ void Client::SendMercPersonalInfo()
stancecount += zone->merc_stance_list[GetMercInfo().MercTemplateID].size(); stancecount += zone->merc_stance_list[GetMercInfo().MercTemplateID].size();
if(stancecount > MAX_MERC_STANCES || mercCount > MAX_MERC || mercTypeCount > MAX_MERC_GRADES) if(stancecount > MAX_MERC_STANCES || mercCount > MAX_MERC || mercTypeCount > MAX_MERC_GRADES)
{ {
Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo canceled: (%i) (%i) (%i)", stancecount, mercCount, mercTypeCount); Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo canceled: (%i) (%i) (%i) for %s", stancecount, mercCount, mercTypeCount, GetName());
SendMercMerchantResponsePacket(0); SendMercMerchantResponsePacket(0);
return; return;
} }
@ -7371,13 +7371,13 @@ void Client::SendMercPersonalInfo()
return; return;
} }
} }
Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo Send Successful"); Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo Send Successful for %s.", GetName());
SendMercMerchantResponsePacket(0); SendMercMerchantResponsePacket(0);
} }
else else
{ {
Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo Send Failed Due to no MercData for %i", GetMercInfo().MercTemplateID); Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo Send Failed Due to no MercData (%i) for %s", GetMercInfo().MercTemplateID, GetName());
} }
} }

20
zone/client_packet.cpp
View File

@ -9315,7 +9315,7 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app)
uint32 merc_command = mc->MercCommand; // Seen 0 (zone in with no merc or suspended), 1 (dismiss merc), 5 (normal state), 20 (unknown), 36 (zone in with merc) uint32 merc_command = mc->MercCommand; // Seen 0 (zone in with no merc or suspended), 1 (dismiss merc), 5 (normal state), 20 (unknown), 36 (zone in with merc)
int32 option = mc->Option; // Seen -1 (zone in with no merc), 0 (setting to passive stance), 1 (normal or setting to balanced stance) int32 option = mc->Option; // Seen -1 (zone in with no merc), 0 (setting to passive stance), 1 (normal or setting to balanced stance)
Log.Out(Logs::General, Logs::Mercenaries, "Command %i, Option %i received.", merc_command, option); Log.Out(Logs::General, Logs::Mercenaries, "Command %i, Option %i received from %s.", merc_command, option, GetName());
if (!RuleB(Mercs, AllowMercs)) if (!RuleB(Mercs, AllowMercs))
return; return;
@ -9349,7 +9349,7 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app)
merc->SetStance(mercTemplate->Stances[option]); merc->SetStance(mercTemplate->Stances[option]);
GetMercInfo().Stance = mercTemplate->Stances[option]; GetMercInfo().Stance = mercTemplate->Stances[option];
Log.Out(Logs::General, Logs::Mercenaries, "Set Stance: %u", merc->GetStance()); Log.Out(Logs::General, Logs::Mercenaries, "Set Stance: %u for %s (%s)", merc->GetStance(), merc->GetName(), GetName());
} }
} }
} }
@ -9372,7 +9372,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
uint32 merchant_id = mmsr->MercMerchantID; uint32 merchant_id = mmsr->MercMerchantID;
uint32 altCurrentType = 19; uint32 altCurrentType = 19;
Log.Out(Logs::General, Logs::Mercenaries, "Data Request for Merchant ID (%i)", merchant_id); Log.Out(Logs::General, Logs::Mercenaries, "Data Request for Merchant ID (%i) for %s.", merchant_id, GetName());
//client is requesting data about currently owned mercenary //client is requesting data about currently owned mercenary
if (merchant_id == 0) { if (merchant_id == 0) {
@ -9380,12 +9380,12 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
//send info about your current merc(s) //send info about your current merc(s)
if (GetMercInfo().mercid) if (GetMercInfo().mercid)
{ {
Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo Request"); Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo Request for %s.", GetName());
SendMercPersonalInfo(); SendMercPersonalInfo();
} }
else else
{ {
Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo Not Sent - MercID (%i)", GetMercInfo().mercid); Log.Out(Logs::General, Logs::Mercenaries, "SendMercPersonalInfo Not Sent - MercID (%i) for %s.", GetMercInfo().mercid, GetName());
} }
} }
@ -9498,7 +9498,7 @@ void Client::Handle_OP_MercenaryDataUpdateRequest(const EQApplicationPacket *app
return; return;
} }
Log.Out(Logs::General, Logs::Mercenaries, "Data Update Request Received."); Log.Out(Logs::General, Logs::Mercenaries, "Data Update Request Received for %s.", GetName());
if (GetMercID()) if (GetMercID())
{ {
@ -9524,7 +9524,7 @@ void Client::Handle_OP_MercenaryDismiss(const EQApplicationPacket *app)
Command = VARSTRUCT_DECODE_TYPE(uint8, InBuffer); Command = VARSTRUCT_DECODE_TYPE(uint8, InBuffer);
} }
Log.Out(Logs::General, Logs::Mercenaries, "Dismiss Request ( %i ) Received.", Command); Log.Out(Logs::General, Logs::Mercenaries, "Dismiss Request ( %i ) Received for %s.", Command, GetName());
// Handle the dismiss here... // Handle the dismiss here...
DismissMerc(GetMercInfo().mercid); DismissMerc(GetMercInfo().mercid);
@ -9549,7 +9549,7 @@ void Client::Handle_OP_MercenaryHire(const EQApplicationPacket *app)
uint32 merc_unk1 = mmrq->MercUnk01; uint32 merc_unk1 = mmrq->MercUnk01;
uint32 merc_unk2 = mmrq->MercUnk02; uint32 merc_unk2 = mmrq->MercUnk02;
Log.Out(Logs::General, Logs::Mercenaries, "Template ID (%i), Merchant ID (%i), Unknown1 (%i), Unknown2 (%i)", merc_template_id, merchant_id, merc_unk1, merc_unk2); Log.Out(Logs::General, Logs::Mercenaries, "Template ID (%i), Merchant ID (%i), Unknown1 (%i), Unknown2 (%i), Client: %s", merc_template_id, merchant_id, merc_unk1, merc_unk2, GetName());
//HirePending = true; //HirePending = true;
SetHoTT(0); SetHoTT(0);
@ -9615,7 +9615,7 @@ void Client::Handle_OP_MercenarySuspendRequest(const EQApplicationPacket *app)
SuspendMercenary_Struct* sm = (SuspendMercenary_Struct*)app->pBuffer; SuspendMercenary_Struct* sm = (SuspendMercenary_Struct*)app->pBuffer;
uint32 merc_suspend = sm->SuspendMerc; // Seen 30 for suspending or unsuspending uint32 merc_suspend = sm->SuspendMerc; // Seen 30 for suspending or unsuspending
Log.Out(Logs::General, Logs::Mercenaries, "Suspend ( %i ) received.", merc_suspend); Log.Out(Logs::General, Logs::Mercenaries, "Suspend ( %i ) received for %s.", merc_suspend, GetName());
if (!RuleB(Mercs, AllowMercs)) if (!RuleB(Mercs, AllowMercs))
return; return;
@ -9635,7 +9635,7 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
return; return;
} }
Log.Out(Logs::General, Logs::Mercenaries, "Timer Request received."); Log.Out(Logs::General, Logs::Mercenaries, "Timer Request received for %s.", GetName());
if (!RuleB(Mercs, AllowMercs)) { if (!RuleB(Mercs, AllowMercs)) {
return; return;

1
zone/exp.cpp
View File

@ -506,7 +506,6 @@ void Client::SetLevel(uint8 set_level, bool command)
SetMana(CalcMaxMana()); SetMana(CalcMaxMana());
UpdateWho(); UpdateWho();
if(GetMerc())
UpdateMercLevel(); UpdateMercLevel();
Save(); Save();

276
zone/merc.cpp
View File

@ -2242,7 +2242,7 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
if(CheckAETaunt()) { if(CheckAETaunt()) {
//get AE taunt //get AE taunt
selectedMercSpell = GetBestMercSpellForAETaunt(this); selectedMercSpell = GetBestMercSpellForAETaunt(this);
Log.Out(Logs::General, Logs::Mercenaries, "AE Taunting"); Log.Out(Logs::General, Logs::Mercenaries, "%s AE Taunting.", GetName());
} }
if(selectedMercSpell.spellid == 0 && CheckTaunt()) { if(selectedMercSpell.spellid == 0 && CheckTaunt()) {
@ -4770,7 +4770,7 @@ Merc* Merc::LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id,
{ {
merc->SetMercData( merc_template->MercTemplateID ); merc->SetMercData( merc_template->MercTemplateID );
database.LoadMercEquipment(merc); database.LoadMercEquipment(merc);
merc->UpdateMercStats(c); merc->UpdateMercStats(c, true);
if(updateFromDB) if(updateFromDB)
{ {
@ -4808,6 +4808,7 @@ Merc* Merc::LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id,
merc->LoadMercSpells(); merc->LoadMercSpells();
} }
Log.Out(Logs::General, Logs::Mercenaries, "LoadMerc Successful for %s (%s).", merc->GetName(), c->GetName());
return merc; return merc;
} }
} }
@ -4836,50 +4837,183 @@ void Merc::UpdateMercInfo(Client *c) {
c->GetMercInfo().drakkinDetails = drakkin_details; c->GetMercInfo().drakkinDetails = drakkin_details;
} }
void Merc::UpdateMercStats(Client *c) { void Merc::UpdateMercStats(Client *c, bool setmax) {
if(c->GetMercInfo().MercTemplateID > 0) if(c->GetMercInfo().MercTemplateID > 0)
{ {
Log.Out(Logs::General, Logs::Mercenaries, "Updating Mercenary Stats for %s (%s).", GetName(), c->GetName());
const NPCType* npc_type = database.GetMercType( zone->GetMercTemplate(c->GetMercInfo().MercTemplateID)->MercNPCID, GetRace(), c->GetLevel()); const NPCType* npc_type = database.GetMercType( zone->GetMercTemplate(c->GetMercInfo().MercTemplateID)->MercNPCID, GetRace(), c->GetLevel());
if (npc_type) if (npc_type)
{ {
max_hp = (npc_type->max_hp * npc_type->scalerate) / 100; max_hp = npc_type->max_hp;
base_hp = (npc_type->max_hp * npc_type->scalerate) / 100; base_hp = npc_type->max_hp;
max_mana = (npc_type->Mana * npc_type->scalerate) / 100; max_mana = npc_type->Mana;
base_mana = (npc_type->Mana * npc_type->scalerate) / 100; base_mana = npc_type->Mana;
hp_regen = (npc_type->hp_regen * npc_type->scalerate) / 100; max_end = npc_type->max_hp; // Hack since Endurance does not exist for NPCType yet
mana_regen = (npc_type->mana_regen * npc_type->scalerate) / 100; base_end = npc_type->max_hp; // Hack since Endurance does not exist for NPCType yet
hp_regen = npc_type->hp_regen;
mana_regen = npc_type->mana_regen;
max_dmg = npc_type->max_dmg;
min_dmg = npc_type->min_dmg;
_baseAC = npc_type->AC;
_baseATK = npc_type->ATK;
_baseSTR = npc_type->STR;
_baseSTA = npc_type->STA;
_baseDEX = npc_type->DEX;
_baseAGI = npc_type->AGI;
_baseWIS = npc_type->WIS;
_baseINT = npc_type->INT;
_baseCHA = npc_type->CHA;
_baseATK = npc_type->ATK;
_baseMR = npc_type->MR;
_baseFR = npc_type->FR;
_baseDR = npc_type->DR;
_basePR = npc_type->PR;
_baseCR = npc_type->CR;
_baseCorrup = npc_type->Corrup;
uint32 scalepercent = (int)(npc_type->scalerate * RuleI(Mercs, ScaleRate) / 100);
ScaleStats(scalepercent, setmax);
level = npc_type->level; level = npc_type->level;
max_dmg = (npc_type->max_dmg * npc_type->scalerate) / 100;
min_dmg = (npc_type->min_dmg * npc_type->scalerate) / 100;
_baseSTR = (npc_type->STR * npc_type->scalerate) / 100;
_baseSTA = (npc_type->STA * npc_type->scalerate) / 100;
_baseDEX = (npc_type->DEX * npc_type->scalerate) / 100;
_baseAGI = (npc_type->AGI * npc_type->scalerate) / 100;
_baseWIS = (npc_type->WIS * npc_type->scalerate) / 100;
_baseINT = (npc_type->INT * npc_type->scalerate) / 100;
_baseCHA = (npc_type->CHA * npc_type->scalerate) / 100;
_baseATK = (npc_type->ATK * npc_type->scalerate) / 100;
_baseMR = (npc_type->MR * npc_type->scalerate) / 100;
_baseFR = (npc_type->FR * npc_type->scalerate) / 100;
_baseDR = (npc_type->DR * npc_type->scalerate) / 100;
_basePR = (npc_type->PR * npc_type->scalerate) / 100;
_baseCR = (npc_type->CR * npc_type->scalerate) / 100;
_baseCorrup = (npc_type->Corrup * npc_type->scalerate) / 100;
_baseAC = (npc_type->AC * npc_type->scalerate) / 100;
attack_speed = npc_type->attack_speed;
attack_count = npc_type->attack_count; attack_count = npc_type->attack_count;
attack_speed = npc_type->attack_speed;
spellscale = npc_type->spellscale; spellscale = npc_type->spellscale;
healscale = npc_type->healscale; healscale = npc_type->healscale;
CalcBonuses(); CalcBonuses();
CalcMaxEndurance();
CalcMaxHP(); CalcMaxHP();
CalcMaxMana(); CalcMaxMana();
CalcMaxEndurance();
} }
} }
} }
void Merc::ScaleStats(int scalepercent, bool setmax) {
Log.Out(Logs::General, Logs::Mercenaries, "Scaling Mercenary Stats to %d Percent for %s.", scalepercent, GetName());
if (scalepercent <= 0)
return;
float scalerate = (float)scalepercent / 100.0f;
if ((int)((float)base_hp * scalerate) > 1)
{
max_hp = (int)((float)base_hp * scalerate);
base_hp = max_hp;
if (setmax)
cur_hp = max_hp;
}
if (base_mana)
{
max_mana = (int)((float)base_mana * scalerate);
base_mana = max_mana;
if (setmax)
cur_mana = max_mana;
}
if (base_end)
{
max_end = (int)((float)base_end * scalerate);
base_end = max_end;
if (setmax)
cur_end = max_end;
}
if (_baseAC)
{
AC = (int)((float)_baseAC * scalerate);
_baseAC = AC;
}
if (_baseATK)
{
ATK = (int)((float)_baseATK * scalerate);
_baseATK = ATK;
}
if (_baseSTR)
{
STR = (int)((float)_baseSTR * scalerate);
_baseSTR = STR;
}
if (_baseSTA)
{
STA = (int)((float)_baseSTA * scalerate);
_baseSTA = STA;
}
if (_baseAGI)
{
AGI = (int)((float)_baseAGI * scalerate);
_baseAGI = AGI;
}
if (_baseDEX)
{
DEX = (int)((float)_baseDEX * scalerate);
_baseDEX = DEX;
}
if (_baseINT)
{
INT = (int)((float)_baseINT * scalerate);
_baseINT = INT;
}
if (_baseWIS)
{
WIS = (int)((float)_baseWIS * scalerate);
_baseWIS = WIS;
}
if (_baseCHA)
{
CHA = (int)((float)_baseCHA * scalerate);
_baseCHA = CHA;
}
if (_baseMR)
{
MR = (int)((float)_baseMR * scalerate);
_baseMR = MR;
}
if (_baseCR)
{
CR = (int)((float)_baseCR * scalerate);
_baseCR = CR;
}
if (_baseDR)
{
DR = (int)((float)_baseDR * scalerate);
_baseDR = DR;
}
if (_baseFR)
{
FR = (int)((float)_baseFR * scalerate);
_baseFR = FR;
}
if (_basePR)
{
PR = (int)((float)_basePR * scalerate);
_basePR = PR;
}
if (_baseCorrup)
{
Corrup = (int)((float)_baseCorrup * scalerate);
_baseCorrup = Corrup;
}
if (max_dmg)
{
max_dmg = (int)((float)max_dmg * scalerate);
}
if (min_dmg)
{
min_dmg = (int)((float)min_dmg * scalerate);
}
return;
}
void Merc::UpdateMercAppearance() { void Merc::UpdateMercAppearance() {
// Copied from Bot Code: // Copied from Bot Code:
uint32 itemID = NO_ITEM; uint32 itemID = NO_ITEM;
@ -4937,7 +5071,7 @@ bool Merc::Spawn(Client *owner) {
SendPosition(); SendPosition();
Log.Out(Logs::General, Logs::Mercenaries, "Spawn Mercenary."); Log.Out(Logs::General, Logs::Mercenaries, "Spawn Mercenary %s.", GetName());
//UpdateMercAppearance(); //UpdateMercAppearance();
@ -5083,7 +5217,8 @@ void Client::SendMercResponsePackets(uint32 ResponseType)
SendMercMerchantResponsePacket(3); SendMercMerchantResponsePacket(3);
break; break;
} }
Log.Out(Logs::General, Logs::Mercenaries, "SendMercResponsePackets %i.", ResponseType); Log.Out(Logs::General, Logs::Mercenaries, "SendMercResponsePackets %i for %s.", ResponseType, GetName());
} }
void Client::UpdateMercTimer() void Client::UpdateMercTimer()
@ -5124,7 +5259,7 @@ void Client::UpdateMercTimer()
SendMercResponsePackets(16); SendMercResponsePackets(16);
} }
Log.Out(Logs::General, Logs::Mercenaries, "UpdateMercTimer Complete."); Log.Out(Logs::General, Logs::Mercenaries, "UpdateMercTimer Complete for %s.", GetName());
// Normal upkeep charge message // Normal upkeep charge message
//Message(7, "You have been charged a mercenary upkeep cost of %i plat, and %i gold and your mercenary upkeep cost timer has been reset to 15 minutes.", upkeep_plat, upkeep_gold, (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60)); //Message(7, "You have been charged a mercenary upkeep cost of %i plat, and %i gold and your mercenary upkeep cost timer has been reset to 15 minutes.", upkeep_plat, upkeep_gold, (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
@ -5177,7 +5312,7 @@ bool Client::CheckCanHireMerc(Mob* merchant, uint32 template_id) {
} }
} }
Log.Out(Logs::General, Logs::Mercenaries, "CheckCanHireMerc True."); Log.Out(Logs::General, Logs::Mercenaries, "CheckCanHireMerc True for %s.", GetName());
return true; return true;
} }
@ -5250,7 +5385,7 @@ bool Client::CheckCanSpawnMerc(uint32 template_id) {
return false; return false;
} }
Log.Out(Logs::General, Logs::Mercenaries, "CheckCanSpawnMerc True."); Log.Out(Logs::General, Logs::Mercenaries, "CheckCanSpawnMerc True for %s.", GetName());
return true; return true;
} }
@ -5272,7 +5407,7 @@ bool Client::CheckCanUnsuspendMerc() {
return false; return false;
} }
Log.Out(Logs::General, Logs::Mercenaries, "CheckCanUnsuspendMerc True."); Log.Out(Logs::General, Logs::Mercenaries, "CheckCanUnsuspendMerc True for %s.", GetName());
return true; return true;
} }
@ -5287,7 +5422,7 @@ void Client::CheckMercSuspendTimer() {
GetMercInfo().SuspendedTime = 0; GetMercInfo().SuspendedTime = 0;
SendMercResponsePackets(0); SendMercResponsePackets(0);
SendMercSuspendResponsePacket(GetMercInfo().SuspendedTime); SendMercSuspendResponsePacket(GetMercInfo().SuspendedTime);
Log.Out(Logs::General, Logs::Mercenaries, "CheckMercSuspendTimer Ready."); Log.Out(Logs::General, Logs::Mercenaries, "CheckMercSuspendTimer Ready for %s.", GetName());
} }
} }
} }
@ -5300,7 +5435,7 @@ void Client::SuspendMercCommand() {
{ {
if(!CheckCanUnsuspendMerc()) if(!CheckCanUnsuspendMerc())
{ {
Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Unable to Unsuspend."); Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Unable to Unsuspend Merc for %s.", GetName());
return; return;
} }
@ -5310,13 +5445,13 @@ void Client::SuspendMercCommand() {
if(merc) if(merc)
{ {
SpawnMerc(merc, true); SpawnMerc(merc, true);
Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Successful Unsuspend."); Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Successful Unsuspend for %s.", GetName());
} }
else else
{ {
//merc failed to spawn //merc failed to spawn
SendMercResponsePackets(3); SendMercResponsePackets(3);
Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Failed to Spawn Merc."); Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Failed to Spawn Merc for %s.", GetName());
} }
} }
else else
@ -5326,10 +5461,11 @@ void Client::SuspendMercCommand() {
if(CurrentMerc && GetMercID()) if(CurrentMerc && GetMercID())
{ {
CurrentMerc->Suspend(); CurrentMerc->Suspend();
Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Successful Suspend."); Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Successful Suspend for %s.", GetName());
} }
else else
{ {
// Reset Merc Suspend State
GetMercInfo().IsSuspended = true; GetMercInfo().IsSuspended = true;
//GetMercInfo().SuspendedTime = time(nullptr) + RuleI(Mercs, SuspendIntervalS); //GetMercInfo().SuspendedTime = time(nullptr) + RuleI(Mercs, SuspendIntervalS);
//GetMercInfo().MercTimerRemaining = GetMercTimer()->GetRemainingTime(); //GetMercInfo().MercTimerRemaining = GetMercTimer()->GetRemainingTime();
@ -5337,9 +5473,15 @@ void Client::SuspendMercCommand() {
GetMercTimer()->Disable(); GetMercTimer()->Disable();
SendMercSuspendResponsePacket(GetMercInfo().SuspendedTime); SendMercSuspendResponsePacket(GetMercInfo().SuspendedTime);
SendMercTimer(nullptr); SendMercTimer(nullptr);
Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Failed to Get Merc to Suspend. Resetting Suspend State for %s.", GetName());
} }
} }
} }
else
{
SpawnMercOnZone();
Log.Out(Logs::General, Logs::Mercenaries, "SuspendMercCommand Request Failed to Load Merc for %s. Trying SpawnMercOnZone.", GetName());
}
} }
@ -5371,7 +5513,7 @@ void Client::SpawnMercOnZone() {
{ {
SpawnMerc(merc, false); SpawnMerc(merc, false);
} }
Log.Out(Logs::General, Logs::Mercenaries, "SpawnMercOnZone Normal Merc."); Log.Out(Logs::General, Logs::Mercenaries, "SpawnMercOnZone Normal Merc for %s.", GetName());
} }
else else
{ {
@ -5387,7 +5529,7 @@ void Client::SpawnMercOnZone() {
// Send Mercenary Status/Timer packet // Send Mercenary Status/Timer packet
SendMercTimer(GetMerc()); SendMercTimer(GetMerc());
Log.Out(Logs::General, Logs::Mercenaries, "SpawnMercOnZone Suspended Merc."); Log.Out(Logs::General, Logs::Mercenaries, "SpawnMercOnZone Suspended Merc for %s.", GetName());
} }
} }
else else
@ -5395,6 +5537,7 @@ void Client::SpawnMercOnZone() {
// No Merc Hired // No Merc Hired
// RoF+ displays a message from the following packet, which seems useless // RoF+ displays a message from the following packet, which seems useless
//SendClearMercInfo(); //SendClearMercInfo();
Log.Out(Logs::General, Logs::Mercenaries, "SpawnMercOnZone Failed to load Merc Info from the Database for %s.", GetName());
} }
} }
@ -5408,17 +5551,17 @@ void Client::SendMercTimer(Merc* merc) {
if (!merc) if (!merc)
{ {
SendMercTimerPacket(NO_MERC_ID, MERC_STATE_SUSPENDED, GetMercInfo().SuspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS)); SendMercTimerPacket(NO_MERC_ID, MERC_STATE_SUSPENDED, GetMercInfo().SuspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS));
Log.Out(Logs::General, Logs::Mercenaries, "SendMercTimer No Merc."); Log.Out(Logs::General, Logs::Mercenaries, "SendMercTimer No Merc for %s.", GetName());
} }
else if (merc->IsSuspended()) else if (merc->IsSuspended())
{ {
SendMercTimerPacket(NO_MERC_ID, MERC_STATE_SUSPENDED, GetMercInfo().SuspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS)); SendMercTimerPacket(NO_MERC_ID, MERC_STATE_SUSPENDED, GetMercInfo().SuspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS));
Log.Out(Logs::General, Logs::Mercenaries, "SendMercTimer Suspended Merc."); Log.Out(Logs::General, Logs::Mercenaries, "SendMercTimer Suspended Merc for %s.", GetName());
} }
else else
{ {
SendMercTimerPacket(merc->GetID(), MERC_STATE_NORMAL, NOT_SUSPENDED_TIME, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS)); SendMercTimerPacket(merc->GetID(), MERC_STATE_NORMAL, NOT_SUSPENDED_TIME, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS));
Log.Out(Logs::General, Logs::Mercenaries, "SendMercTimer Normal Merc."); Log.Out(Logs::General, Logs::Mercenaries, "SendMercTimer Normal Merc for %s.", GetName());
} }
} }
@ -5440,7 +5583,7 @@ void Client::SpawnMerc(Merc* merc, bool setMaxStats) {
merc->Unsuspend(setMaxStats); merc->Unsuspend(setMaxStats);
merc->SetStance(GetMercInfo().Stance); merc->SetStance(GetMercInfo().Stance);
Log.Out(Logs::General, Logs::Mercenaries, "SpawnMerc Success."); Log.Out(Logs::General, Logs::Mercenaries, "SpawnMerc Success for %s.", GetName());
return; return;
@ -5469,7 +5612,7 @@ bool Merc::Suspend() {
// Start the timer to send the packet that refreshes the Unsuspend Button // Start the timer to send the packet that refreshes the Unsuspend Button
mercOwner->GetPTimers().Start(pTimerMercSuspend, RuleI(Mercs, SuspendIntervalS)); mercOwner->GetPTimers().Start(pTimerMercSuspend, RuleI(Mercs, SuspendIntervalS));
Log.Out(Logs::General, Logs::Mercenaries, "Suspend Complete."); Log.Out(Logs::General, Logs::Mercenaries, "Suspend Complete for %s.", mercOwner->GetName());
return true; return true;
} }
@ -5555,12 +5698,12 @@ bool Client::DismissMerc(uint32 MercID) {
bool Dismissed = true; bool Dismissed = true;
if (!database.DeleteMerc(MercID)) if (!database.DeleteMerc(MercID))
{ {
Log.Out(Logs::General, Logs::Mercenaries, "Dismiss Failed for MercID %i", MercID); Log.Out(Logs::General, Logs::Mercenaries, "Dismiss Failed Database Query for MercID: %i, Client: %s.", MercID, GetName());
Dismissed = false; Dismissed = false;
} }
else else
{ {
Log.Out(Logs::General, Logs::Mercenaries, "Dismiss Successful."); Log.Out(Logs::General, Logs::Mercenaries, "Dismiss Successful for %s.", GetName());
} }
if (GetMerc()) if (GetMerc())
@ -5717,13 +5860,13 @@ bool Merc::MercJoinClientGroup() {
database.SetGroupLeaderName(g->GetID(), mercOwner->GetName()); database.SetGroupLeaderName(g->GetID(), mercOwner->GetName());
database.RefreshGroupFromDB(mercOwner); database.RefreshGroupFromDB(mercOwner);
g->SaveGroupLeaderAA(); g->SaveGroupLeaderAA();
Log.Out(Logs::General, Logs::Mercenaries, "Mercenary joined new group."); Log.Out(Logs::General, Logs::Mercenaries, "Mercenary joined new group: %s (%s).", GetName(), mercOwner->GetName());
} }
else else
{ {
g->DisbandGroup(); g->DisbandGroup();
Suspend(); Suspend();
Log.Out(Logs::General, Logs::Mercenaries, "Mercenary disbanded new group."); Log.Out(Logs::General, Logs::Mercenaries, "Mercenary disbanded new group: %s (%s).", GetName(), mercOwner->GetName());
} }
} }
@ -5733,12 +5876,12 @@ bool Merc::MercJoinClientGroup() {
database.RefreshGroupFromDB(mercOwner); database.RefreshGroupFromDB(mercOwner);
// Update members that are out of zone // Update members that are out of zone
GetGroup()->SendGroupJoinOOZ(this); GetGroup()->SendGroupJoinOOZ(this);
Log.Out(Logs::General, Logs::Mercenaries, "Mercenary joined existing group."); Log.Out(Logs::General, Logs::Mercenaries, "Mercenary %s joined existing group with %s.", GetName(), mercOwner->GetName());
} }
else else
{ {
Suspend(); Suspend();
Log.Out(Logs::General, Logs::Mercenaries, "Mercenary failed to join the group - Suspending"); Log.Out(Logs::General, Logs::Mercenaries, "Mercenary failed to join the group - Suspending %s for (%s).", GetName(), mercOwner->GetName());
} }
} }
@ -5789,7 +5932,7 @@ Merc* Client::GetMerc() {
if(GetMercID() == 0) if(GetMercID() == 0)
{ {
Log.Out(Logs::Detail, Logs::Mercenaries, "GetMerc 0."); Log.Out(Logs::Detail, Logs::Mercenaries, "GetMerc - GetMercID: 0 for %s.", GetName());
return (nullptr); return (nullptr);
} }
@ -5797,14 +5940,14 @@ Merc* Client::GetMerc() {
if(tmp == nullptr) if(tmp == nullptr)
{ {
SetMercID(0); SetMercID(0);
Log.Out(Logs::Detail, Logs::Mercenaries, "GetMerc No Merc."); Log.Out(Logs::Detail, Logs::Mercenaries, "GetMerc No Merc for %s.", GetName());
return (nullptr); return (nullptr);
} }
if(tmp->GetOwnerID() != GetID()) if(tmp->GetOwnerID() != GetID())
{ {
SetMercID(0); SetMercID(0);
Log.Out(Logs::Detail, Logs::Mercenaries, "GetMerc Owner Mismatch."); Log.Out(Logs::Detail, Logs::Mercenaries, "GetMerc Owner Mismatch - OwnerID: %d, ClientID: %d, Client: %s.", tmp->GetOwnerID(), GetID(), GetName());
return (nullptr); return (nullptr);
} }
@ -5822,7 +5965,7 @@ uint8 Client::GetNumMercs() {
numMercs++; numMercs++;
} }
} }
Log.Out(Logs::General, Logs::Mercenaries, "GetNumMercs %i.", numMercs); Log.Out(Logs::General, Logs::Mercenaries, "GetNumMercs Number: %i for %s.", numMercs, GetName());
return numMercs; return numMercs;
} }
@ -5863,7 +6006,7 @@ void Client::SetMerc(Merc* newmerc) {
GetMercInfo().Gender = 0; GetMercInfo().Gender = 0;
GetMercInfo().State = 0; GetMercInfo().State = 0;
memset(GetMercInfo().merc_name, 0, 64); memset(GetMercInfo().merc_name, 0, 64);
Log.Out(Logs::General, Logs::Mercenaries, "SetMerc No Merc."); Log.Out(Logs::General, Logs::Mercenaries, "SetMerc No Merc for %s.", GetName());
} }
else else
{ {
@ -5880,7 +6023,7 @@ void Client::SetMerc(Merc* newmerc) {
GetMercInfo().Gender = newmerc->GetGender(); GetMercInfo().Gender = newmerc->GetGender();
GetMercInfo().State = newmerc->IsSuspended() ? MERC_STATE_SUSPENDED : MERC_STATE_NORMAL; GetMercInfo().State = newmerc->IsSuspended() ? MERC_STATE_SUSPENDED : MERC_STATE_NORMAL;
snprintf(GetMercInfo().merc_name, 64, "%s", newmerc->GetName()); snprintf(GetMercInfo().merc_name, 64, "%s", newmerc->GetName());
Log.Out(Logs::General, Logs::Mercenaries, "SetMerc New Merc."); Log.Out(Logs::General, Logs::Mercenaries, "SetMerc New Merc for %s.", GetName());
} }
} }
@ -5888,7 +6031,8 @@ void Client::UpdateMercLevel() {
Merc* merc = GetMerc(); Merc* merc = GetMerc();
if (merc) if (merc)
{ {
merc->UpdateMercStats(this); merc->UpdateMercStats(this, false);
merc->SendAppearancePacket(AT_WhoLevel, GetLevel(), true, true);
} }
} }
@ -5900,7 +6044,7 @@ void Client::SendMercMerchantResponsePacket(int32 response_type) {
MercenaryMerchantResponse_Struct* mmr = (MercenaryMerchantResponse_Struct*)outapp->pBuffer; MercenaryMerchantResponse_Struct* mmr = (MercenaryMerchantResponse_Struct*)outapp->pBuffer;
mmr->ResponseType = response_type; // send specified response type mmr->ResponseType = response_type; // send specified response type
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercMerchantResponsePacket %i.", response_type); Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercMerchantResponsePacket ResponseType: %i, Client: %s.", response_type, GetName());
} }
} }
@ -5909,7 +6053,7 @@ void Client::SendMercenaryUnknownPacket(uint8 type) {
EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryUnknown1, 1); EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryUnknown1, 1);
outapp->WriteUInt8(type); outapp->WriteUInt8(type);
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercenaryUnknownPacket %i.", type); Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercenaryUnknownPacket Type: %i, Client: %s.", type, GetName());
} }
@ -5918,7 +6062,7 @@ void Client::SendMercenaryUnsuspendPacket(uint8 type) {
EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryUnsuspendResponse, 1); EQApplicationPacket *outapp = new EQApplicationPacket(OP_MercenaryUnsuspendResponse, 1);
outapp->WriteUInt8(type); outapp->WriteUInt8(type);
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercenaryUnsuspendPacket %i.", type); Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercenaryUnsuspendPacket Type: %i, Client: %s.", type, GetName());
} }
@ -5928,7 +6072,7 @@ void Client::SendMercSuspendResponsePacket(uint32 suspended_time) {
SuspendMercenaryResponse_Struct* smr = (SuspendMercenaryResponse_Struct*)outapp->pBuffer; SuspendMercenaryResponse_Struct* smr = (SuspendMercenaryResponse_Struct*)outapp->pBuffer;
smr->SuspendTime = suspended_time; // Seen 0 (not suspended) or c9 c2 64 4f (suspended on Sat Mar 17 11:58:49 2012) - Unix Timestamp smr->SuspendTime = suspended_time; // Seen 0 (not suspended) or c9 c2 64 4f (suspended on Sat Mar 17 11:58:49 2012) - Unix Timestamp
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercSuspendResponsePacket %i.", suspended_time); Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercSuspendResponsePacket Time: %i, Client: %s.", suspended_time, GetName());
} }
@ -5943,7 +6087,7 @@ void Client::SendMercTimerPacket(int32 entity_id, int32 merc_state, int32 suspen
mss->UpdateInterval = update_interval; // Seen 900000 - 15 minutes in ms mss->UpdateInterval = update_interval; // Seen 900000 - 15 minutes in ms
mss->MercUnk01 = unk01; // Seen 180000 - 3 minutes in ms - Used for the unsuspend button refresh timer mss->MercUnk01 = unk01; // Seen 180000 - 3 minutes in ms - Used for the unsuspend button refresh timer
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercTimerPacket %i, %i, %i, %i, %i.", entity_id, merc_state, suspended_time, update_interval, unk01); Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercTimerPacket EndID: %i, State: %i, SuspendTime: %i, Interval: %i, Unk1: %i, Client: %s.", entity_id, merc_state, suspended_time, update_interval, unk01, GetName());
} }
@ -5954,7 +6098,7 @@ void Client::SendMercAssignPacket(uint32 entityID, uint32 unk01, uint32 unk02) {
mas->MercUnk01 = unk01; mas->MercUnk01 = unk01;
mas->MercUnk02 = unk02; mas->MercUnk02 = unk02;
FastQueuePacket(&outapp); FastQueuePacket(&outapp);
Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercAssignPacket %i, %i, %i.", entityID, unk01, unk02); Log.Out(Logs::Moderate, Logs::Mercenaries, "Sent SendMercAssignPacket EndID: %i, Unk1: %i, Unk2: %i, Client: %s.", entityID, unk01, unk02, GetName());
} }
void NPC::LoadMercTypes() { void NPC::LoadMercTypes() {

4
zone/merc.h
View File

@ -137,7 +137,7 @@ public:
virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho); virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho);
static Merc* LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id, bool updateFromDB = false); static Merc* LoadMerc(Client *c, MercTemplate* merc_template, uint32 merchant_id, bool updateFromDB = false);
void UpdateMercInfo(Client *c); void UpdateMercInfo(Client *c);
void UpdateMercStats(Client *c); void UpdateMercStats(Client *c, bool setmax = false);
void UpdateMercAppearance(); void UpdateMercAppearance();
virtual void UpdateEquipLightValue(); virtual void UpdateEquipLightValue();
void AddItem(uint8 slot, uint32 item_id); void AddItem(uint8 slot, uint32 item_id);
@ -189,6 +189,7 @@ public:
bool TryHide(); bool TryHide();
// stat functions // stat functions
virtual void ScaleStats(int scalepercent, bool setmax = false);
virtual void CalcBonuses(); virtual void CalcBonuses();
int32 GetEndurance() const {return cur_end;} //This gets our current endurance int32 GetEndurance() const {return cur_end;} //This gets our current endurance
inline virtual int32 GetAC() const { return AC; } inline virtual int32 GetAC() const { return AC; }
@ -347,6 +348,7 @@ private:
// Private "base stats" Members // Private "base stats" Members
int32 base_mana; int32 base_mana;
int32 base_end;
int32 _baseAC; int32 _baseAC;
uint32 _baseSTR; uint32 _baseSTR;
uint32 _baseSTA; uint32 _baseSTA;

7
zone/zonedb.cpp
View File

@ -1996,6 +1996,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client
"m_stats.AC, " "m_stats.AC, "
"m_stats.ATK, " "m_stats.ATK, "
"m_stats.Accuracy, " "m_stats.Accuracy, "
"m_stats.statscale, "
"m_stats.spellscale, " "m_stats.spellscale, "
"m_stats.healscale " "m_stats.healscale "
"FROM merc_stats m_stats " "FROM merc_stats m_stats "
@ -2119,9 +2120,9 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client
tmpNPCType->AC = atoi(row[40]); tmpNPCType->AC = atoi(row[40]);
tmpNPCType->ATK = atoi(row[41]); tmpNPCType->ATK = atoi(row[41]);
tmpNPCType->accuracy_rating = atoi(row[42]); tmpNPCType->accuracy_rating = atoi(row[42]);
tmpNPCType->scalerate = RuleI(Mercs, ScaleRate); tmpNPCType->scalerate = atoi(row[43]);
tmpNPCType->spellscale = atoi(row[43]); tmpNPCType->spellscale = atoi(row[44]);
tmpNPCType->healscale = atoi(row[44]); tmpNPCType->healscale = atoi(row[45]);
// If Merc with duplicate NPC id already in table, // If Merc with duplicate NPC id already in table,
// free item we attempted to add. // free item we attempted to add.