Harmony/Lull temporary fix

[inkubus]

I think i did this right!

Patch:

--- aggro-orig.cpp 2007-08-15 16:58:09.114683370 +0100
+++ aggro.cpp 2007-08-15 17:01:02.979532414 +0100
@@ -987,6 +987,9 @@
int16 Mob::CheckAggroAmount(int16 spellid) {
int16 spell_id = spellid;
int16 AggroAmount = 1;
+ if (IsHarmonySpell(spellid)) {
+ AggroAmount = 0;
+ }
int16 slevel = GetLevel();

for (int o = 0; o < EFFECT_COUNT; o++) {
--- spdat-orig.cpp 2007-08-15 15:34:23.203261821 +0100
+++ spdat.cpp 2007-08-14 22:49:32.057599869 +0100
@@ -199,6 +199,19 @@
return false;
}

+bool IsHarmonySpell(int16 spell_id)
+{
+int i;
+const SPDat_Spell_Struct &sp = spells[spell_id];
+
+for(i = 0; i < EFFECT_COUNT; i++)
+{
+if(sp.effectid[i] == SE_Lull || sp.effectid[i] == SE_Harmony)
+return true;
+}
+return false;
+}
+
bool IsPercentalHealSpell(int16 spell_id)
{
return IsEffectInSpell(spell_id, SE_PercentalHeal);
-- spdat-orig.h 2007-08-15 15:34:34.736113852 +0100
+++ spdat.h 2007-08-15 16:30:38.800733373 +0100
@@ -473,6 +473,7 @@
bool IsStunSpell(int16 spell_id);
bool IsSlowSpell(int16 spell_id);
bool IsHasteSpell(int16 spell_id);
+bool IsHarmonySpell(int16 spell_id);
bool IsPercentalHealSpell(int16 spell_id);
bool IsGroupOnlySpell(int16 spell_id);
bool IsBeneficialSpell(int16 spell_id);
--- spells-orig.cpp 2007-08-15 15:34:49.029169807 +0100
+++ spells.cpp 2007-08-15 16:55:43.259905133 +0100
@@ -2217,6 +2217,8 @@
return(false);
}

+if (!IsHarmonySpell(spell_id))
+{
if(!(IsClient() && CastToClient()->GetGM())) // GMs can cast on anything
{
// Beneficial spells check
@@ -2254,6 +2256,8 @@
}
}

+}
+
// solar: ok at this point the spell is permitted to affect the target,
// but we need to check special cases and resists

@@ -2351,8 +2355,11 @@
) {
int16 aggro_amount = CheckAggroAmount(spell_id);//*spelltar->CastToNPC()->AggroModifier();
mlog(SPELLS__CASTING, "Spell %d cast on %s generated %d hate", spell_id, spelltar->GetName(), aggro_amount);
+ if (!IsHarmonySpell(spell_id))
+ {
spelltar->AddToHateList(this, aggro_amount);
}
+ }
else if (IsBeneficialSpell(spell_id))
entity_list.AddHealAggro(spelltar, this, CheckHealAggroAmount(spell_id));