pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-03 13:22:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merc attack delay

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-30 01:33:55 -05:00
parent 0aba2d578a
commit 8ec1cb949a
5 changed files with 116 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 9071 #define CURRENT_BINARY_DATABASE_VERSION 9072
#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

@ -325,6 +325,7 @@
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| 9071|2015_01_29_merc_stats_table_update.sql|SHOW COLUMNS FROM `merc_stats` LIKE 'statscale'|empty|
9072|2015_01_30_attack_delay.sql|SHOW COLUMNS FROM `merc_stats` LIKE 'attack_delay'|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

3
utils/sql/git/required/2015_01_30_merc_attack_delay.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE `merc_stats` ADD `attack_delay` TINYINT(3) UNSIGNED DEFAULT '30' NOT NULL AFTER `attack_speed`;
UPDATE `merc_stats` SET `attack_delay` = 36 + 36 * (`attack_speed` / 100);
UPDATE `merc_stats` SET `attack_delay` = 30 WHERE `attack_speed` = 0;

19
zone/merc.cpp
View File

@ -4837,18 +4837,19 @@ void Merc::UpdateMercInfo(Client *c) {
c->GetMercInfo().drakkinDetails = drakkin_details; c->GetMercInfo().drakkinDetails = drakkin_details;
} }
void Merc::UpdateMercStats(Client *c, bool setmax) { 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()); Log.Out(Logs::General, Logs::Mercenaries, "Updating Mercenary Stats for %s (%s).", GetName(),
const NPCType* npc_type = database.GetMercType( zone->GetMercTemplate(c->GetMercInfo().MercTemplateID)->MercNPCID, GetRace(), c->GetLevel()); c->GetName());
if (npc_type) const NPCType *npc_type = database.GetMercType(
{ zone->GetMercTemplate(c->GetMercInfo().MercTemplateID)->MercNPCID, GetRace(), c->GetLevel());
if (npc_type) {
max_hp = npc_type->max_hp; max_hp = npc_type->max_hp;
base_hp = npc_type->max_hp; base_hp = npc_type->max_hp;
max_mana = npc_type->Mana; max_mana = npc_type->Mana;
base_mana = npc_type->Mana; base_mana = npc_type->Mana;
max_end = npc_type->max_hp; // Hack since Endurance does not exist for NPCType yet max_end = npc_type->max_hp; // Hack since Endurance does not exist for NPCType yet
base_end = npc_type->max_hp; // Hack since Endurance does not exist for NPCType yet base_end = npc_type->max_hp; // Hack since Endurance does not exist for NPCType yet
hp_regen = npc_type->hp_regen; hp_regen = npc_type->hp_regen;
mana_regen = npc_type->mana_regen; mana_regen = npc_type->mana_regen;
@ -4878,7 +4879,7 @@ void Merc::UpdateMercStats(Client *c, bool setmax) {
level = npc_type->level; level = npc_type->level;
attack_count = npc_type->attack_count; attack_count = npc_type->attack_count;
attack_speed = npc_type->attack_speed; attack_delay = npc_type->attack_delay;
spellscale = npc_type->spellscale; spellscale = npc_type->spellscale;
healscale = npc_type->healscale; healscale = npc_type->healscale;

198
zone/zonedb.cpp
View File

@ -1937,8 +1937,8 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) {
return npc; return npc;
} }
const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 clientlevel) { const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 clientlevel)
{
//need to save based on merc_npc_type & client level //need to save based on merc_npc_type & client level
uint32 merc_type_id = id * 100 + clientlevel; uint32 merc_type_id = id * 100 + clientlevel;
@ -1963,7 +1963,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client
"0 AS gender, " "0 AS gender, "
"m_armorinfo.texture, " "m_armorinfo.texture, "
"m_armorinfo.helmtexture, " "m_armorinfo.helmtexture, "
"m_stats.attack_speed, " "m_stats.attack_delay, "
"m_stats.STR, " "m_stats.STR, "
"m_stats.STA, " "m_stats.STA, "
"m_stats.DEX, " "m_stats.DEX, "
@ -2015,125 +2015,125 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client
"WHERE m_templates.merc_npc_type_id = %d AND m_stats.clientlevel = %d AND m_types.race_id = %d", "WHERE m_templates.merc_npc_type_id = %d AND m_stats.clientlevel = %d AND m_types.race_id = %d",
id, clientlevel, raceid); //dual primary keys. one is ID, one is level. id, clientlevel, raceid); //dual primary keys. one is ID, one is level.
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return nullptr; return nullptr;
} }
const NPCType *npc; const NPCType *npc;
// Process each row returned. // Process each row returned.
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
NPCType *tmpNPCType; NPCType *tmpNPCType;
tmpNPCType = new NPCType; tmpNPCType = new NPCType;
memset (tmpNPCType, 0, sizeof *tmpNPCType); memset(tmpNPCType, 0, sizeof *tmpNPCType);
tmpNPCType->npc_id = atoi(row[0]); tmpNPCType->npc_id = atoi(row[0]);
strn0cpy(tmpNPCType->name, row[1], 50); strn0cpy(tmpNPCType->name, row[1], 50);
tmpNPCType->level = atoi(row[2]); tmpNPCType->level = atoi(row[2]);
tmpNPCType->race = atoi(row[3]); tmpNPCType->race = atoi(row[3]);
tmpNPCType->class_ = atoi(row[4]); tmpNPCType->class_ = atoi(row[4]);
tmpNPCType->max_hp = atoi(row[5]); tmpNPCType->max_hp = atoi(row[5]);
tmpNPCType->cur_hp = tmpNPCType->max_hp; tmpNPCType->cur_hp = tmpNPCType->max_hp;
tmpNPCType->Mana = atoi(row[6]); tmpNPCType->Mana = atoi(row[6]);
tmpNPCType->gender = atoi(row[7]); tmpNPCType->gender = atoi(row[7]);
tmpNPCType->texture = atoi(row[8]); tmpNPCType->texture = atoi(row[8]);
tmpNPCType->helmtexture = atoi(row[9]); tmpNPCType->helmtexture = atoi(row[9]);
tmpNPCType->attack_speed = atof(row[10]); tmpNPCType->attack_delay = atoi(row[10]);
tmpNPCType->STR = atoi(row[11]); tmpNPCType->STR = atoi(row[11]);
tmpNPCType->STA = atoi(row[12]); tmpNPCType->STA = atoi(row[12]);
tmpNPCType->DEX = atoi(row[13]); tmpNPCType->DEX = atoi(row[13]);
tmpNPCType->AGI = atoi(row[14]); tmpNPCType->AGI = atoi(row[14]);
tmpNPCType->INT = atoi(row[15]); tmpNPCType->INT = atoi(row[15]);
tmpNPCType->WIS = atoi(row[16]); tmpNPCType->WIS = atoi(row[16]);
tmpNPCType->CHA = atoi(row[17]); tmpNPCType->CHA = atoi(row[17]);
tmpNPCType->MR = atoi(row[18]); tmpNPCType->MR = atoi(row[18]);
tmpNPCType->CR = atoi(row[19]); tmpNPCType->CR = atoi(row[19]);
tmpNPCType->DR = atoi(row[20]); tmpNPCType->DR = atoi(row[20]);
tmpNPCType->FR = atoi(row[21]); tmpNPCType->FR = atoi(row[21]);
tmpNPCType->PR = atoi(row[22]); tmpNPCType->PR = atoi(row[22]);
tmpNPCType->Corrup = atoi(row[23]); tmpNPCType->Corrup = atoi(row[23]);
tmpNPCType->min_dmg = atoi(row[24]); tmpNPCType->min_dmg = atoi(row[24]);
tmpNPCType->max_dmg = atoi(row[25]); tmpNPCType->max_dmg = atoi(row[25]);
tmpNPCType->attack_count = atoi(row[26]); tmpNPCType->attack_count = atoi(row[26]);
if (row[27] != nullptr) if (row[27] != nullptr)
strn0cpy(tmpNPCType->special_abilities, row[27], 512); strn0cpy(tmpNPCType->special_abilities, row[27], 512);
else else
tmpNPCType->special_abilities[0] = '\0'; tmpNPCType->special_abilities[0] = '\0';
tmpNPCType->d_melee_texture1 = atoi(row[28]); tmpNPCType->d_melee_texture1 = atoi(row[28]);
tmpNPCType->d_melee_texture2 = atoi(row[29]); tmpNPCType->d_melee_texture2 = atoi(row[29]);
tmpNPCType->prim_melee_type = atoi(row[30]); tmpNPCType->prim_melee_type = atoi(row[30]);
tmpNPCType->sec_melee_type = atoi(row[31]); tmpNPCType->sec_melee_type = atoi(row[31]);
tmpNPCType->runspeed= atof(row[32]); tmpNPCType->runspeed = atof(row[32]);
tmpNPCType->hp_regen = atoi(row[33]); tmpNPCType->hp_regen = atoi(row[33]);
tmpNPCType->mana_regen = atoi(row[34]); tmpNPCType->mana_regen = atoi(row[34]);
tmpNPCType->aggroradius = RuleI(Mercs, AggroRadius); tmpNPCType->aggroradius = RuleI(Mercs, AggroRadius);
if (row[35] && strlen(row[35])) if (row[35] && strlen(row[35]))
tmpNPCType->bodytype = (uint8)atoi(row[35]); tmpNPCType->bodytype = (uint8)atoi(row[35]);
else else
tmpNPCType->bodytype = 1; tmpNPCType->bodytype = 1;
uint32 armor_tint_id = atoi(row[36]); uint32 armor_tint_id = atoi(row[36]);
tmpNPCType->armor_tint[0] = (atoi(row[37]) & 0xFF) << 16; tmpNPCType->armor_tint[0] = (atoi(row[37]) & 0xFF) << 16;
tmpNPCType->armor_tint[0] |= (atoi(row[38]) & 0xFF) << 8; tmpNPCType->armor_tint[0] |= (atoi(row[38]) & 0xFF) << 8;
tmpNPCType->armor_tint[0] |= (atoi(row[39]) & 0xFF); tmpNPCType->armor_tint[0] |= (atoi(row[39]) & 0xFF);
tmpNPCType->armor_tint[0] |= (tmpNPCType->armor_tint[0]) ? (0xFF << 24) : 0; tmpNPCType->armor_tint[0] |= (tmpNPCType->armor_tint[0]) ? (0xFF << 24) : 0;
if (armor_tint_id == 0) if (armor_tint_id == 0)
for (int index = MaterialChest; index <= EmuConstants::MATERIAL_END; index++) for (int index = MaterialChest; index <= EmuConstants::MATERIAL_END; index++)
tmpNPCType->armor_tint[index] = tmpNPCType->armor_tint[0]; tmpNPCType->armor_tint[index] = tmpNPCType->armor_tint[0];
else if (tmpNPCType->armor_tint[0] == 0) { else if (tmpNPCType->armor_tint[0] == 0) {
std::string armorTint_query = StringFormat("SELECT red1h, grn1h, blu1h, " std::string armorTint_query = StringFormat("SELECT red1h, grn1h, blu1h, "
"red2c, grn2c, blu2c, " "red2c, grn2c, blu2c, "
"red3a, grn3a, blu3a, " "red3a, grn3a, blu3a, "
"red4b, grn4b, blu4b, " "red4b, grn4b, blu4b, "
"red5g, grn5g, blu5g, " "red5g, grn5g, blu5g, "
"red6l, grn6l, blu6l, " "red6l, grn6l, blu6l, "
"red7f, grn7f, blu7f, " "red7f, grn7f, blu7f, "
"red8x, grn8x, blu8x, " "red8x, grn8x, blu8x, "
"red9x, grn9x, blu9x " "red9x, grn9x, blu9x "
"FROM npc_types_tint WHERE id = %d", "FROM npc_types_tint WHERE id = %d",
armor_tint_id); armor_tint_id);
auto armorTint_results = QueryDatabase(armorTint_query); auto armorTint_results = QueryDatabase(armorTint_query);
if (!results.Success() || results.RowCount() == 0) if (!results.Success() || results.RowCount() == 0)
armor_tint_id = 0; armor_tint_id = 0;
else { else {
auto armorTint_row = results.begin(); auto armorTint_row = results.begin();
for (int index = EmuConstants::MATERIAL_BEGIN; index <= EmuConstants::MATERIAL_END; index++) { for (int index = EmuConstants::MATERIAL_BEGIN; index <= EmuConstants::MATERIAL_END; index++) {
tmpNPCType->armor_tint[index] = atoi(armorTint_row[index * 3]) << 16; tmpNPCType->armor_tint[index] = atoi(armorTint_row[index * 3]) << 16;
tmpNPCType->armor_tint[index] |= atoi(armorTint_row[index * 3 + 1]) << 8; tmpNPCType->armor_tint[index] |= atoi(armorTint_row[index * 3 + 1]) << 8;
tmpNPCType->armor_tint[index] |= atoi(armorTint_row[index * 3 + 2]); tmpNPCType->armor_tint[index] |= atoi(armorTint_row[index * 3 + 2]);
tmpNPCType->armor_tint[index] |= (tmpNPCType->armor_tint[index]) ? (0xFF << 24) : 0; tmpNPCType->armor_tint[index] |= (tmpNPCType->armor_tint[index]) ? (0xFF << 24) : 0;
} }
} }
} else } else
armor_tint_id = 0; armor_tint_id = 0;
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 = atoi(row[43]); tmpNPCType->scalerate = atoi(row[43]);
tmpNPCType->spellscale = atoi(row[44]); tmpNPCType->spellscale = atoi(row[44]);
tmpNPCType->healscale = atoi(row[45]); 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.
if (zone->merctable.find(merc_type_id) != zone->merctable.end()) { if (zone->merctable.find(merc_type_id) != zone->merctable.end()) {
delete tmpNPCType; delete tmpNPCType;
return nullptr; return nullptr;
} }
zone->merctable[merc_type_id] = tmpNPCType; zone->merctable[merc_type_id] = tmpNPCType;
npc = tmpNPCType; npc = tmpNPCType;
} }
return npc; return npc;
} }