Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts: src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
This commit is contained in:
commit
1e57543779
30 files changed
+1596
-622
No files matched your search
@@ -884,12 +884,6 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
|
||||
m_caster->CastSpell(unitTarget, spell->Id, true);
|
||||
return;
|
||||
}
|
||||
// Righteous Defense
|
||||
case 31980:
|
||||
{
|
||||
m_caster->CastSpell(unitTarget, 31790, true);
|
||||
return;
|
||||
}
|
||||
// Cloak of Shadows
|
||||
case 35729:
|
||||
{
|
||||
@@ -1140,32 +1134,8 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)
|
||||
return;
|
||||
|
||||
// Pre effects
|
||||
uint8 uiMaxSafeLevel = 0;
|
||||
switch (m_spellInfo->Id)
|
||||
{
|
||||
case 48129: // Scroll of Recall
|
||||
uiMaxSafeLevel = 40;
|
||||
case 60320: // Scroll of Recall II
|
||||
if (!uiMaxSafeLevel)
|
||||
uiMaxSafeLevel = 70;
|
||||
case 60321: // Scroll of Recal III
|
||||
if (!uiMaxSafeLevel)
|
||||
uiMaxSafeLevel = 80;
|
||||
|
||||
if (unitTarget->getLevel() > uiMaxSafeLevel)
|
||||
{
|
||||
unitTarget->AddAura(60444, unitTarget); //Apply Lost! Aura
|
||||
|
||||
// ALLIANCE from 60323 to 60330 - HORDE from 60328 to 60335
|
||||
uint32 spellId = 60323;
|
||||
if (m_caster->ToPlayer()->GetTeam() == HORDE)
|
||||
spellId += 5;
|
||||
|
||||
spellId += urand(0, 7);
|
||||
m_caster->CastSpell(m_caster, spellId, true);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 66550: // teleports outside (Isle of Conquest)
|
||||
if (Player* target = unitTarget->ToPlayer())
|
||||
{
|
||||
@@ -1189,7 +1159,7 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)
|
||||
// If not exist data for dest location - return
|
||||
if (!m_targets.HasDst())
|
||||
{
|
||||
sLog->outError(LOG_FILTER_SPELLS_AURAS, "Spell::EffectTeleportUnits - does not have destination for spell ID %u\n", m_spellInfo->Id);
|
||||
sLog->outError(LOG_FILTER_SPELLS_AURAS, "Spell::EffectTeleportUnits - does not have destination for spellId %u.", m_spellInfo->Id);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1586,10 +1556,6 @@ void Spell::EffectHealPct(SpellEffIndex /*effIndex*/)
|
||||
if (!m_originalCaster)
|
||||
return;
|
||||
|
||||
// Rune Tap - Party
|
||||
if (m_spellInfo->Id == 59754 && unitTarget == m_caster)
|
||||
return;
|
||||
|
||||
uint32 heal = m_originalCaster->SpellHealingBonusDone(unitTarget, m_spellInfo, unitTarget->CountPctFromMaxHealth(damage), HEAL);
|
||||
heal = unitTarget->SpellHealingBonusTaken(m_originalCaster, m_spellInfo, heal, HEAL);
|
||||
|
||||
@@ -3733,23 +3699,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
|
||||
return;
|
||||
unitTarget->RemoveAurasDueToSpell(m_spellInfo->Effects[effIndex].CalcValue());
|
||||
break;
|
||||
// PX-238 Winter Wondervolt TRAP
|
||||
case 26275:
|
||||
{
|
||||
uint32 spells[4] = { 26272, 26157, 26273, 26274 };
|
||||
|
||||
// check presence
|
||||
for (uint8 j = 0; j < 4; ++j)
|
||||
if (unitTarget->HasAuraEffect(spells[j], 0))
|
||||
return;
|
||||
|
||||
// select spell
|
||||
uint32 iTmpSpellId = spells[urand(0, 3)];
|
||||
|
||||
// cast
|
||||
unitTarget->CastSpell(unitTarget, iTmpSpellId, true);
|
||||
return;
|
||||
}
|
||||
// Bending Shinbone
|
||||
case 8856:
|
||||
{
|
||||
@@ -3795,14 +3744,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
|
||||
m_caster->CastSpell(unitTarget, 22682, true);
|
||||
return;
|
||||
}
|
||||
// Piccolo of the Flaming Fire
|
||||
case 17512:
|
||||
{
|
||||
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
unitTarget->HandleEmoteCommand(EMOTE_STATE_DANCE);
|
||||
return;
|
||||
}
|
||||
// Decimate
|
||||
case 28374:
|
||||
case 54426:
|
||||
@@ -3945,17 +3886,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
|
||||
m_caster->MonsterTextEmote(buf, 0);
|
||||
break;
|
||||
}
|
||||
// Vigilance
|
||||
case 50725:
|
||||
{
|
||||
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
// Remove Taunt cooldown
|
||||
unitTarget->ToPlayer()->RemoveSpellCooldown(355, true);
|
||||
|
||||
return;
|
||||
}
|
||||
// Death Knight Initiate Visual
|
||||
case 51519:
|
||||
{
|
||||
@@ -4114,17 +4044,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
|
||||
}
|
||||
return;
|
||||
}
|
||||
case 63845: // Create Lance
|
||||
{
|
||||
if (m_caster->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
if (m_caster->ToPlayer()->GetTeam() == ALLIANCE)
|
||||
m_caster->CastSpell(m_caster, 63914, true);
|
||||
else
|
||||
m_caster->CastSpell(m_caster, 63919, true);
|
||||
return;
|
||||
}
|
||||
case 59317: // Teleporting
|
||||
{
|
||||
|
||||
@@ -4318,46 +4237,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
|
||||
return;
|
||||
}
|
||||
}
|
||||
case SPELLFAMILY_POTION:
|
||||
{
|
||||
switch (m_spellInfo->Id)
|
||||
{
|
||||
// Netherbloom
|
||||
case 28702:
|
||||
{
|
||||
if (!unitTarget)
|
||||
return;
|
||||
// 25% chance of casting a random buff
|
||||
if (roll_chance_i(75))
|
||||
return;
|
||||
|
||||
// triggered spells are 28703 to 28707
|
||||
// Note: some sources say, that there was the possibility of
|
||||
// receiving a debuff. However, this seems to be removed by a patch.
|
||||
const uint32 spellid = 28703;
|
||||
|
||||
// don't overwrite an existing aura
|
||||
for (uint8 i = 0; i < 5; ++i)
|
||||
if (unitTarget->HasAura(spellid + i))
|
||||
return;
|
||||
unitTarget->CastSpell(unitTarget, spellid+urand(0, 4), true);
|
||||
break;
|
||||
}
|
||||
|
||||
// Nightmare Vine
|
||||
case 28720:
|
||||
{
|
||||
if (!unitTarget)
|
||||
return;
|
||||
// 25% chance of casting Nightmare Pollen
|
||||
if (roll_chance_i(75))
|
||||
return;
|
||||
unitTarget->CastSpell(unitTarget, 28721, true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SPELLFAMILY_DEATHKNIGHT:
|
||||
{
|
||||
// Pestilence
|
||||
@@ -4378,19 +4257,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SPELLFAMILY_WARRIOR:
|
||||
{
|
||||
// Shattering Throw
|
||||
if (m_spellInfo->SpellFamilyFlags[1] & 0x00400000)
|
||||
{
|
||||
if (!unitTarget)
|
||||
return;
|
||||
// remove shields, will still display immune to damage part
|
||||
unitTarget->RemoveAurasWithMechanic(1<<MECHANIC_IMMUNE_SHIELD, AURA_REMOVE_BY_ENEMY_SPELL);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// normal DB scripted effect
|
||||
@@ -4869,44 +4735,11 @@ void Spell::EffectResurrect(SpellEffIndex effIndex)
|
||||
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET)
|
||||
return;
|
||||
|
||||
if (!unitTarget)
|
||||
return;
|
||||
if (unitTarget->GetTypeId() != TYPEID_PLAYER)
|
||||
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
if (unitTarget->isAlive())
|
||||
if (unitTarget->isAlive() || !unitTarget->IsInWorld())
|
||||
return;
|
||||
if (!unitTarget->IsInWorld())
|
||||
return;
|
||||
|
||||
switch (m_spellInfo->Id)
|
||||
{
|
||||
// Defibrillate (Goblin Jumper Cables) have 33% chance on success
|
||||
case 8342:
|
||||
if (roll_chance_i(67))
|
||||
{
|
||||
m_caster->CastSpell(m_caster, 8338, true, m_CastItem);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
// Defibrillate (Goblin Jumper Cables XL) have 50% chance on success
|
||||
case 22999:
|
||||
if (roll_chance_i(50))
|
||||
{
|
||||
m_caster->CastSpell(m_caster, 23055, true, m_CastItem);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
// Defibrillate (Gnomish Army Knife) have 67% chance on success_list
|
||||
case 54732:
|
||||
if (roll_chance_i(33))
|
||||
{
|
||||
return;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Player* target = unitTarget->ToPlayer();
|
||||
|
||||
@@ -5151,26 +4984,10 @@ void Spell::EffectKnockBack(SpellEffIndex effIndex)
|
||||
if (creatureTarget->isWorldBoss() || creatureTarget->IsDungeonBoss())
|
||||
return;
|
||||
|
||||
// Spells with SPELL_EFFECT_KNOCK_BACK(like Thunderstorm) can't knoback target if target has ROOT/STUN
|
||||
// Spells with SPELL_EFFECT_KNOCK_BACK (like Thunderstorm) can't knockback target if target has ROOT/STUN
|
||||
if (unitTarget->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED))
|
||||
return;
|
||||
|
||||
// Typhoon
|
||||
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x01000000)
|
||||
{
|
||||
// Glyph of Typhoon
|
||||
if (m_caster->HasAura(62135))
|
||||
return;
|
||||
}
|
||||
|
||||
// Thunderstorm
|
||||
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags[1] & 0x00002000)
|
||||
{
|
||||
// Glyph of Thunderstorm
|
||||
if (m_caster->HasAura(62132))
|
||||
return;
|
||||
}
|
||||
|
||||
// Instantly interrupt non melee spells being casted
|
||||
if (unitTarget->IsNonMeleeSpellCasted(true))
|
||||
unitTarget->InterruptNonMeleeSpells(true);
|
||||
|
||||
Reference in new issue
Block a user