pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 15:00:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into Bot_Raid_work

Browse Source
This commit is contained in:
neckkola
2022-02-13 07:26:18 -04:00
committed by GitHub
parent 2985d4c488 14f536505e
commit f73ddb1d35
857 changed files with 92718 additions and 44581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/raids.cpp
+2 -38
View File
@@ -635,7 +635,7 @@ void Raid::CastGroupSpell(Mob* caster, uint16 spellid, uint32 gid)
if(members[x].member == caster) {
caster->SpellOnTarget(spellid, caster);
#ifdef GROUP_BUFF_PETS
if(spells[spellid].targettype != ST_GroupNoPets && caster->GetPet() && caster->HasPetAffinity() && !caster->GetPet()->IsCharmed())
if(spells[spellid].target_type != ST_GroupNoPets && caster->GetPet() && caster->HasPetAffinity() && !caster->GetPet()->IsCharmed())
caster->SpellOnTarget(spellid, caster->GetPet());
#endif
}
@@ -646,7 +646,7 @@ void Raid::CastGroupSpell(Mob* caster, uint16 spellid, uint32 gid)
if(distance <= range2){
caster->SpellOnTarget(spellid, members[x].member);
#ifdef GROUP_BUFF_PETS
if(spells[spellid].targettype != ST_GroupNoPets && members[x].member->GetPet() && members[x].member->HasPetAffinity() && !members[x].member->GetPet()->IsCharmed())
if(spells[spellid].target_type != ST_GroupNoPets && members[x].member->GetPet() && members[x].member->HasPetAffinity() && !members[x].member->GetPet()->IsCharmed())
caster->SpellOnTarget(spellid, members[x].member->GetPet());
#endif
}
@@ -927,42 +927,6 @@ void Raid::SplitMoney(uint32 gid, uint32 copper, uint32 silver, uint32 gold, uin
}
}
void Raid::GroupBardPulse(Mob* caster, uint16 spellid, uint32 gid){
uint32 z;
float range, distance;
if(!caster)
return;
range = caster->GetAOERange(spellid);
float range2 = range*range;
for(z=0; z < MAX_RAID_MEMBERS; z++) {
if(members[z].member == caster) {
caster->BardPulse(spellid, caster);
#ifdef GROUP_BUFF_PETS
if(caster->GetPet() && caster->HasPetAffinity() && !caster->GetPet()->IsCharmed())
caster->BardPulse(spellid, caster->GetPet());
#endif
}
else if(members[z].member != nullptr)
{
if(members[z].GroupNumber == gid){
distance = DistanceSquared(caster->GetPosition(), members[z].member->GetPosition());
if(distance <= range2) {
members[z].member->BardPulse(spellid, caster);
#ifdef GROUP_BUFF_PETS
if(members[z].member->GetPet() && members[z].member->HasPetAffinity() && !members[z].member->GetPet()->IsCharmed())
members[z].member->GetPet()->BardPulse(spellid, caster);
#endif
} else
LogSpells("Group bard pulse: [{}] is out of range [{}] at distance [{}] from [{}]", members[z].member->GetName(), range, distance, caster->GetName());
}
}
}
}
void Raid::TeleportGroup(Mob* sender, uint32 zoneID, uint16 instance_id, float x, float y, float z, float heading, uint32 gid)
{
for(int i = 0; i < MAX_RAID_MEMBERS; i++)