Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/MQ2Main/MQ2Utilities.cpp Sat Mar 29 21:03:58 2014
- +++ b/MQ2Main/MQ2Utilities.cpp Sun Mar 30 15:52:56 2014
- @@ -6517,28 +6517,7 @@
- || (aSpell->Attrib[i]==412 || bSpell->Attrib[i]==412) // Limit: Race
- || (aSpell->Attrib[i]==422 || bSpell->Attrib[i]==422) // Limit: Use Min
- || (aSpell->Attrib[i]==423 || bSpell->Attrib[i]==423) // Limit: Use Type
- - || (aSpell->Attrib[i]==428 || bSpell->Attrib[i]==428) // Skill_Proc_Modifier
- - || ((aSpell->Attrib[i]==2 && bSpell->Attrib[i]==2) && // ATK
- - ((aSpell->SpellType==1 || aSpell->SpellType==2) && (bSpell->SpellType==1 || bSpell->SpellType==2)) &&
- - !(aSpell->DurationWindow==bSpell->DurationWindow))
- - || ((aSpell->Attrib[i]==4 && bSpell->Attrib[i]==4) && // STR
- - ((aSpell->SpellType==1 || aSpell->SpellType==2) && (bSpell->SpellType==1 || bSpell->SpellType==2)) &&
- - !(aSpell->DurationWindow==bSpell->DurationWindow))
- - || ((aSpell->Attrib[i]==5 && bSpell->Attrib[i]==5) && // DEX
- - ((aSpell->SpellType==1 || aSpell->SpellType==2) && (bSpell->SpellType==1 || bSpell->SpellType==2)) &&
- - !(aSpell->DurationWindow==bSpell->DurationWindow))
- - || ((aSpell->Attrib[i]==6 && bSpell->Attrib[i]==6) && // AGI
- - ((aSpell->SpellType==1 || aSpell->SpellType==2) && (bSpell->SpellType==1 || bSpell->SpellType==2)) &&
- - !(aSpell->DurationWindow==bSpell->DurationWindow))
- - || ((aSpell->Attrib[i]==7 && bSpell->Attrib[i]==7) && // STA
- - ((aSpell->SpellType==1 || aSpell->SpellType==2) && (bSpell->SpellType==1 || bSpell->SpellType==2)) &&
- - !(aSpell->DurationWindow==bSpell->DurationWindow))
- - || ((aSpell->Attrib[i]==8 && bSpell->Attrib[i]==8) && // INT
- - ((aSpell->SpellType==1 || aSpell->SpellType==2) && (bSpell->SpellType==1 || bSpell->SpellType==2)) &&
- - !(aSpell->DurationWindow==bSpell->DurationWindow))
- - || ((aSpell->Attrib[i]==9 && bSpell->Attrib[i]==9) && // WIS
- - ((aSpell->SpellType==1 || aSpell->SpellType==2) && (bSpell->SpellType==1 || bSpell->SpellType==2)) &&
- - !(aSpell->DurationWindow==bSpell->DurationWindow)));
- + || (aSpell->Attrib[i]==428 || bSpell->Attrib[i]==428)); // Skill_Proc_Modifier
- }
- // ***************************************************************************
- @@ -6550,6 +6529,10 @@
- // ***************************************************************************
- bool BuffStackTest(PSPELL aSpell, PSPELL bSpell){
- if (aSpell->ID==bSpell->ID) return true;
- +
- + if (aSpell->DurationWindow != bSpell->DurationWindow && // one goes to song window one doesn't and at least one is a bard song
- + (aSpell->ClassLevel[8] <= MAX_PC_LEVEL || bSpell->ClassLevel[8] <= MAX_PC_LEVEL))
- + return true;
- int i;
- for (i=0; i<=11; i++) {
Advertisement
Add Comment
Please, Sign In to add comment
