Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Spells: Rename spell script scripts in correct script name

Browse Source
This commit is contained in:
Vincent_Michael committed 2012-12-14 23:19:03 +01:00
1 parent aa420be109
commit d2cc278283
5 files changed
+124 -119
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sql/updates/world/2012_12_14_05_world_spell_script_names.sql
+10
View File
@@ -0,0 +1,10 @@
DELETE FROM `spell_script_names` WHERE `spell_id` IN (24750,24751,44436,-139,66118,67630,68646,68647);
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(24750, 'spell_hallow_end_trick'),
(24751, 'spell_hallow_end_trick_or_treat'),
(44436, 'spell_hallow_end_tricky_treat'),
( -139, 'spell_pri_renew'),
(66118, 'spell_anubarak_leeching_swarm'),
(67630, 'spell_anubarak_leeching_swarm'),
(68646, 'spell_anubarak_leeching_swarm'),
(68647, 'spell_anubarak_leeching_swarm');
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+80 -36
View File
@@ -53,54 +53,54 @@ enum Summons
enum BossSpells enum BossSpells
{ {
SPELL_FREEZE_SLASH = 66012, SPELL_FREEZE_SLASH = 66012,
SPELL_PENETRATING_COLD = 66013, SPELL_PENETRATING_COLD = 66013,
SPELL_LEECHING_SWARM = 66118, SPELL_LEECHING_SWARM = 66118,
SPELL_LEECHING_HEAL = 66125, SPELL_LEECHING_SWARM_HEAL = 66125,
SPELL_LEECHING_DAMAGE = 66240, SPELL_LEECHING_SWARM_DMG = 66240,
SPELL_MARK = 67574, SPELL_MARK = 67574,
SPELL_SPIKE_CALL = 66169, SPELL_SPIKE_CALL = 66169,
SPELL_SUBMERGE_ANUBARAK = 65981, SPELL_SUBMERGE_ANUBARAK = 65981,
SPELL_CLEAR_ALL_DEBUFFS = 34098, SPELL_CLEAR_ALL_DEBUFFS = 34098,
SPELL_EMERGE_ANUBARAK = 65982, SPELL_EMERGE_ANUBARAK = 65982,
SPELL_SUMMON_BEATLES = 66339, SPELL_SUMMON_BEATLES = 66339,
SPELL_SUMMON_BURROWER = 66332, SPELL_SUMMON_BURROWER = 66332,
// Burrow // Burrow
SPELL_CHURNING_GROUND = 66969, SPELL_CHURNING_GROUND = 66969,
// Scarab // Scarab
SPELL_DETERMINATION = 66092, SPELL_DETERMINATION = 66092,
SPELL_ACID_MANDIBLE = 65774, //Passive - Triggered SPELL_ACID_MANDIBLE = 65774, //Passive - Triggered
// Burrower // Burrower
SPELL_SPIDER_FRENZY = 66128, SPELL_SPIDER_FRENZY = 66128,
SPELL_EXPOSE_WEAKNESS = 67720, //Passive - Triggered SPELL_EXPOSE_WEAKNESS = 67720, //Passive - Triggered
SPELL_SHADOW_STRIKE = 66134, SPELL_SHADOW_STRIKE = 66134,
SPELL_SUBMERGE_EFFECT = 68394, SPELL_SUBMERGE_EFFECT = 68394,
SPELL_AWAKENED = 66311, SPELL_AWAKENED = 66311,
SPELL_EMERGE_EFFECT = 65982, SPELL_EMERGE_EFFECT = 65982,
SPELL_PERSISTENT_DIRT = 68048, SPELL_PERSISTENT_DIRT = 68048,
SUMMON_SCARAB = NPC_SCARAB, SUMMON_SCARAB = NPC_SCARAB,
SUMMON_FROSTSPHERE = NPC_FROST_SPHERE, SUMMON_FROSTSPHERE = NPC_FROST_SPHERE,
SPELL_BERSERK = 26662, SPELL_BERSERK = 26662,
//Frost Sphere //Frost Sphere
SPELL_FROST_SPHERE = 67539, SPELL_FROST_SPHERE = 67539,
SPELL_PERMAFROST = 66193, SPELL_PERMAFROST = 66193,
SPELL_PERMAFROST_VISUAL = 65882, SPELL_PERMAFROST_VISUAL = 65882,
SPELL_PERMAFROST_MODEL = 66185, SPELL_PERMAFROST_MODEL = 66185,
//Spike //Spike
SPELL_SUMMON_SPIKE = 66169, SPELL_SUMMON_SPIKE = 66169,
SPELL_SPIKE_SPEED1 = 65920, SPELL_SPIKE_SPEED1 = 65920,
SPELL_SPIKE_TRAIL = 65921, SPELL_SPIKE_TRAIL = 65921,
SPELL_SPIKE_SPEED2 = 65922, SPELL_SPIKE_SPEED2 = 65922,
SPELL_SPIKE_SPEED3 = 65923, SPELL_SPIKE_SPEED3 = 65923,
SPELL_SPIKE_FAIL = 66181, SPELL_SPIKE_FAIL = 66181,
SPELL_SPIKE_TELE = 66170 SPELL_SPIKE_TELE = 66170
}; };
#define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(66193, 67855, 67856, 67857) #define SPELL_PERMAFROST_HELPER RAID_MODE<uint32>(66193, 67855, 67856, 67857)
@@ -841,6 +841,49 @@ class spell_impale : public SpellScriptLoader
} }
}; };
class spell_anubarak_leeching_swarm : public SpellScriptLoader
{
public:
spell_anubarak_leeching_swarm() : SpellScriptLoader("spell_anubarak_leeching_swarm") { }
class spell_anubarak_leeching_swarm_AuraScript : public AuraScript
{
PrepareAuraScript(spell_anubarak_leeching_swarm_AuraScript);
bool Validate(SpellInfo const* /*spell*/)
{
if (!sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_DMG) || !sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_HEAL))
return false;
return true;
}
void HandleEffectPeriodic(AuraEffect const* aurEff)
{
Unit* caster = GetCaster();
if (Unit* target = GetTarget())
{
int32 lifeLeeched = target->CountPctFromCurHealth(aurEff->GetAmount());
if (lifeLeeched < 250)
lifeLeeched = 250;
// Damage
caster->CastCustomSpell(target, SPELL_LEECHING_SWARM_DMG, &lifeLeeched, 0, 0, false);
// Heal
caster->CastCustomSpell(caster, SPELL_LEECHING_SWARM_HEAL, &lifeLeeched, 0, 0, false);
}
}
void Register()
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_anubarak_leeching_swarm_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
{
return new spell_anubarak_leeching_swarm_AuraScript();
}
};
void AddSC_boss_anubarak_trial() void AddSC_boss_anubarak_trial()
{ {
new boss_anubarak_trial(); new boss_anubarak_trial();
@@ -850,4 +893,5 @@ void AddSC_boss_anubarak_trial()
new mob_frost_sphere(); new mob_frost_sphere();
new spell_impale(); new spell_impale();
new spell_anubarak_leeching_swarm();
} }
src/server/scripts/Spells/spell_generic.cpp
+1 -52
View File
@@ -367,59 +367,9 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader
} }
}; };
// 66118 Leeching Swarm
enum LeechingSwarmSpells
{
SPELL_LEECHING_SWARM_DMG = 66240,
SPELL_LEECHING_SWARM_HEAL = 66125,
};
class spell_gen_leeching_swarm : public SpellScriptLoader
{
public:
spell_gen_leeching_swarm() : SpellScriptLoader("spell_gen_leeching_swarm") { }
class spell_gen_leeching_swarm_AuraScript : public AuraScript
{
PrepareAuraScript(spell_gen_leeching_swarm_AuraScript);
bool Validate(SpellInfo const* /*spellEntry*/)
{
if (!sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_DMG) || !sSpellMgr->GetSpellInfo(SPELL_LEECHING_SWARM_HEAL))
return false;
return true;
}
void HandleEffectPeriodic(AuraEffect const* aurEff)
{
Unit* caster = GetCaster();
if (Unit* target = GetTarget())
{
int32 lifeLeeched = target->CountPctFromCurHealth(aurEff->GetAmount());
if (lifeLeeched < 250)
lifeLeeched = 250;
// Damage
caster->CastCustomSpell(target, SPELL_LEECHING_SWARM_DMG, &lifeLeeched, 0, 0, false);
// Heal
caster->CastCustomSpell(caster, SPELL_LEECHING_SWARM_HEAL, &lifeLeeched, 0, 0, false);
}
}
void Register()
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_leeching_swarm_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
AuraScript* GetAuraScript() const
{
return new spell_gen_leeching_swarm_AuraScript();
}
};
enum EluneCandle enum EluneCandle
{ {
NPC_OMEN = 15467, NPC_OMEN = 15467,
SPELL_ELUNE_CANDLE_OMEN_HEAD = 26622, SPELL_ELUNE_CANDLE_OMEN_HEAD = 26622,
SPELL_ELUNE_CANDLE_OMEN_CHEST = 26624, SPELL_ELUNE_CANDLE_OMEN_CHEST = 26624,
@@ -3245,7 +3195,6 @@ void AddSC_generic_spell_scripts()
new spell_gen_av_drekthar_presence(); new spell_gen_av_drekthar_presence();
new spell_gen_burn_brutallus(); new spell_gen_burn_brutallus();
new spell_gen_cannibalize(); new spell_gen_cannibalize();
new spell_gen_leeching_swarm();
new spell_gen_parachute(); new spell_gen_parachute();
new spell_gen_pet_summoned(); new spell_gen_pet_summoned();
new spell_gen_remove_flight_auras(); new spell_gen_remove_flight_auras();
src/server/scripts/Spells/spell_holiday.cpp
+26 -24
View File
@@ -125,15 +125,15 @@ enum TrickSpells
SPELL_TRICK_BUFF = 24753, SPELL_TRICK_BUFF = 24753,
}; };
class spell_trick : public SpellScriptLoader class spell_hallow_end_trick : public SpellScriptLoader
{ {
public: public:
spell_trick() : SpellScriptLoader("spell_trick") {} spell_hallow_end_trick() : SpellScriptLoader("spell_hallow_end_trick") { }
class spell_trick_SpellScript : public SpellScript class spell_hallow_end_trick_SpellScript : public SpellScript
{ {
PrepareSpellScript(spell_trick_SpellScript); PrepareSpellScript(spell_hallow_end_trick_SpellScript);
bool Validate(SpellInfo const* /*spellEntry*/) bool Validate(SpellInfo const* /*spell*/)
{ {
if (!sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_MALE) if (!sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_MALE)
|| !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_FEMALE)
@@ -176,13 +176,13 @@ class spell_trick : public SpellScriptLoader
void Register() void Register()
{ {
OnEffectHitTarget += SpellEffectFn(spell_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
} }
}; };
SpellScript* GetSpellScript() const SpellScript* GetSpellScript() const
{ {
return new spell_trick_SpellScript(); return new spell_hallow_end_trick_SpellScript();
} }
}; };
@@ -197,16 +197,16 @@ enum TrickOrTreatSpells
SPELL_UPSET_TUMMY = 42966 SPELL_UPSET_TUMMY = 42966
}; };
class spell_trick_or_treat : public SpellScriptLoader class spell_hallow_end_trick_or_treat : public SpellScriptLoader
{ {
public: public:
spell_trick_or_treat() : SpellScriptLoader("spell_trick_or_treat") {} spell_hallow_end_trick_or_treat() : SpellScriptLoader("spell_hallow_end_trick_or_treat") {}
class spell_trick_or_treat_SpellScript : public SpellScript class spell_hallow_end_trick_or_treat_SpellScript : public SpellScript
{ {
PrepareSpellScript(spell_trick_or_treat_SpellScript); PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript);
bool Validate(SpellInfo const* /*spellEntry*/) bool Validate(SpellInfo const* /*spell*/)
{ {
if (!sSpellMgr->GetSpellInfo(SPELL_TRICK) || !sSpellMgr->GetSpellInfo(SPELL_TREAT) || !sSpellMgr->GetSpellInfo(SPELL_TRICKED_OR_TREATED)) if (!sSpellMgr->GetSpellInfo(SPELL_TRICK) || !sSpellMgr->GetSpellInfo(SPELL_TREAT) || !sSpellMgr->GetSpellInfo(SPELL_TRICKED_OR_TREATED))
return false; return false;
@@ -225,26 +225,26 @@ class spell_trick_or_treat : public SpellScriptLoader
void Register() void Register()
{ {
OnEffectHitTarget += SpellEffectFn(spell_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
} }
}; };
SpellScript* GetSpellScript() const SpellScript* GetSpellScript() const
{ {
return new spell_trick_or_treat_SpellScript(); return new spell_hallow_end_trick_or_treat_SpellScript();
} }
}; };
class spell_tricky_treat : public SpellScriptLoader class spell_hallow_end_tricky_treat : public SpellScriptLoader
{ {
public: public:
spell_tricky_treat() : SpellScriptLoader("spell_tricky_treat") {} spell_hallow_end_tricky_treat() : SpellScriptLoader("spell_hallow_end_tricky_treat") { }
class spell_tricky_treat_SpellScript : public SpellScript class spell_hallow_end_tricky_treat_SpellScript : public SpellScript
{ {
PrepareSpellScript(spell_tricky_treat_SpellScript); PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript);
bool Validate(SpellInfo const* /*spellEntry*/) bool Validate(SpellInfo const* /*spell*/)
{ {
if (!sSpellMgr->GetSpellInfo(SPELL_TRICKY_TREAT_SPEED)) if (!sSpellMgr->GetSpellInfo(SPELL_TRICKY_TREAT_SPEED))
return false; return false;
@@ -264,20 +264,22 @@ class spell_tricky_treat : public SpellScriptLoader
void Register() void Register()
{ {
OnEffectHitTarget += SpellEffectFn(spell_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
} }
}; };
SpellScript* GetSpellScript() const SpellScript* GetSpellScript() const
{ {
return new spell_tricky_treat_SpellScript(); return new spell_hallow_end_tricky_treat_SpellScript();
} }
}; };
void AddSC_holiday_spell_scripts() void AddSC_holiday_spell_scripts()
{ {
new spell_trick(); // Love is in the Air
new spell_trick_or_treat();
new spell_tricky_treat();
new spell_love_is_in_the_air_romantic_picnic(); new spell_love_is_in_the_air_romantic_picnic();
// Hallow's End
new spell_hallow_end_trick();
new spell_hallow_end_trick_or_treat();
new spell_hallow_end_tricky_treat();
} }
src/server/scripts/Spells/spell_priest.cpp
+7 -7
View File
@@ -376,14 +376,14 @@ class spell_pri_vampiric_touch : public SpellScriptLoader
} }
}; };
class spell_priest_renew : public SpellScriptLoader class spell_pri_renew : public SpellScriptLoader
{ {
public: public:
spell_priest_renew() : SpellScriptLoader("spell_priest_renew") { } spell_pri_renew() : SpellScriptLoader("spell_pri_renew") { }
class spell_priest_renew_AuraScript : public AuraScript class spell_pri_renew_AuraScript : public AuraScript
{ {
PrepareAuraScript(spell_priest_renew_AuraScript); PrepareAuraScript(spell_pri_renew_AuraScript);
bool Load() bool Load()
{ {
@@ -408,13 +408,13 @@ class spell_priest_renew : public SpellScriptLoader
void Register() void Register()
{ {
OnEffectApply += AuraEffectApplyFn(spell_priest_renew_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectApply += AuraEffectApplyFn(spell_pri_renew_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
} }
}; };
AuraScript* GetAuraScript() const AuraScript* GetAuraScript() const
{ {
return new spell_priest_renew_AuraScript(); return new spell_pri_renew_AuraScript();
} }
}; };
@@ -460,6 +460,6 @@ void AddSC_priest_spell_scripts()
new spell_pri_mind_sear(); new spell_pri_mind_sear();
new spell_pri_prayer_of_mending_heal(); new spell_pri_prayer_of_mending_heal();
new spell_pri_vampiric_touch(); new spell_pri_vampiric_touch();
new spell_priest_renew(); new spell_pri_renew();
new spell_pri_shadow_word_death(); new spell_pri_shadow_word_death();
} }