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
Spell.cpp
SpellEffects.cpp
SpellId.h
Spell.h
SkillDiscovery.cpp
SkillDiscovery.h
src/game/CharacterHandler.cpp
+2 -3
View File
@@ -42,7 +42,6 @@
#include "SocialMgr.h"
#include "UpdateMask.h"
#include "Util.h"
#include "SpellId.h"
#include "ScriptMgr.h"
class LoginQueryHolder : public SqlQueryHolder
@@ -746,8 +745,8 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
{
// not blizz like, we must correctly save and load player instead...
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, SPELL_GHOST_8326, true, 0); // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?)
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, 8326, true, 0); // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?)
pCurrChar->SetMovement(MOVE_WATER_WALK);
}
src/game/DuelHandler.cpp
+1 -2
View File
@@ -25,7 +25,6 @@
#include "Opcodes.h"
#include "UpdateData.h"
#include "Player.h"
#include "SpellId.h"
void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
{
@@ -71,7 +70,7 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
if(GetPlayer()->duel->opponent)
GetPlayer()->duel->opponent->CombatStopWithPets(true);
GetPlayer()->CastSpell(GetPlayer(), SPELL_GROVEL_7267, true); // beg
GetPlayer()->CastSpell(GetPlayer(), 7267, true); // beg
GetPlayer()->DuelComplete(DUEL_WON);
return;
}
src/game/MovementHandler.cpp
+2 -3
View File
@@ -33,7 +33,6 @@
#include "WaypointMovementGenerator.h"
#include "InstanceSaveMgr.h"
#include "ObjectMgr.h"
#include "SpellId.h"
void WorldSession::HandleMoveWorldportAckOpcode( WorldPacket & /*recv_data*/ )
{
@@ -178,7 +177,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
// honorless target
if(GetPlayer()->pvpInfo.inHostileArea)
GetPlayer()->CastSpell(GetPlayer(), SPELL_HONORLESS_TARGET_2479, true);
GetPlayer()->CastSpell(GetPlayer(), 2479, true);
// resummon pet
GetPlayer()->ResummonPetTemporaryUnSummonedIfAny();
@@ -226,7 +225,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
{
// honorless target
if(plMover->pvpInfo.inHostileArea)
plMover->CastSpell(plMover, SPELL_HONORLESS_TARGET_2479, true);
plMover->CastSpell(plMover, 2479, true);
}
// resummon pet
src/game/ObjectMgr.cpp
+3 -4
View File
@@ -46,7 +46,6 @@
#include "WaypointManager.h"
#include "InstanceData.h" //for condition_instance_data
#include "GossipDef.h"
#include "SpellId.h"
INSTANTIATE_SINGLETON_1(ObjectMgr);
@@ -2132,7 +2131,7 @@ void ObjectMgr::LoadItemPrototypes()
}
// 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
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;
}
// 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);
const_cast<ItemPrototype*>(proto)->Spells[0].SpellId = 0;
@@ -2215,7 +2214,7 @@ void ObjectMgr::LoadItemPrototypes()
const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0;
}
// 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);
const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0;
src/game/Player.cpp
+21 -23
View File
@@ -66,7 +66,6 @@
#include "AchievementMgr.h"
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
#include "SpellId.h"
#include <cmath>
@@ -1465,7 +1464,7 @@ void Player::setDeathState(DeathState s)
// restore default warrior stance
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
{
if (getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster()
&& !HasSpell(SPELL_DEATH_GATE_50977))
if (getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster() && !HasSpell(50977))
return false;
// far teleport to another map
@@ -1941,7 +1939,7 @@ void Player::ProcessDelayedOperations()
SaveToDB();
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)
{
@@ -4364,9 +4362,9 @@ void Player::BuildPlayerRepop()
data.append(GetPackGUID());
GetSession()->SendPacket(&data);
if(getRace() == RACE_NIGHTELF)
CastSpell(this, SPELL_GHOST_20584, true);
CastSpell(this, SPELL_GHOST_8326, true);
if (getRace() == RACE_NIGHTELF)
CastSpell(this, 20584, 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.STOP_MIRROR_TIMER
@@ -4425,9 +4423,9 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
// remove death flag + set aura
SetByteValue(UNIT_FIELD_BYTES_1, 3, 0x00);
if(getRace() == RACE_NIGHTELF)
RemoveAurasDueToSpell(SPELL_GHOST_20584); // speed bonuses
RemoveAurasDueToSpell(SPELL_GHOST_8326); // SPELL_AURA_GHOST
if (getRace() == RACE_NIGHTELF)
RemoveAurasDueToSpell(20584); // speed bonuses
RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST
setDeathState(ALIVE);
@@ -4467,14 +4465,14 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
if(int32(getLevel()) >= startLevel)
{
// set resurrection sickness
CastSpell(this,SPELL_RESURRECTION_SICKNESS_15007,true);
CastSpell(this, 15007, true);
// not full duration
if(int32(getLevel()) < startLevel+9)
{
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);
}
@@ -7601,7 +7599,7 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
{
ItemPrototype const* proto = item->GetProto();
// 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 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)
{
uint32 cooldownSpell = SPELL_COMBAT_SWAP_DND_6119;
uint32 cooldownSpell = 6119;
if (getClass() == CLASS_ROGUE)
cooldownSpell = SPELL_COMBAT_SWAP_DND_6123;
cooldownSpell = 6123;
SpellEntry const* spellProto = sSpellStore.LookupEntry(cooldownSpell);
@@ -16185,8 +16183,8 @@ void Player::_LoadAuras(QueryResult_AutoPtr result, uint32 timediff)
while (result->NextRow());
}
if(getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
CastSpell(this,SPELL_BATTLE_STANCE_2457,true);
if (getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
CastSpell(this, 2457, true);
}
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)
// 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);
// Now we have cooldown data (if found any), time to apply mods
@@ -19732,7 +19730,7 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
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
{
// check Deserter debuff
if(HasAura(SPELL_DESERTER_26013))
if (HasAura(26013))
return false;
return true;
@@ -19781,7 +19779,7 @@ WorldLocation Player::GetStartPosition() const
{
PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass());
uint32 mapId = info->mapId;
if(getClass() == CLASS_DEATH_KNIGHT && HasSpell(SPELL_DEATH_GATE_50977))
if (getClass() == CLASS_DEATH_KNIGHT && HasSpell(50977))
mapId = 0;
return WorldLocation(mapId, info->positionX, info->positionY, info->positionZ, 0);
}
@@ -20286,7 +20284,7 @@ void Player::SendInitialPacketsAfterAddToMap()
ResetTimeSync();
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
// 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 "DBCStructure.h"
#include "DBCStores.h"
#include "SpellId.h"
#ifdef WIN32
#include <windows.h>
src/game/Spell.cpp
-1
View File
@@ -50,7 +50,6 @@
#include "TemporarySummon.h"
#include "Vehicle.h"
#include "SpellAuraEffects.h"
#include "SpellId.h"
#include "ScriptMgr.h"
#define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILISECONDS)
src/game/SpellAuraEffects.cpp
+1 -2
View File
@@ -30,7 +30,6 @@
#include "Util.h"
#include "Spell.h"
#include "SpellAuraEffects.h"
#include "SpellId.h"
#include "BattleGround.h"
#include "OutdoorPvPMgr.h"
#include "Formulas.h"
@@ -1760,7 +1759,7 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const
}
}
break;
case SPELL_RESTRICTED_FLIGHT_AREA_58600: // No fly Zone - Dalaran
case 58600: // No fly Zone - Dalaran
if (GetTickNumber() == 10)
{
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 "Spell.h"
#include "SpellAuraEffects.h"
#include "SpellId.h"
#include "DynamicObject.h"
#include "ObjectAccessor.h"
#include "Util.h"
@@ -1360,23 +1359,23 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (apply)
{
// Blood Presence bonus
if (presence == SPELL_BLOOD_PRESENCE_48266)
target->CastSpell(target,63611,true);
if (presence == 48266)
target->CastSpell(target, 63611, true);
else if (bloodPresenceAura)
{
int32 basePoints1=bloodPresenceAura->GetAmount();
target->CastCustomSpell(target,63611,NULL,&basePoints1,NULL,true,0,bloodPresenceAura);
}
// Frost Presence bonus
if (presence == SPELL_FROST_PRESENCE_48263)
target->CastSpell(target,61261,true);
if (presence == 48263)
target->CastSpell(target, 61261, true);
else if (frostPresenceAura)
{
int32 basePoints0=frostPresenceAura->GetAmount();
target->CastCustomSpell(target,61261,&basePoints0,NULL,NULL,true,0,frostPresenceAura);
}
// Unholy Presence bonus
if (presence == SPELL_UNHOLY_PRESENCE_48265)
if (presence == 48265)
{
if(unholyPresenceAura)
{
@@ -1396,13 +1395,13 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
else
{
// Remove passive auras
if (presence == SPELL_BLOOD_PRESENCE_48266 || bloodPresenceAura)
if (presence == 48266 || bloodPresenceAura)
target->RemoveAurasDueToSpell(63611);
if (presence == SPELL_FROST_PRESENCE_48263 || frostPresenceAura)
if (presence == 48263 || frostPresenceAura)
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(65095);
src/game/SpellEffects.cpp
+48 -49
View File
@@ -31,7 +31,6 @@
#include "SkillExtraItems.h"
#include "Unit.h"
#include "Spell.h"
#include "SpellId.h"
#include "DynamicObject.h"
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
@@ -269,17 +268,17 @@ void Spell::EffectInstaKill(uint32 /*i*/)
return;
// 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 spellID;
switch (entry)
{
case 416: spellID = SPELL_BURNING_WISH_18789; break; //imp
case 417: spellID = SPELL_FEL_ENERGY_18792; break; //fellhunter
case 1860: spellID = SPELL_FEL_STAMINA_18790; break; //void
case 1863: spellID = SPELL_TOUCH_OF_SHADOW_18791; break; //succubus
case 17252: spellID = SPELL_TOUCH_OF_SHADOW_35701; break; //fellguard
case 416: spellID = 18789; break; //imp
case 417: spellID = 18792; break; //fellhunter
case 1860: spellID = 18790; break; //void
case 1863: spellID = 18791; break; //succubus
case 17252: spellID = 35701; break; //fellguard
default:
sLog.outError("EffectInstaKill: Unhandled creature entry (%u) case.", entry);
return;
@@ -339,10 +338,10 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
switch(m_spellInfo->Id) // better way to check unknown
{
// Positive/Negative Charge
case SPELL_POSITIVE_CHARGE_28062:
case SPELL_NEGATIVE_CHARGE_28085:
case SPELL_POSITIVE_CHARGE_39090:
case SPELL_NEGATIVE_CHARGE_39093:
case 28062:
case 28085:
case 39090:
case 39093:
if (!m_triggeredByAuraSpell)
break;
if (unitTarget == m_caster)
@@ -358,10 +357,10 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
uint32 spellId;
switch (m_spellInfo->Id)
{
case SPELL_POSITIVE_CHARGE_28062: spellId = SPELL_POSITIVE_CHARGE_29659; break;
case SPELL_NEGATIVE_CHARGE_28085: spellId = SPELL_NEGATIVE_CHARGE_29660; break;
case SPELL_POSITIVE_CHARGE_39090: spellId = SPELL_POSITIVE_CHARGE_39089; break;
case SPELL_NEGATIVE_CHARGE_39093: spellId = SPELL_NEGATIVE_CHARGE_39092; break;
case 28062: spellId = 29659; break;
case 28085: spellId = 29660; break;
case 39090: spellId = 39089; break;
case 39093: spellId = 39092; break;
}
m_caster->SetAuraStack(spellId, m_caster, count);
}
@@ -371,11 +370,11 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage = 0;
break;
// Consumption
case SPELL_CONSUMPTION_28865:
case 28865:
damage = (((InstanceMap*)m_caster->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY ? 2750 : 4250);
break;
// percent from health with min
case SPELL_THUNDERCRASH_25599: // Thundercrash
case 25599: // Thundercrash
{
damage = unitTarget->GetHealth() / 2;
if(damage < 200)
@@ -383,7 +382,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
break;
}
// arcane charge. must only affect demons (also undead?)
case SPELL_ARCANE_CHARGES_45072:
case 45072:
{
if(unitTarget->GetCreatureType() != CREATURE_TYPE_DEMON
&& unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD)
@@ -391,7 +390,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
break;
}
// gruul's shatter
case SPELL_SHATTER_33671:
case 33671:
{
// don't damage self and only players
if(unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER)
@@ -404,19 +403,19 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
break;
}
// Cataclysmic Bolt
case SPELL_CATACLYSMIC_BOLT_38441:
case 38441:
{
damage = unitTarget->GetMaxHealth() / 2;
break;
}
// Tympanic Tantrum
case SPELL_TYMPANIC_TANTRUM_62775:
case 62775:
{
damage = unitTarget->GetMaxHealth() / 10;
break;
}
// Gargoyle Strike
case SPELL_GARGOYLE_STRIKE_51963:
case 51963:
{
// about +4 base spell dmg per level
damage = (m_caster->getLevel() - 60) * 4 + 60;
@@ -523,7 +522,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
back_damage -= aurEff->GetAmount() * back_damage / 100;
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:
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))
// Chance has been successfully rolled
if (roll_chance_i(aurEff->GetAmount()))
m_caster->CastSpell(unitTarget, SPELL_MIND_TRAUMA_48301, true);
m_caster->CastSpell(unitTarget, 48301, true);
}
// Smite
else if (m_spellInfo->SpellFamilyFlags[0] & 0x80)
@@ -556,7 +555,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
int chance = (*i)->GetSpellProto()->CalculateSimpleValue(1);
if (roll_chance_i(chance))
// Mind Trauma
m_caster->CastSpell(unitTarget, SPELL_MIND_TRAUMA_48301, true, 0);
m_caster->CastSpell(unitTarget, 48301, true, 0);
break;
}
}
@@ -624,7 +623,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage += int32(((Player*)m_caster)->GetTotalAttackPowerValue(BASE_ATTACK) * 0.09f * doses);
}
// 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;
}
}
@@ -637,7 +636,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage += irand(int32(ap * combo * 0.03f), int32(ap * combo * 0.07f));
// 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;
}
}
@@ -648,7 +647,7 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
//Gore
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;
}
// Steady Shot
@@ -757,7 +756,7 @@ void Spell::EffectDummy(uint32 i)
switch (m_spellInfo->Id)
{
// Wrath of the Astromancer
case SPELL_WRATH_OF_THE_ASTROMANCER_42784:
case 42784:
{
uint32 count = 0;
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);
}
}
case SPELL_DEVIATE_FISH_8063: // Deviate Fish
case 8063: // Deviate Fish
{
if(m_caster->GetTypeId() != TYPEID_PLAYER)
return;
@@ -785,16 +784,16 @@ void Spell::EffectDummy(uint32 i)
uint32 spell_id = 0;
switch(urand(1,5))
{
case 1: spell_id = SPELL_SLEEPY_8064; break; // Sleepy
case 2: spell_id = SPELL_INVIGORATE_8065; break; // Invigorate
case 3: spell_id = SPELL_SHRINK_8066; break; // Shrink
case 4: spell_id = SPELL_PARTY_TIME_8067; break; // Party Time!
case 5: spell_id = SPELL_HEALTHY_SPIRIT_8068; break; // Healthy Spirit
case 1: spell_id = 8064; break; // Sleepy
case 2: spell_id = 8065; break; // Invigorate
case 3: spell_id = 8066; break; // Shrink
case 4: spell_id = 8067; break; // Party Time!
case 5: spell_id = 8068; break; // Healthy Spirit
}
m_caster->CastSpell(m_caster, spell_id, true, NULL);
return;
}
case SPELL_COOKED_DEVIATE_FISH_8213: // Savory Deviate Delight
case 8213: // Savory Deviate Delight
{
if(m_caster->GetTypeId() != TYPEID_PLAYER)
return;
@@ -803,24 +802,24 @@ void Spell::EffectDummy(uint32 i)
switch(urand(1,2))
{
// 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
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);
return;
}
case SPELL_SYMBOL_OF_LIFE_8593: // Symbol of life (restore creature to life)
case SPELL_SHIMMERING_VESSEL_31225: // Shimmering Vessel (restore creature to life)
case 8593: // Symbol of life (restore creature to life)
case 31225: // Shimmering Vessel (restore creature to life)
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
return;
((Creature*)unitTarget)->setDeathState(JUST_ALIVED);
return;
}
case SPELL_DEEP_WOUNDS_12162: // Deep wounds
case SPELL_DEEP_WOUNDS_12850: // (now good common check for this spells)
case SPELL_DEEP_WOUNDS_12868:
case 12162: // Deep wounds
case 12850: // (now good common check for this spells)
case 12868:
{
if (!unitTarget)
return;
@@ -835,16 +834,16 @@ void Spell::EffectDummy(uint32 i)
switch (m_spellInfo->Id)
{
case SPELL_DEEP_WOUNDS_12162: damage *= 0.16f; break; // Rank 1
case SPELL_DEEP_WOUNDS_12850: damage *= 0.32f; break; // Rank 2
case SPELL_DEEP_WOUNDS_12868: damage *= 0.48f; break; // Rank 3
case 12162: damage *= 0.16f; break; // Rank 1
case 12850: damage *= 0.32f; break; // Rank 2
case 12868: damage *= 0.48f; break; // Rank 3
default:
sLog.outError("Spell::EffectDummy: Spell %u not handled in DW",m_spellInfo->Id);
return;
};
// 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)
{
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);
// Mad Alchemist's Potion
if (m_spellInfo->Id == SPELL_MAD_ALCHEMISTS_POTION_45051)
if (m_spellInfo->Id == 45051)
{
// find elixirs on target
bool guardianFound = false;
@@ -3749,7 +3748,7 @@ void Spell::EffectLearnSpell(uint32 i)
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);
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 "Chat.h"
#include "Spell.h"
#include "SpellId.h"
#include "BattleGroundMgr.h"
#include "CreatureAI.h"
@@ -615,7 +614,7 @@ SpellSpecific GetSpellSpecific(SpellEntry const * spellInfo)
}
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)
return SPELL_SPECIFIC_PRESENCE;
break;
@@ -3088,7 +3087,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
// Extra conditions -- leaving the possibility add extra conditions...
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))
return false;
break;
@@ -3675,11 +3674,11 @@ void SpellMgr::LoadSpellCustomAttr()
case 39805: // Lightning Overload
case 52437: // Sudden Death
case 64823: // Item - Druid T8 Balance 4P Bonus
case SPELL_MISSILE_BARRAGE_44401:
case 44401:
spellInfo->procCharges = 1;
count++;
break;
case SPELL_TIDAL_WAVES_53390: // Tidal Wave
case 53390: // Tidal Wave
spellInfo->procCharges = 2;
count++;
break;
@@ -3761,8 +3760,8 @@ void SpellMgr::LoadSpellCustomAttr()
break;
// 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
case SPELL_WRATH_OF_THE_PLAGUEBRINGER_29214: // Wrath of the Plaguebringer
case SPELL_WRATH_OF_THE_PLAGUEBRINGER_54836: // Wrath of the Plaguebringer
case 29214: // Wrath of the Plaguebringer
case 54836: // Wrath of the Plaguebringer
spellInfo->EffectImplicitTargetB[0] = TARGET_UNIT_AREA_ALLY_SRC;
spellInfo->EffectImplicitTargetB[1] = TARGET_UNIT_AREA_ALLY_SRC;
count++;
src/game/Unit.cpp
+6 -7
View File
@@ -54,7 +54,6 @@
#include "TemporarySummon.h"
#include "Vehicle.h"
#include "Transports.h"
#include "SpellId.h"
#include <math.h>
@@ -840,7 +839,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
he->duel->opponent->CombatStopWithPets(true);
he->CombatStopWithPets(true);
he->CastSpell(he, SPELL_GROVEL_7267, true); // beg
he->CastSpell(he, 7267, true); // beg
he->DuelComplete(DUEL_WON);
}
}
@@ -3282,10 +3281,10 @@ void Unit::_UpdateSpells( uint32 time )
void Unit::_UpdateAutoRepeatSpell()
{
//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
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);
m_AutoRepeatFirstCast = true;
return;
@@ -3338,7 +3337,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] )
{
// 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);
m_AutoRepeatFirstCast = true;
}
@@ -3353,7 +3352,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
// it also does break autorepeat if not Auto Shot
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);
addUnitState(UNIT_STAT_CASTING);
} break;
@@ -3361,7 +3360,7 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
case CURRENT_AUTOREPEAT_SPELL:
{
// 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
InterruptSpell(CURRENT_GENERIC_SPELL,false);