From ac7828a8d9c8ca2d4195bacbf7acf6f638f6d759 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 19:42:05 +0100 Subject: [PATCH 1/6] DB/Creature: Fix some factions Updates #11501 --- sql/updates/world/2014_01_27_14_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_01_27_14_world_creature_template.sql diff --git a/sql/updates/world/2014_01_27_14_world_creature_template.sql b/sql/updates/world/2014_01_27_14_world_creature_template.sql new file mode 100644 index 0000000000..97aa6fe0fb --- /dev/null +++ b/sql/updates/world/2014_01_27_14_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction_A` = 514, `faction_H` = 514 WHERE `entry` IN (13326,22714,32062,37383,37402,37404); +UPDATE `creature_template` SET `faction_A` = 1534, `faction_H` = 1534 WHERE `entry` IN (37407); From 6c17bcf928799b19d724a2c4862cb7bc0321dad7 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 20:57:43 +0100 Subject: [PATCH 2/6] DB/Creature: Fix some factions Updates #11501 --- sql/updates/world/2014_01_27_15_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_01_27_15_world_creature_template.sql diff --git a/sql/updates/world/2014_01_27_15_world_creature_template.sql b/sql/updates/world/2014_01_27_15_world_creature_template.sql new file mode 100644 index 0000000000..d4ac82122c --- /dev/null +++ b/sql/updates/world/2014_01_27_15_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction_A` = 26, `faction_H` = 26 WHERE `entry` IN (37469,37470,37473); +UPDATE `creature_template` SET `faction_A` = 1214, `faction_H` = 1214 WHERE `entry` IN (13397,22745,32016); From 6b3c5b7eb33597227acf777ce87b11c757be6aa0 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 21:49:43 +0100 Subject: [PATCH 3/6] DB/Creature: Fix some factions Updates #11501 --- sql/updates/world/2014_01_27_16_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_01_27_16_world_creature_template.sql diff --git a/sql/updates/world/2014_01_27_16_world_creature_template.sql b/sql/updates/world/2014_01_27_16_world_creature_template.sql new file mode 100644 index 0000000000..cf928d315d --- /dev/null +++ b/sql/updates/world/2014_01_27_16_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction_A` = 59, `faction_H` = 59 WHERE `entry` IN (13099,22741,32012,37331,37340,37337,37366); +UPDATE `creature_template` SET `faction_A` = 39, `faction_H` = 39 WHERE `entry` IN (37475); From f9ab8ecd18731755892c81f147c9cd7162521977 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 22:28:31 +0100 Subject: [PATCH 4/6] DB/Creature: Fix some factions Updates #11501 --- sql/updates/world/2014_01_27_17_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_01_27_17_world_creature_template.sql diff --git a/sql/updates/world/2014_01_27_17_world_creature_template.sql b/sql/updates/world/2014_01_27_17_world_creature_template.sql new file mode 100644 index 0000000000..a2ab1383b6 --- /dev/null +++ b/sql/updates/world/2014_01_27_17_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction_A` = 83, `faction_H` = 83 WHERE `entry` IN (35405,37323); +UPDATE `creature_template` SET `faction_A` = 1215, `faction_H` = 1215 WHERE `entry` IN (37481); From 166f7d41da3e5f8052a79f1e4e4850be3bc48ecd Mon Sep 17 00:00:00 2001 From: joschiwald Date: Mon, 27 Jan 2014 23:01:37 +0100 Subject: [PATCH 5/6] Core/Spells: addition to 96060bf0078441e779c4cfcaa80f66ac5e97a3ff --- src/server/scripts/Spells/spell_druid.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index f33a409cf2..5e56d4b8d9 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -1038,12 +1038,23 @@ class spell_dru_wild_growth : public SpellScriptLoader targets.sort(Trinity::HealthPctOrderPred()); targets.resize(maxTargets); } + + _targets = targets; + } + + void SetTargets(std::list& targets) + { + targets = _targets; } void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); } + + private: + std::list _targets; }; SpellScript* GetSpellScript() const OVERRIDE From 4567faa34b9a257b10ee850ffdb5e62d21a6c733 Mon Sep 17 00:00:00 2001 From: Vincent_Michael Date: Mon, 27 Jan 2014 23:12:45 +0100 Subject: [PATCH 6/6] SQL: Rename in correct name --- ...model_info.sql => 2014_01_27_11_world_creature_model_info.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql/updates/world/{2014_01_27_10_world_creature_model_info.sql => 2014_01_27_11_world_creature_model_info.sql} (100%) diff --git a/sql/updates/world/2014_01_27_10_world_creature_model_info.sql b/sql/updates/world/2014_01_27_11_world_creature_model_info.sql similarity index 100% rename from sql/updates/world/2014_01_27_10_world_creature_model_info.sql rename to sql/updates/world/2014_01_27_11_world_creature_model_info.sql