Pet Affinity Fix (maybe)

[demonstar55]

Well, the description says it works on summoned pets, not charmed. I also asked someone on the PEQ server that played an enc on live and he said he didn't think it worked on charmed but he wasn't 100% sure because he mostly soloed. I also can't test these changes because at school I don't have access to a computer that I could host a computer on :P.

So in the file zone/groups.cpp

on line 634

change it from (lines 633-636)

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity))
				caster->BardPulse(spell_id, caster->GetPet());
#endif

to

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity) && !Charmed())
				caster->BardPulse(spell_id, caster->GetPet());
#endif

and on line 644

change from (lines 643-646)

#ifdef GROUP_BUFF_PETS
				if(members[z]->GetPet() && members[z]->GetAA(aaPetAffinity))
					members[z]->GetPet()->BardPulse(spell_id, caster);
#endif

to

#ifdef GROUP_BUFF_PETS
				if(members[z]->GetPet() && members[z]->GetAA(aaPetAffinity) && !Charmed())
					members[z]->GetPet()->BardPulse(spell_id, caster);
#endif

I'm not 100% if this will work :S so it would be nice if someone could check that would be great, only really thing I can think that might not be right is if Pet Affinity works on charmed pets, which I've been told is not the case, or if !Charmed() needs to do something else :S

but the main reason I'm doing this is because if an enc has Pet Affinity and a charmed pet and a bard in their group playing a resist buff song then the pet will break the charm every tick (pretty much) since it checks every tick to see if it can break the charm based on it's MR[I think])

[cavedude]

My research agrees, charmed pets should not be effected by Pet Affinity. So, this is a good fix and I'll get it into SVN after my current batch of testing.

[demonstar55]

well these changes don't work right, need to do some more testing, but I don't have a server to test these on at my disposal right now :( so ignore this until I can get around to getting it to work :P, plus there are a few other lines I found that I'd need to change

[cavedude]

The one thing I did change was !Charmed() should be !caster->GetPet()->Charmed(), substituting caster with members[z] where necessary. Haven't had time to test yet, though. I also added it to a couple of missed lines.

[demonstar55]

Originally Posted by cavedude

The one thing I did change was !Charmed() should be !caster->GetPet()->Charmed(), substituting caster with members[z] where necessary. Haven't had time to test yet, though. I also added it to a couple of missed lines.

Alright that's what I was going to do, some how I missed the lines in spells.cpp my first time, but yeah that's what I was going to try when I went home for spring break

[demonstar55]

even though I'm sure CD found them all, I'll just post everything fixed:

zones/groups.cpp

lines 594-597

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity))
				caster->SpellOnTarget(spell_id, caster->GetPet());
#endif

change to

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity) && !caster->GetPet()->Charmed())
				caster->SpellOnTarget(spell_id, caster->GetPet());
#endif

lines 604 - 607

#ifdef GROUP_BUFF_PETS
				if(members[z]->GetPet() && members[z]->GetAA(aaPetAffinity))
					caster->SpellOnTarget(spell_id, members[z]->GetPet());
#endif

change to

#ifdef GROUP_BUFF_PETS
				if(members[z]->GetPet() && members[z]->GetAA(aaPetAffinity) && !members[z]->GetPet()->Charmed())
					caster->SpellOnTarget(spell_id, members[z]->GetPet());
#endif

lines 633-636

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity))
				caster->BardPulse(spell_id, caster->GetPet());
#endif

change to

#ifdef GROUP_BUFF_PETS
			if(caster->GetPet() && caster->GetAA(aaPetAffinity) && !caster->GetPet()->Charmed())
				caster->BardPulse(spell_id, caster->GetPet());
#endif

well I think you get the idea, but here is the rest of the line numbers

in zones/groups.cpp on line 644

in zones/raids.cpp on lines 413, 424, 592, 603

in zones/spells.cpp on lines 1561 and 1569

the rest in groups and raids are the same (it's the same two statements), for spells it's a little different, for line 1561 change

if (GetPet() && GetAA(aaPetAffinity))

to

if (GetPet() && GetAA(aaPetAffinity) && !GetPet()->Charmed())

and on 1569

if (spell_target->GetPet() && GetAA(aaPetAffinity))

to

if (spell_target->GetPet() && GetAA(aaPetAffinity) && !spell_target->GetPet()->Charmed())

these should be all correct, but I don't have a means to test them