*Remove not needed code
--HG-- branch : trunk
This commit is contained in:
Blaymoira
@@ -0,0 +1,11 @@
|
|||||||
|
delete from spell_bonus_data where entry in (15290, 39373, 33778, 379, 38395, 40972, 22845, 33504, 34299);
|
||||||
|
insert into spell_bonus_data () VALUES
|
||||||
|
(15290, 0, 0, 0, 'Vampiric Embrace'),
|
||||||
|
(39373, 0, 0, 0, 'Shadowmend'),
|
||||||
|
(33778, 0, 0, 0, 'Lifebloom'),
|
||||||
|
(379, 0, 0, 0, 'Earth Shield'),
|
||||||
|
(38395, 0, 0, 0, 'Siphon Essence'),
|
||||||
|
(40972, 0, 0, 0, 'Heal'),
|
||||||
|
(22845, 0, 0, 0, 'Frenzied Regeneration'),
|
||||||
|
(33504, 0, 0, 0, 'Mark of Conquest'),
|
||||||
|
(34299, 0, 0, 0, 'Improved Leader of the Pack');
|
||||||
@@ -91,4 +91,6 @@ INSTALL(FILES
|
|||||||
2021_world.sql
|
2021_world.sql
|
||||||
2025_mangos_7493_01_world_command.sql
|
2025_mangos_7493_01_world_command.sql
|
||||||
2025_mangos_7495_01_world_trinity_string.sql
|
2025_mangos_7495_01_world_trinity_string.sql
|
||||||
|
2031_realmd.sql
|
||||||
|
2057_world.sql
|
||||||
DESTINATION share/trinity/sql/updates)
|
DESTINATION share/trinity/sql/updates)
|
||||||
@@ -8552,199 +8552,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*switch(spellProto->SpellFamilyName)
|
|
||||||
{
|
|
||||||
case SPELLFAMILY_GENERIC:
|
|
||||||
// Siphon Essence - 0%
|
|
||||||
if(spellProto->AttributesEx == 268435456 && spellProto->SpellIconID == 2027)
|
|
||||||
{
|
|
||||||
CastingTime = 0;
|
|
||||||
}
|
|
||||||
// Goblin Rocket Launcher - 0%
|
|
||||||
else if (spellProto->SpellIconID == 184 && spellProto->Attributes == 4259840)
|
|
||||||
{
|
|
||||||
CastingTime = 0;
|
|
||||||
}
|
|
||||||
// Darkmoon Card: Vengeance - 0.1%
|
|
||||||
else if (spellProto->SpellVisual[0] == 9850 && spellProto->SpellIconID == 2230)
|
|
||||||
{
|
|
||||||
CastingTime = 3.5;
|
|
||||||
}
|
|
||||||
case SPELLFAMILY_MAGE:
|
|
||||||
// Ignite - do not modify, it is (8*Rank)% damage of procing Spell
|
|
||||||
if(spellProto->Id==12654)
|
|
||||||
{
|
|
||||||
return pdamage;
|
|
||||||
}
|
|
||||||
// Ice Lance
|
|
||||||
else if((spellProto->SpellFamilyFlags & 0x20000LL) && spellProto->SpellIconID == 186)
|
|
||||||
{
|
|
||||||
CastingTime /= 3; // applied 1/3 bonuses in case generic target
|
|
||||||
if(pVictim->isFrozen()) // and compensate this for frozen target.
|
|
||||||
TakenTotalMod *= 3.0f;
|
|
||||||
}
|
|
||||||
// Pyroblast - 115% of Fire Damage, DoT - 20% of Fire Damage
|
|
||||||
else if((spellProto->SpellFamilyFlags & 0x400000LL) && spellProto->SpellIconID == 184 )
|
|
||||||
{
|
|
||||||
DotFactor = damagetype == DOT ? 0.2f : 1.0f;
|
|
||||||
CastingTime = damagetype == DOT ? 3500 : 4025;
|
|
||||||
}
|
|
||||||
// Fireball - 100% of Fire Damage, DoT - 0% of Fire Damage
|
|
||||||
else if((spellProto->SpellFamilyFlags & 0x1LL) && spellProto->SpellIconID == 185)
|
|
||||||
{
|
|
||||||
CastingTime = 3500;
|
|
||||||
DotFactor = damagetype == DOT ? 0.0f : 1.0f;
|
|
||||||
}
|
|
||||||
// Molten armor
|
|
||||||
else if (spellProto->SpellFamilyFlags & 0x0000000800000000LL)
|
|
||||||
{
|
|
||||||
CastingTime = 0;
|
|
||||||
}
|
|
||||||
// Arcane Missiles triggered spell
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x200000LL) && spellProto->SpellIconID == 225)
|
|
||||||
{
|
|
||||||
CastingTime = 1000;
|
|
||||||
}
|
|
||||||
// Blizzard triggered spell
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x80080LL) && spellProto->SpellIconID == 285)
|
|
||||||
{
|
|
||||||
CastingTime = 500;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_WARLOCK:
|
|
||||||
// Life Tap
|
|
||||||
if((spellProto->SpellFamilyFlags & 0x40000LL) && spellProto->SpellIconID == 208)
|
|
||||||
{
|
|
||||||
CastingTime = 2800; // 80% from +shadow damage
|
|
||||||
DoneTotalMod = 1.0f;
|
|
||||||
TakenTotalMod = 1.0f;
|
|
||||||
}
|
|
||||||
// Dark Pact
|
|
||||||
else if((spellProto->SpellFamilyFlags & 0x80000000LL) && spellProto->SpellIconID == 154 && GetPetGUID())
|
|
||||||
{
|
|
||||||
CastingTime = 3360; // 96% from +shadow damage
|
|
||||||
DoneTotalMod = 1.0f;
|
|
||||||
TakenTotalMod = 1.0f;
|
|
||||||
}
|
|
||||||
// Soul Fire - 115% of Fire Damage
|
|
||||||
else if((spellProto->SpellFamilyFlags & 0x8000000000LL) && spellProto->SpellIconID == 184)
|
|
||||||
{
|
|
||||||
CastingTime = 4025;
|
|
||||||
}
|
|
||||||
// Curse of Agony - 120% of Shadow Damage
|
|
||||||
else if((spellProto->SpellFamilyFlags & 0x0000000400LL) && spellProto->SpellIconID == 544)
|
|
||||||
{
|
|
||||||
DotFactor = 1.2f;
|
|
||||||
}
|
|
||||||
// Drain Mana - 0% of Shadow Damage
|
|
||||||
else if((spellProto->SpellFamilyFlags & 0x10LL) && spellProto->SpellIconID == 548)
|
|
||||||
{
|
|
||||||
CastingTime = 0;
|
|
||||||
}
|
|
||||||
// Drain Soul 214.3%
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x4000LL) && spellProto->SpellIconID == 113 )
|
|
||||||
{
|
|
||||||
CastingTime = 7500;
|
|
||||||
}
|
|
||||||
// Hellfire
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x40LL) && spellProto->SpellIconID == 937)
|
|
||||||
{
|
|
||||||
CastingTime = damagetype == DOT ? 5000 : 500; // self damage seems to be so
|
|
||||||
}
|
|
||||||
// Unstable Affliction - 180%
|
|
||||||
else if (spellProto->Id == 31117 && spellProto->SpellIconID == 232)
|
|
||||||
{
|
|
||||||
CastingTime = 6300;
|
|
||||||
}
|
|
||||||
// Corruption 93%
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x2LL) && spellProto->SpellIconID == 313)
|
|
||||||
{
|
|
||||||
DotFactor = 0.93f;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_PALADIN:
|
|
||||||
// Consecration - 95% of Holy Damage
|
|
||||||
if((spellProto->SpellFamilyFlags & 0x20LL) && spellProto->SpellIconID == 51)
|
|
||||||
{
|
|
||||||
DotFactor = 0.95f;
|
|
||||||
CastingTime = 3500;
|
|
||||||
}
|
|
||||||
// Judgement of Righteousness - 32%
|
|
||||||
else if (spellProto->SpellFamilyFlags & 0x0000000000000400LL)
|
|
||||||
{
|
|
||||||
CastingTime = 1120;
|
|
||||||
}
|
|
||||||
// Seal of Vengeance - 17% per Fully Stacked Tick - 5 Applications
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x80000000000LL) && spellProto->SpellIconID == 2292)
|
|
||||||
{
|
|
||||||
DotFactor = 0.85f;
|
|
||||||
CastingTime = 3500;
|
|
||||||
}
|
|
||||||
// Holy shield - 5% of Holy Damage
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x4000000000LL) && spellProto->SpellIconID == 453)
|
|
||||||
{
|
|
||||||
CastingTime = 175;
|
|
||||||
}
|
|
||||||
// Blessing of Sanctuary - 0%
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x10000000LL) && spellProto->SpellIconID == 29)
|
|
||||||
{
|
|
||||||
CastingTime = 0;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_SHAMAN:
|
|
||||||
// totem attack
|
|
||||||
if (spellProto->SpellFamilyFlags & 0x000040000000LL)
|
|
||||||
{
|
|
||||||
if (spellProto->SpellIconID == 33) // Fire Nova totem attack must be 21.4%(untested)
|
|
||||||
CastingTime = 749; // ignore CastingTime and use as modifier
|
|
||||||
else if (spellProto->SpellIconID == 680) // Searing Totem attack 8%
|
|
||||||
CastingTime = 280; // ignore CastingTime and use as modifier
|
|
||||||
else if (spellProto->SpellIconID == 37) // Magma totem attack must be 6.67%(untested)
|
|
||||||
CastingTime = 234; // ignore CastingTimePenalty and use as modifier
|
|
||||||
}
|
|
||||||
// Lightning Shield (and proc shield from T2 8 pieces bonus ) 33% per charge
|
|
||||||
else if( (spellProto->SpellFamilyFlags & 0x00000000400LL) || spellProto->Id == 23552)
|
|
||||||
CastingTime = 1155; // ignore CastingTimePenalty and use as modifier
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_PRIEST:
|
|
||||||
// Mana Burn - 0% of Shadow Damage
|
|
||||||
if((spellProto->SpellFamilyFlags & 0x10LL) && spellProto->SpellIconID == 212)
|
|
||||||
{
|
|
||||||
CastingTime = 0;
|
|
||||||
}
|
|
||||||
// Mind Flay - 59% of Shadow Damage
|
|
||||||
else if((spellProto->SpellFamilyFlags & 0x800000LL) && spellProto->SpellIconID == 548)
|
|
||||||
{
|
|
||||||
CastingTime = 2065;
|
|
||||||
}
|
|
||||||
// Holy Fire - 86.71%, DoT - 16.5%
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x100000LL) && spellProto->SpellIconID == 156)
|
|
||||||
{
|
|
||||||
DotFactor = damagetype == DOT ? 0.165f : 1.0f;
|
|
||||||
CastingTime = damagetype == DOT ? 3500 : 3035;
|
|
||||||
}
|
|
||||||
// Shadowguard - 28% per charge
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x2000000LL) && spellProto->SpellIconID == 19)
|
|
||||||
{
|
|
||||||
CastingTime = 980;
|
|
||||||
}
|
|
||||||
// Touch of Weakeness - 10%
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x80000LL) && spellProto->SpellIconID == 1591)
|
|
||||||
{
|
|
||||||
CastingTime = 350;
|
|
||||||
}
|
|
||||||
// Reflective Shield (back damage) - 0% (other spells fit to check not have damage effects/auras)
|
|
||||||
else if (spellProto->SpellFamilyFlags == 0 && spellProto->SpellIconID == 566)
|
|
||||||
{
|
|
||||||
CastingTime = 0;
|
|
||||||
}
|
|
||||||
// Holy Nova - 14%
|
|
||||||
else if ((spellProto->SpellFamilyFlags & 0x400000LL) && spellProto->SpellIconID == 1874)
|
|
||||||
{
|
|
||||||
CastingTime = 500;
|
|
||||||
}
|
|
||||||
break;*/
|
|
||||||
|
|
||||||
// Custom scripted damage
|
// Custom scripted damage
|
||||||
// Ice Lance
|
// Ice Lance
|
||||||
if (spellProto->SpellFamilyName == SPELLFAMILY_MAGE && spellProto->SpellIconID == 186)
|
if (spellProto->SpellFamilyName == SPELLFAMILY_MAGE && spellProto->SpellIconID == 186)
|
||||||
@@ -9161,15 +8968,6 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
|
|||||||
if(Unit* owner = GetOwner())
|
if(Unit* owner = GetOwner())
|
||||||
return owner->SpellHealingBonus(pVictim, spellProto, healamount, damagetype, stack);
|
return owner->SpellHealingBonus(pVictim, spellProto, healamount, damagetype, stack);
|
||||||
|
|
||||||
// TODO: to be deleted
|
|
||||||
// These Spells are doing fixed amount of healing (TODO found less hack-like check)
|
|
||||||
if (spellProto->Id == 15290 || spellProto->Id == 39373 ||
|
|
||||||
spellProto->Id == 33778 || spellProto->Id == 379 ||
|
|
||||||
spellProto->Id == 38395 || spellProto->Id == 40972 ||
|
|
||||||
spellProto->Id == 22845 || spellProto->Id == 33504 ||
|
|
||||||
spellProto->Id == 34299)
|
|
||||||
return healamount;
|
|
||||||
|
|
||||||
// Healing Done
|
// Healing Done
|
||||||
// Taken/Done total percent damage auras
|
// Taken/Done total percent damage auras
|
||||||
float DoneTotalMod = 1.0f;
|
float DoneTotalMod = 1.0f;
|
||||||
@@ -9243,63 +9041,6 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*// Exception
|
|
||||||
switch (spellProto->SpellFamilyName)
|
|
||||||
{
|
|
||||||
case SPELLFAMILY_GENERIC:
|
|
||||||
// Healing stream from totem (add 6% per tick from hill bonus owner)
|
|
||||||
// Possibly need do it on apply dummy aura
|
|
||||||
if (spellProto->Id == 52042)
|
|
||||||
CastingTime = 210;
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_SHAMAN:
|
|
||||||
// Earth Shield 30% per charge
|
|
||||||
if (spellProto->SpellFamilyFlags & 0x40000000000LL)
|
|
||||||
CastingTime = 1050;
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_DRUID:
|
|
||||||
// Lifebloom
|
|
||||||
if (spellProto->SpellFamilyFlags & 0x1000000000LL)
|
|
||||||
{
|
|
||||||
CastingTime = damagetype == DOT ? 3500 : 1200;
|
|
||||||
DotFactor = damagetype == DOT ? 0.519f : 1.0f;
|
|
||||||
}
|
|
||||||
// Tranquility triggered spell
|
|
||||||
else if (spellProto->SpellFamilyFlags & 0x80LL)
|
|
||||||
CastingTime = 667;
|
|
||||||
// Rejuvenation
|
|
||||||
else if (spellProto->SpellFamilyFlags & 0x10LL)
|
|
||||||
DotFactor = 0.845f;
|
|
||||||
// Regrowth
|
|
||||||
else if (spellProto->SpellFamilyFlags & 0x40LL)
|
|
||||||
{
|
|
||||||
DotFactor = damagetype == DOT ? 0.705f : 1.0f;
|
|
||||||
CastingTime = damagetype == DOT ? 3500 : 1010;
|
|
||||||
}
|
|
||||||
// Improved Leader of the Pack
|
|
||||||
else if (spellProto->AttributesEx2 == 536870912 && spellProto->SpellIconID == 312
|
|
||||||
&& spellProto->AttributesEx3 == 33554432)
|
|
||||||
{
|
|
||||||
CastingTime = 0;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_PRIEST:
|
|
||||||
// Holy Nova - 14%
|
|
||||||
if ((spellProto->SpellFamilyFlags & 0x8000000LL) && spellProto->SpellIconID == 1874)
|
|
||||||
CastingTime = 500;
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_PALADIN:
|
|
||||||
// Seal and Judgement of Light
|
|
||||||
if ( spellProto->SpellFamilyFlags & 0x100040000LL )
|
|
||||||
CastingTime = 0;
|
|
||||||
break;
|
|
||||||
case SPELLFAMILY_WARRIOR:
|
|
||||||
case SPELLFAMILY_ROGUE:
|
|
||||||
case SPELLFAMILY_HUNTER:
|
|
||||||
CastingTime = 0;
|
|
||||||
break;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
// Taken/Done fixed damage bonus auras
|
// Taken/Done fixed damage bonus auras
|
||||||
int32 DoneAdvertisedBenefit = SpellBaseHealingBonus(GetSpellSchoolMask(spellProto));
|
int32 DoneAdvertisedBenefit = SpellBaseHealingBonus(GetSpellSchoolMask(spellProto));
|
||||||
int32 TakenAdvertisedBenefit = SpellBaseHealingBonusForVictim(GetSpellSchoolMask(spellProto), pVictim);
|
int32 TakenAdvertisedBenefit = SpellBaseHealingBonusForVictim(GetSpellSchoolMask(spellProto), pVictim);
|
||||||
|
|||||||
Reference in New Issue
Block a user