173c173
< /while (TRUE) {
---
> :MainLoop
211c211
< }
---
> /goto :MainLoop
4342c4342
< /if (${BuffPets} && !${Group.Member[${i}].Pet.Name.Find[Familiar]} && !${Group.Member[${i}].Pet.Name.Find[_pet]} && ${Group.Member[${i}].Pet.ID} && !${${Group.Member[${i}].Pet.ID}_Buff${b}} && ${BuffClasses${b}.Find[${Group.Member[${i}].Pet.Class.ShortName}]} && ${Spawn[${Group.Member[${i}].Pet.ID}].Distance}<=100 && (${BuffConditions${b}})) /call BuffQueue ${Group.Member[${i}].Pet.ID} ${b}
---
> /if (${BuffPets} && !${Group.Member[${i}].Spawn.Pet.Name.Find[Familiar]} && !${Group.Member[${i}].Spawn.Pet.Name.Find[_pet]} && ${Group.Member[${i}].Spawn.Pet.ID} && !${${Group.Member[${i}].Spawn.Pet.ID}_Buff${b}} && ${BuffClasses${b}.Find[${Group.Member[${i}].Spawn.Pet.Class.ShortName}]} && ${Spawn[${Group.Member[${i}].Spawn.Pet.ID}].Distance}<=100 && (${BuffConditions${b}})) /call BuffQueue ${Group.Member[${i}].Spawn.Pet.ID} ${b}
4470a4471
> /if (${Defined[${Target.ID}BuffString]}) /squelch /deletevar ${Target.ID}BuffString
4471a4473
> /varset ${Target.ID}BuffString
5335,5336c5337,5338
< /varcalc numEffects ${Spell[${CureSpellName${i}}].NumEffects}
< /for b 1 to ${numEffects}
---
> /for b 1 to 12
> /echo Base ${b} is : ${Spell[${CureSpellName${i}}].Base[${b}]}
6191,6192c6193,6194
< /if (${Group.Member[${gmember}].Pet.ID} && !${Defined[${CurrentSub}IgnoreRecast${i}_${Group.Member[${gmember}].Pet.ID}]}) /declare ${CurrentSub}IgnoreRecast${i}_${Group.Member[${gmember}].Pet.ID} int outer 1
< /if (${${CurrentSub}Recast${i}_${Group.Member[${gmember}].Pet.ID}} && !${${CurrentSub}IgnoreRecast${i}_${Group.Member[${gmember}].Pet.ID}}||!${GroupFightBuffClasses.Find[${Group.Member[${gmember}].Pet.Class.ShortName}]}) /goto :xtarget
---
> /if (${Group.Member[${gmember}].Spawn.Pet.ID} && !${Defined[${CurrentSub}IgnoreRecast${i}_${Group.Member[${gmember}].Spawn.Pet.ID}]}) /declare ${CurrentSub}IgnoreRecast${i}_${Group.Member[${gmember}].Spawn.Pet.ID} int outer 1
> /if (${${CurrentSub}Recast${i}_${Group.Member[${gmember}].Spawn.Pet.ID}} && !${${CurrentSub}IgnoreRecast${i}_${Group.Member[${gmember}].Spawn.Pet.ID}}||!${GroupFightBuffClasses.Find[${Group.Member[${gmember}].Spawn.Pet.Class.ShortName}]}) /goto :xtarget
6195,6196c6197,6198
< /if (${Target.ID}!=${Group.Member[${gmember}].Pet.ID}) /squelch /tar id ${Group.Member[${gmember}].ID}
< /delay 1s ${Target.ID}==${Group.Member[${gmember}].Pet.ID}
---
> /if (${Target.ID}!=${Group.Member[${gmember}].Spawn.Pet.ID}) /squelch /tar id ${Group.Member[${gmember}].ID}
> /delay 1s ${Target.ID}==${Group.Member[${gmember}].Spawn.Pet.ID}
6543,6544c6545,6546
< /if (${HealPetConditions${i}} && (${Range.Between[1,${${CurrentSub}UseAt${i}}:${Group.Member[${gmember}].Pet.PctHPs}]} && (${Spawn[id ${Group.Member[${gmember}].ID}].Pet.Distance}<${Spell[${${CurrentSub}SpellName${i}}].MyRange}||${Spawn[id ${Group.Member[${gmember}].ID}].Pet.Distance}<${Spell[${${CurrentSub}SpellName${i}}].AERange} && ${Spell[${${CurrentSub}SpellName${i}}].AERange}))||${gmember}==0 && ${Range.Between[1,${${CurrentSub}UseAt${i}}:${Me.Pet.PctHPs}]}) {
< /if (${gmember} && ${HealPetRecast${i}${Group.Member[${gmember}].Pet.ID}}||!${gmember} && ${HealPetRecast${i}${Me.Pet.ID}}) /goto :skip
---
> /if (${HealPetConditions${i}} && (${Range.Between[1,${${CurrentSub}UseAt${i}}:${Group.Member[${gmember}].Spawn.Pet.PctHPs}]} && (${Spawn[id ${Group.Member[${gmember}].ID}].Spawn.Pet.Distance}<${Spell[${${CurrentSub}SpellName${i}}].MyRange}||${Spawn[id ${Group.Member[${gmember}].ID}].Spawn.Pet.Distance}<${Spell[${${CurrentSub}SpellName${i}}].AERange} && ${Spell[${${CurrentSub}SpellName${i}}].AERange}))||${gmember}==0 && ${Range.Between[1,${${CurrentSub}UseAt${i}}:${Me.Pet.PctHPs}]}) {
> /if (${gmember} && ${HealPetRecast${i}${Group.Member[${gmember}].Spawn.Pet.ID}}||!${gmember} && ${HealPetRecast${i}${Me.Pet.ID}}) /goto :skip
6549,6550c6551,6552
< /if (${gmember}) /squelch /tar id ${Group.Member[${gmember}].Pet.ID}
< /delay 1s ${Target.ID}==${Group.Member[${gmember}].Pet.ID}
---
> /if (${gmember}) /squelch /tar id ${Group.Member[${gmember}].Spawn.Pet.ID}
> /delay 1s ${Target.ID}==${Group.Member[${gmember}].Spawn.Pet.ID}
6565,6566c6567,6568
< /if (!${Defined[HealPetRecast${i}${Group.Member[${gmember}].Pet.ID}]}) /declare HealPetRecast${i}${Group.Member[${gmember}].Pet.ID} timer outer
< /varset HealPetRecast${i}${Group.Member[${gmember}].Pet.ID} ${Ini[MyIni,HealPet,HealPetRecast${i}]}
---
> /if (!${Defined[HealPetRecast${i}${Group.Member[${gmember}].Spawn.Pet.ID}]}) /declare HealPetRecast${i}${Group.Member[${gmember}].Spawn.Pet.ID} timer outer
> /varset HealPetRecast${i}${Group.Member[${gmember}].Spawn.Pet.ID} ${Ini[MyIni,HealPet,HealPetRecast${i}]}
6865,6866c6867,6868
< /if (${Group.Member[${DesignatedTank}].Pet.ID}) /declare DTHPs int local ${Group.Member[${DesignatedTank}].Pet.PctHPs}
< /if (!${Group.Member[${DesignatedTank}].Pet.ID}) /declare DTHPs int local ${Spawn[${DesignatedTank}].PctHPs}
---
> /if (${Group.Member[${DesignatedTank}].Spawn.Pet.ID}) /declare DTHPs int local ${Group.Member[${DesignatedTank}].Spawn.Pet.PctHPs}
> /if (!${Group.Member[${DesignatedTank}].Spawn.Pet.ID}) /declare DTHPs int local ${Spawn[${DesignatedTank}].PctHPs}
6877,6879c6879,6881
< /if (${Group.Member[${DesignatedTank}].Pet.ID}) {
< /squelch /tar id ${Group.Member[${DesignatedTank}].Pet.ID}
< /delay 1s ${Group.Member[${DesignatedTank}].Pet.ID}
---
> /if (${Group.Member[${DesignatedTank}].Spawn.Pet.ID}) {
> /squelch /tar id ${Group.Member[${DesignatedTank}].Spawn.Pet.ID}
> /delay 1s ${Group.Member[${DesignatedTank}].Spawn.Pet.ID}
6883c6885
< /if (!${Group.Member[${DesignatedTank}].Pet.ID}) {
---
> /if (!${Group.Member[${DesignatedTank}].Spawn.Pet.ID}) {
7183d7184
< /varcalc numEffects ${Spell[${Me.Gem[${i}]}].NumEffects}
7186c7187
< /for effect 1 to ${numEffects}
---
> /for effect 1 to 12
7292,7304c7293,7305
< /if (${MercStanceOOC.NotEqual[NULL]} && ${Mercenary.State.Equal[ACTIVE]} && ${Select[${Me.CombatState},RESTING,ACTIVE]} && !${AddCount} && ${Mercenary.Stance.NotEqual[${${Me.Mercenary.Class.ShortName}_MercStanceOOC}]} && ${${Me.Mercenary.Class.ShortName}_MercStanceOOC.Length}) {
< /stance ${${Me.Mercenary.Class.ShortName}_MercStanceOOC}
< /return
< }
< /if (${Mercenary.State.Equal[ACTIVE]} && (${Target.Named}||${Target.Name.Find[#]}) && ${AddCount} && ${${Me.Mercenary.Class.ShortName}_MercStanceNamed.NotEqual[NULL]} && ${Mercenary.Stance.NotEqual[${${Me.Mercenary.Class.ShortName}_MercStanceNamed}]}) {
< /stance ${MercStanceNamed}
< /return
< }
<
< /if (${Mercenary.State.Equal[ACTIVE]} && !${Target.Named} && !${Target.Name.Find[#]} && ${AddCount} && ${${Me.Mercenary.Class.ShortName}_MercStanceNormal.NotEqual[NULL]} && ${Mercenary.Stance.NotEqual[${${Me.Mercenary.Class.ShortName}_MercStanceNormal}]}) {
< /stance ${MercStanceNormal}
< /return
< }
---
> | /if (${MercStanceOOC.NotEqual[NULL]} && ${Mercenary.State.Equal[ACTIVE]} && ${Select[${Me.CombatState},RESTING,ACTIVE]} && !${AddCount}) {
> | /stance ${${Me.Mercenary.Class.ShortName}_MercStanceOOC}
> | /return
> | }
> | /if (${Mercenary.State.Equal[ACTIVE]} && (${Target.Named}||${Target.Name.Find[#]}) && ${AddCount}) {
> | /stance ${MercStanceNamed}
> | /return
> | }
>
> | /if (${Mercenary.State.Equal[ACTIVE]} && !${Target.Named} && !${Target.Name.Find[#]} && ${AddCount}) {
> | /stance ${MercStanceNormal}
> | /return
> | }