Pet Affinity Fix (maybe)

[cavedude]

I'll fiddle with GetPetType and a couple of other things.

[demonstar55]

Originally Posted by cavedude

I'll fiddle with GetPetType and a couple of other things.

try caster->GetPetType != petCharmed

[cavedude]

Alright, this now works with group spells just fine. The problem is bard songs still hit. Looking at spells.cpp, it looks like Bard spells hit all pets no matter what, it doesn't even check for Pet Affinity. Is this correct? If not, I'll add the check for charmed pets and Pet Affinity. This was also the trouble testing last night, !caster->GetPet()->Charmed() probably did work, since I was only testing with Bard songs not group spells. :I

[demonstar55]

Originally Posted by cavedude

Alright, this now works with group spells just fine. The problem is bard songs still hit. Looking at spells.cpp, it looks like Bard spells hit all pets no matter what, it doesn't even check for Pet Affinity. Is this correct? If not, I'll add the check for charmed pets and Pet Affinity. This was also the trouble testing last night, !caster->GetPet()->Charmed() probably did work, since I was only testing with Bard songs not group spells. :I

Did you change the lines in zones/groups.cpp? From what I recall the comments say they have to do with bard songs, and I don't recall the songs hitting peoples pets that didn't have pet affinity, well besides the chorus ones

[cavedude]

groups.cpp doesn't matter, the problem is in spells.cpp, that's where the final above all be all check is. The code looks like:

#ifdef GROUP_BUFF_PETS
						if (GetPet())
							GetPet()->BardPulse(spell_id, this);
#endif
					}
				}
			}
			else {
				mlog(SPELLS__BARDS, "Bard Song Pulse: spell %d, Group target without group. Affecting caster.", spell_id);
				BardPulse(spell_id, this);
#ifdef GROUP_BUFF_PETS
				if (GetPet())
					GetPet()->BardPulse(spell_id, this);
#endif
			}
			break;
		}
	}

Meaning all songs will land on every pet all the time. I'm going to add a check for charmed pets, but not for Pet Affinity for now. If somebody knows otherwise, please let me know.

[demonstar55]

well I know morte could twist songs on his bard while his end had a charmed pet and then when he got pet affinity the bards resist song would cause the pet to break, so the zones/groups.cpp code would be working

[cavedude]

Alright, we're set. KLS and I think whoever implemented Pet Affinity originally forgot to add it to that line in spells.cpp. Group spells and songs will no longer effect charmed pets, even if the caster has Pet Affinity. Of course, Bard AE songs will still hit charmed pets, as that hits all allied characters and their pets. I'll put it up on TGC tonight, and if it checks out there, I'll commit to SVN.