Scripts/Spells: Migrate Some Scripted Spells to Scripts (#23185)

* Migrate spells to scripts

* Simplify code

* I need to sleep

* Update chapter1.cpp

* Use actual damage

* No need in null check here
This commit is contained in:
Sorikoff
2019-04-16 07:49:39 +00:00
committed by Giacomo Pozzoni
parent 50d32fe493
commit 2cfaeb1400
8 changed files with 283 additions and 168 deletions

View File

@@ -650,6 +650,34 @@ class spell_item_decahedral_dwarven_dice : public SpellScript
}
};
enum GoblinWeatherMachine
{
SPELL_PERSONALIZED_WEATHER1 = 46740,
SPELL_PERSONALIZED_WEATHER2 = 46739,
SPELL_PERSONALIZED_WEATHER3 = 46738,
SPELL_PERSONALIZED_WEATHER4 = 46736
};
// 46203 - Goblin Weather Machine
class spell_item_goblin_weather_machine : public SpellScript
{
PrepareSpellScript(spell_item_goblin_weather_machine);
void HandleScript(SpellEffIndex /* effIndex */)
{
Unit* target = GetHitUnit();
uint32 spellId = RAND(SPELL_PERSONALIZED_WEATHER1, SPELL_PERSONALIZED_WEATHER2, SPELL_PERSONALIZED_WEATHER3,
SPELL_PERSONALIZED_WEATHER4);
target->CastSpell(target, spellId, true);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_item_goblin_weather_machine::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 8342 - Defibrillate (Goblin Jumper Cables) have 33% chance on success
// 22999 - Defibrillate (Goblin Jumper Cables XL) have 50% chance on success
// 54732 - Defibrillate (Gnomish Army Knife) have 67% chance on success
@@ -3687,6 +3715,43 @@ class spell_item_taunt_flag_targeting : public SpellScript
}
};
enum MirrensDrinkingHat
{
ITEM_LOCH_MODAN_LAGER = 23584,
ITEM_STOUTHAMMER_LITE = 23585,
ITEM_AERIE_PEAK_PALE_ALE = 23586
};
// 29830 - Mirren's Drinking Hat
class spell_item_mirrens_drinking_hat : public SpellScript
{
PrepareSpellScript(spell_item_mirrens_drinking_hat);
void HandleScriptEffect(SpellEffIndex effIndex)
{
uint32 itemId;
switch (urand(1, 6))
{
case 1:
case 2:
case 3:
itemId = ITEM_LOCH_MODAN_LAGER; break;
case 4:
case 5:
itemId = ITEM_STOUTHAMMER_LITE; break;
case 6:
itemId = ITEM_AERIE_PEAK_PALE_ALE; break;
}
if (itemId)
CreateItem(effIndex, itemId);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_item_mirrens_drinking_hat::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 13180 - Gnomish Mind Control Cap
enum MindControlCap
{
@@ -3972,6 +4037,7 @@ void AddSC_item_spell_scripts()
new spell_item_deathbringers_will<SPELL_STRENGTH_OF_THE_TAUNKA, SPELL_AGILITY_OF_THE_VRYKUL, SPELL_POWER_OF_THE_TAUNKA, SPELL_AIM_OF_THE_IRON_DWARVES, SPELL_SPEED_OF_THE_VRYKUL>("spell_item_deathbringers_will_normal");
new spell_item_deathbringers_will<SPELL_STRENGTH_OF_THE_TAUNKA_HERO, SPELL_AGILITY_OF_THE_VRYKUL_HERO, SPELL_POWER_OF_THE_TAUNKA_HERO, SPELL_AIM_OF_THE_IRON_DWARVES_HERO, SPELL_SPEED_OF_THE_VRYKUL_HERO>("spell_item_deathbringers_will_heroic");
RegisterSpellScript(spell_item_decahedral_dwarven_dice);
RegisterSpellScript(spell_item_goblin_weather_machine);
new spell_item_defibrillate("spell_item_goblin_jumper_cables", 67, SPELL_GOBLIN_JUMPER_CABLES_FAIL);
new spell_item_defibrillate("spell_item_goblin_jumper_cables_xl", 50, SPELL_GOBLIN_JUMPER_CABLES_XL_FAIL);
new spell_item_defibrillate("spell_item_gnomish_army_knife", 33);
@@ -4060,6 +4126,7 @@ void AddSC_item_spell_scripts()
RegisterAuraScript(spell_item_charm_witch_doctor);
RegisterAuraScript(spell_item_mana_drain);
RegisterSpellScript(spell_item_taunt_flag_targeting);
RegisterSpellScript(spell_item_mirrens_drinking_hat);
RegisterSpellScript(spell_item_mind_control_cap);
RegisterSpellScript(spell_item_universal_remote);