pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-30 09:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Player event export plus lua_object api

Browse Source
This commit is contained in:
KimLS
2013-06-03 16:49:47 -07:00
parent bc82bff4b4
commit 85c7e1b059
7 changed files with 397 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/merc.cpp
+1 -3
View File
@@ -426,7 +426,7 @@ void Merc::AddItemBonuses(const Item_Struct *item, StatBonuses* newbon) {
if(item->Attack > 0) {
int cap = RuleI(Character, ItemATKCap);
unsigned int cap = RuleI(Character, ItemATKCap);
cap += itembonuses.ItemATKCap + spellbonuses.ItemATKCap + aabonuses.ItemATKCap;
if((newbon->ATK + item->Attack) > cap)
@@ -2284,7 +2284,6 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
else {
for( int i = 0; i < MAX_GROUP_MEMBERS; i++) {
if(g->members[i]) {
int32 oDontDoAgainBefore;
Mob* tar = g->members[i];
if( !tar->IsImmuneToSpell(selectedMercSpell.spellid, this)
@@ -2463,7 +2462,6 @@ bool Merc::AICastSpell(int8 iChance, int32 iSpellTypes) {
if(castedSpell) {
if(IsGroupSpell(selectedMercSpell.spellid)){
Group *g;
if(this->HasGroup()) {
Group *g = this->GetGroup();