MacroQuest64

Code: Select all

   /if (${doSwitch} && ${wstype.Equal[Beneficial]}) {
     /varset itemspellname ${FindItem[${weapon1}].Spell}
     /if (${itemspellname.NotEqual[${Me.Buff[${itemspellname}]}]} && !${FindItem[${weapon1}].InvSlot.Name.Equal[mainhand]} && !${FindItem[${weapon1}].InvSlot.Name.Equal[offhand]}) {
       /if (${verbosity}>=1) /${channel} ** Beneficial proc-weapon swapping...
       /call Weapon_Swap "${weapon1}" "${weapon2}"
     }
   }

Code: Select all

case Spell: 
		if (Dest.Ptr=GetSpellByID(pItem->Item->[b]Clicky.SpellID[/b])) 
		{ 
			Dest.Type=pSpellType; 
			return true; 
		} 

+		if (Dest.Ptr=GetSpellByID(pItem->Item->Proc.SpellID))
+		{
+			Dest.Type=pSpellType;
+			return true;
+		}
		return false; 
	case EffectType:
		//0 Proc 
		//1 Clickable from inventory (any class) 
		//2 Worn effect (haste, cleave) 
		//3 Unknown 
		//4 Clickable must be worn 
		//5 Clickable from inventory (class restricted) 
		//6 Focus effect 
		//7 Memmable spell scroll 
      // This used to return an int type with a case statment, items could have 
      // only one effect. For backwards compatibility we return based on a hierarchy. 
      // A zero in any field indicates no effect (others will also be zero) 
      if (!pItem->Item->Clicky.SpellID) 
      { 
         return false; 
      } 
      else if (pItem->Item->Scroll.SpellID!=-1) 
      { 
         Dest.Ptr="Spell Scroll"; 
      } 
      else if (pItem->Item->Clicky.SpellID!=-1) 
      { 
         // code to detect must-be-worn etc here 
         switch (pItem->Item->Clicky.EffectType) 
         { 
         case 4: 
                Dest.Ptr="Click Worn"; 
            break; 
         case 1: 
         case 5: 
            Dest.Ptr="Click Inventory"; 
            break; 
         default: 
            Dest.Ptr="Click Unknown"; 
         } 
      } 
      else if (pItem->Item->Focus.SpellID!=-1 || pItem->Item->Worn.SpellID!=-1) 
      { 
         Dest.Ptr="Worn"; 
      } 
      else if (pItem->Item->[b]Proc.SpellID[/b]!=-1) 
      { 
         Dest.Ptr="Combat"; 
      } 
      else 
      { 
         return false; 
      } 
		Dest.Type=pStringType; 
		return true;