mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-18 01:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Over 100 camangos Cata commits applied (to c12950)

Browse source 
Over 100 camangos Cata commits applied. up to and inclusing c12950.
This commit is contained in:
Charles A Edwards 2016-08-20 17:10:24 +01:00 • committed by Antz
parent b4ec0440aa
commit eef77eadb9
117 changed files with 4314 additions and 3547 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/game/Object/SpellMgr.cpp
View file

@ -776,6 +776,8 @@ bool IsPositiveEffect(SpellEntry const* spellproto, SpellEffectIndex effIndex)
// some explicitly required script effect sets
switch (spellproto->Id)
{
case 42436: // Drink!
case 42492: // Cast Energized
case 46650: // Open Brutallus Back Door
case 62488: // Activate Construct
case 64503: // Water
@ -903,6 +905,7 @@ bool IsPositiveEffect(SpellEntry const* spellproto, SpellEffectIndex effIndex)
case SPELL_AURA_PERIODIC_LEECH:
case SPELL_AURA_MOD_STALKED:
case SPELL_AURA_PERIODIC_DAMAGE_PERCENT:
case SPELL_AURA_PREVENT_RESURRECTION:
return false;
case SPELL_AURA_PERIODIC_DAMAGE: // used in positive spells also.
// part of negative spell if casted at self (prevent cancel)
@ -2231,6 +2234,25 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
if ((spellInfo_1->Id == 62559 && spellInfo_2->Id == 62538) ||
(spellInfo_2->Id == 62559 && spellInfo_1->Id == 62538))
return false;
// Phase 2 Transform and Shadowy Barrier
if ((spellInfo_1->Id == 65157 && spellInfo_2->Id == 64775) ||
(spellInfo_2->Id == 65157 && spellInfo_1->Id == 64775))
return false;
// Empowered (dummy) and Empowered
if ((spellInfo_1->Id == 64161 && spellInfo_2->Id == 65294) ||
(spellInfo_2->Id == 64161 && spellInfo_1->Id == 65294))
return false;
// Spectral Realm (reaction) and Spectral Realm (invisibility)
if ((spellInfo_1->Id == 44852 && spellInfo_2->Id == 46021) ||
(spellInfo_2->Id == 44852 && spellInfo_1->Id == 46021))
return false;
// Halls of Reflection Clone
if (spellInfo_1->SpellIconID == 692 && spellInfo_2->SpellIconID == 692)
return false;
break;
}
case SPELLFAMILY_MAGE:
@ -3489,7 +3511,11 @@ void SpellMgr::LoadSpellScriptTarget()
spellEffect->EffectImplicitTargetA == TARGET_AREAEFFECT_GO_AROUND_SOURCE ||
spellEffect->EffectImplicitTargetB == TARGET_AREAEFFECT_GO_AROUND_SOURCE ||
spellEffect->EffectImplicitTargetA == TARGET_AREAEFFECT_GO_AROUND_DEST ||
spellEffect->EffectImplicitTargetB == TARGET_AREAEFFECT_GO_AROUND_DEST)
spellEffect->EffectImplicitTargetB == TARGET_AREAEFFECT_GO_AROUND_DEST ||
spellEffect->EffectImplicitTargetA == TARGET_NARROW_FRONTAL_CONE ||
spellEffect->EffectImplicitTargetB == TARGET_NARROW_FRONTAL_CONE ||
spellEffect->EffectImplicitTargetA == TARGET_NARROW_FRONTAL_CONE_2 ||
spellEffect->EffectImplicitTargetB == TARGET_NARROW_FRONTAL_CONE_2)
{
targetfound = true;
break;