araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 22:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

* Move all movable spell effects from core to DB. Needs DB support.

Browse Source 
* Fix some compile errors made in previous commits.

--HG--
branch : trunk
This commit is contained in:
azazel
2010-08-07 01:02:09 +06:00
parent 485886fe71
commit f413d60908
7 changed files with 14 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/base/world_database.sql
-1
View File
@@ -14716,7 +14716,6 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
( 58601, 'spell_gen_remove_flight_auras'),
-- warrior
( 12975,'spell_warr_last_stand'),
( 21977,'spell_warr_warriors_wrath'),
-- paladin
( 20425, 'spell_pal_judgement_of_command'),
(-20473, 'spell_pal_holy_shock'),
sql/updates/9213_world_spell_script_names.sql
+1
View File
@@ -0,0 +1 @@
DELETE FROM `spell_script_names` WHERE `spell_id`=21977 AND `ScriptName`='spell_warr_warriors_wrath';
src/server/game/Spells/SpellEffects.cpp
-177
View File
@@ -968,15 +968,6 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastSpell(unitTarget, effect, true);
return;
}
case 15998: // Capture Worg Pup
case 29435: // Capture Female Kaliri Hatchling
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
return;
unitTarget->ToCreature()->ForcedDespawn();
return;
}
case 16589: // Noggenfogger Elixir
{
if (m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -1069,13 +1060,6 @@ void Spell::EffectDummy(uint32 i)
else // Gadgetzan Transporter Failure - failure
m_caster->CastSpell(m_caster, 23446, true);
return;
case 23645: // Hourglass Sand
m_caster->RemoveAurasDueToSpell(23170); // Brood Affliction: Bronze
return;
case 23725: // Gift of Life (warrior bwl trinket)
m_caster->CastSpell(m_caster, 23782, true);
m_caster->CastSpell(m_caster, 23783, true);
return;
case 25860: // Reindeer Transformation
{
if (!m_caster->HasAuraType(SPELL_AURA_MOUNTED))
@@ -1204,11 +1188,6 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastCustomSpell(unitTarget, 37675, &basepoints0, NULL, NULL, true);
return;
}
case 40109: // Knockdown Fel Cannon: The Bolt
{
unitTarget->CastSpell(unitTarget, 40075, true);
return;
}
case 40802: // Mingo's Fortune Generator (Mingo's Fortune Giblets)
{
// selecting one from Bloodstained Fortune item
@@ -1331,10 +1310,6 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastSpell(m_caster, 49378, true);
}
return;
// Magic Pull
case 51336:
m_caster->CastSpell(unitTarget,50770,true);
break;
case 52845: // Brewfest Mount Transformation (Faction Swap)
if (m_caster->GetTypeId() != TYPEID_PLAYER)
return;
@@ -1401,14 +1376,6 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastSpell(m_caster, 30452, true, NULL);
return;
}
case 51592: // Pickup Primordial Hatchling
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
return;
unitTarget->ToCreature()->ForcedDespawn();
return;
}
case 52308: // Take Sputum Sample
{
switch(i)
@@ -4812,12 +4779,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
}
return;
}
// Dispelling Analysis
case 37028:
{
unitTarget->RemoveAurasDueToSpell(36904);
return;
}
case 45204: // Clone Me!
case 41055: // Copy Weapon
case 45206: // Copy Off-hand Weapon
@@ -4827,14 +4788,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
case 41054: // Copy Weapon
m_caster->CastSpell(unitTarget, damage, false);
break;
// Despawn Horse
case 52267:
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
return;
unitTarget->ToCreature()->ForcedDespawn();
return;
}
case 55693: // Remove Collapsing Cave Aura
if (!unitTarget)
return;
@@ -4881,37 +4834,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
case 26465:
unitTarget->RemoveAuraFromStack(26464);
return;
// Orb teleport spells
case 25140:
case 25143:
case 25650:
case 25652:
case 29128:
case 29129:
case 35376:
case 35727:
{
if (!unitTarget)
return;
uint32 spellid;
switch(m_spellInfo->Id)
{
case 25140: spellid = 32571; break;
case 25143: spellid = 32572; break;
case 25650: spellid = 30140; break;
case 25652: spellid = 30141; break;
case 29128: spellid = 32568; break;
case 29129: spellid = 32569; break;
case 35376: spellid = 25649; break;
case 35727: spellid = 35730; break;
default:
return;
}
unitTarget->CastSpell(unitTarget,spellid,false);
return;
}
// Shadow Flame (All script effects, not just end ones to prevent player from dodging the last triggered spell)
case 22539:
case 22972:
@@ -5012,11 +4934,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
cTarget->RemoveCorpse();
break;
}
// Tidal Surge
case 38358:
if (unitTarget)
m_caster->CastSpell(unitTarget, 38353, true);
return;
/*// Flame Crash
case 41126:
{
@@ -5026,15 +4943,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
unitTarget->CastSpell(unitTarget, 41131, true);
break;
}*/
// Draw Soul
case 40904:
{
if (!unitTarget)
return;
unitTarget->CastSpell(m_caster, 40903, true);
break;
}
case 48025: // Headless Horseman's Mount
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
@@ -5156,15 +5064,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
}
break;
}
// Force Cast - Portal Effect: Sunwell Isle
case 44876:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 44870, true);
break;
}
// Brutallus - Burn
case 45141:
case 45151:
@@ -5176,25 +5075,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
break;
}
// spell of Brutallus - Stomp
case 45185:
{
if (!unitTarget)
return;
unitTarget->RemoveAurasDueToSpell(46394);
break;
}
// Negative Energy
case 46289:
{
if (!unitTarget)
return;
m_caster->CastSpell(unitTarget, 46285, true);
break;
}
// Goblin Weather Machine
case 46203:
{
@@ -5334,11 +5214,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
if (unitTarget->GetTypeId() == TYPEID_UNIT && unitTarget->ToCreature()->isSummon())
unitTarget->ToTempSummon()->UnSummon();
return;
// Sky Darkener Assault
case 52124:
if (unitTarget)
m_caster->CastSpell(unitTarget, 52125, false);
return;
case 52479: // Gift of the Harvester
if (unitTarget && m_originalCaster)
m_originalCaster->CastSpell(unitTarget, urand(0, 1) ? damage : 52505, true);
@@ -5389,45 +5264,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
return;
}
// Gigantic Feast
case 58466:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 58648, true);
unitTarget->CastSpell(unitTarget, 58467, true);
break;
}
// Small Feast
case 58475:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 58648, true);
unitTarget->CastSpell(unitTarget, 58477, true);
break;
}
// Great Feast
case 57337:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 58067, true);
break;
}
//Fish Feast
case 57397:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 58648, true);
unitTarget->CastSpell(unitTarget, 57398, true);
break;
}
case 58941: // Rock Shards
if (unitTarget && m_originalCaster)
{
@@ -5761,11 +5597,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
}
break;
}
case 67751:// Ghoul Explode
{
unitTarget->CastSpell(unitTarget,67729,false); //Explode
break;
}
case 66545: //Summon Memory
{
uint8 uiRandom = urand(0,25);
@@ -6100,14 +5931,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
{
switch(m_spellInfo->Id)
{
// Dreaming Glory
case 28698:
{
if (!unitTarget)
return;
unitTarget->CastSpell(unitTarget, 28694, true);
break;
}
// Netherbloom
case 28702:
{
src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+2 -3
View File
@@ -46,9 +46,8 @@ enum Misc
class instance_deadmines : public InstanceMapScript
{
public:
instance_deadmines()
: InstanceMapScript("instance_deadmines");
: InstanceMapScript("instance_deadmines")
{
}
@@ -252,7 +251,7 @@ class instance_deadmines : public InstanceMapScript
}
};
InstanceData* OnGetInstanceData(InstanceMap* map)
InstanceData* OnGetInstanceData(InstanceMap* pMap)
{
return new instance_deadmines_InstanceMapScript(pMap);
}
src/server/scripts/Spells/spell_generic.cpp
+1 -2
View File
@@ -27,7 +27,6 @@
class spell_gen_remove_flight_auras : public SpellHandlerScript
{
public:
spell_gen_remove_flight_auras() : SpellHandlerScript("spell_gen_remove_flight_auras") {}
class spell_gen_remove_flight_auras_SpellScript : public SpellScript
@@ -51,7 +50,7 @@ class spell_gen_remove_flight_auras : public SpellHandlerScript
{
return new spell_gen_remove_flight_auras_SpellScript;
}
}
};
void AddSC_generic_spell_scripts()
{
src/server/scripts/Spells/spell_mage.cpp
+10 -10
View File
@@ -113,22 +113,22 @@ class spell_mage_polymorph_cast_visual : public SpellHandlerScript
}
};
const uint32 spell_mage_polymorph_cast_visual_SpellScript::spell_list[6] =
{
SPELL_MAGE_SQUIRREL_FORM,
SPELL_MAGE_GIRAFFE_FORM,
SPELL_MAGE_SERPENT_FORM,
SPELL_MAGE_DRAGONHAWK_FORM,
SPELL_MAGE_WORGEN_FORM,
SPELL_MAGE_SHEEP_FORM
};
SpellScript* GetSpellScript() const
{
return new spell_mage_polymorph_cast_visual_SpellScript();
}
};
const uint32 spell_mage_polymorph_cast_visual::spell_mage_polymorph_cast_visual_SpellScript::spell_list[6] =
{
SPELL_MAGE_SQUIRREL_FORM,
SPELL_MAGE_GIRAFFE_FORM,
SPELL_MAGE_SERPENT_FORM,
SPELL_MAGE_DRAGONHAWK_FORM,
SPELL_MAGE_WORGEN_FORM,
SPELL_MAGE_SHEEP_FORM
};
class spell_mage_summon_water_elemental : public SpellHandlerScript
{
public:
src/server/scripts/Spells/spell_warrior.cpp
-35
View File
@@ -26,7 +26,6 @@
enum WarriorSpells
{
WARRIOR_SPELL_LAST_STAND_TRIGGERED = 12976,
WARRIOR_SPELL_WARRIORS_WRATH_TRIGGERED = 21887,
};
class spell_warr_last_stand : public SpellHandlerScript
@@ -62,41 +61,7 @@ class spell_warr_last_stand : public SpellHandlerScript
}
};
class spell_warr_warriors_wrath : public SpellHandlerScript
{
public:
spell_warr_warriors_wrath() : SpellHandlerScript("spell_warr_warriors_wrath") { }
class spell_warr_warriors_wrath_SpellScript : public SpellScript
{
bool Validate(SpellEntry const *spellEntry)
{
if (!sSpellStore.LookupEntry(WARRIOR_SPELL_WARRIORS_WRATH_TRIGGERED))
return false;
return true;
}
void HandleDummy(SpellEffIndex effIndex)
{
if (Unit *unitTarget = GetHitUnit())
GetCaster()->CastSpell(unitTarget, WARRIOR_SPELL_WARRIORS_WRATH_TRIGGERED, true);
}
void Register()
{
// add dummy effect spell handler to Warrior's Wrath
EffectHandlers += EffectHandlerFn(spell_warr_warriors_wrath_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript *GetSpellScript() const
{
return new spell_warr_warriors_wrath_SpellScript();
}
};
void AddSC_warrior_spell_scripts()
{
new spell_warr_last_stand;
new spell_warr_warriors_wrath;
}