pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 02:31:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
KimLS
2013-05-23 12:50:34 -07:00
parent ce63503bab 815c3dc73f
commit a3e24b6854
214 changed files with 2422 additions and 2373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+5 -4
View File
@@ -9,6 +9,7 @@
#include "zone.h"
#include "StringIDs.h"
#include "../common/MiscFunctions.h"
#include "../common/StringUtil.h"
#include "../common/rulesys.h"
#include "QuestParserCollection.h"
#include "watermap.h"
@@ -1122,7 +1123,7 @@ int32 Merc::CalcBaseEndurance()
int BonusUpto800 = int( at_most_800 / 4 ) ;
if(Stats > 400) {
Bonus400to800 = int( (at_most_800 - 400) / 4 );
HalfBonus400to800 = int( max( ( at_most_800 - 400 ), 0 ) / 8 );
HalfBonus400to800 = int( std::max( ( at_most_800 - 400 ), 0 ) / 8 );
if(Stats > 800) {
Bonus800plus = int( (Stats - 800) / 8 ) * 2;
@@ -1928,7 +1929,7 @@ bool Merc::AI_IdleCastCheck() {
if (AIautocastspell_timer->Check(false)) {
_ZP(Merc_AI_IdleCastCheck);
#if MobAI_DEBUG_Spells >= 25
cout << "Non-Engaged autocast check triggered: " << this->GetCleanName() << endl;
std::cout << "Non-Engaged autocast check triggered: " << this->GetCleanName() << std::endl;
#endif
AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting.
@@ -3751,7 +3752,7 @@ MercSpell Merc::GetBestMercSpellForCure(Merc* caster, Mob *tar) {
//Check for group cure first
if(countNeedsCured > 2) {
for(list<MercSpell>::iterator itr = cureList.begin(); itr != cureList.end(); itr++) {
for(std::list<MercSpell>::iterator itr = cureList.begin(); itr != cureList.end(); itr++) {
MercSpell selectedMercSpell = *itr;
if(IsGroupSpell(itr->spellid) && CheckSpellRecastTimers(caster, itr->spellid)) {
@@ -3791,7 +3792,7 @@ MercSpell Merc::GetBestMercSpellForCure(Merc* caster, Mob *tar) {
//no group cure for target- try to find single target spell
if(!spellSelected) {
for(list<MercSpell>::iterator itr = cureList.begin(); itr != cureList.end(); itr++) {
for(std::list<MercSpell>::iterator itr = cureList.begin(); itr != cureList.end(); itr++) {
MercSpell selectedMercSpell = *itr;
if(CheckSpellRecastTimers(caster, itr->spellid)) {