pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented spells_new field 198 = no_detrimental_spell_aggro

Browse Source 
Spells with this flag will not generate any aggro
Note: DOT portions of spells wilth this flag STILL generate aggro.
Example Harminous Arrow (Ranger AA) 16127
This commit is contained in:
KayenEQ 2015-10-08 16:05:14 -04:00
parent c35eacbc99
commit 20bdbdd52d
7 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/shareddb.cpp
View File

@ -1660,6 +1660,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
sp[tempid].directional_end = static_cast<float>(atoi(row[195])); sp[tempid].directional_end = static_cast<float>(atoi(row[195]));
sp[tempid].sneak = atoi(row[196]) != 0; sp[tempid].sneak = atoi(row[196]) != 0;
sp[tempid].not_focusable = atoi(row[197]) != 0; sp[tempid].not_focusable = atoi(row[197]) != 0;
sp[tempid].no_detrimental_spell_aggro = atoi(row[198]) != 0;
sp[tempid].suspendable = atoi(row[200]) != 0; sp[tempid].suspendable = atoi(row[200]) != 0;
sp[tempid].viral_range = atoi(row[201]); sp[tempid].viral_range = atoi(row[201]);
sp[tempid].songcap = atoi(row[202]); sp[tempid].songcap = atoi(row[202]);

8
common/spdat.cpp
View File

