Merge pull request #353 from TrinityCore/master

Update 11.10.24
KamiliaBlow · Nov 10, 2024 · ab4a09c · ab4a09c
2 parents 5e7d134 + b98d83c
commit ab4a09c
Show file tree

Hide file tree

Showing 7 changed files with 563 additions and 0 deletions.
diff --git a/sql/updates/world/master/2024_11_09_00_world.sql b/sql/updates/world/master/2024_11_09_00_world.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_rog_airborne_irritant','spell_rog_airborne_irritant_target_selection');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(2094, 'spell_rog_airborne_irritant'),
+(427773, 'spell_rog_airborne_irritant_target_selection');
diff --git a/sql/updates/world/master/2024_11_09_01_world.sql b/sql/updates/world/master/2024_11_09_01_world.sql
diff --git a/sql/updates/world/master/2024_11_09_02_world.sql b/sql/updates/world/master/2024_11_09_02_world.sql
@@ -0,0 +1,29 @@
+-- Dorak
+DELETE FROM `waypoint_path` WHERE `PathId` = 274273;
+DELETE FROM `waypoint_path_node` WHERE `PathId` = 274273;
+
+SET @MOVERGUID := 304070;
+SET @ENTRY := 34284;
+SET @PATHOFFSET := 0;
+SET @PATH := @ENTRY * 100 + @PATHOFFSET;
+DELETE FROM `waypoint_path` WHERE `PathId`= @PATH;
+INSERT INTO `waypoint_path` (`PathId`, `MoveType`, `Flags`, `Velocity`, `Comment`) VALUES
+(@PATH, 1, 0x0, NULL, 'Dorak - Scripted Path');
+
+DELETE FROM `waypoint_path_node` WHERE `PathId`= @PATH;
+INSERT INTO `waypoint_path_node` (`PathId`, `NodeId`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `Delay`) VALUES
+(@PATH, 0, 69.16949, -3618.468, 28.68636, 3.612831592559814453, 4258),
+(@PATH, 1, 66.85916, -3643.826, 27.43744, NULL, 0),
+(@PATH, 2, 66.50076, -3653.195, 27.26537, 2.670353651046752929, 5482);
+
+UPDATE `creature` SET `position_x`= 66.85916, `position_y`= -3643.826, `position_z`= 27.43744, `orientation`= 0, `MovementType`= 2 WHERE `guid`=@MOVERGUID;
+DELETE FROM `creature_addon` WHERE `guid`=@MOVERGUID;
+INSERT INTO `creature_addon` (`guid`, `PathId`, `SheathState`) VALUES
+(@MOVERGUID, @PATH, 1);
+
+-- Dorak smart ai
+SET @ENTRY := 34284;
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `action_param7`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`, `Difficulties`) VALUES
+(@ENTRY, 0, 0, 0, 34, 0, 100, 0, 2, 0, 0, 0, 0, 5, 15, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'On movement of type WAYPOINT_MOTION_TYPE inform, point 0 - Self: Play emote 15', '');
diff --git a/sql/updates/world/master/2024_11_09_03_world.sql b/sql/updates/world/master/2024_11_09_03_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rog_acrobatic_strikes';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(455143, 'spell_rog_acrobatic_strikes');
diff --git a/sql/updates/world/master/2024_11_09_04_world.sql b/sql/updates/world/master/2024_11_09_04_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_monk_rising_sun_kick';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(107428, 'spell_monk_rising_sun_kick');
diff --git a/src/server/scripts/Spells/spell_monk.cpp b/src/server/scripts/Spells/spell_monk.cpp
@@ -46,10 +46,12 @@
 enum MonkSpells
 {
     SPELL_MONK_CALMING_COALESCENCE                      = 388220,
+    SPELL_MONK_COMBAT_CONDITIONING                      = 128595,
     SPELL_MONK_CRACKLING_JADE_LIGHTNING_CHANNEL         = 117952,
     SPELL_MONK_CRACKLING_JADE_LIGHTNING_CHI_PROC        = 123333,
     SPELL_MONK_CRACKLING_JADE_LIGHTNING_KNOCKBACK       = 117962,
     SPELL_MONK_CRACKLING_JADE_LIGHTNING_KNOCKBACK_CD    = 117953,
+    SPELL_MONK_MORTAL_WOUNDS                            = 115804,
     SPELL_MONK_POWER_STRIKE_PROC                        = 129914,
     SPELL_MONK_POWER_STRIKE_ENERGIZE                    = 121283,
     SPELL_MONK_PROVOKE_SINGLE_TARGET                    = 116189,
@@ -357,6 +359,33 @@ class spell_monk_provoke : public SpellScript
     }
 };
 
+// 107428 - Rising Sun Kick
+class spell_monk_rising_sun_kick : public SpellScript
+{
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_MONK_COMBAT_CONDITIONING, SPELL_MONK_MORTAL_WOUNDS });
+    }
+
+    bool Load() override
+    {
+        return GetCaster()->HasAura(SPELL_MONK_COMBAT_CONDITIONING);
+    }
+
+    void HandleOnHit(SpellEffIndex /*effIndex*/) const
+    {
+        GetCaster()->CastSpell(GetHitUnit(), SPELL_MONK_MORTAL_WOUNDS, CastSpellExtraArgsInit{
+            .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
+            .TriggeringSpell = GetSpell()
+        });
+    }
+
+    void Register() override
+    {
+        OnEffectLaunchTarget += SpellEffectFn(spell_monk_rising_sun_kick::HandleOnHit, EFFECT_0, SPELL_EFFECT_TRIGGER_SPELL);
+    }
+};
+
 // 109132 - Roll
 class spell_monk_roll : public SpellScript
 {
@@ -2561,6 +2590,7 @@ void AddSC_monk_spell_scripts()
     RegisterSpellScript(spell_monk_power_strike_periodic);
     RegisterSpellScript(spell_monk_power_strike_proc);
     RegisterSpellScript(spell_monk_provoke);
+    RegisterSpellScript(spell_monk_rising_sun_kick);
     RegisterSpellScript(spell_monk_roll);
     RegisterSpellScript(spell_monk_roll_aura);
     RegisterSpellScript(spell_monk_stagger);

diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
@@ -36,7 +36,9 @@
 
 enum RogueSpells
 {
+    SPELL_ROGUE_ACROBATIC_STRIKES_PROC              = 455144,
     SPELL_ROGUE_ADRENALINE_RUSH                     = 13750,
+    SPELL_ROGUE_AIRBORNE_IRRITANT                   = 200733,
     SPELL_ROGUE_AMPLIFYING_POISON                   = 381664,
     SPELL_ROGUE_AMPLIFYING_POISON_DEBUFF            = 383414,
     SPELL_ROGUE_ATROPHIC_POISON                     = 381637,
@@ -46,6 +48,7 @@ enum RogueSpells
     SPELL_ROGUE_BLACKJACK                           = 394119,
     SPELL_ROGUE_BLADE_FLURRY                        = 13877,
     SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK           = 22482,
+    SPELL_ROGUE_BLIND_AREA                          = 427773,
     SPELL_ROGUE_BROADSIDE                           = 193356,
     SPELL_ROGUE_BURIED_TREASURE                     = 199600,
     SPELL_ROGUE_CHEAT_DEATH_DUMMY                   = 31231,
@@ -145,6 +148,69 @@ bool IsFinishingMove(Spell const* spell)
     return GetFinishingMoveCPCost(spell).has_value();
 }
 
+// 455143 - Acrobatic Strikes
+class spell_rog_acrobatic_strikes : public AuraScript
+{
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_ROGUE_ACROBATIC_STRIKES_PROC });
+    }
+
+    void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) const
+    {
+        GetTarget()->CastSpell(GetTarget(), SPELL_ROGUE_ACROBATIC_STRIKES_PROC, CastSpellExtraArgsInit{
+            .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
+            .TriggeringAura = aurEff
+        });
+    }
+
+    void Register() override
+    {
+        OnEffectProc += AuraEffectProcFn(spell_rog_acrobatic_strikes::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
+    }
+};
+
+// Called by 2094 - Blind
+class spell_rog_airborne_irritant : public SpellScript
+{
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_ROGUE_AIRBORNE_IRRITANT, SPELL_ROGUE_BLIND_AREA });
+    }
+
+    bool Load() override
+    {
+        return GetCaster()->HasAura(SPELL_ROGUE_AIRBORNE_IRRITANT);
+    }
+
+    void HandleHit(SpellEffIndex /*effIndex*/) const
+    {
+        GetCaster()->CastSpell(GetHitUnit(), SPELL_ROGUE_BLIND_AREA, CastSpellExtraArgsInit{
+            .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
+            .TriggeringSpell = GetSpell()
+        });
+    }
+
+    void Register() override
+    {
+        OnEffectHit += SpellEffectFn(spell_rog_airborne_irritant::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
+    }
+};
+
+// 427773 - Blind
+class spell_rog_airborne_irritant_target_selection : public SpellScript
+{
+    void FilterTargets(std::list<WorldObject*>& targets) const
+    {
+        targets.remove(GetExplTargetWorldObject());
+    }
+
+    void Register() override
+    {
+        OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rog_airborne_irritant_target_selection::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY);
+    }
+};
+
 // 53 - Backstab
 class spell_rog_backstab : public SpellScript
 {
@@ -1770,6 +1836,9 @@ class spell_rog_shuriken_storm : public SpellScriptLoader
 
 void AddSC_rogue_spell_scripts()
 {
+    RegisterSpellScript(spell_rog_acrobatic_strikes);
+    RegisterSpellScript(spell_rog_airborne_irritant);
+    RegisterSpellScript(spell_rog_airborne_irritant_target_selection);
     RegisterSpellScript(spell_rog_backstab);
     RegisterSpellScript(spell_rog_blackjack);
     RegisterSpellScript(spell_rog_blade_flurry);