From faf9f481ef41902affe2867bbb5f51ac94ca41a6 Mon Sep 17 00:00:00 2001 From: Nay Date: Fri, 7 Sep 2012 04:12:45 +0100 Subject: DB/NPCs: Set UNIT_FLAG2_REGENERATE_POWER for all creatures (exceptions to this rule will have to be fixed) --- sql/updates/world/2012_09_07_01_world_creature_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_09_07_01_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_07_01_world_creature_template.sql b/sql/updates/world/2012_09_07_01_world_creature_template.sql new file mode 100644 index 00000000000..16e4f670fd2 --- /dev/null +++ b/sql/updates/world/2012_09_07_01_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `unit_flags2`=`unit_flags2`|0x800; -- UNIT_FLAG2_REGENERATE_POWER -- cgit v1.2.3 From f9b3cf1531cf1086a8451350bfaf10bc5c63421c Mon Sep 17 00:00:00 2001 From: Subv Date: Fri, 7 Sep 2012 17:36:29 -0500 Subject: DB/Schema: Change charset of `characters` Allows having different characters with names like "Subv" and "Súbv", it was not possible to have two characters with these names at the same time before closes #7679 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/updates/characters/2012_09_07_00_characters_characters.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/characters/2012_09_07_00_characters_characters.sql (limited to 'sql') diff --git a/sql/updates/characters/2012_09_07_00_characters_characters.sql b/sql/updates/characters/2012_09_07_00_characters_characters.sql new file mode 100644 index 00000000000..26ad904b4a0 --- /dev/null +++ b/sql/updates/characters/2012_09_07_00_characters_characters.sql @@ -0,0 +1,2 @@ +ALTER TABLE `characters` MODIFY `name` + VARCHAR(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL; -- cgit v1.2.3 From 673ce30f38e983ac73fa916b8a6b1d71790c107c Mon Sep 17 00:00:00 2001 From: Subv Date: Fri, 7 Sep 2012 18:26:14 -0500 Subject: Core/Spells: Fixed Improved Health Funnel damage reduction effect. Author: Josh closes #7275 --- .../2012_09_07_02_world_spell_script_names.sql | 3 ++ src/server/scripts/Spells/spell_warlock.cpp | 47 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 sql/updates/world/2012_09_07_02_world_spell_script_names.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_07_02_world_spell_script_names.sql b/sql/updates/world/2012_09_07_02_world_spell_script_names.sql new file mode 100644 index 00000000000..652d45543e3 --- /dev/null +++ b/sql/updates/world/2012_09_07_02_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM spell_script_names WHERE spell_id = -755; +INSERT IGNORE INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(-755, 'spell_warl_health_funnel'); diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index e0131190916..9b227737e0a 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -41,6 +41,10 @@ enum WarlockSpells WARLOCK_HAUNT_HEAL = 48210, WARLOCK_UNSTABLE_AFFLICTION_DISPEL = 31117, WARLOCK_CURSE_OF_DOOM_EFFECT = 18662, + WARLOCK_IMPROVED_HEALTH_FUNNEL_R1 = 18703, + WARLOCK_IMPROVED_HEALTH_FUNNEL_R2 = 18704, + WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R1 = 60955, + WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2 = 60956, }; class spell_warl_banish : public SpellScriptLoader @@ -671,6 +675,48 @@ class spell_warl_curse_of_doom : public SpellScriptLoader } }; +class spell_warl_health_funnel : public SpellScriptLoader +{ +public: + spell_warl_health_funnel() : SpellScriptLoader("spell_warl_health_funnel") { } + + class spell_warl_health_funnel_AuraScript : public AuraScript + { + PrepareAuraScript(spell_warl_health_funnel_AuraScript) + void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Unit* target = GetTarget()) + { + if (GetCaster()->HasAura(WARLOCK_IMPROVED_HEALTH_FUNNEL_R2)) + target->CastSpell(target, WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2, true); + else if (GetCaster()->HasAura(WARLOCK_IMPROVED_HEALTH_FUNNEL_R1)) + target->CastSpell(target, WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R1, true); + } + + } + + void RemoveEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + { + if (Unit* target = GetTarget()) + { + target->RemoveAurasDueToSpell(WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R1); + target->RemoveAurasDueToSpell(WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2); + } + } + + void Register() + { + OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); + OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); + } + }; + + AuraScript* GetAuraScript() const + { + return new spell_warl_health_funnel_AuraScript(); + } +}; + void AddSC_warlock_spell_scripts() { new spell_warl_banish(); @@ -686,4 +732,5 @@ void AddSC_warlock_spell_scripts() new spell_warl_haunt(); new spell_warl_unstable_affliction(); new spell_warl_curse_of_doom(); + new spell_warl_health_funnel(); } -- cgit v1.2.3 From 4cf1e7309ff07b99a7c906a9069a436f925c01a3 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 8 Sep 2012 02:15:12 +0200 Subject: DB/Achievement: Fix achievement "Who Needs Bloodlust"? Closes: #4812 --- sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql b/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..cce5745dee9 --- /dev/null +++ b/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql @@ -0,0 +1,6 @@ +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10304,10313); +INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES +(10304,5,62320,0,''), +(10304,12,0,0,''), +(10313,5,62320,0,''), +(10313,12,1,0,''); -- cgit v1.2.3