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

Add support for setting cast_time of aura

Browse Source
This commit is contained in:
Michael Cook (mackal) 2017-07-14 13:49:32 -04:00
parent 94038ebb75
commit ee618f70ab
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
utils/sql/git/required/2017_07_xx_aura.sql
View File

@ -9,5 +9,6 @@ CREATE TABLE `auras` (
`movement` INT(10) NOT NULL DEFAULT 0, `movement` INT(10) NOT NULL DEFAULT 0,
`duration` INT(10) NOT NULL DEFAULT 5400, `duration` INT(10) NOT NULL DEFAULT 5400,
`icon` INT(10) NOT NULL DEFAULT -1, `icon` INT(10) NOT NULL DEFAULT -1,
`cast_time` INT(10) NOT NULL DEFAULT 0,
PRIMARY KEY(`type`) PRIMARY KEY(`type`)
) )

29
zone/aura.cpp
View File

@ -12,6 +12,11 @@ Aura::Aura(NPCType *type_data, Mob *owner, AuraRecord &record)
GiveNPCTypeData(type_data); // we will delete this later on GiveNPCTypeData(type_data); // we will delete this later on
m_owner = owner->GetID(); m_owner = owner->GetID();
if (record.cast_time) {
cast_timer.SetTimer(record.cast_time);
cast_timer.Disable(); // we don't want to be enabled yet
}
if (record.aura_type < static_cast<int>(AuraType::Max)) if (record.aura_type < static_cast<int>(AuraType::Max))
type = static_cast<AuraType>(record.aura_type); type = static_cast<AuraType>(record.aura_type);
else else
@ -58,8 +63,6 @@ void Aura::ProcessOnAllFriendlies(Mob *owner)
void Aura::ProcessOnAllGroupMembers(Mob *owner) void Aura::ProcessOnAllGroupMembers(Mob *owner)
{ {
if (!process_timer.Check())
return;
auto &mob_list = entity_list.GetMobList(); // read only reference so we can do it all inline auto &mob_list = entity_list.GetMobList(); // read only reference so we can do it all inline
std::set<int> delayed_remove; std::set<int> delayed_remove;
if (owner->IsRaidGrouped() && owner->IsClient()) { // currently raids are just client, but safety check if (owner->IsRaidGrouped() && owner->IsClient()) { // currently raids are just client, but safety check
@ -228,15 +231,19 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
casted_on.erase(e); casted_on.erase(e);
} }
if (cast_timer.Enabled() || !cast_timer.Check()) // so if we have a cast timer and our set isn't empty and timer is disabled we need to enable it
if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty())
cast_timer.Start();
if (!cast_timer.Enabled() || !cast_timer.Check())
return; return;
// TODO: some auras have to recast (DRU for example, non-buff too) // some auras have to recast (DRU for example, non-buff too)
/* for (auto &e : casted_on) { for (auto &e : casted_on) {
auto mob = entity_list.GetMob(e); auto mob = entity_list.GetMob(e);
if (mob != nullptr && (!is_buff || !mob->IsAffectedByBuff(spell_id))) if (mob != nullptr)
SpellFinished(spell_id, mob);
}*/ }
} }
void Aura::ProcessOnGroupMembersPets(Mob *owner) void Aura::ProcessOnGroupMembersPets(Mob *owner)
@ -277,6 +284,9 @@ bool Aura::Process()
} }
// TODO: waypoints? // TODO: waypoints?
if (!process_timer.Check())
return true;
if (process_func) if (process_func)
process_func(*this, owner); process_func(*this, owner);
@ -356,7 +366,7 @@ void Mob::MakeAura(uint16 spell_id)
bool ZoneDatabase::GetAuraEntry(uint16 spell_id, AuraRecord &record) bool ZoneDatabase::GetAuraEntry(uint16 spell_id, AuraRecord &record)
{ {
auto query = StringFormat("SELECT npc_type, name, spell_id, distance, aura_type, spawn_type, movement, " auto query = StringFormat("SELECT npc_type, name, spell_id, distance, aura_type, spawn_type, movement, "
"duration, icon FROM auras WHERE type='%d'", "duration, icon, cast_time FROM auras WHERE type='%d'",
spell_id); spell_id);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
@ -378,6 +388,7 @@ bool ZoneDatabase::GetAuraEntry(uint16 spell_id, AuraRecord &record)
record.movement = atoi(row[6]); record.movement = atoi(row[6]);
record.duration = atoi(row[7]) * 1000; // DB is in seconds record.duration = atoi(row[7]) * 1000; // DB is in seconds
record.icon = atoi(row[8]); record.icon = atoi(row[8]);
record.cast_time = atoi(row[9]) * 1000; // DB is in seconds
return true; return true;
} }

1
zone/zonedb.h
View File

@ -133,6 +133,7 @@ struct AuraRecord {
int movement; int movement;
int duration; // seconds some live for 90 mins (normal) others for 2 mins (traps) int duration; // seconds some live for 90 mins (normal) others for 2 mins (traps)
int icon; // -1 will use the buffs NEW_ICON int icon; // -1 will use the buffs NEW_ICON
int cast_time; // seconds some auras recast on a timer, most seem to be every 12 seconds
}; };
// Actual pet info for a client. // Actual pet info for a client.