@ -1092,6 +1092,14 @@ bool DetrimentalSpellAllowsRest(uint16 spell_id)
return false; return false;
} }
bool NoDetrimentalSpellAggro(uint16 spell_id)
{
if (IsValidSpell(spell_id))
return spells[spell_id].no_detrimental_spell_aggro;
return false;
}
uint32 GetNimbusEffect(uint16 spell_id) uint32 GetNimbusEffect(uint16 spell_id)
{ {
if (IsValidSpell(spell_id)) if (IsValidSpell(spell_id))

6
common/spdat.h
View File

@ -745,7 +745,8 @@ struct SPDat_Spell_Struct
/* 195 */ float directional_end; // Cone End Angle: /* 195 */ float directional_end; // Cone End Angle:
/* 196 */ bool sneak; // effect can only be used if sneaking (rogue 'Daggerfall' ect) /* 196 */ bool sneak; // effect can only be used if sneaking (rogue 'Daggerfall' ect)
/* 197 */ bool not_focusable; //prevents focus effects from being applied to spell /* 197 */ bool not_focusable; //prevents focus effects from being applied to spell
/* 198- 199 */ /* 198 */ bool no_detrimental_spell_aggro;
/* 199 */
/* 200 */ bool suspendable; // buff is suspended in suspended buff zones /* 200 */ bool suspendable; // buff is suspended in suspended buff zones
/* 201 */ int viral_range; /* 201 */ int viral_range;
/* 202 */ int songcap; // individual song cap /* 202 */ int songcap; // individual song cap
@ -764,7 +765,7 @@ struct SPDat_Spell_Struct
/* 215 - 216 */ /* 215 - 216 */
/* 217 */ int override_crit_chance; //Places a cap on the max chance to critical /* 217 */ int override_crit_chance; //Places a cap on the max chance to critical
/* 218 */ int aemaxtargets; //Is used for various AE effects /* 218 */ int aemaxtargets; //Is used for various AE effects
/* 219 */ int no_heal_damage_item_mod; //Is used for beam and ring spells for target # limits (not implemented) /* 219 */ int no_heal_damage_item_mod;
/* 220 - 223 */ /* 220 - 223 */
/* 224 */ bool persistdeath; // buff doesn't get stripped on death /* 224 */ bool persistdeath; // buff doesn't get stripped on death
/* 225 - 226 */ /* 225 - 226 */
@ -880,6 +881,7 @@ uint32 GetPartialMeleeRuneReduction(uint32 spell_id);
uint32 GetPartialMagicRuneReduction(uint32 spell_id); uint32 GetPartialMagicRuneReduction(uint32 spell_id);
uint32 GetPartialMeleeRuneAmount(uint32 spell_id); uint32 GetPartialMeleeRuneAmount(uint32 spell_id);
uint32 GetPartialMagicRuneAmount(uint32 spell_id); uint32 GetPartialMagicRuneAmount(uint32 spell_id);
bool NoDetrimentalSpellAggro(uint16 spell_id);
int CalcPetHp(int levelb, int classb, int STA = 75); int CalcPetHp(int levelb, int classb, int STA = 75);
const char *GetRandPetName(); const char *GetRandPetName();

3
zone/aggro.cpp
View File

@ -960,6 +960,9 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) {
//offensive spell aggro //offensive spell aggro
int32 Mob::CheckAggroAmount(uint16 spell_id, Mob *target, bool isproc) int32 Mob::CheckAggroAmount(uint16 spell_id, Mob *target, bool isproc)
{ {
if (NoDetrimentalSpellAggro(spell_id))
return 0;
int32 AggroAmount = 0; int32 AggroAmount = 0;
int32 nonModifiedAggro = 0; int32 nonModifiedAggro = 0;
uint16 slevel = GetLevel(); uint16 slevel = GetLevel();

13
zone/attack.cpp
View File

@ -2410,7 +2410,7 @@ bool NPC::Death(Mob* killerMob, int32 damage, uint16 spell, SkillUseTypes attack
return true; return true;
} }
void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, bool iYellForHelp /*= true*/, bool bFrenzy /*= false*/, bool iBuffTic /*= false*/) void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, bool iYellForHelp /*= true*/, bool bFrenzy /*= false*/, bool iBuffTic /*= false*/, uint16 spell_id)
{ {
if(!other) if(!other)
return; return;
@ -2466,6 +2466,9 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
if(IsFamiliar() || GetSpecialAbility(IMMUNE_AGGRO)) if(IsFamiliar() || GetSpecialAbility(IMMUNE_AGGRO))
return; return;
if (spell_id != SPELL_UNKNOWN && NoDetrimentalSpellAggro(spell_id))
return;
if (other == myowner) if (other == myowner)
return; return;
@ -3139,15 +3142,15 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons
if(!RuleB(Combat, EXPFromDmgShield)) { if(!RuleB(Combat, EXPFromDmgShield)) {
// Damage shield damage shouldn't count towards who gets EXP // Damage shield damage shouldn't count towards who gets EXP
if(!attacker->CastToClient()->GetFeigned() && !FromDamageShield) if(!attacker->CastToClient()->GetFeigned() && !FromDamageShield)
AddToHateList(attacker, 0, damage, true, false, iBuffTic); AddToHateList(attacker, 0, damage, true, false, iBuffTic, spell_id);
} }
else { else {
if(!attacker->CastToClient()->GetFeigned()) if(!attacker->CastToClient()->GetFeigned())
AddToHateList(attacker, 0, damage, true, false, iBuffTic); AddToHateList(attacker, 0, damage, true, false, iBuffTic, spell_id);
} }
} }
else else
AddToHateList(attacker, 0, damage, true, false, iBuffTic); AddToHateList(attacker, 0, damage, true, false, iBuffTic, spell_id);
} }
if(damage > 0) { if(damage > 0) {
@ -3172,7 +3175,7 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons
{ {
if (!pet->IsHeld()) { if (!pet->IsHeld()) {
Log.Out(Logs::Detail, Logs::Aggro, "Sending pet %s into battle due to attack.", pet->GetName()); Log.Out(Logs::Detail, Logs::Aggro, "Sending pet %s into battle due to attack.", pet->GetName());
pet->AddToHateList(attacker, 1); pet->AddToHateList(attacker, 1,0, true, false, false, spell_id);
pet->SetTarget(attacker); pet->SetTarget(attacker);
Message_StringID(10, PET_ATTACKING, pet->GetCleanName(), attacker->GetCleanName()); Message_StringID(10, PET_ATTACKING, pet->GetCleanName(), attacker->GetCleanName());
} }

2
zone/mob.h
View File

@ -489,7 +489,7 @@ public:
inline uint32 GetLevelCon(uint8 iOtherLevel) const { inline uint32 GetLevelCon(uint8 iOtherLevel) const {
return this ? GetLevelCon(GetLevel(), iOtherLevel) : CON_GREEN; } return this ? GetLevelCon(GetLevel(), iOtherLevel) : CON_GREEN; }
virtual void AddToHateList(Mob* other, uint32 hate = 0, int32 damage = 0, bool iYellForHelp = true, virtual void AddToHateList(Mob* other, uint32 hate = 0, int32 damage = 0, bool iYellForHelp = true,
bool bFrenzy = false, bool iBuffTic = false); bool bFrenzy = false, bool iBuffTic = false, uint16 spell_id = SPELL_UNKNOWN);
bool RemoveFromHateList(Mob* mob); bool RemoveFromHateList(Mob* mob);
void SetHateAmountOnEnt(Mob* other, int32 hate = 0, int32 damage = 0) { hate_list.SetHateAmountOnEnt(other,hate,damage);} void SetHateAmountOnEnt(Mob* other, int32 hate = 0, int32 damage = 0) { hate_list.SetHateAmountOnEnt(other,hate,damage);}
void HalveAggro(Mob *other) { uint32 in_hate = GetHateAmount(other); SetHateAmountOnEnt(other, (in_hate > 1 ? in_hate / 2 : 1)); } void HalveAggro(Mob *other) { uint32 in_hate = GetHateAmount(other); SetHateAmountOnEnt(other, (in_hate > 1 ? in_hate / 2 : 1)); }

12
zone/spells.cpp
View File

@ -4067,7 +4067,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
if(aggro > 0) { if(aggro > 0) {
AddToHateList(caster, aggro); AddToHateList(caster, aggro);
} else { } else {
AddToHateList(caster, 1); AddToHateList(caster, 1,0,true,false,false,spell_id);
} }
return true; return true;
} }
@ -4094,7 +4094,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
if(aggro > 0) { if(aggro > 0) {
AddToHateList(caster, aggro); AddToHateList(caster, aggro);
} else { } else {
AddToHateList(caster, 1); AddToHateList(caster, 1,0,true,false,false,spell_id);
} }
return true; return true;
} }
@ -4110,7 +4110,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
if(aggro > 0) { if(aggro > 0) {
AddToHateList(caster, aggro); AddToHateList(caster, aggro);
} else { } else {
AddToHateList(caster, 1); AddToHateList(caster, 1,0,true,false,false,spell_id);
} }
return true; return true;
} else if(IsClient() && caster->IsClient() && (caster->CastToClient()->GetGM() == false)) } else if(IsClient() && caster->IsClient() && (caster->CastToClient()->GetGM() == false))
@ -4127,7 +4127,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
if (aggro > 0) { if (aggro > 0) {
AddToHateList(caster, aggro); AddToHateList(caster, aggro);
} else { } else {
AddToHateList(caster, 1); AddToHateList(caster, 1,0,true,false,false,spell_id);
} }
return true; return true;
} }
@ -4150,7 +4150,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
if(aggro > 0) { if(aggro > 0) {
AddToHateList(caster, aggro); AddToHateList(caster, aggro);
} else { } else {
AddToHateList(caster, 1); AddToHateList(caster, 1,0,true,false,false,spell_id);
} }
return true; return true;
} }
@ -4190,7 +4190,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
if(aggro > 0) { if(aggro > 0) {
AddToHateList(caster, aggro); AddToHateList(caster, aggro);
} else { } else {
AddToHateList(caster, 1); AddToHateList(caster, 1,0,true,false,false,spell_id);
} }
return true; return true;
} }