SPA Limits fix

diff -ur MQ2-stock/MQ2Main/MQ2Main.h MQ2/MQ2Main/MQ2Main.h
--- MQ2-stock/MQ2Main/MQ2Main.h 2014-03-18 18:17:02.000000000 -0400
+++ MQ2/MQ2Main/MQ2Main.h   2014-03-21 01:33:15.468941400 -0400
@@ -489,6 +489,7 @@
 EQLIB_API bool GetBuffID(PSPELLBUFF pBuff, DWORD &nID);
 EQLIB_API PCHAR GetLDoNTheme(DWORD LDTheme);
 EQLIB_API bool BuffStackTest(PSPELL aSpell, PSPELL bSpell);
+EQLIB_API bool BlankSpellEffect(int x);
 EQLIB_API DWORD GetItemTimer(PCONTENTS pItem);
 EQLIB_API PCONTENTS GetItemContentsBySlotID(DWORD dwSlotID);
 EQLIB_API PCONTENTS GetItemContentsByName(CHAR *ItemName);
diff -ur MQ2-stock/MQ2Main/MQ2Utilities.cpp MQ2/MQ2Main/MQ2Utilities.cpp
--- MQ2-stock/MQ2Main/MQ2Utilities.cpp  2014-03-18 19:04:18.000000000 -0400
+++ MQ2/MQ2Main/MQ2Utilities.cpp    2014-03-21 01:33:37.103178800 -0400
@@ -5906,6 +5906,23 @@
 }

 // ***************************************************************************
+// Function:    BlankSpellEffect
+// Description: Returns boolean true if the SPA is considered blank for
+//              stacking purposes
+// Usage:       BuffStackTest helper function
+// ***************************************************************************
+
+bool BlankSpellEffect(int x)
+{
+    if (x == 57 || (x >= 134 && x <= 144) || x == 254 || x == 311 || x == 348 ||
+            x == 391 || x == 403 || x == 404 || x == 411 || x == 412 ||
+            x == 414 || x == 422 || x == 423 || x == 428)
+        return true;
+
+    return false;
+}
+
+// ***************************************************************************
 // Function:    BuffStackTest
 // Description: Return boolean true if the two spells will stack
 // Usage:       Used by ${Spell[xxx].Stacks}, ${Spell[xxx].StacksPet},
@@ -5922,7 +5939,7 @@
         //Placeholder, exclude it so slots don't match up. Now Check to see if the slots
         //have equal attribute values. If the do, they don't stack.
         //WriteChatf("\nSlot %d: bSpell->Attrib=%d, bSpell->Base=%d, bSpell->TargetType=%d, aSpell->Attrib=%d, aSpell->Base=%d, aSpell->TargetType=%d", i, bSpell->Attrib[i], bSpell->Base[i], bSpell->TargetType, aSpell->Attrib[i], aSpell->Base[i], aSpell->TargetType);
-        if (bSpell->Attrib[i]==aSpell->Attrib[i] && !(bSpell->Attrib[i]==254 || aSpell->Attrib[i]==254) && !(bSpell->Attrib[i]==57 && aSpell->Attrib[i]==57)&& !(bSpell->Attrib[i]==311 && aSpell->Attrib[i]==311))
+        if (bSpell->Attrib[i]==aSpell->Attrib[i] && !BlankSpellEffect(aSpell->Attrib[i]))
             if (!((bSpell->Attrib[i]==10 && (bSpell->Base[i]==-6 || bSpell->Base[i]==0)) ||
                 (aSpell->Attrib[i]==10 && (aSpell->Base[i]==-6 || aSpell->Base[i]==0)) ||
                 (bSpell->Attrib[i]==79 && bSpell->Base[i]>0 && bSpell->TargetType==6) ||