Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/ScarletHalls: Reverted Call Reinforcements to TARGET_DEST_DB

Browse Source 
* 62156f57b2 followup
This commit is contained in:
Naddley
2024-05-05 05:35:33 +02:00
committed by ModoX
parent 62156f57b2
commit ee6ba02a77
2 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/updates/world/master/2024_05_05_00_world.sql
View File

@@ -21,16 +21,20 @@ INSERT INTO `serverside_spell_effect` (`SpellID`, `EffectIndex`, `DifficultyID`,
(128930, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0);
-- Script Names
DELETE FROM `spell_script_names` WHERE `spell_id` IN (111216, 111394, 112953, 113969, 111755, 111756, 128930);
DELETE FROM `spell_script_names` WHERE `spell_id` IN (111216, 111394, 112953, 113959, 111755, 111756, 128930);
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(111216, 'spell_harlan_blades_of_light'),
(111394, 'spell_harlan_blades_of_light_selector'),
(112953, 'spell_harlan_leave_vehicle'),
(113959, 'spell_scarlet_defender_heavy_armor'),
(111755, 'spell_call_reinforcements_right'),
(111756, 'spell_call_reinforcements_left'),
(128930, 'spell_eject_spirits_of_redemption');
-- Spelltarget Pos.
DELETE FROM `spell_target_position` WHERE `ID` IN (111755, 111756);
INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES
(111755, 0, 1001, 1182.020, 447.325, 11.98933, NULL, 0),
(111756, 0, 1001, 1181.833, 440.649, 11.98763, NULL, 0);
-- Conditions
DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceEntry` IN (111394));
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ConditionStringValue1`, `NegativeCondition`, `Comment`) VALUES

33
src/server/scripts/EasternKingdoms/ScarletMonastery/ScarletHalls/boss_armsmaster_harlan.cpp
View File

@@ -261,37 +261,6 @@ class spell_scarlet_defender_heavy_armor : public AuraScript
}
};
constexpr Position CallReinforcmentsRightPosition = { 1182.020f, 447.325f, 11.98933f };
constexpr Position CallReinforcmentsLeftPosition = { 1181.833f, 440.649f, 11.98763f };
// 111755 - Call Reinforcements
class spell_call_reinforcements_right : public SpellScript
{
void SetDest(SpellDestination& dest)
{
dest.Relocate(CallReinforcmentsRightPosition);
}
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_call_reinforcements_right::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
};
// 111756 - Call Reinforcements
class spell_call_reinforcements_left : public SpellScript
{
void SetDest(SpellDestination& dest)
{
dest.Relocate(CallReinforcmentsLeftPosition);
}
void Register() override
{
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_call_reinforcements_left::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY);
}
};
// 128930 - Eject Spirits of Redemption
class spell_eject_spirits_of_redemption : public SpellScript
{
@@ -328,7 +297,5 @@ void AddSC_boss_armsmaster_harlan()
RegisterSpellScript(spell_harlan_blades_of_light_selector);
RegisterSpellScript(spell_harlan_leave_vehicle);
RegisterSpellScript(spell_scarlet_defender_heavy_armor);
RegisterSpellScript(spell_call_reinforcements_right);
RegisterSpellScript(spell_call_reinforcements_left);
RegisterSpellScript(spell_eject_spirits_of_redemption);
}