From 0e7948e97b25eaedfcc1f4a35ca45c3f850fee44 Mon Sep 17 00:00:00 2001 From: Alan Date: Sat, 15 Jul 2023 12:03:39 -0300 Subject: [PATCH 1/7] fix Riding Speed increases Druid Flight Forms --- src/server/game/Spells/SpellInfoCorrections.cpp | 10 ++++++++++ src/server/scripts/Spells/spell_item.cpp | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index bff534f0adaa6..40f1049033c29 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4547,6 +4547,16 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->MaxAffectedTargets = 1; }); + // item: Riding Crop/Skybreaker Whip (https://www.wowhead.com/tbc/spell=48776/mount-speed) + // item: Mithril Spurs (https://www.wowhead.com/tbc/spell=7215/mithril-spurs) + // item: Enchant Gloves - Riding Skill (https://www.wowhead.com/tbc/spell=13927/minor-mount-speed) modified in wolk expansion + // item: Carrot on a Stick (https://www.wowhead.com/tbc/spell=48777/mount-speed) + ApplySpellFix({ 48776, 7215, 13927, 48777 }, [](SpellInfo* spellInfo) + { + spellInfo->Effects[EFFECT_0].ApplyAuraName = SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK; + spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; + }); + for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i]; diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 8a539394228b3..be069c444b507 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -286,8 +286,8 @@ class spell_item_with_mount_speed : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_item_with_mount_speed::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_item_with_mount_speed::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply += AuraEffectApplyFn(spell_item_with_mount_speed::OnApply, EFFECT_0, SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove += AuraEffectRemoveFn(spell_item_with_mount_speed::OnRemove, EFFECT_0, SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK, AURA_EFFECT_HANDLE_REAL); } }; From d016c2ef5c2485cc50e5979835f97dd16dc41c75 Mon Sep 17 00:00:00 2001 From: Alan Date: Sat, 15 Jul 2023 12:19:29 -0300 Subject: [PATCH 2/7] update --- src/server/game/Spells/SpellInfoCorrections.cpp | 1 - src/server/scripts/Spells/spell_item.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index 40f1049033c29..af747c6dfd909 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4553,7 +4553,6 @@ void SpellMgr::LoadSpellInfoCorrections() // item: Carrot on a Stick (https://www.wowhead.com/tbc/spell=48777/mount-speed) ApplySpellFix({ 48776, 7215, 13927, 48777 }, [](SpellInfo* spellInfo) { - spellInfo->Effects[EFFECT_0].ApplyAuraName = SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK; spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; }); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index be069c444b507..8a539394228b3 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -286,8 +286,8 @@ class spell_item_with_mount_speed : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_item_with_mount_speed::OnApply, EFFECT_0, SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_item_with_mount_speed::OnRemove, EFFECT_0, SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK, AURA_EFFECT_HANDLE_REAL); + OnEffectApply += AuraEffectApplyFn(spell_item_with_mount_speed::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove += AuraEffectRemoveFn(spell_item_with_mount_speed::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; From a56963931cf66ae1d06563ee8717f007c9533bf5 Mon Sep 17 00:00:00 2001 From: Alan Date: Mon, 24 Jul 2023 10:59:25 -0300 Subject: [PATCH 3/7] update --- src/server/game/Spells/SpellInfoCorrections.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index af747c6dfd909..d8624deaaf044 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4549,10 +4549,15 @@ void SpellMgr::LoadSpellInfoCorrections() // item: Riding Crop/Skybreaker Whip (https://www.wowhead.com/tbc/spell=48776/mount-speed) // item: Mithril Spurs (https://www.wowhead.com/tbc/spell=7215/mithril-spurs) - // item: Enchant Gloves - Riding Skill (https://www.wowhead.com/tbc/spell=13927/minor-mount-speed) modified in wolk expansion + ApplySpellFix({ 48776, 7215 }, [](SpellInfo* spellInfo) + { + spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; + }); + // item: Carrot on a Stick (https://www.wowhead.com/tbc/spell=48777/mount-speed) - ApplySpellFix({ 48776, 7215, 13927, 48777 }, [](SpellInfo* spellInfo) + ApplySpellFix({ 48777 }, [](SpellInfo* spellInfo) { + spellInfo->Effects[EFFECT_1].Effect = SPELL_EFFECT_APPLY_AURA; spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; }); From 38afb5421932af58ea2e96446e7de5413e0ea311 Mon Sep 17 00:00:00 2001 From: Grimgravy Date: Sun, 30 Jul 2023 15:15:24 -0300 Subject: [PATCH 4/7] Update SpellInfoCorrections.cpp --- src/server/game/Spells/SpellInfoCorrections.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index 9b751a6c490ec..49071aeea7508 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4553,14 +4553,14 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_0].TriggerSpell = 62585; // Mulgore Hatchling (fear) }); - // item: Riding Crop/Skybreaker Whip (https://www.wowhead.com/tbc/spell=48776/mount-speed) - // item: Mithril Spurs (https://www.wowhead.com/tbc/spell=7215/mithril-spurs) + // Mount Speed + // Mithril Spurs ApplySpellFix({ 48776, 7215 }, [](SpellInfo* spellInfo) { spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; }); - // item: Carrot on a Stick (https://www.wowhead.com/tbc/spell=48777/mount-speed) + // Mount Speed ApplySpellFix({ 48777 }, [](SpellInfo* spellInfo) { spellInfo->Effects[EFFECT_1].Effect = SPELL_EFFECT_APPLY_AURA; From 40c2076cf9959216592d94f2b361746fcc98801d Mon Sep 17 00:00:00 2001 From: Grimgravy Date: Wed, 20 Mar 2024 14:17:01 -0300 Subject: [PATCH 5/7] Update SpellInfoCorrections.cpp --- src/server/game/Spells/SpellInfoCorrections.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index a0a959a8f74d4..ae54195c5be9e 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4800,13 +4800,7 @@ void SpellMgr::LoadSpellInfoCorrections() // Mount Speed // Mithril Spurs - ApplySpellFix({ 48776, 7215 }, [](SpellInfo* spellInfo) - { - spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; - }); - - // Mount Speed - ApplySpellFix({ 48777 }, [](SpellInfo* spellInfo) + ApplySpellFix({ 48777, 7215 }, [](SpellInfo* spellInfo) { spellInfo->Effects[EFFECT_1].Effect = SPELL_EFFECT_APPLY_AURA; spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; From b2bd12ae69c6b998653cfba9f847d1823f27b9ba Mon Sep 17 00:00:00 2001 From: Grimgravy Date: Wed, 20 Mar 2024 14:27:01 -0300 Subject: [PATCH 6/7] Update SpellInfoCorrections.cpp --- src/server/game/Spells/SpellInfoCorrections.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index ae54195c5be9e..360fa903f3400 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4799,13 +4799,18 @@ void SpellMgr::LoadSpellInfoCorrections() }); // Mount Speed - // Mithril Spurs - ApplySpellFix({ 48777, 7215 }, [](SpellInfo* spellInfo) + ApplySpellFix({ 48777 }, [](SpellInfo* spellInfo) { spellInfo->Effects[EFFECT_1].Effect = SPELL_EFFECT_APPLY_AURA; spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; }); + // Mithril Spurs + ApplySpellFix({ 7215 }, [](SpellInfo* spellInfo) + { + spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; + }); + for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i]; From 49f3b18ed4d17bb920bef4b71f1808adf4c4a1f1 Mon Sep 17 00:00:00 2001 From: Alan Date: Sun, 22 Sep 2024 13:50:11 -0300 Subject: [PATCH 7/7] fix update --- src/server/game/Entities/Unit/Unit.cpp | 3 +++ src/server/game/Spells/SpellInfoCorrections.cpp | 13 ------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 19c2be2f9d242..de0bf9f2d2b6a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14279,7 +14279,10 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) stack_bonus = GetTotalAuraMultiplier(SPELL_AURA_MOD_MOUNTED_FLIGHT_SPEED_ALWAYS); } else // Use not mount (shapeshift for example) auras (should stack) + { main_speed_mod = GetTotalAuraModifier(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED) + GetTotalAuraModifier(SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); + stack_bonus = GetTotalAuraMultiplier(SPELL_AURA_MOD_MOUNTED_FLIGHT_SPEED_ALWAYS); + } non_stack_bonus += GetMaxPositiveAuraModifier(SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK) / 100.0f; diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index 1704fd60f95d0..9cf614e11b44f 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -4837,19 +4837,6 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->AttributesEx5 |= SPELL_ATTR5_ALLOW_ACTION_DURING_CHANNEL; }); - // Mount Speed - ApplySpellFix({ 48777 }, [](SpellInfo* spellInfo) - { - spellInfo->Effects[EFFECT_1].Effect = SPELL_EFFECT_APPLY_AURA; - spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; - }); - - // Mithril Spurs - ApplySpellFix({ 7215 }, [](SpellInfo* spellInfo) - { - spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK; - }); - for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i];