araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Script/Quest: fix (More) Torch Catching (#24907)

Browse Source 
* Script/Quest: fix (More) Torch Catching.

Closes #24893

Co-authored-by: Carbenium <carbenium@outlook.com>
This commit is contained in:
Rothend
2020-08-12 13:40:28 +02:00
committed by GitHub
parent 6116e5b385
commit a375f15ae2
2 changed files with 158 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/updates/world/3.3.5/2020_08_12_00_world.sql Normal file
View File

@@ -0,0 +1,6 @@
DELETE FROM `spell_script_names` WHERE `ScriptName` IN ("spell_midsummer_fling_torch_triggered", "spell_midsummer_fling_torch_catch", "spell_midsummer_fling_torch_missed", "spell_midsummer_fling_torch");
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(45669, "spell_midsummer_fling_torch_triggered"),
(45671, "spell_midsummer_fling_torch_catch"),
(45676, "spell_midsummer_fling_torch_missed"),
(46747, "spell_midsummer_fling_torch");

153
src/server/scripts/Spells/spell_holiday.cpp
View File

@@ -1682,7 +1682,9 @@ enum JugglingTorch
SPELL_GIVE_TORCH = 45280,
QUEST_TORCH_CATCHING_A = 11657,
QUEST_TORCH_CATCHING_H = 11923
QUEST_TORCH_CATCHING_H = 11923,
QUEST_MORE_TORCH_CATCHING_A = 11924,
QUEST_MORE_TORCH_CATCHING_H = 11925
};
// 45819 - Throw Torch
@@ -1768,6 +1770,151 @@ class spell_midsummer_torch_catch : public SpellScript
}
};
enum FlingTorch
{
SPELL_FLING_TORCH_TRIGGERED = 45669,
SPELL_FLING_TORCH_SHADOW = 46105,
SPELL_JUGGLE_TORCH_MISSED = 45676,
SPELL_TORCHES_CAUGHT = 45693,
SPELL_TORCH_CATCHING_SUCCESS_ALLIANCE = 46081,
SPELL_TORCH_CATCHING_SUCCESS_HORDE = 46654,
SPELL_TORCH_CATCHING_REMOVE_TORCHES = 46084
};
// 46747 - Fling torch
class spell_midsummer_fling_torch : public SpellScript
{
PrepareSpellScript(spell_midsummer_fling_torch);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_FLING_TORCH_TRIGGERED, SPELL_FLING_TORCH_SHADOW });
}
void HandleDummy(SpellEffIndex /*effIndex*/)
{
Position dest = GetCaster()->GetFirstCollisionPosition(30.0f, (float)rand_norm() * static_cast<float>(2 * M_PI));
GetCaster()->CastSpell(dest, SPELL_FLING_TORCH_TRIGGERED, true);
GetCaster()->CastSpell(dest, SPELL_FLING_TORCH_SHADOW);
}
void Register() override
{
OnEffectHit += SpellEffectFn(spell_midsummer_fling_torch::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 45669 - Fling Torch
class spell_midsummer_fling_torch_triggered : public SpellScript
{
PrepareSpellScript(spell_midsummer_fling_torch_triggered);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_JUGGLE_TORCH_MISSED });
}
void HandleTriggerMissile(SpellEffIndex effIndex)
{
if (Position const* pos = GetHitDest())
{
if (GetCaster()->GetExactDist2d(pos) > 3.0f)
{
PreventHitEffect(effIndex);
GetCaster()->CastSpell(*GetExplTargetDest(), SPELL_JUGGLE_TORCH_MISSED);
GetCaster()->RemoveAura(SPELL_TORCHES_CAUGHT);
}
}
}
void Register() override
{
OnEffectHit += SpellEffectFn(spell_midsummer_fling_torch_triggered::HandleTriggerMissile, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE);
}
};
// 45671 - Juggle Torch (Catch, Quest)
class spell_midsummer_fling_torch_catch : public SpellScript
{
PrepareSpellScript(spell_midsummer_fling_torch_catch);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({
SPELL_FLING_TORCH_TRIGGERED,
SPELL_TORCH_CATCHING_SUCCESS_ALLIANCE,
SPELL_TORCH_CATCHING_SUCCESS_HORDE,
SPELL_TORCH_CATCHING_REMOVE_TORCHES,
SPELL_FLING_TORCH_SHADOW
});
}
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
Player* player = GetHitPlayer();
if (!player)
return;
if (!GetExplTargetDest())
return;
// Only the caster can catch the torch
if (player->GetGUID() != GetCaster()->GetGUID())
return;
uint8 requiredCatches = 0;
// Number of required catches depends on quest - 4 for the normal quest, 10 for the daily version
if (player->GetQuestStatus(QUEST_TORCH_CATCHING_A) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_TORCH_CATCHING_H) == QUEST_STATUS_INCOMPLETE)
requiredCatches = 3;
else if (player->GetQuestStatus(QUEST_MORE_TORCH_CATCHING_A) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_MORE_TORCH_CATCHING_H) == QUEST_STATUS_INCOMPLETE)
requiredCatches = 9;
// Used quest item without being on quest - do nothing
if (requiredCatches == 0)
return;
if (player->GetAuraCount(SPELL_TORCHES_CAUGHT) >= requiredCatches)
{
player->CastSpell(player, (player->GetTeam() == ALLIANCE) ? SPELL_TORCH_CATCHING_SUCCESS_ALLIANCE : SPELL_TORCH_CATCHING_SUCCESS_HORDE);
player->CastSpell(player, SPELL_TORCH_CATCHING_REMOVE_TORCHES);
player->RemoveAura(SPELL_TORCHES_CAUGHT);
}
else
{
Position dest = player->GetFirstCollisionPosition(15.0f, (float)rand_norm() * static_cast<float>(2 * M_PI));
player->CastSpell(player, SPELL_TORCHES_CAUGHT);
player->CastSpell(dest, SPELL_FLING_TORCH_TRIGGERED, true);
player->CastSpell(dest, SPELL_FLING_TORCH_SHADOW);
}
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_midsummer_fling_torch_catch::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 45676 - Juggle Torch (Quest, Missed)
class spell_midsummer_fling_torch_missed : public SpellScript
{
PrepareSpellScript(spell_midsummer_fling_torch_missed);
void FilterTargets(std::list<WorldObject*>& targets)
{
// This spell only hits the caster
targets.remove_if([this](WorldObject* obj)
{
return obj->GetGUID() != GetCaster()->GetGUID();
});
}
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_midsummer_fling_torch_missed::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_midsummer_fling_torch_missed::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENTRY);
}
};
void AddSC_holiday_spell_scripts()
{
// Love is in the Air
@@ -1823,4 +1970,8 @@ void AddSC_holiday_spell_scripts()
RegisterAuraScript(spell_midsummer_ribbon_pole_periodic_visual);
RegisterSpellScript(spell_midsummer_juggle_torch);
RegisterSpellScript(spell_midsummer_torch_catch);
RegisterSpellScript(spell_midsummer_fling_torch);
RegisterSpellScript(spell_midsummer_fling_torch_triggered);
RegisterSpellScript(spell_midsummer_fling_torch_catch);
RegisterSpellScript(spell_midsummer_fling_torch_missed);
}