From f2210e49667837d54dd553e0859087bce9c92f27 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 29 Aug 2014 09:46:05 +0200 Subject: DB/Creature: Add trigger and civilian flags to the other difficulty entries of the Soul Consumption trigger By Nyeriah, closes #12957 --- sql/updates/world/2014_08_29_01_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_08_29_01_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_08_29_01_world_creature_template.sql b/sql/updates/world/2014_08_29_01_world_creature_template.sql new file mode 100644 index 00000000000..4c4101d0c83 --- /dev/null +++ b/sql/updates/world/2014_08_29_01_world_creature_template.sql @@ -0,0 +1,2 @@ +-- Adds trigger and civilian flags_extra to Halion's Soul Consumption triggers +UPDATE `creature_template` SET `flags_extra` = `flags_extra` |2|128 WHERE `entry` IN (40673, 40674, 40675); -- cgit v1.2.3 From 6489e71328ab9f27b8ec7e786b60a20d75763693 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 29 Aug 2014 13:17:57 +0200 Subject: DB/Creature: Fix more factions (Fixes also 4.3.4 database startup errors) --- sql/updates/world/2014_08_29_02_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_08_29_02_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_08_29_02_world_creature_template.sql b/sql/updates/world/2014_08_29_02_world_creature_template.sql new file mode 100644 index 00000000000..2b151714e97 --- /dev/null +++ b/sql/updates/world/2014_08_29_02_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction`=534 WHERE `entry` IN (37580,37614,37576,37615,37575,37617,37572,37616); +UPDATE `creature_template` SET `faction`=35 WHERE `entry` IN (37813,38402,38582,38583); -- cgit v1.2.3 From fb4a8afa1250454ccb566b3d1841c927d22b9a8f Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 29 Aug 2014 13:32:38 +0200 Subject: DB/Creature: Fix even more factions (This also fixes 4.3.4 startup errors) --- sql/updates/world/2014_08_29_03_world_creature_template.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2014_08_29_03_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_08_29_03_world_creature_template.sql b/sql/updates/world/2014_08_29_03_world_creature_template.sql new file mode 100644 index 00000000000..7c057c8dc85 --- /dev/null +++ b/sql/updates/world/2014_08_29_03_world_creature_template.sql @@ -0,0 +1,5 @@ +-- +UPDATE `creature_template` SET `faction`=1692 WHERE `entry` IN (33139,34111); +UPDATE `creature_template` SET `faction`=16 WHERE `entry` IN(32908,33151,32907,33150,32885,33153,32883,33152,32882,33154); +UPDATE `creature_template` SET `faction`=1814 WHERE `entry` IN (29098,31602,29096,31590,29062,31589); +UPDATE `creature_template` SET `faction`=14 WHERE `entry` IN (29153,31585); -- cgit v1.2.3 From 6658d4157528496eca497a6fa7561b67768c2d96 Mon Sep 17 00:00:00 2001 From: Golrag Date: Fri, 29 Aug 2014 18:56:13 +0200 Subject: Scripts/ICC: Fixed Impale (Lord Marrowgar) --- sql/updates/world/2014_08_29_04_world_creature_template.sql | 1 + src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2014_08_29_04_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_08_29_04_world_creature_template.sql b/sql/updates/world/2014_08_29_04_world_creature_template.sql new file mode 100644 index 00000000000..d63bf2b77e2 --- /dev/null +++ b/sql/updates/world/2014_08_29_04_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|0x10000000 WHERE `entry` IN (36619, 38711, 38712); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 1ff7e1b1352..9d24ad062df 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -643,7 +643,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader for (std::list::const_iterator itr = targets.begin(); itr != targets.end(); ++itr, ++i) { Unit* target = *itr; - target->CastCustomSpell(BoneSpikeSummonId[i], SPELLVALUE_BASE_POINT0, 0, target, true); + target->CastSpell(target, BoneSpikeSummonId[i], true); } marrowgarAI->Talk(SAY_BONESPIKE); -- cgit v1.2.3