From c61ce54f0355c4b3178a2dab7ffb480656ff92b9 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 25 Aug 2012 01:29:03 +0200 Subject: Misc/Battlefield: * Fix faction for Wintergrasp Siege Turret * Add missing magic number --- sql/updates/world/2012_08_25_00_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_08_25_00_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_08_25_00_world_creature_template.sql b/sql/updates/world/2012_08_25_00_world_creature_template.sql new file mode 100644 index 00000000000..f7ec4c87fb9 --- /dev/null +++ b/sql/updates/world/2012_08_25_00_world_creature_template.sql @@ -0,0 +1,3 @@ +-- Wintergrasp Siege Turret +UPDATE `creature_template` SET `faction_A`=1732,`faction_H`=1732 WHERE `entry`=28319; -- Alliance +UPDATE `creature_template` SET `faction_A`=1735,`faction_H`=1735 WHERE `entry`=32629; -- Horde -- cgit v1.2.3 From fd3ab841adba57b902edb1970f72e0d71fa733ec Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 25 Aug 2012 03:16:18 +0200 Subject: DB/Creature: Fix Twilight Whelp faction from sniff --- sql/updates/world/2012_08_25_01_world_creature_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_08_25_01_world_creature_template.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_08_25_01_world_creature_template.sql b/sql/updates/world/2012_08_25_01_world_creature_template.sql new file mode 100644 index 00000000000..ef8e5bdd8fc --- /dev/null +++ b/sql/updates/world/2012_08_25_01_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `faction_A`=103,`faction_H`=103 WHERE `entry` IN (30890,31540); -- Twilight Whelp -- cgit v1.2.3 From c66de00638aa3a2f215faac02c9166e29be15c8a Mon Sep 17 00:00:00 2001 From: gecko32 Date: Sun, 26 Aug 2012 02:02:21 +0200 Subject: DB/Conditions: Fix Sartharion Berserk targets --- sql/updates/world/2012_08_26_00_world_conditions.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_08_26_00_world_conditions.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_08_26_00_world_conditions.sql b/sql/updates/world/2012_08_26_00_world_conditions.sql new file mode 100644 index 00000000000..c33d9bfc878 --- /dev/null +++ b/sql/updates/world/2012_08_26_00_world_conditions.sql @@ -0,0 +1,5 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=61632; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,7,61632,0,0,31,0,3,30449,0,0,0,'','Sartharion Berserk - Only hit Tenebron, Shadron & Vesperon'), +(13,7,61632,0,1,31,0,3,30451,0,0,0,'','Sartharion Berserk - Only hit Tenebron, Shadron & Vesperon'), +(13,7,61632,0,2,31,0,3,30452,0,0,0,'','Sartharion Berserk - Only hit Tenebron, Shadron & Vesperon'); -- cgit v1.2.3 From 8b939700e78aed23788b5a66738a58adb7e20d21 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 26 Aug 2012 17:31:37 +0200 Subject: DB/Misc: * Fix phaseMask for Mature Lasher * Implement Essence of Wintergrasp only for wintergrasp zone --- sql/updates/world/2012_08_26_01_world_creature.sql | 1 + sql/updates/world/2012_08_26_02_world_spell_area.sql | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_08_26_01_world_creature.sql create mode 100644 sql/updates/world/2012_08_26_02_world_spell_area.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_08_26_01_world_creature.sql b/sql/updates/world/2012_08_26_01_world_creature.sql new file mode 100644 index 00000000000..af14886850d --- /dev/null +++ b/sql/updates/world/2012_08_26_01_world_creature.sql @@ -0,0 +1 @@ +UPDATE `creature` SET `phaseMask`=256 WHERE `id`=34300; diff --git a/sql/updates/world/2012_08_26_02_world_spell_area.sql b/sql/updates/world/2012_08_26_02_world_spell_area.sql new file mode 100644 index 00000000000..c4eae68e3c4 --- /dev/null +++ b/sql/updates/world/2012_08_26_02_world_spell_area.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_area` WHERE spell=58045; +INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(58045,4197,0,0,0,0,0,2,1); -- cgit v1.2.3 From fcd48335e8efc194d8c731eaf7fe39d7166dce52 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 26 Aug 2012 19:38:05 +0200 Subject: Core/Spells: Implement Battleground - Dampening for wintergrasp --- sql/updates/world/2012_08_26_03_world_spell_area.sql | 3 +++ src/server/game/Spells/SpellMgr.cpp | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 sql/updates/world/2012_08_26_03_world_spell_area.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2012_08_26_03_world_spell_area.sql b/sql/updates/world/2012_08_26_03_world_spell_area.sql new file mode 100644 index 00000000000..65072d2b4a7 --- /dev/null +++ b/sql/updates/world/2012_08_26_03_world_spell_area.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_area` WHERE spell=74411 AND `area`=4197; +INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(74411,4197,0,0,0,0,0,2,1); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 2633fd8ea30..b580c5e2282 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1177,6 +1177,16 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 return battlefieldWG->IsEnabled() && (player->GetTeamId() == battlefieldWG->GetDefenderTeam()) && !battlefieldWG->IsWarTime(); break; } + case 74411: // Battleground - Dampening + { + if (!player) + return false; + + if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(player->GetZoneId())) + return bf->IsWarTime(); + break; + } + } return true; -- cgit v1.2.3