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

Fixed Merc lack of use of heal over time spells (causing excessive healing), fixed pet mitigation/AC issues.

Browse Source
This commit is contained in:
badcaptain 2013-04-02 19:09:32 -04:00
parent 24d4eaf65d
commit a787a7ce72
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zone/attack.cpp
View File

@ -562,7 +562,14 @@ void Mob::MeleeMitigation(Mob *attacker, int32 &damage, int32 minhit)
} }
else if(IsNPC()) else if(IsNPC())
{ {
armor = spellbonuses.AC + itembonuses.AC + (CastToNPC()->GetRawAC() / RuleR(Combat, NPCACFactor)) + 1; armor = CastToNPC()->GetRawAC();
if(!IsPet())
{
armor = (armor / RuleR(Combat, NPCACFactor));
}
armor += spellbonuses.AC + itembonuses.AC + 1;
} }
if(GetClass() == WIZARD || GetClass() == MAGICIAN || GetClass() == NECROMANCER || GetClass() == ENCHANTER) if(GetClass() == WIZARD || GetClass() == MAGICIAN || GetClass() == NECROMANCER || GetClass() == ENCHANTER)

15
zone/merc.cpp
View File

@ -2237,10 +2237,6 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
if(numToHeal > 2) { if(numToHeal > 2) {
selectedMercSpell = GetBestMercSpellForGroupHeal(this); selectedMercSpell = GetBestMercSpellForGroupHeal(this);
if(selectedMercSpell.spellid == 0) {
selectedMercSpell = GetBestMercSpellForRegularSingleTargetHeal(this);
}
} }
if(tar && selectedMercSpell.spellid == 0) { if(tar && selectedMercSpell.spellid == 0) {
@ -2267,7 +2263,7 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
selectedMercSpell = GetBestMercSpellForRegularSingleTargetHeal(this); selectedMercSpell = GetBestMercSpellForRegularSingleTargetHeal(this);
} }
} }
else if (tar->GetHPRatio() < 75) { else if (tar->GetHPRatio() < 80) {
selectedMercSpell = GetBestMercSpellForPercentageHeal(this); selectedMercSpell = GetBestMercSpellForPercentageHeal(this);
//get regular heal //get regular heal
@ -2278,17 +2274,13 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
else { else {
//check for heal over time. if not present, try it first //check for heal over time. if not present, try it first
if(!tar->FindType(SE_HealOverTime)) { if(!tar->FindType(SE_HealOverTime)) {
selectedMercSpell = GetBestMercSpellForRegularSingleTargetHeal(this); selectedMercSpell = GetBestMercSpellForHealOverTime(this);
}
//get regular heal //get regular heal
if(selectedMercSpell.spellid == 0) { if(selectedMercSpell.spellid == 0) {
selectedMercSpell = GetBestMercSpellForRegularSingleTargetHeal(this); selectedMercSpell = GetBestMercSpellForRegularSingleTargetHeal(this);
} }
} }
if(selectedMercSpell.spellid == 0) {
selectedMercSpell = GetFirstMercSpellForSingleTargetHeal(this);
} }
} }
@ -5598,6 +5590,9 @@ void Client::SpawnMercOnZone()
GetMercInfo().SuspendedTime = 0; GetMercInfo().SuspendedTime = 0;
// Get merc, assign it to client & spawn // Get merc, assign it to client & spawn
if(database.LoadMercInfo(this)) { if(database.LoadMercInfo(this)) {
if(!CheckCanUnsuspendMerc()){
return;
}
Merc* merc = Merc::LoadMerc(this, &zone->merc_templates[GetMercInfo().MercTemplateID], 0, true); Merc* merc = Merc::LoadMerc(this, &zone->merc_templates[GetMercInfo().MercTemplateID], 0, true);
SpawnMerc(merc, false); SpawnMerc(merc, false);
SendMercTimerPacket(merc->GetID(), 5, GetMercInfo().SuspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS)); SendMercTimerPacket(merc->GetID(), 5, GetMercInfo().SuspendedTime, GetMercInfo().MercTimerRemaining, RuleI(Mercs, SuspendIntervalMS));