josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed stupid/not needed file Spellid.h.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
n0n4m3
2010-02-15 18:23:39 +01:00
parent 922b368aac
commit bcd4a48328
31 changed files with 231 additions and 140390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/CMakeLists.txt
-1
View File
@@ -242,7 +242,6 @@ SET(game_STAT_SRCS
SpellAuraEffects.h SpellAuraEffects.h
Spell.cpp Spell.cpp
SpellEffects.cpp SpellEffects.cpp
SpellId.h
Spell.h Spell.h
SkillDiscovery.cpp SkillDiscovery.cpp
SkillDiscovery.h SkillDiscovery.h
src/game/CharacterHandler.cpp
+2 -3
View File
@@ -42,7 +42,6 @@
#include "SocialMgr.h" #include "SocialMgr.h"
#include "UpdateMask.h" #include "UpdateMask.h"
#include "Util.h" #include "Util.h"
#include "SpellId.h"
#include "ScriptMgr.h" #include "ScriptMgr.h"
class LoginQueryHolder : public SqlQueryHolder class LoginQueryHolder : public SqlQueryHolder
@@ -746,8 +745,8 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
{ {
// not blizz like, we must correctly save and load player instead... // not blizz like, we must correctly save and load player instead...
if(pCurrChar->getRace() == RACE_NIGHTELF) if(pCurrChar->getRace() == RACE_NIGHTELF)
pCurrChar->CastSpell(pCurrChar, SPELL_GHOST_20584, true, 0);// auras SPELL_AURA_INCREASE_SPEED(+speed in wisp form), SPELL_AURA_INCREASE_SWIM_SPEED(+swim speed in wisp form), SPELL_AURA_TRANSFORM (to wisp form) pCurrChar->CastSpell(pCurrChar, 20584, true, 0);// auras SPELL_AURA_INCREASE_SPEED(+speed in wisp form), SPELL_AURA_INCREASE_SWIM_SPEED(+swim speed in wisp form), SPELL_AURA_TRANSFORM (to wisp form)
pCurrChar->CastSpell(pCurrChar, SPELL_GHOST_8326, true, 0); // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?) pCurrChar->CastSpell(pCurrChar, 8326, true, 0); // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?)
pCurrChar->SetMovement(MOVE_WATER_WALK); pCurrChar->SetMovement(MOVE_WATER_WALK);
} }
src/game/DuelHandler.cpp
+1 -2
View File
@@ -25,7 +25,6 @@
#include "Opcodes.h" #include "Opcodes.h"
#include "UpdateData.h" #include "UpdateData.h"
#include "Player.h" #include "Player.h"
#include "SpellId.h"
void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket) void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
{ {
@@ -71,7 +70,7 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
if(GetPlayer()->duel->opponent) if(GetPlayer()->duel->opponent)
GetPlayer()->duel->opponent->CombatStopWithPets(true); GetPlayer()->duel->opponent->CombatStopWithPets(true);
GetPlayer()->CastSpell(GetPlayer(), SPELL_GROVEL_7267, true); // beg GetPlayer()->CastSpell(GetPlayer(), 7267, true); // beg
GetPlayer()->DuelComplete(DUEL_WON); GetPlayer()->DuelComplete(DUEL_WON);
return; return;
} }
src/game/MovementHandler.cpp
+2 -3
View File
@@ -33,7 +33,6 @@
#include "WaypointMovementGenerator.h" #include "WaypointMovementGenerator.h"
#include "InstanceSaveMgr.h" #include "InstanceSaveMgr.h"
#include "ObjectMgr.h" #include "ObjectMgr.h"
#include "SpellId.h"
void WorldSession::HandleMoveWorldportAckOpcode( WorldPacket & /*recv_data*/ ) void WorldSession::HandleMoveWorldportAckOpcode( WorldPacket & /*recv_data*/ )
{ {
@@ -178,7 +177,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
// honorless target // honorless target
if(GetPlayer()->pvpInfo.inHostileArea) if(GetPlayer()->pvpInfo.inHostileArea)
GetPlayer()->CastSpell(GetPlayer(), SPELL_HONORLESS_TARGET_2479, true); GetPlayer()->CastSpell(GetPlayer(), 2479, true);
// resummon pet // resummon pet
GetPlayer()->ResummonPetTemporaryUnSummonedIfAny(); GetPlayer()->ResummonPetTemporaryUnSummonedIfAny();
@@ -226,7 +225,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
{ {
// honorless target // honorless target
if(plMover->pvpInfo.inHostileArea) if(plMover->pvpInfo.inHostileArea)
plMover->CastSpell(plMover, SPELL_HONORLESS_TARGET_2479, true); plMover->CastSpell(plMover, 2479, true);
} }
// resummon pet // resummon pet
src/game/ObjectMgr.cpp
+3 -4
View File
@@ -46,7 +46,6 @@
#include "WaypointManager.h" #include "WaypointManager.h"
#include "InstanceData.h" //for condition_instance_data #include "InstanceData.h" //for condition_instance_data
#include "GossipDef.h" #include "GossipDef.h"
#include "SpellId.h"
INSTANTIATE_SINGLETON_1(ObjectMgr); INSTANTIATE_SINGLETON_1(ObjectMgr);
@@ -2132,7 +2131,7 @@ void ObjectMgr::LoadItemPrototypes()
} }
// special format // special format
if ((proto->Spells[0].SpellId == SPELL_LEARNING_483) || (proto->Spells[0].SpellId == SPELL_LEARNING_55884)) if ((proto->Spells[0].SpellId == 483) || (proto->Spells[0].SpellId == 55884))
{ {
// spell_1 // spell_1
if (proto->Spells[0].SpellTrigger != ITEM_SPELLTRIGGER_ON_USE) if (proto->Spells[0].SpellTrigger != ITEM_SPELLTRIGGER_ON_USE)
@@ -2169,7 +2168,7 @@ void ObjectMgr::LoadItemPrototypes()
const_cast<ItemPrototype*>(proto)->Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; const_cast<ItemPrototype*>(proto)->Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE;
} }
// allowed only in special format // allowed only in special format
else if ((proto->Spells[1].SpellId==SPELL_LEARNING_483) || (proto->Spells[1].SpellId == SPELL_LEARNING_55884)) else if ((proto->Spells[1].SpellId==483) || (proto->Spells[1].SpellId == 55884))
{ {
sLog.outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%u)",i,1+1,proto->Spells[1].SpellId); sLog.outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%u)",i,1+1,proto->Spells[1].SpellId);
const_cast<ItemPrototype*>(proto)->Spells[0].SpellId = 0; const_cast<ItemPrototype*>(proto)->Spells[0].SpellId = 0;
@@ -2215,7 +2214,7 @@ void ObjectMgr::LoadItemPrototypes()
const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0; const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0;
} }
// allowed only in special format // allowed only in special format
else if ((proto->Spells[j].SpellId==SPELL_LEARNING_483) || (proto->Spells[j].SpellId==SPELL_LEARNING_55884)) else if ((proto->Spells[j].SpellId == 483) || (proto->Spells[j].SpellId == 55884))
{ {
sLog.outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%u)",i,j+1,proto->Spells[j].SpellId); sLog.outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%u)",i,j+1,proto->Spells[j].SpellId);
const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0; const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0;
src/game/Player.cpp
+21 -23
View File
@@ -66,7 +66,6 @@
#include "AchievementMgr.h" #include "AchievementMgr.h"
#include "SpellAuras.h" #include "SpellAuras.h"
#include "SpellAuraEffects.h" #include "SpellAuraEffects.h"
#include "SpellId.h"
#include <cmath> #include <cmath>
@@ -1465,7 +1464,7 @@ void Player::setDeathState(DeathState s)
// restore default warrior stance // restore default warrior stance
if (getClass() == CLASS_WARRIOR) if (getClass() == CLASS_WARRIOR)
CastSpell(this,SPELL_BATTLE_STANCE_2457,true); CastSpell(this, 2457, true);
} }
} }
@@ -1786,8 +1785,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
} }
else else
{ {
if (getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster() if (getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster() && !HasSpell(50977))
&& !HasSpell(SPELL_DEATH_GATE_50977))
return false; return false;
// far teleport to another map // far teleport to another map
@@ -1941,7 +1939,7 @@ void Player::ProcessDelayedOperations()
SaveToDB(); SaveToDB();
if (m_DelayedOperations & DELAYED_SPELL_CAST_DESERTER) if (m_DelayedOperations & DELAYED_SPELL_CAST_DESERTER)
CastSpell(this, SPELL_DESERTER_26013, true); // Deserter CastSpell(this, 26013, true); // Deserter
if (m_DelayedOperations & DELAYED_BG_MOUNT_RESTORE) if (m_DelayedOperations & DELAYED_BG_MOUNT_RESTORE)
{ {
@@ -4364,9 +4362,9 @@ void Player::BuildPlayerRepop()
data.append(GetPackGUID()); data.append(GetPackGUID());
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
if(getRace() == RACE_NIGHTELF) if (getRace() == RACE_NIGHTELF)
CastSpell(this, SPELL_GHOST_20584, true); CastSpell(this, 20584, true);
CastSpell(this, SPELL_GHOST_8326, true); CastSpell(this, 8326, true);
// there must be SMSG.FORCE_RUN_SPEED_CHANGE, SMSG.FORCE_SWIM_SPEED_CHANGE, SMSG.MOVE_WATER_WALK // there must be SMSG.FORCE_RUN_SPEED_CHANGE, SMSG.FORCE_SWIM_SPEED_CHANGE, SMSG.MOVE_WATER_WALK
// there must be SMSG.STOP_MIRROR_TIMER // there must be SMSG.STOP_MIRROR_TIMER
@@ -4425,9 +4423,9 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
// remove death flag + set aura // remove death flag + set aura
SetByteValue(UNIT_FIELD_BYTES_1, 3, 0x00); SetByteValue(UNIT_FIELD_BYTES_1, 3, 0x00);
if(getRace() == RACE_NIGHTELF) if (getRace() == RACE_NIGHTELF)
RemoveAurasDueToSpell(SPELL_GHOST_20584); // speed bonuses RemoveAurasDueToSpell(20584); // speed bonuses
RemoveAurasDueToSpell(SPELL_GHOST_8326); // SPELL_AURA_GHOST RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST
setDeathState(ALIVE); setDeathState(ALIVE);
@@ -4467,14 +4465,14 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
if(int32(getLevel()) >= startLevel) if(int32(getLevel()) >= startLevel)
{ {
// set resurrection sickness // set resurrection sickness
CastSpell(this,SPELL_RESURRECTION_SICKNESS_15007,true); CastSpell(this, 15007, true);
// not full duration // not full duration
if(int32(getLevel()) < startLevel+9) if(int32(getLevel()) < startLevel+9)
{ {
int32 delta = (int32(getLevel()) - startLevel + 1)*MINUTE; int32 delta = (int32(getLevel()) - startLevel + 1)*MINUTE;
if(Aura * aur = GetAura(SPELL_RESURRECTION_SICKNESS_15007, GetGUID())) if(Aura * aur = GetAura(15007, GetGUID()))
{ {
aur->SetDuration(delta*IN_MILISECONDS); aur->SetDuration(delta*IN_MILISECONDS);
} }
@@ -7601,7 +7599,7 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
{ {
ItemPrototype const* proto = item->GetProto(); ItemPrototype const* proto = item->GetProto();
// special learning case // special learning case
if (proto->Spells[0].SpellId == SPELL_LEARNING_483 || proto->Spells[0].SpellId==SPELL_LEARNING_55884) if (proto->Spells[0].SpellId == 483 || proto->Spells[0].SpellId == 55884)
{ {
uint32 learn_spell_id = proto->Spells[0].SpellId; uint32 learn_spell_id = proto->Spells[0].SpellId;
uint32 learning_spell_id = proto->Spells[1].SpellId; uint32 learning_spell_id = proto->Spells[1].SpellId;
@@ -11249,10 +11247,10 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
if(pProto && isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer == 0) if(pProto && isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer == 0)
{ {
uint32 cooldownSpell = SPELL_COMBAT_SWAP_DND_6119; uint32 cooldownSpell = 6119;
if (getClass() == CLASS_ROGUE) if (getClass() == CLASS_ROGUE)
cooldownSpell = SPELL_COMBAT_SWAP_DND_6123; cooldownSpell = 6123;
SpellEntry const* spellProto = sSpellStore.LookupEntry(cooldownSpell); SpellEntry const* spellProto = sSpellStore.LookupEntry(cooldownSpell);
@@ -16185,8 +16183,8 @@ void Player::_LoadAuras(QueryResult_AutoPtr result, uint32 timediff)
while (result->NextRow()); while (result->NextRow());
} }
if(getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT)) if (getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
CastSpell(this,SPELL_BATTLE_STANCE_2457,true); CastSpell(this, 2457, true);
} }
void Player::_LoadGlyphAuras() void Player::_LoadGlyphAuras()
@@ -19418,7 +19416,7 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it
{ {
// shoot spells used equipped item cooldown values already assigned in GetAttackTime(RANGED_ATTACK) // shoot spells used equipped item cooldown values already assigned in GetAttackTime(RANGED_ATTACK)
// prevent 0 cooldowns set by another way // prevent 0 cooldowns set by another way
if (rec <= 0 && catrec <= 0 && (cat == 76 || IsAutoRepeatRangedSpell(spellInfo) && spellInfo->Id != SPELL_AUTO_SHOT_75)) if (rec <= 0 && catrec <= 0 && (cat == 76 || IsAutoRepeatRangedSpell(spellInfo) && spellInfo->Id != 75))
rec = GetAttackTime(RANGED_ATTACK); rec = GetAttackTime(RANGED_ATTACK);
// Now we have cooldown data (if found any), time to apply mods // Now we have cooldown data (if found any), time to apply mods
@@ -19732,7 +19730,7 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
return; return;
} }
CastSpell(this, SPELL_DESERTER_26013, true); // Deserter CastSpell(this, 26013, true); // Deserter
} }
} }
} }
@@ -19741,7 +19739,7 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
bool Player::CanJoinToBattleground() const bool Player::CanJoinToBattleground() const
{ {
// check Deserter debuff // check Deserter debuff
if(HasAura(SPELL_DESERTER_26013)) if (HasAura(26013))
return false; return false;
return true; return true;
@@ -19781,7 +19779,7 @@ WorldLocation Player::GetStartPosition() const
{ {
PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass()); PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass());
uint32 mapId = info->mapId; uint32 mapId = info->mapId;
if(getClass() == CLASS_DEATH_KNIGHT && HasSpell(SPELL_DEATH_GATE_50977)) if (getClass() == CLASS_DEATH_KNIGHT && HasSpell(50977))
mapId = 0; mapId = 0;
return WorldLocation(mapId, info->positionX, info->positionY, info->positionZ, 0); return WorldLocation(mapId, info->positionX, info->positionY, info->positionZ, 0);
} }
@@ -20286,7 +20284,7 @@ void Player::SendInitialPacketsAfterAddToMap()
ResetTimeSync(); ResetTimeSync();
SendTimeSync(); SendTimeSync();
CastSpell(this, SPELL_LOGINEFFECT_836, true); // LOGINEFFECT CastSpell(this, 836, true); // LOGINEFFECT
// set some aura effects that send packet to player client after add player to map // set some aura effects that send packet to player client after add player to map
// SendMessageToSet not send it to player not it map, only for aura that not changed anything at re-apply // SendMessageToSet not send it to player not it map, only for aura that not changed anything at re-apply
src/game/ScriptedPch.h
-1
View File
@@ -21,7 +21,6 @@
#include "Chat.h" #include "Chat.h"
#include "DBCStructure.h" #include "DBCStructure.h"
#include "DBCStores.h" #include "DBCStores.h"
#include "SpellId.h"
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
src/game/Spell.cpp
-1
View File
@@ -50,7 +50,6 @@
#include "TemporarySummon.h" #include "TemporarySummon.h"
#include "Vehicle.h" #include "Vehicle.h"
#include "SpellAuraEffects.h" #include "SpellAuraEffects.h"
#include "SpellId.h"
#include "ScriptMgr.h" #include "ScriptMgr.h"
#define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILISECONDS) #define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILISECONDS)
src/game/SpellAuraEffects.cpp
+1 -2
View File
@@ -30,7 +30,6 @@
#include "Util.h" #include "Util.h"
#include "Spell.h" #include "Spell.h"
#include "SpellAuraEffects.h" #include "SpellAuraEffects.h"
#include "SpellId.h"
#include "BattleGround.h" #include "BattleGround.h"
#include "OutdoorPvPMgr.h" #include "OutdoorPvPMgr.h"
#include "Formulas.h" #include "Formulas.h"
@@ -1760,7 +1759,7 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const
} }
} }
break; break;
case SPELL_RESTRICTED_FLIGHT_AREA_58600: // No fly Zone - Dalaran case 58600: // No fly Zone - Dalaran
if (GetTickNumber() == 10) if (GetTickNumber() == 10)
{ {
target->RemoveAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED); target->RemoveAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED);
src/game/SpellAuras.cpp
+9 -10
View File
@@ -28,7 +28,6 @@
#include "Unit.h" #include "Unit.h"
#include "Spell.h" #include "Spell.h"
#include "SpellAuraEffects.h" #include "SpellAuraEffects.h"
#include "SpellId.h"
#include "DynamicObject.h" #include "DynamicObject.h"
#include "ObjectAccessor.h" #include "ObjectAccessor.h"
#include "Util.h" #include "Util.h"
@@ -1360,23 +1359,23 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (apply) if (apply)
{ {
// Blood Presence bonus // Blood Presence bonus
if (presence == SPELL_BLOOD_PRESENCE_48266) if (presence == 48266)
target->CastSpell(target,63611,true); target->CastSpell(target, 63611, true);
else if (bloodPresenceAura) else if (bloodPresenceAura)
{ {
int32 basePoints1=bloodPresenceAura->GetAmount(); int32 basePoints1=bloodPresenceAura->GetAmount();
target->CastCustomSpell(target,63611,NULL,&basePoints1,NULL,true,0,bloodPresenceAura); target->CastCustomSpell(target,63611,NULL,&basePoints1,NULL,true,0,bloodPresenceAura);
} }
// Frost Presence bonus // Frost Presence bonus
if (presence == SPELL_FROST_PRESENCE_48263) if (presence == 48263)
target->CastSpell(target,61261,true); target->CastSpell(target, 61261, true);
else if (frostPresenceAura) else if (frostPresenceAura)
{ {
int32 basePoints0=frostPresenceAura->GetAmount(); int32 basePoints0=frostPresenceAura->GetAmount();
target->CastCustomSpell(target,61261,&basePoints0,NULL,NULL,true,0,frostPresenceAura); target->CastCustomSpell(target,61261,&basePoints0,NULL,NULL,true,0,frostPresenceAura);
} }
// Unholy Presence bonus // Unholy Presence bonus
if (presence == SPELL_UNHOLY_PRESENCE_48265) if (presence == 48265)
{ {
if(unholyPresenceAura) if(unholyPresenceAura)
{ {
@@ -1396,13 +1395,13 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
else else
{ {
// Remove passive auras // Remove passive auras
if (presence == SPELL_BLOOD_PRESENCE_48266 || bloodPresenceAura) if (presence == 48266 || bloodPresenceAura)
target->RemoveAurasDueToSpell(63611); target->RemoveAurasDueToSpell(63611);
if (presence == SPELL_FROST_PRESENCE_48263 || frostPresenceAura) if (presence == 48263 || frostPresenceAura)
target->RemoveAurasDueToSpell(61261); target->RemoveAurasDueToSpell(61261);
if (presence == SPELL_UNHOLY_PRESENCE_48265 || unholyPresenceAura) if (presence == 48265 || unholyPresenceAura)
{ {
if(presence == SPELL_UNHOLY_PRESENCE_48265 && unholyPresenceAura) if(presence == 48265 && unholyPresenceAura)
{ {
//target->RemoveAurasDueToSpell(63622); //target->RemoveAurasDueToSpell(63622);
target->RemoveAurasDueToSpell(65095); target->RemoveAurasDueToSpell(65095);
src/game/SpellEffects.cpp
+48 -49
View File
@@ -31,7 +31,6 @@
#include "SkillExtraItems.h" #include "SkillExtraItems.h"
#include "Unit.h" #include "Unit.h"
#include "Spell.h" #include "Spell.h"
#include "SpellId.h"
#include "DynamicObject.h" #include "DynamicObject.h"
#include "SpellAuras.h" #include "SpellAuras.h"
#include "SpellAuraEffects.h" #include "SpellAuraEffects.h"
@@ -269,17 +268,17 @@ void Spell::EffectInstaKill(uint32 /*i*/)
return; return;
// Demonic Sacrifice // Demonic Sacrifice
if (m_spellInfo->Id == SPELL_DEMONIC_SACRIFICE_18788 && unitTarget->GetTypeId() == TYPEID_UNIT) if (m_spellInfo->Id == 18788 && unitTarget->GetTypeId() == TYPEID_UNIT)
{ {
uint32 entry = unitTarget->GetEntry(); uint32 entry = unitTarget->GetEntry();
uint32 spellID; uint32 spellID;
switch (entry) switch (entry)
{ {
case 416: spellID = SPELL_BURNING_WISH_18789; break; //imp case 416: spellID = 18789; break; //imp
case 417: spellID = SPELL_FEL_ENERGY_18792; break; //fellhunter case 417: spellID = 18792; break; //fellhunter
case 1860: spellID = SPELL_FEL_STAMINA_18790; break; //void case 1860: spellID = 18790; break; //void
case 1863: spellID = SPELL_TOUCH_OF_SHADOW_18791; break; //succubus case 1863: spellID = 18791; break; //succubus
case 17252: spellID = SPELL_TOUCH_OF_SHADOW_35701; break; //fellguard case 17252: spellID = 35701; break; //fellguard
default: default:
sLog.outError("EffectInstaKill: Unhandled creature entry (%u) case.", entry); sLog.outError("EffectInstaKill: Unhandled creature entry (%u) case.", entry);
return; return;
@@ -339,10 +338,10 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
switch(m_spellInfo->Id) // better way to check unknown switch(m_spellInfo->Id) // better way to check unknown
{ {
// Positive/Negative Charge // Positive/Negative Charge
case SPELL_POSITIVE_CHARGE_28062: case 28062:
case SPELL_NEGATIVE_CHARGE_28085: case 28085:
case SPELL_POSITIVE_CHARGE_39090: case 39090:
case SPELL_NEGATIVE_CHARGE_39093: case 39093:
if (!m_triggeredByAuraSpell) if (!m_triggeredByAuraSpell)
break; break;
if (unitTarget == m_caster) if (unitTarget == m_caster)
@@ -358,10 +357,10 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
uint32 spellId; uint32 spellId;
switch (m_spellInfo->Id) switch (m_spellInfo->Id)
{ {
case SPELL_POSITIVE_CHARGE_28062: spellId = SPELL_POSITIVE_CHARGE_29659; break; case 28062: spellId = 29659; break;
case SPELL_NEGATIVE_CHARGE_28085: spellId = SPELL_NEGATIVE_CHARGE_29660; break; case 28085: spellId = 29660; break;
case SPELL_POSITIVE_CHARGE_39090: spellId = SPELL_POSITIVE_CHARGE_39089; break; case 39090: spellId = 39089; break;
case SPELL_NEGATIVE_CHARGE_39093: spellId = SPELL_NEGATIVE_CHARGE_39092; break; case 39093: spellId = 39092; break;
} }
m_caster->SetAuraStack(spellId, m_caster, count); m_caster->SetAuraStack(spellId, m_caster, count);
} }
@@ -371,11 +370,11 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage = 0; damage = 0;
break; break;
// Consumption // Consumption
case SPELL_CONSUMPTION_28865: case 28865:
damage = (((InstanceMap*)m_caster->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY ? 2750 : 4250); damage = (((InstanceMap*)m_caster->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY ? 2750 : 4250);
break; break;
// percent from health with min // percent from health with min
case SPELL_THUNDERCRASH_25599: // Thundercrash case 25599: // Thundercrash
{ {
damage = unitTarget->GetHealth() / 2; damage = unitTarget->GetHealth() / 2;
if(damage < 200) if(damage < 200)
@@ -383,7 +382,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
break; break;
} }
// arcane charge. must only affect demons (also undead?) // arcane charge. must only affect demons (also undead?)
case SPELL_ARCANE_CHARGES_45072: case 45072:
{ {
if(unitTarget->GetCreatureType() != CREATURE_TYPE_DEMON if(unitTarget->GetCreatureType() != CREATURE_TYPE_DEMON
&& unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD) && unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD)
@@ -391,7 +390,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
break; break;
} }
// gruul's shatter // gruul's shatter
case SPELL_SHATTER_33671: case 33671:
{ {
// don't damage self and only players // don't damage self and only players
if(unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER) if(unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER)
@@ -404,19 +403,19 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
break; break;
} }
// Cataclysmic Bolt // Cataclysmic Bolt
case SPELL_CATACLYSMIC_BOLT_38441: case 38441:
{ {
damage = unitTarget->GetMaxHealth() / 2; damage = unitTarget->GetMaxHealth() / 2;
break; break;
} }
// Tympanic Tantrum // Tympanic Tantrum
case SPELL_TYMPANIC_TANTRUM_62775: case 62775:
{ {
damage = unitTarget->GetMaxHealth() / 10; damage = unitTarget->GetMaxHealth() / 10;
break; break;
} }
// Gargoyle Strike // Gargoyle Strike
case SPELL_GARGOYLE_STRIKE_51963: case 51963:
{ {
// about +4 base spell dmg per level // about +4 base spell dmg per level
damage = (m_caster->getLevel() - 60) * 4 + 60; damage = (m_caster->getLevel() - 60) * 4 + 60;
@@ -523,7 +522,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
back_damage -= aurEff->GetAmount() * back_damage / 100; back_damage -= aurEff->GetAmount() * back_damage / 100;
if(back_damage < unitTarget->GetHealth()) if(back_damage < unitTarget->GetHealth())
m_caster->CastCustomSpell(m_caster, SPELL_SHADOW_WORD_DEATH_32409, &back_damage, 0, 0, true); m_caster->CastCustomSpell(m_caster, 32409, &back_damage, 0, 0, true);
} }
// Mind Blast - applies Mind Trauma if: // Mind Blast - applies Mind Trauma if:
else if (m_spellInfo->SpellFamilyFlags[2] & 0x00002000) else if (m_spellInfo->SpellFamilyFlags[2] & 0x00002000)
@@ -534,7 +533,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
if (AuraEffect * aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST,95,0)) if (AuraEffect * aurEff = m_caster->GetDummyAuraEffect(SPELLFAMILY_PRIEST,95,0))
// Chance has been successfully rolled // Chance has been successfully rolled
if (roll_chance_i(aurEff->GetAmount())) if (roll_chance_i(aurEff->GetAmount()))
m_caster->CastSpell(unitTarget, SPELL_MIND_TRAUMA_48301, true); m_caster->CastSpell(unitTarget, 48301, true);
} }
// Smite // Smite
else if (m_spellInfo->SpellFamilyFlags[0] & 0x80) else if (m_spellInfo->SpellFamilyFlags[0] & 0x80)
@@ -556,7 +555,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
int chance = (*i)->GetSpellProto()->CalculateSimpleValue(1); int chance = (*i)->GetSpellProto()->CalculateSimpleValue(1);
if (roll_chance_i(chance)) if (roll_chance_i(chance))
// Mind Trauma // Mind Trauma
m_caster->CastSpell(unitTarget, SPELL_MIND_TRAUMA_48301, true, 0); m_caster->CastSpell(unitTarget, 48301, true, 0);
break; break;
} }
} }
@@ -624,7 +623,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage += int32(((Player*)m_caster)->GetTotalAttackPowerValue(BASE_ATTACK) * 0.09f * doses); damage += int32(((Player*)m_caster)->GetTotalAttackPowerValue(BASE_ATTACK) * 0.09f * doses);
} }
// Eviscerate and Envenom Bonus Damage (item set effect) // Eviscerate and Envenom Bonus Damage (item set effect)
if (m_caster->HasAura(SPELL_EVISCERATE_AND_ENVENOM_BONUS_DAMAGE_37169)) if (m_caster->HasAura(37169))
damage += ((Player*)m_caster)->GetComboPoints()*40; damage += ((Player*)m_caster)->GetComboPoints()*40;
} }
} }
@@ -637,7 +636,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage += irand(int32(ap * combo * 0.03f), int32(ap * combo * 0.07f)); damage += irand(int32(ap * combo * 0.03f), int32(ap * combo * 0.07f));
// Eviscerate and Envenom Bonus Damage (item set effect) // Eviscerate and Envenom Bonus Damage (item set effect)
if (m_caster->HasAura(SPELL_EVISCERATE_AND_ENVENOM_BONUS_DAMAGE_37169)) if (m_caster->HasAura(37169))
damage += combo*40; damage += combo*40;
} }
} }
@@ -648,7 +647,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
//Gore //Gore
if (m_spellInfo->SpellIconID == 1578) if (m_spellInfo->SpellIconID == 1578)
{ {
if (m_caster->HasAura(SPELL_CHARGE_57627)) // Charge 6 sec post-affect if (m_caster->HasAura(57627)) // Charge 6 sec post-affect
damage *= 2; damage *= 2;
} }
// Steady Shot // Steady Shot
@@ -757,7 +756,7 @@ void Spell::EffectDummy(uint32 i)
switch (m_spellInfo->Id) switch (m_spellInfo->Id)
{ {
// Wrath of the Astromancer // Wrath of the Astromancer
case SPELL_WRATH_OF_THE_ASTROMANCER_42784: case 42784:
{ {
uint32 count = 0; uint32 count = 0;
for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
@@ -777,7 +776,7 @@ void Spell::EffectDummy(uint32 i)
m_caster->DealDamage(casttarget, damage, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, spellInfo, false); m_caster->DealDamage(casttarget, damage, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, spellInfo, false);
} }
} }
case SPELL_DEVIATE_FISH_8063: // Deviate Fish case 8063: // Deviate Fish
{ {
if(m_caster->GetTypeId() != TYPEID_PLAYER) if(m_caster->GetTypeId() != TYPEID_PLAYER)
return; return;
@@ -785,16 +784,16 @@ void Spell::EffectDummy(uint32 i)
uint32 spell_id = 0; uint32 spell_id = 0;
switch(urand(1,5)) switch(urand(1,5))
{ {
case 1: spell_id = SPELL_SLEEPY_8064; break; // Sleepy case 1: spell_id = 8064; break; // Sleepy
case 2: spell_id = SPELL_INVIGORATE_8065; break; // Invigorate case 2: spell_id = 8065; break; // Invigorate
case 3: spell_id = SPELL_SHRINK_8066; break; // Shrink case 3: spell_id = 8066; break; // Shrink
case 4: spell_id = SPELL_PARTY_TIME_8067; break; // Party Time! case 4: spell_id = 8067; break; // Party Time!
case 5: spell_id = SPELL_HEALTHY_SPIRIT_8068; break; // Healthy Spirit case 5: spell_id = 8068; break; // Healthy Spirit
} }
m_caster->CastSpell(m_caster, spell_id, true, NULL); m_caster->CastSpell(m_caster, spell_id, true, NULL);
return; return;
} }
case SPELL_COOKED_DEVIATE_FISH_8213: // Savory Deviate Delight case 8213: // Savory Deviate Delight
{ {
if(m_caster->GetTypeId() != TYPEID_PLAYER) if(m_caster->GetTypeId() != TYPEID_PLAYER)
return; return;
@@ -803,24 +802,24 @@ void Spell::EffectDummy(uint32 i)
switch(urand(1,2)) switch(urand(1,2))
{ {
// Flip Out - ninja // Flip Out - ninja
case 1: spell_id = (m_caster->getGender() == GENDER_MALE ? SPELL_FLIP_OUT_8219 : SPELL_FLIP_OUT_8220); break; case 1: spell_id = (m_caster->getGender() == GENDER_MALE ? 8219 : 8220); break;
// Yaaarrrr - pirate // Yaaarrrr - pirate
case 2: spell_id = (m_caster->getGender() == GENDER_MALE ? SPELL_YAAARRRR_8221 : SPELL_YAAARRRR_8222); break; case 2: spell_id = (m_caster->getGender() == GENDER_MALE ? 8221 : 8222); break;
} }
m_caster->CastSpell(m_caster,spell_id,true,NULL); m_caster->CastSpell(m_caster,spell_id,true,NULL);
return; return;
} }
case SPELL_SYMBOL_OF_LIFE_8593: // Symbol of life (restore creature to life) case 8593: // Symbol of life (restore creature to life)
case SPELL_SHIMMERING_VESSEL_31225: // Shimmering Vessel (restore creature to life) case 31225: // Shimmering Vessel (restore creature to life)
{ {
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT) if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
return; return;
((Creature*)unitTarget)->setDeathState(JUST_ALIVED); ((Creature*)unitTarget)->setDeathState(JUST_ALIVED);
return; return;
} }
case SPELL_DEEP_WOUNDS_12162: // Deep wounds case 12162: // Deep wounds
case SPELL_DEEP_WOUNDS_12850: // (now good common check for this spells) case 12850: // (now good common check for this spells)
case SPELL_DEEP_WOUNDS_12868: case 12868:
{ {
if (!unitTarget) if (!unitTarget)
return; return;
@@ -835,16 +834,16 @@ void Spell::EffectDummy(uint32 i)
switch (m_spellInfo->Id) switch (m_spellInfo->Id)
{ {
case SPELL_DEEP_WOUNDS_12162: damage *= 0.16f; break; // Rank 1 case 12162: damage *= 0.16f; break; // Rank 1
case SPELL_DEEP_WOUNDS_12850: damage *= 0.32f; break; // Rank 2 case 12850: damage *= 0.32f; break; // Rank 2
case SPELL_DEEP_WOUNDS_12868: damage *= 0.48f; break; // Rank 3 case 12868: damage *= 0.48f; break; // Rank 3
default: default:
sLog.outError("Spell::EffectDummy: Spell %u not handled in DW",m_spellInfo->Id); sLog.outError("Spell::EffectDummy: Spell %u not handled in DW",m_spellInfo->Id);
return; return;
}; };
// get remaining damage of old Deep Wound aura // get remaining damage of old Deep Wound aura
AuraEffect* deepWound = unitTarget->GetAuraEffect(SPELL_DEEP_WOUNDS_12721, 0); AuraEffect* deepWound = unitTarget->GetAuraEffect(12721, 0);
if (deepWound) if (deepWound)
{ {
int32 remainingTicks = deepWound->GetBase()->GetDuration() / deepWound->GetAmplitude(); int32 remainingTicks = deepWound->GetBase()->GetDuration() / deepWound->GetAmplitude();
@@ -3225,7 +3224,7 @@ void Spell::EffectEnergize(uint32 i)
m_caster->EnergizeBySpell(unitTarget, m_spellInfo->Id, damage, power); m_caster->EnergizeBySpell(unitTarget, m_spellInfo->Id, damage, power);
// Mad Alchemist's Potion // Mad Alchemist's Potion
if (m_spellInfo->Id == SPELL_MAD_ALCHEMISTS_POTION_45051) if (m_spellInfo->Id == 45051)
{ {
// find elixirs on target // find elixirs on target
bool guardianFound = false; bool guardianFound = false;
@@ -3749,7 +3748,7 @@ void Spell::EffectLearnSpell(uint32 i)
Player *player = (Player*)unitTarget; Player *player = (Player*)unitTarget;
uint32 spellToLearn = (m_spellInfo->Id == SPELL_LEARNING_483 || m_spellInfo->Id == SPELL_LEARNING_55884) ? damage : m_spellInfo->EffectTriggerSpell[i]; uint32 spellToLearn = (m_spellInfo->Id == 483 || m_spellInfo->Id == 55884) ? damage : m_spellInfo->EffectTriggerSpell[i];
player->learnSpell(spellToLearn,false); player->learnSpell(spellToLearn,false);
sLog.outDebug("Spell: Player %u has learned spell %u from NpcGUID=%u", player->GetGUIDLow(), spellToLearn, m_caster->GetGUIDLow()); sLog.outDebug("Spell: Player %u has learned spell %u from NpcGUID=%u", player->GetGUIDLow(), spellToLearn, m_caster->GetGUIDLow());
src/game/SpellId.h
-140140
View File
File diff suppressed because it is too large Load Diff
src/game/SpellMgr.cpp
+6 -7
View File
@@ -26,7 +26,6 @@
#include "World.h" #include "World.h"
#include "Chat.h" #include "Chat.h"
#include "Spell.h" #include "Spell.h"
#include "SpellId.h"
#include "BattleGroundMgr.h" #include "BattleGroundMgr.h"
#include "CreatureAI.h" #include "CreatureAI.h"
@@ -615,7 +614,7 @@ SpellSpecific GetSpellSpecific(SpellEntry const * spellInfo)
} }
case SPELLFAMILY_DEATHKNIGHT: case SPELLFAMILY_DEATHKNIGHT:
if (spellInfo->Id == SPELL_BLOOD_PRESENCE_48266 || spellInfo->Id == SPELL_FROST_PRESENCE_48263 || spellInfo->Id == SPELL_UNHOLY_PRESENCE_48265) if (spellInfo->Id == 48266 || spellInfo->Id == 48263 || spellInfo->Id == 48265)
//if (spellInfo->Category == 47) //if (spellInfo->Category == 47)
return SPELL_SPECIFIC_PRESENCE; return SPELL_SPECIFIC_PRESENCE;
break; break;
@@ -3088,7 +3087,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
// Extra conditions -- leaving the possibility add extra conditions... // Extra conditions -- leaving the possibility add extra conditions...
switch(spellId) switch(spellId)
{ {
case SPELL_RESTRICTED_FLIGHT_AREA_58600: // No fly Zone - Dalaran (Krasus Landing exception) case 58600: // No fly Zone - Dalaran (Krasus Landing exception)
if (!player || player->GetAreaId() == 4564 || !player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY) || player->HasAura(44795)) if (!player || player->GetAreaId() == 4564 || !player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY) || player->HasAura(44795))
return false; return false;
break; break;
@@ -3675,11 +3674,11 @@ void SpellMgr::LoadSpellCustomAttr()
case 39805: // Lightning Overload case 39805: // Lightning Overload
case 52437: // Sudden Death case 52437: // Sudden Death
case 64823: // Item - Druid T8 Balance 4P Bonus case 64823: // Item - Druid T8 Balance 4P Bonus
case SPELL_MISSILE_BARRAGE_44401: case 44401:
spellInfo->procCharges = 1; spellInfo->procCharges = 1;
count++; count++;
break; break;
case SPELL_TIDAL_WAVES_53390: // Tidal Wave case 53390: // Tidal Wave
spellInfo->procCharges = 2; spellInfo->procCharges = 2;
count++; count++;
break; break;
@@ -3761,8 +3760,8 @@ void SpellMgr::LoadSpellCustomAttr()
break; break;
// target allys instead of enemies, target A is src_caster, spells with effect like that have ally target // target allys instead of enemies, target A is src_caster, spells with effect like that have ally target
// this is the only known exception, probably just wrong data // this is the only known exception, probably just wrong data
case SPELL_WRATH_OF_THE_PLAGUEBRINGER_29214: // Wrath of the Plaguebringer case 29214: // Wrath of the Plaguebringer
case SPELL_WRATH_OF_THE_PLAGUEBRINGER_54836: // Wrath of the Plaguebringer case 54836: // Wrath of the Plaguebringer
spellInfo->EffectImplicitTargetB[0] = TARGET_UNIT_AREA_ALLY_SRC; spellInfo->EffectImplicitTargetB[0] = TARGET_UNIT_AREA_ALLY_SRC;
spellInfo->EffectImplicitTargetB[1] = TARGET_UNIT_AREA_ALLY_SRC; spellInfo->EffectImplicitTargetB[1] = TARGET_UNIT_AREA_ALLY_SRC;
count++; count++;
src/game/Unit.cpp
+6 -7
View File
@@ -54,7 +54,6 @@
#include "TemporarySummon.h" #include "TemporarySummon.h"
#include "Vehicle.h" #include "Vehicle.h"
#include "Transports.h" #include "Transports.h"
#include "SpellId.h"
#include <math.h> #include <math.h>
@@ -840,7 +839,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
he->duel->opponent->CombatStopWithPets(true); he->duel->opponent->CombatStopWithPets(true);
he->CombatStopWithPets(true); he->CombatStopWithPets(true);
he->CastSpell(he, SPELL_GROVEL_7267, true); // beg he->CastSpell(he, 7267, true); // beg
he->DuelComplete(DUEL_WON); he->DuelComplete(DUEL_WON);
} }
} }
@@ -3282,10 +3281,10 @@ void Unit::_UpdateSpells( uint32 time )
void Unit::_UpdateAutoRepeatSpell() void Unit::_UpdateAutoRepeatSpell()
{ {
//check "realtime" interrupts //check "realtime" interrupts
if ( (GetTypeId() == TYPEID_PLAYER && ((Player*)this)->isMoving()) || IsNonMeleeSpellCasted(false,false,true,m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == SPELL_AUTO_SHOT_75) ) if ( (GetTypeId() == TYPEID_PLAYER && ((Player*)this)->isMoving()) || IsNonMeleeSpellCasted(false,false,true,m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id == 75) )
{ {
// cancel wand shoot // cancel wand shoot
if(m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != SPELL_AUTO_SHOT_75) if(m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75)
InterruptSpell(CURRENT_AUTOREPEAT_SPELL); InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
m_AutoRepeatFirstCast = true; m_AutoRepeatFirstCast = true;
return; return;
@@ -3338,7 +3337,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] ) if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] )
{ {
// break autorepeat if not Auto Shot // break autorepeat if not Auto Shot
if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != SPELL_AUTO_SHOT_75) if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75)
InterruptSpell(CURRENT_AUTOREPEAT_SPELL); InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
m_AutoRepeatFirstCast = true; m_AutoRepeatFirstCast = true;
} }
@@ -3353,7 +3352,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
// it also does break autorepeat if not Auto Shot // it also does break autorepeat if not Auto Shot
if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] && if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] &&
m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != SPELL_AUTO_SHOT_75 ) m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75 )
InterruptSpell(CURRENT_AUTOREPEAT_SPELL); InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
addUnitState(UNIT_STAT_CASTING); addUnitState(UNIT_STAT_CASTING);
} break; } break;
@@ -3361,7 +3360,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
case CURRENT_AUTOREPEAT_SPELL: case CURRENT_AUTOREPEAT_SPELL:
{ {
// only Auto Shoot does not break anything // only Auto Shoot does not break anything
if (pSpell->m_spellInfo->Id != SPELL_AUTO_SHOT_75) if (pSpell->m_spellInfo->Id != 75)
{ {
// generic autorepeats break generic non-delayed and channeled non-delayed spells // generic autorepeats break generic non-delayed and channeled non-delayed spells
InterruptSpell(CURRENT_GENERIC_SPELL,false); InterruptSpell(CURRENT_GENERIC_SPELL,false);
src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+3 -3
View File
@@ -387,7 +387,7 @@ struct npc_death_knight_initiateAI : public CombatAI
pDoneBy->AttackStop(); pDoneBy->AttackStop();
me->CastSpell(pDoneBy, SPELL_DUEL_VICTORY, true); me->CastSpell(pDoneBy, SPELL_DUEL_VICTORY, true);
lose = true; lose = true;
me->CastSpell(me, SPELL_GROVEL_7267, true); me->CastSpell(me, 7267, true);
me->RestoreFaction(); me->RestoreFaction();
} }
} }
@@ -417,14 +417,14 @@ struct npc_death_knight_initiateAI : public CombatAI
{ {
if (lose) if (lose)
{ {
if (!me->HasAura(SPELL_GROVEL_7267)) if (!me->HasAura(7267))
EnterEvadeMode(); EnterEvadeMode();
return; return;
} }
else if (me->getVictim()->GetTypeId() == TYPEID_PLAYER else if (me->getVictim()->GetTypeId() == TYPEID_PLAYER
&& me->getVictim()->GetHealth() * 10 < me->getVictim()->GetMaxHealth()) && me->getVictim()->GetHealth() * 10 < me->getVictim()->GetMaxHealth())
{ {
me->getVictim()->CastSpell(me->getVictim(), SPELL_GROVEL_7267, true); // beg me->getVictim()->CastSpell(me->getVictim(), 7267, true); // beg
me->getVictim()->RemoveGameObject(SPELL_DUEL_FLAG, true); me->getVictim()->RemoveGameObject(SPELL_DUEL_FLAG, true);
EnterEvadeMode(); EnterEvadeMode();
return; return;
src/scripts/examples/example_creature.cpp
+7 -8
View File
@@ -22,7 +22,6 @@ SDCategory: Script Examples
EndScriptData */ EndScriptData */
#include "ScriptedPch.h" #include "ScriptedPch.h"
#include "SpellId.h"
// **** This script is designed as an example for others to build on **** // **** This script is designed as an example for others to build on ****
// **** Please modify whatever you'd like to as this script is only for developement **** // **** Please modify whatever you'd like to as this script is only for developement ****
@@ -58,13 +57,13 @@ enum Spells
{ {
// List of spells. // List of spells.
// Not required to define them in this way, but will make it easier to maintain in case spellId change // Not required to define them in this way, but will make it easier to maintain in case spellId change
SPELL_BUFF = SPELL_INCREASED_STAMINA_25661, SPELL_BUFF = 25661,
SPELL_ONE = SPELL_PUMMEL_12555, SPELL_ONE = 12555,
SPELL_ONE_ALT = SPELL_POISON_BOLT_VOLLEY_24099, SPELL_ONE_ALT = 24099,
SPELL_TWO = SPELL_FROST_HOLD_10017, SPELL_TWO = 10017,
SPELL_THREE = SPELL_KNOCKBACK_26027, SPELL_THREE = 26027,
SPELL_FRENZY = SPELL_FRENZY_23537, SPELL_FRENZY = 23537,
SPELL_BERSERK = SPELL_BERSERK_32965, SPELL_BERSERK = 32965,
}; };
enum eEnums enum eEnums
src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+14 -14
View File
@@ -94,40 +94,40 @@ enum Spells
{ {
//***** Main Phase 1 ******** //***** Main Phase 1 ********
//Eye Spells //Eye Spells
SPELL_FREEZE_ANIM = SPELL_FREEZE_ANIM_16245, SPELL_FREEZE_ANIM = 16245,
SPELL_GREEN_BEAM = SPELL_EYE_BEAM_26134, SPELL_GREEN_BEAM = 26134,
SPELL_DARK_GLARE = SPELL_DARK_GLARE_26029, SPELL_DARK_GLARE = 26029,
SPELL_RED_COLORATION = SPELL_GLOWY_RED_22518, //Probably not the right spell but looks similar SPELL_RED_COLORATION = 22518, //Probably not the right spell but looks similar
//Eye Tentacles Spells //Eye Tentacles Spells
SPELL_MIND_FLAY = SPELL_MIND_FLAY_26143, SPELL_MIND_FLAY = 26143,
//Claw Tentacles Spells //Claw Tentacles Spells
SPELL_GROUND_RUPTURE = SPELL_GROUND_RUPTURE_26139, SPELL_GROUND_RUPTURE = 26139,
SPELL_HAMSTRING = SPELL_HAMSTRING_26141, SPELL_HAMSTRING = 26141,
//***** Main Phase 2 ****** //***** Main Phase 2 ******
//Body spells //Body spells
//#define SPELL_CARAPACE_CTHUN 26156 //Was removed from client dbcs //#define SPELL_CARAPACE_CTHUN 26156 //Was removed from client dbcs
SPELL_TRANSFORM = SPELL_TRANSFORM_CTHUN___PHASE_2_26232, SPELL_TRANSFORM = 26232,
SPELL_PURPLE_COLORATION = SPELL_GLOWY_PURPLE_22581, //Probably not the right spell but looks similar SPELL_PURPLE_COLORATION = 22581, //Probably not the right spell but looks similar
//Eye Tentacles Spells //Eye Tentacles Spells
//SAME AS PHASE1 //SAME AS PHASE1
//Giant Claw Tentacles //Giant Claw Tentacles
SPELL_MASSIVE_GROUND_RUPTURE = SPELL_GROUND_RUPTURE_26100, SPELL_MASSIVE_GROUND_RUPTURE = 26100,
//Also casts Hamstring //Also casts Hamstring
SPELL_THRASH = SPELL_THRASH_3391, SPELL_THRASH = 3391,
//Giant Eye Tentacles //Giant Eye Tentacles
//CHAIN CASTS "SPELL_GREEN_BEAM" //CHAIN CASTS "SPELL_GREEN_BEAM"
//Stomach Spells //Stomach Spells
SPELL_MOUTH_TENTACLE = SPELL_SUMMON_MOUTH_TENTACLE_26332, SPELL_MOUTH_TENTACLE = 26332,
SPELL_EXIT_STOMACH_KNOCKBACK = SPELL_SPIT_OUT_25383, SPELL_EXIT_STOMACH_KNOCKBACK = 25383,
SPELL_DIGESTIVE_ACID = SPELL_DIGESTIVE_ACID_26476, SPELL_DIGESTIVE_ACID = 26476,
}; };
enum Actions enum Actions
src/scripts/northrend/draktharon_keep/boss_trollgore.cpp
+8 -8
View File
@@ -32,15 +32,15 @@ update creature_template set scriptname = 'boss_trollgore' where entry = '';
enum Spells enum Spells
{ {
SPELL_INFECTED_WOUND = SPELL_INFECTED_WOUND_49637, SPELL_INFECTED_WOUND = 49637,
SPELL_CRUSH = SPELL_CRUSH_49639, SPELL_CRUSH = 49639,
SPELL_CORPSE_EXPLODE = SPELL_CORPSE_EXPLODE_49555, SPELL_CORPSE_EXPLODE = 49555,
SPELL_CONSUME = SPELL_CONSUME_49380, SPELL_CONSUME = 49380,
SPELL_CONSUME_AURA = SPELL_CONSUME_49381, SPELL_CONSUME_AURA = 49381,
//Heroic spells //Heroic spells
H_SPELL_CORPSE_EXPLODE = SPELL_CORPSE_EXPLODE_59807, H_SPELL_CORPSE_EXPLODE = 59807,
H_SPELL_CONSUME = SPELL_CONSUME_59803, H_SPELL_CONSUME = 59803,
H_SPELL_CONSUME_AURA = SPELL_CONSUME_59805, H_SPELL_CONSUME_AURA = 59805,
}; };
enum Yells enum Yells
{ {
src/scripts/northrend/naxxramas/boss_anubrekhan.cpp
+7 -7
View File
@@ -36,13 +36,13 @@ enum Events
enum Spells enum Spells
{ {
SPELL_IMPALE_10 = SPELL_IMPALE_28783, SPELL_IMPALE_10 = 28783,
SPELL_IMPALE_25 = SPELL_IMPALE_56090, SPELL_IMPALE_25 = 56090,
SPELL_LOCUST_SWARM_10 = SPELL_LOCUST_SWARM_28785, SPELL_LOCUST_SWARM_10 = 28785,
SPELL_LOCUST_SWARM_25 = SPELL_LOCUST_SWARM_54021, SPELL_LOCUST_SWARM_25 = 54021,
SPELL_SUMMON_CORPSE_SCARABS_PLR = SPELL_SUMMON_CORPSE_SCARABS_5_29105, // This spawns 5 corpse scarabs on top of player SPELL_SUMMON_CORPSE_SCARABS_PLR = 29105, // This spawns 5 corpse scarabs on top of player
SPELL_SUMMON_CORPSE_SCARABS_MOB = SPELL_SUMMON_CORPSE_SCARABS_10_28864, // This spawns 10 corpse scarabs on top of dead guards SPELL_SUMMON_CORPSE_SCARABS_MOB = 28864, // This spawns 10 corpse scarabs on top of dead guards
SPELL_BERSERK = SPELL_BERSERK_27680, SPELL_BERSERK = 27680,
}; };
struct boss_anubrekhanAI : public BossAI struct boss_anubrekhanAI : public BossAI
src/scripts/northrend/naxxramas/boss_faerlina.cpp
+8 -8
View File
@@ -34,14 +34,14 @@ enum Yells
enum Spells enum Spells
{ {
SPELL_POISON_BOLT_VOLLEY = SPELL_POISON_BOLT_VOLLEY_28796, SPELL_POISON_BOLT_VOLLEY = 28796,
H_SPELL_POISON_BOLT_VOLLEY = SPELL_POISON_BOLT_VOLLEY_54098, H_SPELL_POISON_BOLT_VOLLEY = 54098,
SPELL_RAIN_OF_FIRE = SPELL_RAIN_OF_FIRE_28794, SPELL_RAIN_OF_FIRE = 28794,
H_SPELL_RAIN_OF_FIRE = SPELL_RAIN_OF_FIRE_54099, H_SPELL_RAIN_OF_FIRE = 54099,
SPELL_FRENZY = SPELL_FRENZY_28798, SPELL_FRENZY = 28798,
H_SPELL_FRENZY = SPELL_FRENZY_54100, H_SPELL_FRENZY = 54100,
SPELL_WIDOWS_EMBRACE = SPELL_WIDOWS_EMBRACE_28732, SPELL_WIDOWS_EMBRACE = 28732,
H_SPELL_WIDOWS_EMBRACE = SPELL_WIDOWS_EMBRACE_54097 H_SPELL_WIDOWS_EMBRACE = 54097
}; };
enum Events enum Events
src/scripts/northrend/naxxramas/boss_gothik.cpp
+9 -9
View File
@@ -27,15 +27,15 @@ enum Yells
//Gothik //Gothik
enum Spells enum Spells
{ {
SPELL_HARVEST_SOUL = SPELL_HARVEST_SOUL_28679, SPELL_HARVEST_SOUL = 28679,
SPELL_SHADOW_BOLT = SPELL_SHADOW_BOLT_29317, SPELL_SHADOW_BOLT = 29317,
H_SPELL_SHADOW_BOLT = SPELL_SHADOW_BOLT_56405, H_SPELL_SHADOW_BOLT = 56405,
SPELL_INFORM_LIVE_TRAINEE = SPELL_TO_ANCHOR_1_27892, SPELL_INFORM_LIVE_TRAINEE = 27892,
SPELL_INFORM_LIVE_KNIGHT = SPELL_TO_ANCHOR_1_27928, SPELL_INFORM_LIVE_KNIGHT = 27928,
SPELL_INFORM_LIVE_RIDER = SPELL_TO_ANCHOR_1_27935, SPELL_INFORM_LIVE_RIDER = 27935,
SPELL_INFORM_DEAD_TRAINEE = SPELL_ANCHOR_TO_SKULLS_27915, SPELL_INFORM_DEAD_TRAINEE = 27915,
SPELL_INFORM_DEAD_KNIGHT = SPELL_ANCHOR_TO_SKULLS_27931, SPELL_INFORM_DEAD_KNIGHT = 27931,
SPELL_INFORM_DEAD_RIDER = SPELL_ANCHOR_TO_SKULLS_27937 SPELL_INFORM_DEAD_RIDER = 27937
}; };
enum Creatures enum Creatures
{ {
src/scripts/northrend/naxxramas/boss_loatheb.cpp
+6 -6
View File
@@ -21,12 +21,12 @@
enum Spells enum Spells
{ {
SPELL_NECROTIC_AURA = SPELL_NECROTIC_AURA_55593, SPELL_NECROTIC_AURA = 55593,
SPELL_SUMMON_SPORE = SPELL_SUMMON_SPORE_29234, SPELL_SUMMON_SPORE = 29234,
SPELL_DEATHBLOOM = SPELL_DEATHBLOOM_29865, SPELL_DEATHBLOOM = 29865,
H_SPELL_DEATHBLOOM = SPELL_DEATHBLOOM_55053, H_SPELL_DEATHBLOOM = 55053,
SPELL_INEVITABLE_DOOM = SPELL_INEVITABLE_DOOM_29204, SPELL_INEVITABLE_DOOM = 29204,
H_SPELL_INEVITABLE_DOOM = SPELL_INEVITABLE_DOOM_55052 H_SPELL_INEVITABLE_DOOM = 55052
}; };
enum Events enum Events
src/scripts/northrend/naxxramas/boss_maexxna.cpp
+9 -9
View File
@@ -21,15 +21,15 @@
enum Spells enum Spells
{ {
SPELL_WEB_WRAP = SPELL_WEB_WRAP_28622, SPELL_WEB_WRAP = 28622,
SPELL_WEB_SPRAY_10 = SPELL_WEB_SPRAY_29484, SPELL_WEB_SPRAY_10 = 29484,
SPELL_WEB_SPRAY_25 = SPELL_WEB_SPRAY_54125, SPELL_WEB_SPRAY_25 = 54125,
SPELL_POISON_SHOCK_10 = SPELL_POISON_SHOCK_28741, SPELL_POISON_SHOCK_10 = 28741,
SPELL_POISON_SHOCK_25 = SPELL_POISON_SHOCK_54122, SPELL_POISON_SHOCK_25 = 54122,
SPELL_NECROTIC_POISON_10 = SPELL_NECROTIC_POISON_28776, SPELL_NECROTIC_POISON_10 = 28776,
SPELL_NECROTIC_POISON_25 = SPELL_NECROTIC_POISON_54121, SPELL_NECROTIC_POISON_25 = 54121,
SPELL_FRENZY_10 = SPELL_FRENZY_54123, SPELL_FRENZY_10 = 54123,
SPELL_FRENZY_25 = SPELL_FRENZY_54124, SPELL_FRENZY_25 = 54124,
}; };
enum Creatures enum Creatures
src/scripts/northrend/naxxramas/boss_patchwerk.cpp
+5 -5
View File
@@ -19,11 +19,11 @@
enum Spells enum Spells
{ {
SPELL_HATEFUL_STRIKE = SPELL_HATEFUL_STRIKE_41926, SPELL_HATEFUL_STRIKE = 41926,
H_SPELL_HATEFUL_STRIKE = SPELL_HATEFUL_STRIKE_59192, H_SPELL_HATEFUL_STRIKE = 59192,
SPELL_FRENZY = SPELL_FRENZY_28131, SPELL_FRENZY = 28131,
SPELL_BERSERK = SPELL_BERSERK_26662, SPELL_BERSERK = 26662,
SPELL_SLIME_BOLT = SPELL_SLIME_BOLT_32309, SPELL_SLIME_BOLT = 32309,
}; };
enum Yells enum Yells
src/scripts/northrend/naxxramas/boss_thaddius.cpp
+12 -12
View File
@@ -29,10 +29,10 @@ enum StalaggYells
enum StalagSpells enum StalagSpells
{ {
SPELL_POWERSURGE = SPELL_POWER_SURGE_28134, SPELL_POWERSURGE = 28134,
H_SPELL_POWERSURGE = SPELL_POWER_SURGE_54529, H_SPELL_POWERSURGE = 54529,
SPELL_MAGNETIC_PULL = SPELL_MAGNETIC_PULL_28338, SPELL_MAGNETIC_PULL = 28338,
SPELL_STALAGG_TESLA = SPELL_STALAGG_TESLA_PASSIVE_28097 SPELL_STALAGG_TESLA = 28097
}; };
//Feugen //Feugen
@@ -45,9 +45,9 @@ enum FeugenYells
enum FeugenSpells enum FeugenSpells
{ {
SPELL_STATICFIELD = SPELL_STATIC_FIELD_28135, SPELL_STATICFIELD = 28135,
H_SPELL_STATICFIELD = SPELL_STATIC_FIELD_54528, H_SPELL_STATICFIELD = 54528,
SPELL_FEUGEN_TESLA = SPELL_FEUGEN_TESLA_PASSIVE_28109 SPELL_FEUGEN_TESLA = 28109
}; };
// Thaddius DoAction // Thaddius DoAction
@@ -80,11 +80,11 @@ enum ThaddiusYells
enum ThaddiusSpells enum ThaddiusSpells
{ {
SPELL_POLARITY_SHIFT = SPELL_POLARITY_SHIFT_28089, SPELL_POLARITY_SHIFT = 28089,
SPELL_BALL_LIGHTNING = SPELL_BALL_LIGHTNING_28299, SPELL_BALL_LIGHTNING = 28299,
SPELL_CHAIN_LIGHTNING = SPELL_CHAIN_LIGHTNING_28167, SPELL_CHAIN_LIGHTNING = 28167,
H_SPELL_CHAIN_LIGHTNING = SPELL_CHAIN_LIGHTNING_54531, H_SPELL_CHAIN_LIGHTNING = 54531,
SPELL_BERSERK = SPELL_BERSERK_27680 SPELL_BERSERK = 27680
}; };
enum Events enum Events
src/scripts/northrend/violet_hold/boss_cyanigosa.cpp
+9 -9
View File
@@ -14,15 +14,15 @@ update creature_template set scriptname = '' where entry = '';
enum Spells enum Spells
{ {
SPELL_ARCANE_VACUUM = SPELL_ARCANE_VACUUM_58694, SPELL_ARCANE_VACUUM = 58694,
SPELL_BLIZZARD = SPELL_BLIZZARD_58693, SPELL_BLIZZARD = 58693,
H_SPELL_BLIZZARD = SPELL_BLIZZARD_59369, H_SPELL_BLIZZARD = 59369,
SPELL_MANA_DESTRUCTION = SPELL_MANA_DESTRUCTION_59374, SPELL_MANA_DESTRUCTION = 59374,
SPELL_TAIL_SWEEP = SPELL_TAIL_SWEEP_58690, SPELL_TAIL_SWEEP = 58690,
H_SPELL_TAIL_SWEEP = SPELL_TAIL_SWEEP_59283, H_SPELL_TAIL_SWEEP = 59283,
SPELL_UNCONTROLLABLE_ENERGY = SPELL_UNCONTROLLABLE_ENERGY_58688, SPELL_UNCONTROLLABLE_ENERGY = 58688,
H_SPELL_UNCONTROLLABLE_ENERGY = SPELL_UNCONTROLLABLE_ENERGY_59281, H_SPELL_UNCONTROLLABLE_ENERGY = 59281,
SPELL_TRANSFORM = SPELL_CYANIGOSA_TRANSFORM_58668 SPELL_TRANSFORM = 58668
}; };
enum Yells enum Yells
src/scripts/northrend/violet_hold/boss_erekem.cpp
+9 -9
View File
@@ -14,15 +14,15 @@ update creature_template set scriptname = '' where entry = '';
enum Spells enum Spells
{ {
SPELL_BLOODLUST = SPELL_BLOODLUST_54516, SPELL_BLOODLUST = 54516,
SPELL_BREAK_BONDS = SPELL_BREAK_BONDS_59463, SPELL_BREAK_BONDS = 59463,
SPELL_CHAIN_HEAL = SPELL_CHAIN_HEAL_54481, SPELL_CHAIN_HEAL = 54481,
H_SPELL_CHAIN_HEAL = SPELL_CHAIN_HEAL_59473, H_SPELL_CHAIN_HEAL = 59473,
SPELL_EARTH_SHIELD = SPELL_EARTH_SHIELD_54479, SPELL_EARTH_SHIELD = 54479,
H_SPELL_EARTH_SHIELD = SPELL_EARTH_SHIELD_59471, H_SPELL_EARTH_SHIELD = 59471,
SPELL_EARTH_SHOCK = SPELL_EARTH_SHOCK_54511, SPELL_EARTH_SHOCK = 54511,
SPELL_LIGHTNING_BOLT = SPELL_LIGHTNING_BOLT_53044, SPELL_LIGHTNING_BOLT = 53044,
SPELL_STORMSTRIKE = SPELL_STORMSTRIKE_51876 SPELL_STORMSTRIKE = 51876
}; };
enum Yells enum Yells
src/scripts/northrend/violet_hold/boss_ichoron.cpp
+9 -9
View File
@@ -27,15 +27,15 @@ Script Data End */
enum Spells enum Spells
{ {
SPELL_DRAINED = SPELL_DRAINED_59820, SPELL_DRAINED = 59820,
SPELL_FRENZY = SPELL_FRENZY_54312, SPELL_FRENZY = 54312,
SPELL_FRENZY_H = SPELL_FRENZY_59522, SPELL_FRENZY_H = 59522,
SPELL_PROTECTIVE_BUBBLE = SPELL_PROTECTIVE_BUBBLE_54306, SPELL_PROTECTIVE_BUBBLE = 54306,
SPELL_WATER_BLAST = SPELL_WATER_BLAST_54237, SPELL_WATER_BLAST = 54237,
SPELL_WATER_BLAST_H = SPELL_WATER_BLAST_59520, SPELL_WATER_BLAST_H = 59520,
SPELL_WATER_BOLT_VOLLEY = SPELL_WATER_BOLT_VOLLEY_54241, SPELL_WATER_BOLT_VOLLEY = 54241,
SPELL_WATER_BOLT_VOLLEY_H = SPELL_WATER_BOLT_VOLLEY_59521, SPELL_WATER_BOLT_VOLLEY_H = 59521,
SPELL_SPLASH = SPELL_SPLASH_59516, SPELL_SPLASH = 59516,
}; };
enum IchoronCreatures enum IchoronCreatures
src/scripts/northrend/violet_hold/boss_zuramat.cpp
+7 -7
View File
@@ -10,14 +10,14 @@ Script Data End */
enum Spells enum Spells
{ {
SPELL_SHROUD_OF_DARKNESS = SPELL_SHROUD_OF_DARKNESS_54524, SPELL_SHROUD_OF_DARKNESS = 54524,
H_SPELL_SHROUD_OF_DARKNESS = SPELL_SHROUD_OF_DARKNESS_59745, H_SPELL_SHROUD_OF_DARKNESS = 59745,
SPELL_SUMMON_VOID_SENTRY = SPELL_SUMMON_VOID_SENTRY_54369, SPELL_SUMMON_VOID_SENTRY = 54369,
SPELL_VOID_SHIFT = SPELL_VOID_SHIFT_54361, SPELL_VOID_SHIFT = 54361,
H_SPELL_VOID_SHIFT = SPELL_VOID_SHIFT_59743, H_SPELL_VOID_SHIFT = 59743,
SPELL_ZURAMAT_ADD_2 = SPELL_ZURAMAT_ADD_2_54342, SPELL_ZURAMAT_ADD_2 = 54342,
H_SPELL_ZURAMAT_ADD_2 = SPELL_ZURAMAT_ADD_2_59747 H_SPELL_ZURAMAT_ADD_2 = 59747
}; };
enum ZuramatCreatures enum ZuramatCreatures
src/scripts/world/go_scripts.cpp
+10 -10
View File
@@ -716,19 +716,19 @@ bool GOHello_go_soulwell(Player *pPlayer, GameObject* pGO)
uint32 newSpell = 0; uint32 newSpell = 0;
if (pGO->GetEntry() == 193169) // Soulwell for rank 2 if (pGO->GetEntry() == 193169) // Soulwell for rank 2
{ {
if (caster->HasAura(SPELL_IMPROVED_HEALTHSTONE_18693)) // Improved Healthstone rank 2 if (caster->HasAura(18693)) // Improved Healthstone rank 2
newSpell = SPELL_CREATE_FEL_HEALTHSTONE_58898; newSpell = 58898;
else if (caster->HasAura(SPELL_IMPROVED_HEALTHSTONE_18692)) // Improved Healthstone rank 1 else if (caster->HasAura(18692)) // Improved Healthstone rank 1
newSpell = SPELL_CREATE_FEL_HEALTHSTONE_58896; newSpell = 58896;
else newSpell = SPELL_CREATE_FEL_HEALTHSTONE_58890; else newSpell = 58890;
} }
else if (pGO->GetEntry() == 181621) // Soulwell for rank 1 else if (pGO->GetEntry() == 181621) // Soulwell for rank 1
{ {
if (caster->HasAura(SPELL_IMPROVED_HEALTHSTONE_18693)) // Improved Healthstone rank 2 if (caster->HasAura(18693)) // Improved Healthstone rank 2
newSpell = SPELL_CREATE_MASTER_HEALTHSTONE_34150; newSpell = 34150;
else if (caster->HasAura(SPELL_IMPROVED_HEALTHSTONE_18692)) // Improved Healthstone rank 1 else if (caster->HasAura(18692)) // Improved Healthstone rank 1
newSpell = SPELL_CREATE_MASTER_HEALTHSTONE_34149; newSpell = 34149;
else newSpell = SPELL_CREATE_MASTER_HEALTHSTONE_34130; else newSpell = 34130;
} }
pGO->AddUse(); pGO->AddUse();
win/VC90/game.vcproj
-4
View File
@@ -814,10 +814,6 @@
RelativePath="..\..\src\game\SpellHandler.cpp" RelativePath="..\..\src\game\SpellHandler.cpp"
> >
</File> </File>
<File
RelativePath="..\..\src\game\SpellId.h"
>
</File>
<File <File
RelativePath="..\..\src\game\TaxiHandler.cpp" RelativePath="..\..\src\game\TaxiHandler.cpp"
> >