Core: Use new SpellInfo class in core. Sadly, this commit is not compatibile with some of the custom code. To make your code work again you may need to change:

*SpellEntry is now SpellInfo
*GetSpellProto is now GetSpellInfo
*SpellEntry::Effect*[effIndex] is now avalible under SpellInfo.Effects[effIndex].*
*sSpellStore.LookupEntry is no longer valid, use sSpellMgr->GetSpellInfo()
*SpellFunctions from SpellMgr.h like DoSpellStuff(spellId) are now: spellInfo->DoStuff()
*SpellMgr::CalculateEffectValue and similar functions are now avalible in SpellEffectInfo class.
*GET_SPELL macro is removed, code which used it is moved to SpellMgr::LoadDbcDataCorrections
*code which affected dbc data in SpellMgr::LoadSpellCustomAttr is now moved to LoadDbcDataCorrections
This commit is contained in:
QAston committed 2011-07-26 23:09:28 +02:00
1 parent 29c228a801
commit b0fe236265
195 files changed
+4630 -6929

No files matched your search

+2 -2
View File
@@ -976,11 +976,11 @@ public:
{
// reset all states
for (int i = 1; i <= 32; ++i)
unit->ModifyAuraState(AuraState(i), false);
unit->ModifyAuraState(AuraStateType(i), false);
return true;
}
unit->ModifyAuraState(AuraState(abs(state)), state > 0);
unit->ModifyAuraState(AuraStateType(abs(state)), state > 0);
return true;
}
+10 -10
View File
@@ -80,13 +80,13 @@ public:
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint32 spell = handler->extractSpellIdFromLink((char*)args);
if (!spell || !sSpellStore.LookupEntry(spell))
if (!spell || !sSpellMgr->GetSpellInfo(spell))
return false;
char const* allStr = strtok(NULL, " ");
bool allRanks = allStr ? (strncmp(allStr, "all", strlen(allStr)) == 0) : false;
SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spell);
if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer()))
{
handler->PSendSysMessage(LANG_COMMAND_SPELL_BROKEN, spell);
@@ -118,13 +118,13 @@ public:
static bool HandleLearnAllGMCommand(ChatHandler* handler, const char* /*args*/)
{
for (uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
for (uint32 i = 0; i < sSpellMgr->GetSpellInfoStoreSize(); ++i)
{
SpellEntry const* spellInfo = sSpellStore.LookupEntry(i);
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(i);
if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false))
continue;
if (!sSpellMgr->IsSkillTypeSpell(i, SKILL_INTERNAL))
if (!spellInfo->IsAbilityOfSkillType(SKILL_INTERNAL))
continue;
handler->GetSession()->GetPlayer()->learnSpell(i, false);
@@ -154,12 +154,12 @@ public:
if (!entry)
continue;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(entry->spellId);
SpellInfo const *spellInfo = sSpellMgr->GetSpellInfo(entry->spellId);
if (!spellInfo)
continue;
// skip server-side/triggered spells
if (spellInfo->spellLevel == 0)
if (spellInfo->SpellLevel == 0)
continue;
// skip wrong class/race skills
@@ -218,7 +218,7 @@ public:
if (!spellId) // ??? none spells in talent
continue;
SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId);
if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false))
continue;
@@ -297,7 +297,7 @@ public:
if (!spellid) // ??? none spells in talent
continue;
SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid);
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellid);
if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, handler->GetSession()->GetPlayer(), false))
continue;
@@ -456,7 +456,7 @@ public:
if (skillLine->classmask && (skillLine->classmask & classmask) == 0)
continue;
SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->spellId);
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(skillLine->spellId);
if (!spellInfo || !SpellMgr::IsSpellValid(spellInfo, player, false))
continue;
@@ -98,7 +98,7 @@ public:
void UpdateAI(const uint32 diff);
void SpellHit(Unit* /*source*/, const SpellEntry *spell)
void SpellHit(Unit* /*source*/, const SpellInfo *spell)
{
if (spell->Mechanic == MECHANIC_DISARM)
DoScriptText(SAY_DISARMED, me);
@@ -149,7 +149,7 @@ public:
CAST_CRE(pMalchezaar)->AI()->KilledUnit(who);
}
void SpellHit(Unit* /*who*/, const SpellEntry *spell)
void SpellHit(Unit* /*who*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_INFERNAL_RELAY)
{
@@ -305,7 +305,7 @@ public:
void EnfeebleHealthEffect()
{
const SpellEntry *info = GetSpellStore()->LookupEntry(SPELL_ENFEEBLE_EFFECT);
const SpellInfo *info = sSpellMgr->GetSpellInfo(SPELL_ENFEEBLE_EFFECT);
if (!info)
return;
@@ -486,12 +486,12 @@ public:
DrinkInturrupted = true;
}
void SpellHit(Unit* /*pAttacker*/, const SpellEntry* Spell)
void SpellHit(Unit* /*pAttacker*/, const SpellInfo* Spell)
{
//We only care about interrupt effects and only if they are durring a spell currently being casted
if ((Spell->Effect[0] != SPELL_EFFECT_INTERRUPT_CAST &&
Spell->Effect[1] != SPELL_EFFECT_INTERRUPT_CAST &&
Spell->Effect[2] != SPELL_EFFECT_INTERRUPT_CAST) || !me->IsNonMeleeSpellCasted(false))
if ((Spell->Effects[0].Effect != SPELL_EFFECT_INTERRUPT_CAST &&
Spell->Effects[1].Effect != SPELL_EFFECT_INTERRUPT_CAST &&
Spell->Effects[2].Effect != SPELL_EFFECT_INTERRUPT_CAST) || !me->IsNonMeleeSpellCasted(false))
return;
//Interrupt effect
@@ -340,7 +340,7 @@ public:
me->DespawnOrUnsummon();
}
void SpellHit(Unit* /*caster*/, const SpellEntry *Spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *Spell)
{
if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand()%10)))
{
@@ -1080,7 +1080,7 @@ public:
me->DespawnOrUnsummon();
}
void SpellHit(Unit* /*caster*/, const SpellEntry *Spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *Spell)
{
if (Spell->Id == SPELL_DRINK_POISON)
{
@@ -138,14 +138,14 @@ public:
if (lList.isEmpty())
return;
SpellEntry const* pSpell = GetSpellStore()->LookupEntry(SPELL_ORB_KILL_CREDIT);
SpellInfo const* pSpell = sSpellMgr->GetSpellInfo(SPELL_ORB_KILL_CREDIT);
for (Map::PlayerList::const_iterator i = lList.begin(); i != lList.end(); ++i)
{
if (Player* player = i->getSource())
{
if (pSpell && pSpell->EffectMiscValue[0])
player->KilledMonsterCredit(pSpell->EffectMiscValue[0], 0);
if (pSpell && pSpell->Effects[0].MiscValue)
player->KilledMonsterCredit(pSpell->Effects[0].MiscValue, 0);
}
}
}
@@ -436,7 +436,7 @@ public:
m_bIsDuelInProgress = false;
}
void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
void SpellHit(Unit* pCaster, const SpellInfo* pSpell)
{
if (!m_bIsDuelInProgress && pSpell->Id == SPELL_DUEL)
{
@@ -625,7 +625,7 @@ public:
{
npc_salanar_the_horsemanAI(Creature* c) : ScriptedAI(c) {}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
if (spell->Id == DELIVER_STOLEN_HORSE)
{
@@ -71,7 +71,7 @@ public:
me->RestoreFaction();
}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->isAlive() && !uiSpeech_counter)
{
@@ -143,13 +143,6 @@ public:
mob_wisp_invisAI(Creature* c) : ScriptedAI(c)
{
Creaturetype = delay = spell = spell2 = 0;
//that's hack but there are no info about range of this spells in dbc
SpellEntry *wisp = GET_SPELL(SPELL_WISP_BLUE);
if (wisp)
wisp->rangeIndex = 6; //100 yards
SpellEntry *port = GET_SPELL(SPELL_WISP_FLIGHT_PORT);
if (port)
port->rangeIndex = 6;
}
uint32 Creaturetype;
@@ -183,7 +176,7 @@ public:
DoCast(me, spell);
}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_WISP_FLIGHT_PORT && Creaturetype == 4)
me->SetDisplayId(2027);
@@ -290,7 +283,7 @@ public:
}
}
void SpellHit(Unit* caster, const SpellEntry* spell)
void SpellHit(Unit* caster, const SpellInfo* spell)
{
if (!withbody)
return;
@@ -534,7 +527,7 @@ public:
return NULL;
}
void SpellHitTarget(Unit* unit, const SpellEntry* spell)
void SpellHitTarget(Unit* unit, const SpellInfo* spell)
{
if (spell->Id == SPELL_CONFLAGRATION && unit->HasAura(SPELL_CONFLAGRATION))
SaySound(SAY_CONFLAGRATION, unit);
@@ -553,7 +546,7 @@ public:
pInstance->SetData(DATA_HORSEMAN_EVENT, DONE);
}
void SpellHit(Unit* caster, const SpellEntry* spell)
void SpellHit(Unit* caster, const SpellInfo* spell)
{
if (withhead)
return;
@@ -781,7 +774,7 @@ public:
void EnterCombat(Unit* /*who*/){}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_SPROUTING)
{
@@ -157,7 +157,7 @@ public:
}
}
void SpellHit(Unit* /*who*/, const SpellEntry* pSpell)
void SpellHit(Unit* /*who*/, const SpellInfo* pSpell)
{
//When hit with ressurection say text
if (pSpell->Id == SPELL_SCARLETRESURRECTION)
@@ -148,7 +148,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
if (caster->GetTypeId() == TYPEID_PLAYER)
{
@@ -224,7 +224,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (!Tagged && spell->Id == SPELL_EGAN_BLASTER)
Tagged = true;
@@ -181,7 +181,7 @@ public:
me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
}
void SpellHitTarget(Unit* target, const SpellEntry* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell)
{
switch(spell->Id)
{
@@ -476,7 +476,7 @@ public:
me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
}
void SpellHitTarget(Unit* target, const SpellEntry* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell)
{
switch(spell->Id)
{
@@ -701,7 +701,7 @@ public:
void EnterCombat(Unit* /*who*/){}
void SpellHitTarget(Unit* target, const SpellEntry* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell)
{
switch(spell->Id)
{
@@ -118,17 +118,6 @@ public:
boss_felmystAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
// wait for core patch be accepted
/*SpellEntry *TempSpell = GET_SPELL(SPELL_ENCAPSULATE_EFFECT);
if (TempSpell->SpellIconID == 2294)
TempSpell->SpellIconID = 2295;
TempSpell = GET_SPELL(SPELL_VAPOR_TRIGGER);
if ((TempSpell->Attributes & SPELL_ATTR0_PASSIVE) == 0)
TempSpell->Attributes |= SPELL_ATTR0_PASSIVE;
TempSpell = GET_SPELL(SPELL_FOG_CHARM2);
if ((TempSpell->Attributes & SPELL_ATTR0_PASSIVE) == 0)
TempSpell->Attributes |= SPELL_ATTR0_PASSIVE;*/
}
InstanceScript *pInstance;
@@ -203,7 +192,7 @@ public:
pInstance->SetData(DATA_FELMYST_EVENT, DONE);
}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
// workaround for linked aura
/*if (spell->Id == SPELL_VAPOR_FORCE)
@@ -122,9 +122,6 @@ public:
DoorGUID = 0;
bJustReset = false;
me->setActive(true);
SpellEntry *TempSpell = GET_SPELL(SPELL_SPECTRAL_BLAST);
if (TempSpell)
TempSpell->EffectImplicitTargetB[0] = TARGET_UNIT_TARGET_ENEMY;
}
InstanceScript *pInstance;
@@ -413,7 +413,7 @@ public:
Summons.Summon(summoned);
}
void SpellHit(Unit* /*caster*/, const SpellEntry* Spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* Spell)
{
float x, y, z, o;
me->GetHomePosition(x, y, z, o);
@@ -475,10 +475,10 @@ public:
me->AddUnitState(UNIT_STAT_STUNNED);
}
void SpellHit(Unit* /*caster*/, const SpellEntry* Spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* Spell)
{
for (uint8 i = 0; i < 3; ++i)
if (Spell->Effect[i] == 38)
if (Spell->Effects[i].Effect == 38)
me->DisappearAndDie();
}
@@ -112,10 +112,10 @@ class boss_archaedas : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
// Being woken up from the altar, start the awaken sequence
if (spell == GetSpellStore()->LookupEntry(SPELL_ARCHAEDAS_AWAKEN))
if (spell == sSpellMgr->GetSpellInfo(SPELL_ARCHAEDAS_AWAKEN))
{
me->MonsterYell(SAY_AGGRO, LANG_UNIVERSAL, 0);
DoPlaySoundToSet(me, SOUND_AGGRO);
@@ -267,9 +267,9 @@ class mob_archaedas_minions : public CreatureScript
bAmIAwake = true;
}
void SpellHit (Unit* /*caster*/, const SpellEntry *spell) {
void SpellHit (Unit* /*caster*/, const SpellInfo *spell) {
// time to wake up, start animation
if (spell == GetSpellStore()->LookupEntry(SPELL_ARCHAEDAS_AWAKEN))
if (spell == sSpellMgr->GetSpellInfo(SPELL_ARCHAEDAS_AWAKEN))
{
iAwakenTimer = 5000;
bWakingUp = true;
@@ -37,7 +37,6 @@ enum Spells
SPELL_GUST_OF_WIND = 43621,
SPELL_ELECTRICAL_STORM = 43648,
SPELL_BERSERK = 45078,
SPELL_ELECTRICAL_DAMAGE = 43657,
SPELL_ELECTRICAL_OVERLOAD = 43658,
SPELL_EAGLE_SWOOP = 44732
};
@@ -75,9 +74,6 @@ class boss_akilzon : public CreatureScript
{
boss_akilzonAI(Creature* c) : ScriptedAI(c)
{
SpellEntry *TempSpell = GET_SPELL(SPELL_ELECTRICAL_DAMAGE);
if (TempSpell)
TempSpell->EffectBasePoints[1] = 49;//disable bugged lightning until fixed in core
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
@@ -61,7 +61,6 @@ EndScriptData */
#define SPELL_SHRED_ARMOR 43243
#define MOB_TOTEM 24224
#define SPELL_LIGHTNING 43301
enum PhaseHalazzi
{
@@ -87,10 +86,6 @@ class boss_halazzi : public CreatureScript
boss_halazziAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
// need to find out what controls totem's spell cooldown
SpellEntry *TempSpell = GET_SPELL(SPELL_LIGHTNING);
if (TempSpell && TempSpell->CastingTimeIndex != 5)
TempSpell->CastingTimeIndex = 5; // 2000 ms casting time
}
InstanceScript *pInstance;
@@ -147,7 +142,7 @@ class boss_halazzi : public CreatureScript
damage = 0;
}
void SpellHit(Unit*, const SpellEntry *spell)
void SpellHit(Unit*, const SpellInfo *spell)
{
if (spell->Id == SPELL_TRANSFORM_SPLIT2)
EnterPhase(PHASE_HUMAN);
@@ -454,7 +454,7 @@ class mob_janalai_firebomb : public CreatureScript
void Reset() {}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_FIRE_BOMB_THROW)
DoCast(me, SPELL_FIRE_BOMB_DUMMY, true);
@@ -685,7 +685,7 @@ public:
void UpdateAI(uint32 const /*diff*/) {}
void SpellHit(Unit* /*caster*/, const SpellEntry* spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
{
if (spell->Id == SPELL_HATCH_EGG)
{
@@ -610,7 +610,7 @@ class mob_zuljin_vortex : public CreatureScript
void EnterCombat(Unit* /*pTarget*/) {}
void SpellHit(Unit* caster, const SpellEntry* spell)
void SpellHit(Unit* caster, const SpellInfo* spell)
{
if (spell->Id == SPELL_ZAP_INFORM)
DoCast(caster, SPELL_ZAP_DAMAGE, true);
@@ -91,7 +91,7 @@ class npc_forest_frog : public CreatureScript
}
}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == ENTRY_FOREST_FROG)
{
@@ -120,7 +120,7 @@ public:
PlayerGUID = 0;
}
void SpellHit(Unit* caster, const SpellEntry* spell)
void SpellHit(Unit* caster, const SpellInfo* spell)
{
if (!caster)
return;
@@ -85,7 +85,7 @@ public:
}
}
void SpellHit(Unit* Hitter, const SpellEntry *Spellkind)
void SpellHit(Unit* Hitter, const SpellInfo *Spellkind)
{
if ((Spellkind->Id == SPELL_SHIMMERING_VESSEL) && !spellHit &&
(Hitter->GetTypeId() == TYPEID_PLAYER) && (CAST_PLR(Hitter)->IsActiveQuest(QUEST_REDEEMING_THE_DEAD)))
@@ -59,7 +59,7 @@ public:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
if (caster->GetTypeId() == TYPEID_PLAYER)
{
@@ -48,10 +48,10 @@ class spell_ex_5581 : public SpellScriptLoader
// function called on server startup
// checks if script has data required for it to work
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
// check if spellid 70522 exists in dbc, we will trigger it later
if (!sSpellStore.LookupEntry(SPELL_TRIGGERED))
if (!sSpellMgr->GetSpellInfo(SPELL_TRIGGERED))
return false;
return true;
}
@@ -147,10 +147,10 @@ class spell_ex_66244 : public SpellScriptLoader
PrepareAuraScript(spell_ex_66244AuraScript);
// function called on server startup
// checks if script has data required for it to work
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
// check if spellid exists in dbc, we will trigger it later
if (!sSpellStore.LookupEntry(SPELL_TRIGGERED))
if (!sSpellMgr->GetSpellInfo(SPELL_TRIGGERED))
return false;
return true;
}
@@ -379,7 +379,7 @@ class spell_ex : public SpellScriptLoader
{
PrepareSpellScript(spell_ex_SpellScript);
//bool Validate(SpellEntry const* spellEntry){return true;}
//bool Validate(SpellInfo const* spellEntry){return true;}
//bool Load(){return true;}
//void Unload(){}
@@ -406,7 +406,7 @@ class spell_ex : public SpellScriptLoader
class spell_ex_AuraScript : public AuraScript
{
PrepareAuraScript(spell_ex)
//bool Validate(SpellEntry const* spellEntry){return true;}
//bool Validate(SpellInfo const* spellEntry){return true;}
//bool Load(){return true;}
//void Unload(){}
@@ -69,12 +69,6 @@ public:
pInstance = c->GetInstanceScript();
pGo = false;
pos = 0;
SpellEntry *TempSpell = GET_SPELL(SPELL_SLEEP);
if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
{
TempSpell->EffectImplicitTargetA[0] = 1;
TempSpell->EffectImplicitTargetB[0] = 0;
}
}
uint32 SwarmTimer;
@@ -60,9 +60,6 @@ public:
pInstance = c->GetInstanceScript();
pGo = false;
pos = 0;
SpellEntry *TempSpell = GET_SPELL(SPELL_HOWL_OF_AZGALOR);
if (TempSpell)
TempSpell->EffectRadiusIndex[0] = 12;//100yards instead of 50000?!
}
uint32 RainTimer;
@@ -57,12 +57,6 @@ public:
pInstance = c->GetInstanceScript();
pGo = false;
pos = 0;
SpellEntry *TempSpell = GET_SPELL(SPELL_MARK);
if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1)
{
TempSpell->EffectImplicitTargetA[0] = 1;
TempSpell->EffectImplicitTargetB[0] = 0;
}
}
uint32 CleaveTimer;
@@ -1215,7 +1215,7 @@ class npc_crate_helper : public CreatureScript
_marked = false;
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_ARCANE_DISRUPTION && !_marked)
{
@@ -141,7 +141,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void SpellHit(Unit* /*caster*/, const SpellEntry* spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
{
if (SpellCorrupt_Timer)
return;
@@ -225,7 +225,7 @@ public:
DoScriptText(SAY_KILL, me);
}
void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell)
void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell)
{
if (pSpell->Id == SPELL_BREATH_EAST_TO_WEST ||
pSpell->Id == SPELL_BREATH_WEST_TO_EAST ||
@@ -285,7 +285,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellEntry* pSpell)
void SpellHitTarget(Unit* target, const SpellInfo* pSpell)
{
//Workaround - Couldn't find a way to group this spells (All Eruption)
if (((pSpell->Id >= 17086 && pSpell->Id <= 17095) ||
@@ -157,7 +157,7 @@ struct boss_twinemperorsAI : public ScriptedAI
}
}
void SpellHit(Unit* caster, const SpellEntry *entry)
void SpellHit(Unit* caster, const SpellInfo *entry)
{
if (caster == me)
return;
+1 -1
View File
@@ -63,7 +63,7 @@ public:
void EnterCombat(Unit* /*who*/) { }
void SpellHit(Unit* Hitter, const SpellEntry *Spellkind)
void SpellHit(Unit* Hitter, const SpellInfo *Spellkind)
{
if (!spellhit &&
Hitter->GetTypeId() == TYPEID_PLAYER &&
@@ -111,7 +111,7 @@ public:
}
}
void SpellHit(Unit* Caster, const SpellEntry *Spell)
void SpellHit(Unit* Caster, const SpellInfo *Spell)
{
if (Spell->SpellFamilyFlags[2] & 0x080000000)
{
+1 -1
View File
@@ -122,7 +122,7 @@ public:
}
}
void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell)
void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell)
{
if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_AWAKEN)
ClearSleeping();
+1 -1
View File
@@ -135,7 +135,7 @@ public:
}
}
void SpellHit(Unit* /*pCaster*/, SpellEntry const* pSpell)
void SpellHit(Unit* /*pCaster*/, SpellInfo const* pSpell)
{
if (pSpell->Id == SPELL_KODO_KOMBO_GOSSIP)
{
+12 -12
View File
@@ -67,7 +67,7 @@ public:
work = true;
}
void SpellHit(Unit* caster, const SpellEntry * spell)
void SpellHit(Unit* caster, const SpellInfo * spell)
{
if (spell->Id == SPELL_AWAKEN_PEON && caster->GetTypeId() == TYPEID_PLAYER
&& CAST_PLR(caster)->GetQuestStatus(QUEST_LAZY_PEONS) == QUEST_STATUS_INCOMPLETE)
@@ -391,7 +391,7 @@ class npc_troll_volunteer : public CreatureScript
me->DespawnOrUnsummon();
}
void SpellHit(Unit* caster, SpellEntry const* spell)
void SpellHit(Unit* caster, SpellInfo const* spell)
{
if (spell->Id == SPELL_AOE_TURNIN && caster->GetEntry() == NPC_URUZIN && !_complete)
{
@@ -424,9 +424,9 @@ class spell_mount_check : public SpellScriptLoader
class spell_mount_check_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mount_check_AuraScript)
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_MOUNTING_CHECK))
if (!sSpellMgr->GetSpellInfo(SPELL_MOUNTING_CHECK))
return false;
return true;
}
@@ -472,11 +472,11 @@ class spell_voljin_war_drums : public SpellScriptLoader
class spell_voljin_war_drums_SpellScript : public SpellScript
{
PrepareSpellScript(spell_voljin_war_drums_SpellScript)
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_MOTIVATE_1))
if (!sSpellMgr->GetSpellInfo(SPELL_MOTIVATE_1))
return false;
if (!sSpellStore.LookupEntry(SPELL_MOTIVATE_2))
if (!sSpellMgr->GetSpellInfo(SPELL_MOTIVATE_2))
return false;
return true;
}
@@ -529,12 +529,12 @@ class spell_voodoo : public SpellScriptLoader
{
PrepareSpellScript(spell_voodoo_SpellScript)
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_BREW) || !sSpellStore.LookupEntry(SPELL_GHOSTLY) ||
!sSpellStore.LookupEntry(SPELL_HEX1) || !sSpellStore.LookupEntry(SPELL_HEX2) ||
!sSpellStore.LookupEntry(SPELL_HEX3) || !sSpellStore.LookupEntry(SPELL_GROW) ||
!sSpellStore.LookupEntry(SPELL_LAUNCH))
if (!sSpellMgr->GetSpellInfo(SPELL_BREW) || !sSpellMgr->GetSpellInfo(SPELL_GHOSTLY) ||
!sSpellMgr->GetSpellInfo(SPELL_HEX1) || !sSpellMgr->GetSpellInfo(SPELL_HEX2) ||
!sSpellMgr->GetSpellInfo(SPELL_HEX3) || !sSpellMgr->GetSpellInfo(SPELL_GROW) ||
!sSpellMgr->GetSpellInfo(SPELL_LAUNCH))
return false;
return true;
}
@@ -701,16 +701,16 @@ class spell_ooze_zap : public SpellScriptLoader
{
PrepareSpellScript(spell_ooze_zap_SpellScript);
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_OOZE_ZAP))
if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP))
return false;
return true;
}
SpellCastResult CheckRequirement()
{
if (!GetCaster()->HasAura(SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), EFFECT_1)))
if (!GetCaster()->HasAura(GetSpellInfo()->Effects[EFFECT_1].CalcValue()))
return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; // This is actually correct
if (!GetTargetUnit())
@@ -748,9 +748,9 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader
{
PrepareSpellScript(spell_ooze_zap_channel_end_SpellScript);
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_OOZE_ZAP_CHANNEL_END))
if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP_CHANNEL_END))
return false;
return true;
}
@@ -784,9 +784,9 @@ class spell_energize_aoe : public SpellScriptLoader
{
PrepareSpellScript(spell_energize_aoe_SpellScript);
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_ENERGIZED))
if (!sSpellMgr->GetSpellInfo(SPELL_ENERGIZED))
return false;
return true;
}
@@ -795,7 +795,7 @@ class spell_energize_aoe : public SpellScriptLoader
{
for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end();)
{
if ((*itr)->GetTypeId() == TYPEID_PLAYER && (*itr)->ToPlayer()->GetQuestStatus(SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), EFFECT_1)) == QUEST_STATUS_INCOMPLETE)
if ((*itr)->GetTypeId() == TYPEID_PLAYER && (*itr)->ToPlayer()->GetQuestStatus(GetSpellInfo()->Effects[EFFECT_1].CalcValue()) == QUEST_STATUS_INCOMPLETE)
++itr;
else
unitList.erase(itr++);
+1 -1
View File
@@ -116,7 +116,7 @@ public:
me->UpdateEntry(NPC_KYLE_FRENZIED);
}
void SpellHit(Unit* pCaster, SpellEntry const* pSpell)
void SpellHit(Unit* pCaster, SpellInfo const* pSpell)
{
if (!me->getVictim() && !bEvent && pSpell->Id == SPELL_LUNCH)
{
+1 -1
View File
@@ -265,7 +265,7 @@ public:
me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY)
{
@@ -237,7 +237,7 @@ public:
}
}
void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell)
void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell)
{
if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_REVIVE_RINGO)
ClearFaint();
@@ -101,7 +101,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellEntry *spell)
void SpellHitTarget(Unit* target, const SpellInfo *spell)
{
if (spell->Id == SPELL_INSANITY)
{
@@ -312,7 +312,7 @@ class spell_baltharus_enervating_brand : public SpellScriptLoader
{
PreventDefaultAction();
Unit* target = GetTarget();
uint32 triggerSpellId = GetSpellProto()->EffectTriggerSpell[aurEff->GetEffIndex()];
uint32 triggerSpellId = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell;
target->CastSpell(target, triggerSpellId, true);
if (Unit* caster = GetCaster())
@@ -367,7 +367,7 @@ public:
me->SetInCombatWithZone();
}
/*void SpellHitTarget(Unit* target, const SpellEntry *pSpell)
/*void SpellHitTarget(Unit* target, const SpellInfo *pSpell)
{
if (pSpell->Id == SPELL_FEL_STREAK)
DoCastAOE(SPELL_FEL_INFERNO); //66517
@@ -772,7 +772,7 @@ public:
me->SetInCombatWithZone();
}
void SpellHitTarget(Unit* target, const SpellEntry* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell)
{
if (spell->Id == SPELL_TRAMPLE && target->GetTypeId() == TYPEID_PLAYER)
{
@@ -254,12 +254,12 @@ struct boss_twin_baseAI : public ScriptedAI
m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetHealth() >= uiDamage ? me->GetHealth() - uiDamage : 0);
}
void SpellHit(Unit* caster, const SpellEntry* spell)
void SpellHit(Unit* caster, const SpellInfo* spell)
{
if (caster->ToCreature() == me)
if (spell->Effect[0] == 136) //Effect Heal
if (spell->Effects[0].Effect == 136) //Effect Heal
if (m_pInstance)
m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetHealth() + me->CountPctFromMaxHealth(spell->EffectBasePoints[0]));
m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetHealth() + me->CountPctFromMaxHealth(spell->Effects[EFFECT_0].CalcValue()));
}
void SummonColorballs(uint8 quantity)
@@ -234,7 +234,7 @@ class boss_devourer_of_souls : public CreatureScript
}
}
void SpellHitTarget(Unit* /*target*/, const SpellEntry *spell)
void SpellHitTarget(Unit* /*target*/, const SpellInfo *spell)
{
if (spell->Id == H_SPELL_PHANTOM_BLAST)
threeFaced = false;
@@ -165,7 +165,7 @@ class boss_garfrost : public CreatureScript
events.ScheduleEvent(EVENT_RESUME_ATTACK, 5000);
}
void SpellHitTarget(Unit* target, const SpellEntry* spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell)
{
if (spell->Id == SPELL_PERMAFROST_HELPER)
{
@@ -359,7 +359,7 @@ class boss_drakkari_elemental : public CreatureScript
me->DespawnOrUnsummon();
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
if (spell->Id == SPELL_MERGE)
{
@@ -447,7 +447,7 @@ class boss_prince_keleseth_icc : public CreatureScript
me->SetHealth(_spawnHealth);
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_INVOCATION_OF_BLOOD_KELESETH)
DoAction(ACTION_CAST_INVOCATION);
@@ -668,7 +668,7 @@ class boss_prince_taldaram_icc : public CreatureScript
me->SetHealth(_spawnHealth);
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_INVOCATION_OF_BLOOD_TALDARAM)
DoAction(ACTION_CAST_INVOCATION);
@@ -916,7 +916,7 @@ class boss_prince_valanar_icc : public CreatureScript
DoZoneInCombat(summon);
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_INVOCATION_OF_BLOOD_VALANAR)
DoAction(ACTION_CAST_INVOCATION);
@@ -1470,7 +1470,7 @@ class spell_taldaram_flame_ball_visual : public SpellScriptLoader
return;
// SPELL_FLAME_SPHERE_SPAWN_EFFECT
if (GetSpellProto()->Id == SPELL_FLAME_SPHERE_SPAWN_EFFECT)
if (GetSpellInfo()->Id == SPELL_FLAME_SPHERE_SPAWN_EFFECT)
{
target->CastSpell(target, SPELL_BALL_OF_FLAMES, true);
target->AI()->DoAction(ACTION_FLAME_BALL_CHASE);
@@ -488,13 +488,13 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader
{
PrepareSpellScript(spell_blood_queen_vampiric_bite_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR))
if (!sSpellMgr->GetSpellInfo(SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR))
return false;
if (!sSpellStore.LookupEntry(SPELL_FRENZIED_BLOODTHIRST))
if (!sSpellMgr->GetSpellInfo(SPELL_FRENZIED_BLOODTHIRST))
return false;
if (!sSpellStore.LookupEntry(SPELL_PRESENCE_OF_THE_DARKFALLEN))
if (!sSpellMgr->GetSpellInfo(SPELL_PRESENCE_OF_THE_DARKFALLEN))
return false;
return true;
}
@@ -607,9 +607,9 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader
{
PrepareSpellScript(spell_blood_queen_bloodbolt_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_TWILIGHT_BLOODBOLT))
if (!sSpellMgr->GetSpellInfo(SPELL_TWILIGHT_BLOODBOLT))
return false;
return true;
}
@@ -703,9 +703,9 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader
{
PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE))
if (!sSpellMgr->GetSpellInfo(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE))
return false;
return true;
}
@@ -713,8 +713,8 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader
// this is an additional effect to be executed
void PeriodicTick(AuraEffect const* aurEff)
{
SpellEntry const* damageSpell = sSpellStore.LookupEntry(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE);
int32 damage = SpellMgr::CalculateSpellEffectAmount(damageSpell, EFFECT_0);
SpellInfo const* damageSpell = sSpellMgr->GetSpellInfo(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE);
int32 damage = damageSpell->Effects[EFFECT_0].CalcValue();
float multiplier = 0.3375f + 0.1f * uint32(aurEff->GetTickNumber()/10); // do not convert to 0.01f - we need tick number/10 as INT (damage increases every 10 ticks)
damage = int32(damage * multiplier);
GetTarget()->CastCustomSpell(SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE, SPELLVALUE_BASE_POINT0, damage, GetTarget(), true);
@@ -377,7 +377,7 @@ class boss_deathbringer_saurfang : public CreatureScript
instance->HandleGameObject(instance->GetData64(GO_SAURFANG_S_DOOR), false);
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
switch (spell->Id)
{
@@ -625,7 +625,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript
}
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_GRIP_OF_AGONY)
{
@@ -828,7 +828,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
}
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_GRIP_OF_AGONY)
{
@@ -930,7 +930,7 @@ class npc_saurfang_event : public CreatureScript
_index = data;
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_GRIP_OF_AGONY)
{
@@ -966,11 +966,11 @@ class spell_deathbringer_blood_link : public SpellScriptLoader
{
PrepareSpellScript(spell_deathbringer_blood_link_SpellScript);
bool Validate(SpellEntry const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/)
{
if (!sSpellStore.LookupEntry(SPELL_BLOOD_LINK_POWER))
if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_POWER))
return false;
if (!sSpellStore.LookupEntry(SPELL_BLOOD_POWER))
if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_POWER))
return false;
return true;
}
@@ -1004,9 +1004,9 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader
{
PrepareAuraScript(spell_deathbringer_blood_link_AuraScript);
bool Validate(SpellEntry const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/)
{
if (!sSpellStore.LookupEntry(SPELL_MARK_OF_THE_FALLEN_CHAMPION))
if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_THE_FALLEN_CHAMPION))
return false;
return true;
}
@@ -1096,9 +1096,9 @@ class spell_deathbringer_rune_of_blood : public SpellScriptLoader
{
PrepareSpellScript(spell_deathbringer_rune_of_blood_SpellScript);
bool Validate(SpellEntry const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/)
{
if (!sSpellStore.LookupEntry(SPELL_BLOOD_LINK_DUMMY))
if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_DUMMY))
return false;
return true;
}
@@ -1131,9 +1131,9 @@ class spell_deathbringer_blood_nova : public SpellScriptLoader
{
PrepareSpellScript(spell_deathbringer_blood_nova_SpellScript);
bool Validate(SpellEntry const* /*spellInfo*/)
bool Validate(SpellInfo const* /*spellInfo*/)
{
if (!sSpellStore.LookupEntry(SPELL_BLOOD_LINK_DUMMY))
if (!sSpellMgr->GetSpellInfo(SPELL_BLOOD_LINK_DUMMY))
return false;
return true;
}
@@ -156,7 +156,7 @@ class boss_festergut : public CreatureScript
Talk(SAY_KILL);
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
if (spell->Id == PUNGENT_BLIGHT_HELPER)
target->RemoveAurasDueToSpell(INOCULATED_HELPER);
@@ -387,9 +387,9 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader
{
PrepareSpellScript(spell_festergut_gastric_bloat_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_GASTRIC_EXPLOSION))
if (!sSpellMgr->GetSpellInfo(SPELL_GASTRIC_EXPLOSION))
return false;
return true;
}
@@ -425,9 +425,9 @@ class spell_festergut_blighted_spores : public SpellScriptLoader
{
PrepareAuraScript(spell_festergut_blighted_spores_AuraScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_INOCULATED))
if (!sSpellMgr->GetSpellInfo(SPELL_INOCULATED))
return false;
return true;
}
@@ -572,7 +572,7 @@ class boss_lady_deathwhisper : public CreatureScript
DoCast(cultist, SPELL_DARK_MARTYRDOM_T);
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
if (spell->Id == SPELL_DARK_MARTYRDOM_T)
{
@@ -648,7 +648,7 @@ class npc_cult_fanatic : public CreatureScript
Events.ScheduleEvent(EVENT_CULTIST_DARK_MARTYRDOM, urand(18000, 32000));
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_DARK_TRANSFORMATION)
me->UpdateEntry(NPC_DEFORMED_FANATIC);
@@ -726,7 +726,7 @@ class npc_cult_adherent : public CreatureScript
Events.ScheduleEvent(EVENT_CULTIST_DARK_MARTYRDOM, urand(18000, 32000));
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_DARK_EMPOWERMENT)
me->UpdateEntry(NPC_EMPOWERED_ADHERENT);
@@ -810,7 +810,7 @@ class npc_vengeful_shade : public CreatureScript
me->AddAura(SPELL_VENGEFUL_BLAST_PASSIVE, me);
}
void SpellHitTarget(Unit* /*target*/, SpellEntry const* spell)
void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell)
{
switch (spell->Id)
{
@@ -333,16 +333,16 @@ class boss_professor_putricide : public CreatureScript
{
case PHASE_COMBAT_2:
{
SpellEntry const* spell = sSpellStore.LookupEntry(SPELL_CREATE_CONCOCTION);
SpellInfo const* spell = sSpellMgr->GetSpellInfo(SPELL_CREATE_CONCOCTION);
DoCast(me, SPELL_CREATE_CONCOCTION);
events.ScheduleEvent(EVENT_PHASE_TRANSITION, GetSpellCastTime(sSpellMgr->GetSpellForDifficultyFromSpell(spell, me)) + 100);
events.ScheduleEvent(EVENT_PHASE_TRANSITION, sSpellMgr->GetSpellForDifficultyFromSpell(spell, me)->CalcCastTime() + 100);
break;
}
case PHASE_COMBAT_3:
{
SpellEntry const* spell = sSpellStore.LookupEntry(SPELL_GUZZLE_POTIONS);
SpellInfo const* spell = sSpellMgr->GetSpellInfo(SPELL_GUZZLE_POTIONS);
DoCast(me, SPELL_GUZZLE_POTIONS);
events.ScheduleEvent(EVENT_PHASE_TRANSITION, GetSpellCastTime(sSpellMgr->GetSpellForDifficultyFromSpell(spell, me)) + 100);
events.ScheduleEvent(EVENT_PHASE_TRANSITION, sSpellMgr->GetSpellForDifficultyFromSpell(spell, me)->CalcCastTime() + 100);
break;
}
default:
@@ -671,7 +671,7 @@ class npc_volatile_ooze : public CreatureScript
_newTargetSelectTimer = 0;
}
void SpellHitTarget(Unit* /*target*/, SpellEntry const* spell)
void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell)
{
if (!_newTargetSelectTimer && sSpellMgr->GetSpellDifficultyId(spell->Id) == sSpellMgr->GetSpellDifficultyId(SPELL_OOZE_ERUPTION))
_newTargetSelectTimer = 1000;
@@ -719,7 +719,7 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader
Unit* target = GetTarget();
if (Unit* caster = GetCaster())
{
target->RemoveAuraFromStack(GetSpellProto()->Id, GetCasterGUID());
target->RemoveAuraFromStack(GetSpellInfo()->Id, GetCasterGUID());
if (!target->HasAura(GetId())&& caster->GetTypeId() == TYPEID_UNIT)
caster->ToCreature()->DespawnOrUnsummon();
}
@@ -760,11 +760,11 @@ class spell_putricide_ooze_channel : public SpellScriptLoader
{
PrepareSpellScript(spell_putricide_ooze_channel_SpellScript);
bool Validate(SpellEntry const* spell)
bool Validate(SpellInfo const* spell)
{
if (!spell->excludeTargetAuraSpell)
if (!spell->ExcludeTargetAuraSpell)
return false;
if (!sSpellStore.LookupEntry(spell->excludeTargetAuraSpell))
if (!sSpellMgr->GetSpellInfo(spell->ExcludeTargetAuraSpell))
return false;
return true;
}
@@ -779,7 +779,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader
void SelectTarget(std::list<Unit*>& targetList)
{
targetList.remove_if(BeamProtectionCheck(GetSpellInfo()->excludeTargetAuraSpell));
targetList.remove_if(BeamProtectionCheck(GetSpellInfo()->ExcludeTargetAuraSpell));
if (targetList.empty())
{
FinishCast(SPELL_FAILED_NO_VALID_TARGETS);
@@ -896,7 +896,7 @@ class spell_putricide_slime_puddle : public SpellScriptLoader
if (Aura* size = caster->GetAura(70347))
radiusMod += size->GetStackAmount();
uint32 triggerSpellId = GetSpellProto()->EffectTriggerSpell[aurEff->GetEffIndex()];
uint32 triggerSpellId = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell;
caster->CastCustomSpell(triggerSpellId, SPELLVALUE_RADIUS_MOD, radiusMod * 100, caster, true);
}
}
@@ -970,7 +970,7 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader
break;
}
GetCaster()->CastSpell(target, uint32(GetSpellInfo()->EffectBasePoints[stage]+1), true, NULL, NULL, GetCaster()->GetGUID());
GetCaster()->CastSpell(target, uint32(GetSpellInfo()->Effects[stage].CalcValue()), true, NULL, NULL, GetCaster()->GetGUID());
}
void Register()
@@ -999,7 +999,7 @@ class spell_putricide_ooze_summon : public SpellScriptLoader
PreventDefaultAction();
if (Unit* caster = GetCaster())
{
uint32 triggerSpellId = GetSpellProto()->EffectTriggerSpell[aurEff->GetEffIndex()];
uint32 triggerSpellId = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell;
float x, y, z;
GetTarget()->GetPosition(x, y, z);
z = GetTarget()->GetMap()->GetHeight(x, y, z, true, 25.0f);
@@ -1069,7 +1069,7 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader
if (i == skipIndex)
continue;
uint32 spellId = uint32(SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), uint8(i)));
uint32 spellId = uint32(GetSpellInfo()->Effects[i].CalcValue());
GetCaster()->CastSpell(GetCaster(), spellId, true, NULL, NULL, GetCaster()->GetGUID());
}
}
@@ -1095,11 +1095,11 @@ class spell_putricide_unbound_plague : public SpellScriptLoader
{
PrepareSpellScript(spell_putricide_unbound_plague_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_UNBOUND_PLAGUE))
if (!sSpellMgr->GetSpellInfo(SPELL_UNBOUND_PLAGUE))
return false;
if (!sSpellStore.LookupEntry(SPELL_UNBOUND_PLAGUE_SEARCHER))
if (!sSpellMgr->GetSpellInfo(SPELL_UNBOUND_PLAGUE_SEARCHER))
return false;
return true;
}
@@ -1217,11 +1217,11 @@ class spell_putricide_mutated_plague : public SpellScriptLoader
if (!caster)
return;
uint32 triggerSpell = GetSpellProto()->EffectTriggerSpell[aurEff->GetEffIndex()];
SpellEntry const* spell = sSpellStore.LookupEntry(triggerSpell);
uint32 triggerSpell = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell;
SpellInfo const* spell = sSpellMgr->GetSpellInfo(triggerSpell);
spell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, caster);
int32 damage = SpellMgr::CalculateSpellEffectAmount(spell, 0, caster);
int32 damage = spell->Effects[EFFECT_0].CalcValue(caster);
float multiplier = 2.0f;
if (GetTarget()->GetMap()->GetSpawnMode() & 1)
multiplier = 3.0f;
@@ -1234,7 +1234,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
uint32 healSpell = uint32(SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), 0));
uint32 healSpell = uint32(GetSpellInfo()->Effects[EFFECT_0].CalcValue());
GetTarget()->CastSpell(GetTarget(), healSpell, true, NULL, NULL, GetCasterGUID());
}
@@ -1398,9 +1398,9 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader
return;
}
uint32 entry = uint32(GetSpellInfo()->EffectMiscValue[effIndex]);
SummonPropertiesEntry const* properties = sSummonPropertiesStore.LookupEntry(uint32(GetSpellInfo()->EffectMiscValueB[effIndex]));
uint32 duration = uint32(GetSpellDuration(GetSpellInfo()));
uint32 entry = uint32(GetSpellInfo()->Effects[effIndex].MiscValue);
SummonPropertiesEntry const* properties = sSummonPropertiesStore.LookupEntry(uint32(GetSpellInfo()->Effects[effIndex].MiscValueB));
uint32 duration = uint32(GetSpellInfo()->GetDuration());
Position pos;
caster->GetPosition(&pos);
@@ -148,7 +148,7 @@ class boss_rotface : public CreatureScript
professor->AI()->EnterEvadeMode();
}
void SpellHitTarget(Unit* /*target*/, SpellEntry const* spell)
void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_SLIME_SPRAY)
Talk(SAY_SLIME_SPRAY);
@@ -612,9 +612,9 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScriptLoader
{
PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER))
if (!sSpellMgr->GetSpellInfo(SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER))
return false;
return true;
}
@@ -658,7 +658,7 @@ class spell_rotface_unstable_ooze_explosion : public SpellScriptLoader
if (!GetTargetUnit())
return;
uint32 triggered_spell_id = GetSpellInfo()->EffectTriggerSpell[effIndex];
uint32 triggered_spell_id = GetSpellInfo()->Effects[effIndex].TriggerSpell;
float x, y, z;
GetTargetUnit()->GetPosition(x, y, z);
@@ -321,7 +321,7 @@ class boss_sindragosa : public CreatureScript
summon->AI()->JustDied(summon);
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
if (uint32 spellId = sSpellMgr->GetSpellIdForDifficulty(70127, me))
if (spellId == spell->Id)
@@ -1019,9 +1019,9 @@ class spell_sindragosa_instability : public SpellScriptLoader
{
PrepareAuraScript(spell_sindragosa_instability_AuraScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_BACKLASH))
if (!sSpellMgr->GetSpellInfo(SPELL_BACKLASH))
return false;
return true;
}
@@ -1053,9 +1053,9 @@ class spell_sindragosa_frost_beacon : public SpellScriptLoader
{
PrepareAuraScript(spell_sindragosa_frost_beacon_AuraScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_ICE_TOMB_DAMAGE))
if (!sSpellMgr->GetSpellInfo(SPELL_ICE_TOMB_DAMAGE))
return false;
return true;
}
@@ -1088,7 +1088,7 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader
{
PrepareSpellScript(spell_sindragosa_ice_tomb_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sObjectMgr->GetCreatureTemplate(NPC_ICE_TOMB))
return false;
@@ -1175,9 +1175,9 @@ class spell_sindragosa_collision_filter : public SpellScriptLoader
{
PrepareSpellScript(spell_sindragosa_collision_filter_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_ICE_TOMB_DAMAGE))
if (!sSpellMgr->GetSpellInfo(SPELL_ICE_TOMB_DAMAGE))
return false;
return true;
}
@@ -1210,9 +1210,9 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader
{
PrepareSpellScript(spell_sindragosa_icy_grip_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_ICY_GRIP_JUMP))
if (!sSpellMgr->GetSpellInfo(SPELL_ICY_GRIP_JUMP))
return false;
return true;
}
@@ -1244,9 +1244,9 @@ class spell_rimefang_icy_blast : public SpellScriptLoader
{
PrepareSpellScript(spell_rimefang_icy_blast_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_ICY_BLAST_AREA))
if (!sSpellMgr->GetSpellInfo(SPELL_ICY_BLAST_AREA))
return false;
return true;
}
@@ -1296,9 +1296,9 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader
{
PrepareSpellScript(spell_frostwarden_handler_order_whelp_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_FOCUS_FIRE))
if (!sSpellMgr->GetSpellInfo(SPELL_FOCUS_FIRE))
return false;
return true;
}
@@ -1378,7 +1378,7 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader
PreventDefaultAction();
if (Unit* caster = GetCaster())
{
caster->AddThreat(GetTarget(), -float(SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), EFFECT_1)));
caster->AddThreat(GetTarget(), -float(GetSpellInfo()->Effects[EFFECT_1].CalcValue()));
caster->GetAI()->SetData(DATA_WHELP_MARKER, 0);
}
}
@@ -387,7 +387,7 @@ class boss_valithria_dreamwalker : public CreatureScript
}
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_DREAM_SLIP)
{
@@ -826,7 +826,7 @@ class boss_sister_svalna : public CreatureScript
}
}
void SpellHit(Unit* caster, SpellEntry const* spell)
void SpellHit(Unit* caster, SpellInfo const* spell)
{
if (spell->Id == SPELL_HURL_SPEAR && me->HasAura(SPELL_AETHER_SHIELD))
{
@@ -835,7 +835,7 @@ class boss_sister_svalna : public CreatureScript
}
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
switch (spell->Id)
{
@@ -1276,7 +1276,7 @@ struct npc_argent_captainAI : public ScriptedAI
Reset();
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_REVIVE_CHAMPION && !IsUndead)
{
@@ -1505,7 +1505,7 @@ class npc_captain_grondel : public CreatureScript
switch (eventId)
{
case EVENT_GRONDEL_CHARGE_CHECK:
if (CanCast(me->getVictim(), sSpellStore.LookupEntry(SPELL_CHARGE)))
if (CanCast(me->getVictim(), sSpellMgr->GetSpellInfo(SPELL_CHARGE)))
DoCastVictim(SPELL_CHARGE);
Events.ScheduleEvent(EVENT_GRONDEL_CHARGE_CHECK, 500);
break;
@@ -1717,7 +1717,7 @@ class spell_icc_sprit_alarm : public SpellScriptLoader
{
PreventHitDefaultEffect(effIndex);
uint32 trapId = 0;
switch (GetSpellInfo()->EffectMiscValue[effIndex])
switch (GetSpellInfo()->Effects[effIndex].MiscValue)
{
case EVENT_AWAKEN_WARD_1:
trapId = GO_SPIRIT_ALARM_1;
@@ -409,9 +409,9 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader
public:
spell_trigger_spell_from_caster_SpellScript(uint32 triggerId) : SpellScript(), _triggerId(triggerId) { }
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(_triggerId))
if (!sSpellMgr->GetSpellInfo(_triggerId))
return false;
return true;
}
@@ -53,7 +53,7 @@ class icecrown_citadel_teleport : public GameObjectScript
{
player->PlayerTalkClass->ClearMenus();
player->CLOSE_GOSSIP_MENU();
SpellEntry const* spell = sSpellStore.LookupEntry(action);
SpellInfo const* spell = sSpellMgr->GetSpellInfo(action);
if (!spell)
return false;
@@ -105,7 +105,7 @@ class boss_faerlina : public CreatureScript
DoScriptText(SAY_DEATH, me);
}
void SpellHit(Unit* caster, SpellEntry const* spell)
void SpellHit(Unit* caster, SpellInfo const* spell)
{
if (spell->Id == SPELL_WIDOWS_EMBRACE || spell->Id == H_SPELL_WIDOWS_EMBRACE)
{
@@ -343,7 +343,7 @@ class boss_gothik : public CreatureScript
return false;
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
uint32 spellId = 0;
switch(spell->Id)
@@ -366,7 +366,7 @@ class boss_gothik : public CreatureScript
damage = 0;
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
if (!me->isInCombat())
return;
@@ -59,7 +59,7 @@ public:
events.ScheduleEvent(EVENT_BERSERK, 12*60000);
}
void SpellHitTarget(Unit* target, const SpellEntry *spell)
void SpellHitTarget(Unit* target, const SpellInfo *spell)
{
if (spell->Id == uint32(SPELL_SLIME_SPRAY))
{
@@ -132,7 +132,7 @@ public:
CheckPlayersFrostResist();
}
void SpellHitTarget(Unit* target, const SpellEntry *spell)
void SpellHitTarget(Unit* target, const SpellInfo *spell)
{
if (spell->Id == SPELL_ICEBOLT)
{
@@ -379,7 +379,7 @@ public:
}
}
void SpellHit(Unit* caster, const SpellEntry* spell)
void SpellHit(Unit* caster, const SpellInfo* spell)
{
if (spell->Id == SPELL_POWER_SPARK_MALYGOS)
{
@@ -298,7 +298,7 @@ public:
me->DeleteThreatList();
}
void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell)
void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell)
{
switch(pSpell->Id)
{
@@ -173,7 +173,7 @@ class npc_azure_ring_captain : public CreatureScript
me->SetReactState(REACT_AGGRESSIVE);
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
if (spell->Id == SPELL_ICE_BEAM)
{
@@ -143,7 +143,7 @@ public:
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
}
void SpellHit(Unit* /*caster*/, const SpellEntry* spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
{
if (spell->Id == SPELL_DISPERSE)
{
@@ -427,7 +427,7 @@ public:
}
}
void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell)
void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell)
{
// This is the dummy effect of the spells
if (pSpell->Id == SPELL_SHATTER_N || pSpell->Id == SPELL_SHATTER_H)
@@ -157,7 +157,7 @@ public:
DoScriptText(SAY_KILL, me);
}
void SpellHitTarget(Unit* target, const SpellEntry* pSpell)
void SpellHitTarget(Unit* target, const SpellInfo* pSpell)
{
//this part should be in the core
if (pSpell->Id == SPELL_SHATTER || pSpell->Id == H_SPELL_SHATTER)
@@ -316,7 +316,7 @@ class boss_flame_leviathan : public CreatureScript
//TODO: effect 0 and effect 1 may be on different target
//TODO: Move to spellscript
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
if (spell->Id == SPELL_PURSUED)
AttackStart(target);
@@ -328,7 +328,7 @@ class boss_flame_leviathan : public CreatureScript
DoScriptText(SAY_DEATH, me);
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_START_THE_ENGINE)
vehicle->InstallAllAccessories(false);
@@ -845,7 +845,7 @@ class npc_pool_of_tar : public CreatureScript
damage = 0;
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->SchoolMask & SPELL_SCHOOL_MASK_FIRE && !me->HasAura(SPELL_BLAZE))
me->CastSpell(me, SPELL_BLAZE, true);
@@ -1506,7 +1506,7 @@ class npc_unstable_sun_beam : public CreatureScript
despawnTimer -= diff;
}
void SpellHitTarget(Unit* target, SpellEntry const* spell)
void SpellHitTarget(Unit* target, SpellInfo const* spell)
{
if (target && spell->Id == SPELL_UNSTABLE_ENERGY)
{
@@ -1540,7 +1540,7 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader
void HandleScript(SpellEffIndex /*effIndex*/)
{
Unit* target = GetHitUnit();
SpellEntry const* spellInfo = GetSpellInfo();
SpellInfo const* spellInfo = GetSpellInfo();
switch (spellInfo->Id)
{
case SPELL_ATTUNED_TO_NATURE_2_DOSE_REDUCTION:
@@ -1589,7 +1589,7 @@ class spell_freya_iron_roots : public SpellScriptLoader
void HandleSummon(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
uint32 entry = uint32(GetSpellInfo()->EffectMiscValue[effIndex]);
uint32 entry = uint32(GetSpellInfo()->Effects[effIndex].MiscValue);
Position pos;
GetCaster()->GetPosition(&pos);
@@ -200,7 +200,7 @@ class boss_general_vezax : public CreatureScript
DoMeleeAttackIfReady();
}
void SpellHitTarget(Unit* who, SpellEntry const* spell)
void SpellHitTarget(Unit* who, SpellInfo const* spell)
{
if (who && who->GetTypeId() == TYPEID_PLAYER && spell->Id == SPELL_SHADOW_CRASH_HIT)
shadowDodger = false;
@@ -881,7 +881,7 @@ class npc_toasty_fire : public CreatureScript
DoCast(me, SPELL_SINGED, true);
}
void SpellHit(Unit* /*who*/, const SpellEntry* spell)
void SpellHit(Unit* /*who*/, const SpellInfo* spell)
{
if (spell->Id == SPELL_BLOCK_OF_ICE || spell->Id == SPELL_ICE_SHARD || spell->Id == SPELL_ICE_SHARD_HIT)
{
@@ -430,11 +430,11 @@ class spell_ignis_slag_pot : public SpellScriptLoader
{
PrepareAuraScript(spell_ignis_slag_pot_AuraScript);
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellStore.LookupEntry(SPELL_SLAG_POT_DAMAGE))
if (!sSpellMgr->GetSpellInfo(SPELL_SLAG_POT_DAMAGE))
return false;
if (!sSpellStore.LookupEntry(SPELL_SLAG_IMBUED))
if (!sSpellMgr->GetSpellInfo(SPELL_SLAG_IMBUED))
return false;
return true;
}
@@ -461,10 +461,10 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader
switch (target->GetMap()->GetDifficulty())
{
case RAID_DIFFICULTY_10MAN_NORMAL:
target->RemoveAura(SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), EFFECT_0));
target->RemoveAura(GetSpellInfo()->Effects[EFFECT_0].CalcValue());
break;
case RAID_DIFFICULTY_25MAN_NORMAL:
target->RemoveAura(SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), EFFECT_1));
target->RemoveAura(GetSpellInfo()->Effects[EFFECT_1].CalcValue());
break;
default:
break;
@@ -185,7 +185,7 @@ class boss_razorscale_controller : public CreatureScript
me->SetReactState(REACT_PASSIVE);
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
switch (spell->Id)
{
@@ -360,7 +360,7 @@ class boss_razorscale : public CreatureScript
controller->AI()->Reset();
}
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
{
if (spell->Id == SPELL_HARPOON_TRIGGER)
++HarpoonCounter;
@@ -1004,7 +1004,7 @@ class spell_razorscale_devouring_flame : public SpellScriptLoader
{
PreventHitDefaultEffect(effIndex);
Unit* caster = GetCaster();
uint32 entry = uint32(GetSpellInfo()->EffectMiscValue[effIndex]);
uint32 entry = uint32(GetSpellInfo()->Effects[effIndex].MiscValue);
WorldLocation const* summonLocation = GetTargetDest();
if (!caster || !summonLocation)
return;
@@ -758,9 +758,9 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader
{
PrepareAuraScript(spell_xt002_searing_light_spawn_life_spark_AuraScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_SUMMON_LIFE_SPARK))
if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_LIFE_SPARK))
return false;
return true;
}
@@ -794,9 +794,9 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader
{
PrepareAuraScript(spell_xt002_gravity_bomb_aura_AuraScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_SUMMON_VOID_ZONE))
if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_VOID_ZONE))
return false;
return true;
}
@@ -878,18 +878,18 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader
{
PrepareSpellScript(spell_xt002_heart_overload_periodic_SpellScript);
bool Validate(SpellEntry const* /*spell*/)
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_ENERGY_ORB))
if (!sSpellMgr->GetSpellInfo(SPELL_ENERGY_ORB))
return false;
if (!sSpellStore.LookupEntry(SPELL_RECHARGE_BOOMBOT))
if (!sSpellMgr->GetSpellInfo(SPELL_RECHARGE_BOOMBOT))
return false;
if (!sSpellStore.LookupEntry(SPELL_RECHARGE_PUMMELER))
if (!sSpellMgr->GetSpellInfo(SPELL_RECHARGE_PUMMELER))
return false;
if (!sSpellStore.LookupEntry(SPELL_RECHARGE_SCRAPBOT))
if (!sSpellMgr->GetSpellInfo(SPELL_RECHARGE_SCRAPBOT))
return false;
return true;
@@ -276,7 +276,7 @@ public:
Summons.Despawn(summoned);
}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_HARPOON_DAMAGE)
{
@@ -191,7 +191,7 @@ public:
pInstance->SetData(DATA_KING_YMIRON_EVENT, IN_PROGRESS);
}
void SpellHitTarget(Unit* who, SpellEntry const* spell)
void SpellHitTarget(Unit* who, SpellInfo const* spell)
{
if (who && who->GetTypeId() == TYPEID_PLAYER && spell->Id == 59302)
kingsBane = false;
@@ -73,7 +73,7 @@ public:
casterGuid = 0;
}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
if (Phase)
return;
@@ -866,7 +866,7 @@ public:
AttackStart(who);
}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
if (spell->Id == SPELL_DRAKE_HARPOON && caster->GetTypeId() == TYPEID_PLAYER)
{
@@ -1622,7 +1622,7 @@ public:
AttackStart(who);
}
void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
void SpellHit(Unit* pCaster, const SpellInfo* pSpell)
{
if (pSpell->Id == SPELL_ARCANE_CHAINS && pCaster->GetTypeId() == TYPEID_PLAYER && !HealthAbovePct(50) && !bEnslaved)
{
@@ -1706,7 +1706,7 @@ public:
{
}
void SpellHit(Unit* pUnit, const SpellEntry* pSpell)
void SpellHit(Unit* pUnit, const SpellInfo* pSpell)
{
if (pSpell->Id == SPELL_NEURAL_NEEDLE && pUnit->GetTypeId() == TYPEID_PLAYER)
{
@@ -421,7 +421,7 @@ public:
m_gender = uiData;
}
void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
void SpellHit(Unit* pCaster, const SpellInfo* pSpell)
{
if (pSpell->Id == SPELL_OUTHOUSE_GROANS)
{
@@ -594,7 +594,7 @@ public:
me->DespawnOrUnsummon(DespawnTimer);
}
void SpellHit(Unit* caster, const SpellEntry *spell)
void SpellHit(Unit* caster, const SpellInfo *spell)
{
if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TYPEID_PLAYER
&& caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE)
@@ -784,7 +784,7 @@ public:
DoMeleeAttackIfReady();
}
void SpellHit(Unit* pCaster, const SpellEntry *pSpell)
void SpellHit(Unit* pCaster, const SpellInfo *pSpell)
{
if (pCaster && pCaster->GetTypeId() == TYPEID_PLAYER && pSpell->Id == SPELL_SMOKE_BOMB)
{
@@ -543,7 +543,7 @@ public:
sayTimer -= uiDiff;
}
void SpellHit(Unit* caster, const SpellEntry* proto)
void SpellHit(Unit* caster, const SpellInfo* proto)
{
if (!proto || proto->Id != SPELL_OFFER)
return;
+1 -1
View File
@@ -638,7 +638,7 @@ public:
}
}
void SpellHit(Unit* hitter, const SpellEntry* spell)
void SpellHit(Unit* hitter, const SpellInfo* spell)
{
if (!hitter || !spell)
return;
+4 -4
View File
@@ -83,7 +83,7 @@ public:
me->setDeathState(DEAD);
}
void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
void SpellHit(Unit* pCaster, const SpellInfo* pSpell)
{
if (pSpell->Id == SPELL_UNLOCK_SHACKLE)
{
@@ -146,7 +146,7 @@ public:
void MoveInLineOfSight(Unit* /*who*/){}
void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell)
void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell)
{
if (pSpell->Id == SPELL_FREE_RAGECLAW)
{
@@ -1043,14 +1043,14 @@ public:
uint32 uiElementalSpellTimer;
uint8 uiBossRandom;
uint32 uiSpellEntry;
uint32 uiSpellInfo;
bool bAddAttack;
void Reset()
{
uiBossRandom = 0;
uiSpellEntry = 0;
uiSpellInfo = 0;
uiElementalSpellTimer = urand(5000, 8000);
bAddAttack = false;
@@ -98,7 +98,7 @@ public:
void EnterCombat(Unit* /*who*/) { }
// Sonic Boom instant damage (needs core fix instead of this)
void SpellHitTarget(Unit* target, const SpellEntry *spell)
void SpellHitTarget(Unit* target, const SpellInfo *spell)
{
if (target && target->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT))
me->DealDamage(target, (target->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell);
@@ -163,7 +163,7 @@ public:
targets.resize(5);
//Aura each player in the targets list with Bloodboil. Aura code copied+pasted from Aura command in Level3.cpp
/*SpellEntry const *spellInfo = GetSpellStore()->LookupEntry(SPELL_BLOODBOIL);
/*SpellInfo const *spellInfo = sSpellMgr->GetSpellInfo(SPELL_BLOODBOIL);
if (spellInfo)
{
for (std::list<Unit* >::const_iterator itr = targets.begin(); itr != targets.end(); ++itr)
@@ -471,10 +471,6 @@ public:
{
pInstance = c->GetInstanceScript();
DoCast(me, SPELL_DUAL_WIELD, true);
SpellEntry *TempSpell = GET_SPELL(SPELL_SHADOWFIEND_PASSIVE);
if (TempSpell)
TempSpell->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends
}
InstanceScript* pInstance;
@@ -589,7 +585,7 @@ public:
done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him
}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades!
{
@@ -2167,7 +2163,7 @@ public:
{
blade_of_azzinothAI(Creature* c) : NullCreatureAI(c) {}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE)
me->SetDisplayId(21431);//appear when hit by Illidan's glaive
@@ -536,11 +536,11 @@ public:
}
}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL))
for (uint8 i = 0; i < 3; ++i)
if (spell->Effect[i] == SPELL_EFFECT_INTERRUPT_CAST)
if (spell->Effects[i].Effect == SPELL_EFFECT_INTERRUPT_CAST)
if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)->m_spellInfo->Id == SPELL_SOUL_SHOCK
|| me->GetCurrentSpell(CURRENT_GENERIC_SPELL)->m_spellInfo->Id == SPELL_DEADEN)
me->InterruptSpell(CURRENT_GENERIC_SPELL, false);
@@ -106,7 +106,7 @@ public:
DoScriptText(SAY_DEATH, me);
}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD))
{
@@ -891,9 +891,9 @@ public:
{
PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript);
bool Validate(SpellEntry const* /*spellEntry*/)
bool Validate(SpellInfo const* /*spellEntry*/)
{
return sSpellStore.LookupEntry(SPELL_REFLECTIVE_SHIELD_T);
return sSpellMgr->GetSpellInfo(SPELL_REFLECTIVE_SHIELD_T);
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
@@ -515,7 +515,7 @@ public:
if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != me->getVictim()->GetGUID() && TargetList.size()<5)
TargetList.push_back(tempTarget);
}
//SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER);
//SpellInfo *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER);
for (std::vector<Unit* >::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr)
{
if ((*itr) && (*itr)->isAlive())
@@ -81,13 +81,6 @@ public:
boss_the_lurker_belowAI(Creature* c) : Scripted_NoMovementAI(c), Summons(me)
{
pInstance = c->GetInstanceScript();
SpellEntry *TempSpell = GET_SPELL(SPELL_SPOUT_ANIM);
if (TempSpell)
{
TempSpell->Effect[0] = 0;//remove all spell effect, only anim is needed
TempSpell->Effect[1] = 0;
TempSpell->Effect[2] = 0;
}
}
InstanceScript* pInstance;
@@ -410,9 +403,6 @@ public:
{
mob_coilfang_ambusherAI(Creature* c) : Scripted_NoMovementAI(c)
{
SpellEntry *TempSpell = GET_SPELL(SPELL_SHOOT);
if (TempSpell)
TempSpell->Effect[0] = 2;//change spell effect from weapon % dmg to simple phisical dmg
}
uint32 MultiShotTimer;
@@ -148,7 +148,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void SpellHit(Unit* /*caster*/, const SpellEntry *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
{
//hack :(
if (spell->Id == SPELL_WARLORDS_RAGE_PROC)
@@ -120,7 +120,7 @@ public:
}
}
void SpellHitTarget(Unit* target, const SpellEntry* pSpell)
void SpellHitTarget(Unit* target, const SpellInfo* pSpell)
{
//This to emulate effect1 (77) of SPELL_GROUND_SLAM, knock back to any direction
//It's initially wrong, since this will cause fall damage, which is by comments, not intended.
@@ -247,7 +247,7 @@ class boss_kelidan_the_breaker : public CreatureScript
DoScriptText(SAY_NOVA, me);
if (SpellEntry *nova = GET_SPELL(SPELL_BURNING_NOVA))
if (SpellInfo const* nova = sSpellMgr->GetSpellInfo(SPELL_BURNING_NOVA))
{
if (Aura * aura = Aura::TryRefreshStackOrCreate(nova, MAX_EFFECT_MASK, me, me))
aura->ApplyForTargets();
@@ -95,7 +95,7 @@ class boss_nazan : public CreatureScript
uint32 Turn_Timer;
bool flight;
uint64 VazrudenGUID;
SpellEntry *liquid_fire;
SpellInfo *liquid_fire;
void Reset()
{
@@ -117,7 +117,7 @@ class boss_nazan : public CreatureScript
}
}
void SpellHitTarget(Unit* target, const SpellEntry* entry)
void SpellHitTarget(Unit* target, const SpellInfo* entry)
{
if (target && entry->Id == uint32(SPELL_FIREBALL))
me->SummonCreature(ENTRY_LIQUID_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000);
@@ -72,7 +72,7 @@ enum eSpells
SPELL_CLEAVE = 30619,
SPELL_QUAKE_TRIGGER = 30657, //must be cast with 30561 as the proc spell
SPELL_QUAKE_KNOCKBACK = 30571,
SPELL_BLAZE_TARGET = 30541, //core bug, does not support target 7
SPELL_BLAZE_TARGET = 30541,
SPELL_BLAZE_TRAP = 30542,
SPELL_DEBRIS_KNOCKDOWN = 36449,
SPELL_DEBRIS_VISUAL = 30632,
@@ -124,7 +124,7 @@ class mob_abyssal : public CreatureScript
FireBlast_Timer = 6000;
}
void SpellHit(Unit*, const SpellEntry *spell)
void SpellHit(Unit*, const SpellInfo *spell)
{
if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET)
{
@@ -220,20 +220,6 @@ class boss_magtheridon : public CreatureScript
pInstance = creature->GetInstanceScript();
me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10);
// target 7, random target with certain entry spell, need core fix
SpellEntry *TempSpell;
TempSpell = GET_SPELL(SPELL_BLAZE_TARGET);
if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 6)
{
TempSpell->EffectImplicitTargetA[0] = 6;
TempSpell->EffectImplicitTargetB[0] = 0;
}
TempSpell = GET_SPELL(SPELL_QUAKE_TRIGGER);
if (TempSpell && TempSpell->EffectTriggerSpell[0] != SPELL_QUAKE_KNOCKBACK)
{
TempSpell->EffectTriggerSpell[0] = SPELL_QUAKE_KNOCKBACK;
}
}
CubeMap Cube;
Loaded 100 of 195 files, more files were not shown because too many files have changed in this diff. Show more