From 9ad5dce64ce97557beb55facb1f9d8fd2d032e5c Mon Sep 17 00:00:00 2001 From: DDuarte Date: Thu, 30 Oct 2014 13:29:33 +0000 Subject: [PATCH 01/16] SQL: Update /dev/world_database.sql --- sql/base/dev/world_database.sql | 240 +++++++++++++++++++------------- 1 file changed, 140 insertions(+), 100 deletions(-) diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql index bd1db442770..82d08621789 100644 --- a/sql/base/dev/world_database.sql +++ b/sql/base/dev/world_database.sql @@ -1,8 +1,8 @@ --- MySQL dump 10.15 Distrib 10.0.13-MariaDB, for Win64 (x86) +-- MySQL dump 10.13 Distrib 5.6.9-rc, for Win64 (x86_64) -- --- Host: localhost Database: world +-- Host: localhost Database: world335 -- ------------------------------------------------------ --- Server version 10.0.13-MariaDB +-- Server version 5.6.9-rc /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -276,6 +276,8 @@ CREATE TABLE `creature` ( `guid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Global Unique Identifier', `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Creature Identifier', `map` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier', + `zoneId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Zone Identifier', + `areaId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Area Identifier', `spawnMask` tinyint(3) unsigned NOT NULL DEFAULT '1', `phaseMask` int(10) unsigned NOT NULL DEFAULT '1', `modelid` mediumint(8) unsigned NOT NULL DEFAULT '0', @@ -389,14 +391,17 @@ DROP TABLE IF EXISTS `creature_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `creature_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -653,14 +658,17 @@ DROP TABLE IF EXISTS `disenchant_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `disenchant_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Recommended id selection: item_level*100 + item_quality', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(9) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -707,14 +715,17 @@ DROP TABLE IF EXISTS `fishing_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `fishing_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1024,6 +1035,8 @@ CREATE TABLE `gameobject` ( `guid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Global Unique Identifier', `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Gameobject Identifier', `map` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier', + `zoneId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Zone Identifier', + `areaId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Area Identifier', `spawnMask` tinyint(3) unsigned NOT NULL DEFAULT '1', `phaseMask` int(10) unsigned NOT NULL DEFAULT '1', `position_x` float NOT NULL DEFAULT '0', @@ -1050,14 +1063,17 @@ DROP TABLE IF EXISTS `gameobject_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `gameobject_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1240,14 +1256,17 @@ DROP TABLE IF EXISTS `item_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `item_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2003,14 +2022,17 @@ DROP TABLE IF EXISTS `mail_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `mail_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2022,14 +2044,17 @@ DROP TABLE IF EXISTS `milling_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `milling_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2266,14 +2291,17 @@ DROP TABLE IF EXISTS `pickpocketing_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `pickpocketing_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2614,14 +2642,17 @@ DROP TABLE IF EXISTS `prospecting_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `prospecting_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2827,14 +2858,17 @@ DROP TABLE IF EXISTS `reference_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `reference_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -2956,14 +2990,17 @@ DROP TABLE IF EXISTS `skinning_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `skinning_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -3252,14 +3289,17 @@ DROP TABLE IF EXISTS `spell_loot_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `spell_loot_template` ( - `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', - `item` mediumint(8) unsigned NOT NULL DEFAULT '0', - `ChanceOrQuestChance` float NOT NULL DEFAULT '100', - `lootmode` smallint(5) unsigned NOT NULL DEFAULT '1', - `groupid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `mincountOrRef` mediumint(8) NOT NULL DEFAULT '1', - `maxcount` tinyint(3) unsigned NOT NULL DEFAULT '1', - PRIMARY KEY (`entry`,`item`) + `Entry` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Item` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Reference` mediumint(8) unsigned NOT NULL DEFAULT '0', + `Chance` float NOT NULL DEFAULT '100', + `QuestRequired` tinyint(1) NOT NULL DEFAULT '0', + `LootMode` smallint(5) unsigned NOT NULL DEFAULT '1', + `GroupId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `MinCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `MaxCount` tinyint(3) unsigned NOT NULL DEFAULT '1', + `Comment` varchar(255) DEFAULT NULL, + PRIMARY KEY (`Entry`,`Item`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System'; /*!40101 SET character_set_client = @saved_cs_client */; @@ -3634,4 +3674,4 @@ CREATE TABLE `waypoints` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2014-09-21 17:08:37 +-- Dump completed on 2014-10-30 13:28:50 From 29d4afd88743adb720370a86b163f93d00a3c238 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Thu, 30 Oct 2014 20:09:37 -0200 Subject: [PATCH 02/16] DB/Achievement: Remove unneeded criteria data for "A Tribute to Immortality" Required team is already checked from dbc on criteria update Closes #4622 Thanks to @joschiwald (cherry picked from commit 1823e2f9b822b163a7f79719e6c8d1504707292e) --- sql/updates/world/2014_10_30_02_world.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2014_10_30_02_world.sql diff --git a/sql/updates/world/2014_10_30_02_world.sql b/sql/updates/world/2014_10_30_02_world.sql new file mode 100644 index 00000000000..a3de351d578 --- /dev/null +++ b/sql/updates/world/2014_10_30_02_world.sql @@ -0,0 +1 @@ +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12358, 12359) AND `type` = 14; From 5dd990156c759412a21fa527279a813fa4066425 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sat, 1 Nov 2014 01:44:54 +0000 Subject: [PATCH 03/16] DB/Quest: New Recruit Fix New Recruit http://www.wowhead.com/quest=13143 --- sql/updates/world/2014_11_01_00_world.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sql/updates/world/2014_11_01_00_world.sql diff --git a/sql/updates/world/2014_11_01_00_world.sql b/sql/updates/world/2014_11_01_00_world.sql new file mode 100644 index 00000000000..6623f1e00b1 --- /dev/null +++ b/sql/updates/world/2014_11_01_00_world.sql @@ -0,0 +1,13 @@ +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry` IN(30894,31049); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN(30894,31049) AND `source_type`=0; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(30894, 0, 0, 1, 8, 0, 100, 0, 58151, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Spellhit (Subdued Lithe Stalker) - Store Targetlist'), +(30894, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Spellhit (Subdued Lithe Stalker) - Follow Target'), +(30894, 0, 2, 3, 8, 0, 100, 0, 58178, 0, 0, 0, 33, 31049, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Spellhit (CSA Dummy Effect) - Give Kill Credit'), +(30894, 0, 3, 0, 61, 0, 100, 0, 58178, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Spellhit (CSA Dummy Effect) - Despawn'), +(31049, 0, 0, 0, 1, 0, 100, 0, 0, 0, 1000, 1000, 11, 58178, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Geist Return Bunny - OOC - Cast CSA Dummy Effect (25 yards)'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=30894; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(22, 4, 30894, 0, 0, 1, 1, 58151, 0, 0, 0, 0, 0, '', 'Only run AI if Lithe Stalker has Aura (Subdued Lithe Stalker)'); From e5da0dccfac75fc1ccb111b9977f31ff35745922 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sat, 1 Nov 2014 00:10:42 -0200 Subject: [PATCH 04/16] Scripts/ToC: Twin Val'kyr - Script rewritten to EventMaps - Implemented random special ability sequence - Adjusted timer for special abilities to 45 seconds - Misc clean up. Closes #7546 --- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 210 +++++++++--------- 1 file changed, 102 insertions(+), 108 deletions(-) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 63b47da0807..cbab1158910 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -31,7 +31,7 @@ #include "CellImpl.h" #include "trial_of_the_crusader.h" -enum Yells +enum Texts { SAY_AGGRO = 0, SAY_NIGHT = 1, @@ -91,6 +91,23 @@ enum BossSpells SPELL_SURGE_OF_SPEED = 65828 }; +enum Events +{ + EVENT_TWIN_SPIKE = 1, + EVENT_TOUCH = 2, + EVENT_SPECIAL_ABILITY = 3, + EVENT_BERSERK = 4 +}; + +enum Stages +{ + STAGE_DARK_VORTEX, + STAGE_DARK_PACT, + STAGE_LIGHT_VORTEX, + STAGE_LIGHT_PACT, + MAX_STAGES +}; + #define SPELL_DARK_ESSENCE_HELPER RAID_MODE(65684, 67176, 67177, 67178) #define SPELL_LIGHT_ESSENCE_HELPER RAID_MODE(65686, 67222, 67223, 67224) @@ -101,8 +118,9 @@ enum BossSpells enum Actions { - ACTION_VORTEX = 0, - ACTION_PACT = 1 + ACTION_VORTEX, + ACTION_PACT, + ACTION_SPECIAL_ABILITY }; #define ESSENCE_REMOVE 0 @@ -143,14 +161,8 @@ struct boss_twin_baseAI : public BossAI { boss_twin_baseAI(Creature* creature) : BossAI(creature, BOSS_VALKIRIES) { - Initialize(); AuraState = AURA_STATE_NONE; - - Stage = 0; - Weapon = 0; - - VortexEmote = 0; SisterNpcId = 0; MyEmphatySpellId = 0; OtherEssenceSpellId = 0; @@ -162,16 +174,6 @@ struct boss_twin_baseAI : public BossAI TouchSpellId = 0; } - void Initialize() - { - IsBerserk = false; - - SpecialAbilityTimer = 1 * MINUTE*IN_MILLISECONDS; - SpikeTimer = 20 * IN_MILLISECONDS; - TouchTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS); - BerserkTimer = IsHeroic() ? 6 * MINUTE*IN_MILLISECONDS : 10 * MINUTE*IN_MILLISECONDS; - } - void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); @@ -180,7 +182,6 @@ struct boss_twin_baseAI : public BossAI /* Uncomment this once that they are floating above the ground me->SetLevitate(true); me->SetFlying(true); */ - Initialize(); summons.DespawnAll(); } @@ -218,11 +219,6 @@ struct boss_twin_baseAI : public BossAI } } - void JustSummoned(Creature* summoned) override - { - summons.Summon(summoned); - } - void SummonedCreatureDespawn(Creature* summoned) override { switch (summoned->GetEntry()) @@ -282,6 +278,11 @@ struct boss_twin_baseAI : public BossAI Talk(SAY_AGGRO); DoCast(me, SurgeSpellId); + + events.ScheduleEvent(EVENT_TWIN_SPIKE, 20 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_BERSERK, IsHeroic() ? 6 * MINUTE*IN_MILLISECONDS : 10 * MINUTE*IN_MILLISECONDS); + if (IsHeroic()) + events.ScheduleEvent(EVENT_TOUCH, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS)); } void DoAction(int32 action) override @@ -289,10 +290,16 @@ struct boss_twin_baseAI : public BossAI switch (action) { case ACTION_VORTEX: - Stage = me->GetEntry() == NPC_LIGHTBANE ? 2 : 1; + Talk(EMOTE_VORTEX); + DoCastAOE(VortexSpellId); break; case ACTION_PACT: - Stage = me->GetEntry() == NPC_LIGHTBANE ? 1 : 2; + Talk(EMOTE_TWINK_PACT); + Talk(SAY_TWINK_PACT); + if (Creature* sister = GetSister()) + sister->CastSpell(sister, SPELL_POWER_TWINS, false); + DoCast(me, ShieldSpellId); + DoCast(me, TwinPactSpellId); break; default: break; @@ -305,95 +312,31 @@ struct boss_twin_baseAI : public BossAI me->SetCanDualWield(mode); } - void UpdateAI(uint32 diff) override + void ExecuteEvent(uint32 eventId) override { - if (!instance || !UpdateVictim()) - return; - - if (me->HasUnitState(UNIT_STATE_CASTING)) - return; - - switch (Stage) + switch (eventId) { - case 0: + case EVENT_TWIN_SPIKE: + DoCastVictim(SpikeSpellId); + events.ScheduleEvent(EVENT_TWIN_SPIKE, 20 * IN_MILLISECONDS); break; - case 1: // Vortex - if (SpecialAbilityTimer <= diff) - { - if (Creature* pSister = GetSister()) - pSister->AI()->DoAction(ACTION_VORTEX); - Talk(VortexEmote); - DoCastAOE(VortexSpellId); - Stage = 0; - SpecialAbilityTimer = 1*MINUTE*IN_MILLISECONDS; - } - else - SpecialAbilityTimer -= diff; + case EVENT_TOUCH: + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true, OtherEssenceSpellId)) + me->CastCustomSpell(TouchSpellId, SPELLVALUE_MAX_TARGETS, 1, target, false); + events.ScheduleEvent(EVENT_TOUCH, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS)); break; - case 2: // Shield + Pact - if (SpecialAbilityTimer <= diff) - { - Talk(EMOTE_TWINK_PACT); - Talk(SAY_TWINK_PACT); - if (Creature* pSister = GetSister()) - { - pSister->AI()->DoAction(ACTION_PACT); - pSister->CastSpell(pSister, SPELL_POWER_TWINS, false); - } - DoCast(me, ShieldSpellId); - DoCast(me, TwinPactSpellId); - Stage = 0; - SpecialAbilityTimer = 1*MINUTE*IN_MILLISECONDS; - } - else - SpecialAbilityTimer -= diff; + case EVENT_BERSERK: + DoCast(me, SPELL_BERSERK); + Talk(SAY_BERSERK); break; default: break; } - - if (SpikeTimer <= diff) - { - DoCastVictim(SpikeSpellId); - SpikeTimer = 20*IN_MILLISECONDS; - } - else - SpikeTimer -= diff; - - if (IsHeroic() && TouchTimer <= diff) - { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true, OtherEssenceSpellId)) - me->CastCustomSpell(TouchSpellId, SPELLVALUE_MAX_TARGETS, 1, target, false); - TouchTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); - } - else - TouchTimer -= diff; - - if (!IsBerserk && BerserkTimer <= diff) - { - DoCast(me, SPELL_BERSERK); - Talk(SAY_BERSERK); - IsBerserk = true; - } - else - BerserkTimer -= diff; - - DoMeleeAttackIfReady(); } protected: AuraStateType AuraState; - - uint8 Stage; - bool IsBerserk; - uint32 Weapon; - uint32 SpecialAbilityTimer; - uint32 SpikeTimer; - uint32 TouchTimer; - uint32 BerserkTimer; - - int32 VortexEmote; uint32 SisterNpcId; uint32 MyEmphatySpellId; uint32 OtherEssenceSpellId; @@ -414,15 +357,14 @@ class boss_fjola : public CreatureScript { boss_fjolaAI(Creature* creature) : boss_twin_baseAI(creature) { + GenerateStageSequence(); } void Reset() override { SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); - Stage = 0; Weapon = EQUIP_MAIN_1; AuraState = AURA_STATE_UNKNOWN22; - VortexEmote = EMOTE_VORTEX; SisterNpcId = NPC_DARKBANE; MyEmphatySpellId = SPELL_TWIN_EMPATHY_DARK; OtherEssenceSpellId = SPELL_DARK_ESSENCE_HELPER; @@ -437,10 +379,43 @@ class boss_fjola : public CreatureScript boss_twin_baseAI::Reset(); } + void ExecuteEvent(uint32 eventId) override + { + if (eventId == EVENT_SPECIAL_ABILITY) + { + if (CurrentStage == MAX_STAGES) + GenerateStageSequence(); + + switch (Stage[CurrentStage]) + { + case STAGE_DARK_VORTEX: + if (Creature* sister = GetSister()) + sister->AI()->DoAction(ACTION_VORTEX); + break; + case STAGE_DARK_PACT: + if (Creature* sister = GetSister()) + sister->AI()->DoAction(ACTION_PACT); + break; + case STAGE_LIGHT_VORTEX: + me->AI()->DoAction(ACTION_VORTEX); + break; + case STAGE_LIGHT_PACT: + me->AI()->DoAction(ACTION_PACT); + break; + default: + break; + } + ++CurrentStage; + events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45 * IN_MILLISECONDS); + } + else + boss_twin_baseAI::ExecuteEvent(eventId); + } + void EnterCombat(Unit* who) override { instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, EVENT_START_TWINS_FIGHT); - + events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45 * IN_MILLISECONDS); me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN); boss_twin_baseAI::EnterCombat(who); } @@ -457,6 +432,27 @@ class boss_fjola : public CreatureScript boss_twin_baseAI::JustReachedHome(); } + + void GenerateStageSequence() + { + CurrentStage = 0; + + // Initialize and clean up. + for (int i = 0; i < MAX_STAGES; ++i) + Stage[i] = i; + + // Allocate an unique random stage to each position in the array. + for (int i = 0; i < MAX_STAGES - 1; ++i) + { + int random = i + (rand32() % (MAX_STAGES - i)); + int temp = Stage[i]; + Stage[i] = Stage[random]; + Stage[random] = temp; + } + } + private: + uint8 Stage[4]; + uint8 CurrentStage; }; CreatureAI* GetAI(Creature* creature) const override @@ -477,10 +473,8 @@ class boss_eydis : public CreatureScript void Reset() override { SetEquipmentSlots(false, EQUIP_MAIN_2, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); - Stage = 1; Weapon = EQUIP_MAIN_2; AuraState = AURA_STATE_UNKNOWN19; - VortexEmote = EMOTE_VORTEX; SisterNpcId = NPC_LIGHTBANE; MyEmphatySpellId = SPELL_TWIN_EMPATHY_LIGHT; OtherEssenceSpellId = SPELL_LIGHT_ESSENCE_HELPER; From 141cf754d60dd1ffe9799100e75d7d9597b06f4c Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sat, 1 Nov 2014 02:38:01 +0000 Subject: [PATCH 05/16] DB/Quest: The Vile Hold Script Eye of Dominion / Lithestalker for http://www.wowhead.com/quest=13145 --- sql/updates/world/2014_11_01_01_world.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sql/updates/world/2014_11_01_01_world.sql diff --git a/sql/updates/world/2014_11_01_01_world.sql b/sql/updates/world/2014_11_01_01_world.sql new file mode 100644 index 00000000000..4f1b4f738db --- /dev/null +++ b/sql/updates/world/2014_11_01_01_world.sql @@ -0,0 +1,16 @@ +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=193424; +DELETE FROM `smart_scripts` WHERE `entryorguid`=193424 AND `source_type`=1; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(193424, 1, 0, 1, 62, 0, 100, 0, 10111, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Eye of Dominion - On Gossip Option 0 Selected - Close Gossip'), +(193424, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 85, 58106, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Eye of Dominion - On Gossip Option 0 Selected - Invoker Cast Forcecast: Control Lithe Stalker'), +(193424, 1, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 85, 58037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Eye of Dominion - On Gossip Option 0 Selected - Invoker Cast Control Lithe Stalker'); + +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry` =30895; +DELETE FROM `smart_scripts` WHERE `entryorguid` =30895 AND `source_type`=0; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(30895, 0, 0, 0, 27, 0, 100, 1, 0, 0, 0, 0, 11, 58117, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Passenger Boarded - Cast Force Reaction: Scourge'), +(30895, 0, 1, 0, 28, 0, 100, 1, 0, 0, 0, 0, 28, 58117, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Passenger Removed - Remove Aura Force Reaction: Scourge'); + +UPDATE `creature_template` SET `spell1`=57882, `spell2`=58203, `spell3`=58282, `spell4`=58283 WHERE `entry`=30895; From 0ef518fefc6477797862178ad6ad7f978afb2af8 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sat, 1 Nov 2014 00:42:05 -0200 Subject: [PATCH 06/16] Scripts/ToC: Misc forgotten clean ups --- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index cbab1158910..4ffecad04e0 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -37,8 +37,8 @@ enum Texts SAY_NIGHT = 1, SAY_LIGHT = 2, EMOTE_VORTEX = 3, - EMOTE_TWINK_PACT = 4, - SAY_TWINK_PACT = 5, + EMOTE_TWIN_PACT = 4, + SAY_TWIN_PACT = 5, SAY_KILL_PLAYER = 6, SAY_BERSERK = 7, SAY_DEATH = 8 @@ -294,8 +294,8 @@ struct boss_twin_baseAI : public BossAI DoCastAOE(VortexSpellId); break; case ACTION_PACT: - Talk(EMOTE_TWINK_PACT); - Talk(SAY_TWINK_PACT); + Talk(EMOTE_TWIN_PACT); + Talk(SAY_TWIN_PACT); if (Creature* sister = GetSister()) sister->CastSpell(sister, SPELL_POWER_TWINS, false); DoCast(me, ShieldSpellId); @@ -397,10 +397,10 @@ class boss_fjola : public CreatureScript sister->AI()->DoAction(ACTION_PACT); break; case STAGE_LIGHT_VORTEX: - me->AI()->DoAction(ACTION_VORTEX); + DoAction(ACTION_VORTEX); break; case STAGE_LIGHT_PACT: - me->AI()->DoAction(ACTION_PACT); + DoAction(ACTION_PACT); break; default: break; From 820e3eb2eb273bf7587e5e45fa7e989e053a7969 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sat, 1 Nov 2014 02:45:40 +0000 Subject: [PATCH 07/16] DB/Quest: A Undead's Best Friend / Eidolan Watcher Fix http://www.wowhead.com/quest=13169/an-undeads-best-friend and other quests using this vehicle Only major bug as with the lithe stalker is when player exits vehicle player should get teleported back to position where they mounted vehicle as if it was pocessed but this is vehicle --- sql/updates/world/2014_11_01_02_world.sql | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 sql/updates/world/2014_11_01_02_world.sql diff --git a/sql/updates/world/2014_11_01_02_world.sql b/sql/updates/world/2014_11_01_02_world.sql new file mode 100644 index 00000000000..3bb7e3a033b --- /dev/null +++ b/sql/updates/world/2014_11_01_02_world.sql @@ -0,0 +1,29 @@ + UPDATE `smart_scripts` SET `event_type`=25 WHERE `entryorguid`=29717 AND `source_type`=0 AND `id`=0 AND `link`=0; + + UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN(31119,30952,30951,31131,30951); + + DELETE FROM `smart_scripts` WHERE `entryorguid`IN(31110,31119,30952,3095200,31131,3113100,30951); + INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES + (31110, 0, 0, 0, 54, 0, 100, 1, 0, 0, 0, 0, 11, 58548, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Eidolon Watcher - On Just Summoned - Cast Ethereal'), + (31110, 0, 1, 0, 27, 0, 100, 1, 0, 0, 0, 0, 11, 58548, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Eidolon Watcher - On Passenger Boarded - Cast Ethereal'), + (31110, 0, 2, 0, 28, 0, 100, 1, 0, 0, 0, 0, 28, 58548, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Eidolon Watcher - On Passenger Removed - Remove Ethereal'), + (31110, 0, 3, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 58548, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Eidolon Watcher - On Reset - Cast Ethereal'), + (31119, 0, 0, 1, 54, 0, 100, 1, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Bloody Meat - On Just Summoned - Store Targetlist'), + (31119, 0, 1, 0, 61, 0, 100, 1, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 30952, 0, 0, 0, 0, 0, 0, 'Bloody Meat - On Just Summoned - Set Data on Hungering Plaguehound'), + (31119, 0, 2, 3, 38, 0, 100, 1, 1, 1, 0, 0, 11, 58564, 2, 0, 0, 0, 0, 21, 100, 0, 0, 0, 0, 0, 0, 'Bloody Meat - On Data Set - Give Kill Credit'), + (31119, 0, 3, 0, 61, 0, 100, 1, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Bloody Meat - On Data Set - Despawn'), + (30952, 0, 0, 0, 75, 0, 100, 0, 0, 31119, 20, 15000, 80, 3095200, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound - On Bloody Meat within 20 yards - Run Script'), + (30951, 0, 0, 0, 8, 0, 100, 0, 45254, 0, 0, 0, 33, 30951, 0, 0, 0, 0, 0, 21, 50, 0, 0, 0, 0, 0, 0, 'Restless Lookout - On Spellhit - Killcredit'), + (31131, 0, 0, 0, 8, 0, 100, 0, 58662, 0, 300000, 300000, 80, 3113100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Containment Crystal - On Spellhit - Run Script'), + (3113100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, 31131, 0, 0, 0, 0, 0, 21, 50, 0, 0, 0, 0, 0, 0, 'Containment Crystal - Script - Kill Credit'), + (3113100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 90, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Containment Crystal - Script - Set Bytes 1'), + (3113100, 9, 2, 0, 0, 0, 100, 0, 300000, 300000, 0, 0, 91, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Containment Crystal - Script - Remove Bytes 1'), + (3095200, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound - Script - Disable Random Move'), + (3095200, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 19, 31119, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound - Script - Move to Bloodymeat'), + (3095200, 9, 2, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 31119, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound - Script - Move to Bloodymeat'), + (3095200, 9, 3, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound - Script - Evade'), + (3095200, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 89, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hungering Plaguehound - Script - Enable Random Move'); + + DELETE FROM `spell_linked_spell` WHERE `spell_trigger`IN(-58563); + INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES + (-58563, 45254, 0,'Assasinate Restless Lookout triggers Suicide'); From f6896c9a3a460047b47190d2964d73029bf33eb1 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sat, 1 Nov 2014 01:58:49 -0200 Subject: [PATCH 08/16] Scripts/ToC: Few codestyle changes and clean ups --- .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 13 ++----------- .../TrialOfTheCrusader/boss_northrend_beasts.cpp | 4 +--- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 3 +-- .../TrialOfTheCrusader/trial_of_the_crusader.cpp | 4 +--- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index a8a370076a8..f26ccd6bf25 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -97,9 +97,7 @@ class boss_jaraxxus : public CreatureScript struct boss_jaraxxusAI : public BossAI { - boss_jaraxxusAI(Creature* creature) : BossAI(creature, BOSS_JARAXXUS) - { - } + boss_jaraxxusAI(Creature* creature) : BossAI(creature, BOSS_JARAXXUS) { } void Reset() override { @@ -136,11 +134,6 @@ class boss_jaraxxus : public CreatureScript Talk(SAY_DEATH); } - void JustSummoned(Creature* summoned) override - { - summons.Summon(summoned); - } - void EnterCombat(Unit* /*who*/) override { _EnterCombat(); @@ -370,9 +363,7 @@ class npc_nether_portal : public CreatureScript struct npc_nether_portalAI : public ScriptedAI { - npc_nether_portalAI(Creature* creature) : ScriptedAI(creature), _summons(me) - { - } + npc_nether_portalAI(Creature* creature) : ScriptedAI(creature), _summons(me) { } void Reset() override { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 771151632ff..2f7722d96fc 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -156,9 +156,7 @@ class boss_gormok : public CreatureScript struct boss_gormokAI : public BossAI { - boss_gormokAI(Creature* creature) : BossAI(creature, BOSS_BEASTS) - { - } + boss_gormokAI(Creature* creature) : BossAI(creature, BOSS_BEASTS) { } void Reset() override { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 4ffecad04e0..75649215db6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -119,8 +119,7 @@ enum Stages enum Actions { ACTION_VORTEX, - ACTION_PACT, - ACTION_SPECIAL_ABILITY + ACTION_PACT }; #define ESSENCE_REMOVE 0 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 885017c24dd..e79437b06a2 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -111,9 +111,7 @@ class npc_announcer_toc10 : public CreatureScript struct npc_announcer_toc10AI : public ScriptedAI { - npc_announcer_toc10AI(Creature* creature) : ScriptedAI(creature) - { - } + npc_announcer_toc10AI(Creature* creature) : ScriptedAI(creature) { } void Reset() override { From 08721749a2e1ff6cfd813943e312aed142d78bc1 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sat, 1 Nov 2014 23:49:10 +0000 Subject: [PATCH 09/16] DB/Misc: Lithe Stalker Quests Fix: - http://www.wowhead.com/quest=13146 Generosity Abounds http://www.wowhead.com/quest=13147 Matchmaker http://www.wowhead.com/quest=13160 Stunning View Closes https://github.com/TrinityCore/TrinityCore/issues/11855 Closes https://github.com/TrinityCore/TrinityCore/issues/13487 --- sql/updates/world/2014_11_01_03_world.sql | 60 +++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 sql/updates/world/2014_11_01_03_world.sql diff --git a/sql/updates/world/2014_11_01_03_world.sql b/sql/updates/world/2014_11_01_03_world.sql new file mode 100644 index 00000000000..dad3773f912 --- /dev/null +++ b/sql/updates/world/2014_11_01_03_world.sql @@ -0,0 +1,60 @@ +DELETE FROM `smart_scripts` WHERE `entryorguid`=30922 AND `source_type`=0 AND `id` IN(3,4,5,6); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(30922, 0, 3, 4, 8, 0, 100, 0, 58283, 0, 120000, 120000, 11, 52353, 0, 0, 0, 0, 0, 19, 30895, 0, 0, 0, 0, 0, 0, 'Umbral Brute - On Spellhit (Throw Rock) - Cast Script Effect - Creature Capture GUID to Dot Variable'), +(30922, 0, 4, 5,61, 0, 100, 0, 0, 0, 0, 0, 11, 56685, 0, 0, 0, 0, 0, 19, 30921, 0, 0, 0, 0, 0, 0, 'Umbral Brute - On Spellhit (Throw Rock) - Cast CSA Dummy Effect 1'), +(30922, 0, 5, 6,61, 0, 100, 0, 0, 0, 0, 0, 11, 59120, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Umbral Brute - On Spellhit (Throw Rock) - Cast Scourge Fight Kill Credit'), +(30922, 0, 6, 0,61, 0, 100, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 30895, 0, 0, 0, 0, 0, 0, 'Umbral Brute - On Spellhit (Throw Rock) - Set Data 1 1 - Lithe Stalker'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=30895 AND `source_type`=0 AND `id` IN(2,3,4,5); + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(30895, 0, 2, 0, 38, 0, 100, 0, 1, 1, 0, 0, 11, 59129, 2, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Data Set 1 1 - Cast Scourge Fight Kill Credit For Real'), +(30895, 0, 3, 4, 38, 0, 100, 0, 2, 2, 0, 0, 11, 59098, 2, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Data Set 2 2 - Cast Scourge Bomb Kill Credit'), +(30895, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 28, 58203, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Data Set 2 2 - Remove Iron chain'), +(30895, 0, 5, 0, 38, 0, 100, 0, 3, 3, 0, 0, 11, 59137, 2, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Lithe Stalker - On Data Set 3 3 - Cast Gargoyle Kill Credit'); + +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry` =31075; +DELETE FROM `smart_scripts` WHERE `entryorguid` =31075 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` =3107500 AND `source_type`=9; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(31075, 0, 0, 0, 8, 0, 100, 0, 58203, 0, 30000, 30000, 29, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Scourge Bomb - On Spell Hit (Iron Chain) - Follow Lith Stalker'), +(31075, 0, 1, 0, 34, 0, 100, 0, 0, 0, 0, 0, 11, 58206, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Scourge Bomb - On Movement Inform - Cast Scourge Bomb Dragging Aura'), +(31075, 0, 2, 0, 38, 0, 100, 0, 1, 1, 0, 0, 80, 3107500, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Scourge Bomb - On Data Set 1 1 - Run Script'), +(31075, 0, 3, 0, 1, 0, 100, 0, 1000, 1000, 1000, 1000, 101, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Scourge Bomb - OOC - Set Home Position'), +(3107500, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 59078, 0, 0, 0, 0, 0, 19, 30920, 0, 0, 0, 0, 0, 0, 'Scourge Bomb - Script - Cast Scourge Bomb Explosion'), +(3107500, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 1000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Scourge Bomb - Script - Despawn'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=30920 AND `source_type`=0 AND `id` >0; +DELETE FROM `smart_scripts` WHERE `entryorguid` =3092000 AND `source_type`=9; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(30920, 0, 1, 2, 75, 0, 100, 1, 0, 31075, 5, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - On Scourge Bomb within 5 yards - say'), +(30920, 0, 2, 3, 61, 0, 100, 1, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 31075, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - On Scourge Bomb within 5 yards - Set Data 1 1 on Scourge Bomb'), +(30920, 0, 3, 4, 61, 0, 100, 1, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 30895, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - On Scourge Bomb within 5 yards - Set Data 2 2 on Lithstalker'), +(30920, 0, 4, 0, 61, 0, 100, 1, 0, 0, 0, 0, 80, 3092000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - On Scourge Bomb within 5 yards - Run Script'), + +(3092000, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 52593, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - Script - Cast Bloated Abomination Feign Death'), +(3092000, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 52516, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - Script - Cast Burst at the Seams:Bone'), +(3092000, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 52520, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - Script - Cast Explode Abomination:Meat'), +(3092000, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 52523, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - Script - Cast Explode Abomination:Bloody Meat'), +(3092000, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 58231, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - Script - Cast Exploding Abomination'), +(3092000, 9, 5, 0, 0, 0, 100, 0, 400, 400, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lumbering Atrocity - Script - Despawn'); + +DELETE FROM `creature_text` WHERE `entry`=30920; +INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES +(30920, 0, 0, 'What little geist want?', 12, 0, 100, 0, 0, 0, 'Lumbering Atrocity',31614), +(30920, 0, 1, 'Present?', 12, 0, 100, 0, 0, 0, 'Lumbering Atrocity',31609), +(30920, 0, 2, 'That not nice!', 12, 0, 100, 0, 0, 0, 'Lumbering Atrocity',31615), +(30920, 0, 3, 'What bomb thing for?', 12, 0, 100, 0, 0, 0, 'Lumbering Atrocity',31610), +(30920, 0, 4, 'Want me to deliver somewhere?', 12, 0, 100, 0, 0, 0, 'Lumbering Atrocity',31611), +(30920, 0, 5, 'I not sure this safe, little geist.', 12, 0, 100, 0, 0, 0, 'Lumbering Atrocity',31612), +(30920, 0, 6, 'This no go here.', 12, 0, 100, 0, 0, 0, 'Lumbering Atrocity',31613), +(30920, 0, 7, 'For me?', 12, 0, 100, 0, 0, 0, 'Lumbering Atrocity',31608); + +UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry` =31012; +DELETE FROM `smart_scripts` WHERE `entryorguid` =31012 AND `source_type`=0; + +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(31012, 0, 0, 1, 8, 0, 100, 1, 58282, 0, 0, 0, 11, 58285, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Iceskin Sentry - On Spellhiy - Cast Gargoyle Explosion'), +(31012, 0, 1, 0, 61, 0, 100, 1, 0, 0, 0, 0, 45, 3, 3, 0, 0, 0, 0, 19, 30895, 0, 0, 0, 0, 0, 0, 'Iceskin Sentry - On Spellhiy - Set Data 3 3 on Lithe Stalker'); From d0ae5070caedba8e11995bf70f6516b2d0765e3a Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 2 Nov 2014 01:33:16 +0000 Subject: [PATCH 10/16] DB/Misc: Eye of Dominion gossip conditions --- sql/updates/world/2014_11_02_00_world.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/2014_11_02_00_world.sql diff --git a/sql/updates/world/2014_11_02_00_world.sql b/sql/updates/world/2014_11_02_00_world.sql new file mode 100644 index 00000000000..33eccda9b32 --- /dev/null +++ b/sql/updates/world/2014_11_02_00_world.sql @@ -0,0 +1,10 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceEntry` IN(10111,10028); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 10111, 0, 0, 0, 9, 0, 13145, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken The Vile Hold (13145)'), +(15, 10111, 0, 0, 1, 9, 0, 13146, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken Generosity Abounds (13146)'), +(15, 10111, 0, 0, 2, 9, 0, 13147, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken Matchmaker (13147)'), +(15, 10111, 0, 0, 3, 9, 0, 13147, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken Stunning View (13160)'), +(15, 10028, 0, 0, 0, 9, 0, 13168, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken Parting Gifts (13168)'), +(15, 10028, 0, 0, 1, 9, 0, 13169, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken An Undeads Best Friend (13169)'), +(15, 10028, 0, 0, 2, 9, 0, 13171, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken From Whence They Came (13171)'), +(15, 10028, 0, 0, 3, 9, 0, 13170, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken Honor is for the Weak (13170)'); From 3f094b9116d934ffeee917b0abf9ccd622381f68 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sun, 2 Nov 2014 01:17:45 -0200 Subject: [PATCH 11/16] Scripts/ToC: Remove a safe-measure call that caused issues Closes #11874 --- .../TrialOfTheCrusader/boss_northrend_beasts.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 2f7722d96fc..021cae3e623 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -640,7 +640,6 @@ struct boss_jormungarAI : public BossAI me->SetDisplayId(ModelMobile); me->RemoveAurasDueToSpell(SPELL_SUBMERGE_0); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - me->GetMotionMaster()->Clear(); // if the worm was mobile before submerging, make him stationary now if (WasMobile) @@ -721,9 +720,7 @@ class boss_dreadscale : public CreatureScript struct boss_dreadscaleAI : public boss_jormungarAI { - boss_dreadscaleAI(Creature* creature) : boss_jormungarAI(creature) - { - } + boss_dreadscaleAI(Creature* creature) : boss_jormungarAI(creature) { } void Reset() override { From dd1e9ecd5aa501f28ad71ae8dd497f591b31f709 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 2 Nov 2014 11:10:20 +0000 Subject: [PATCH 12/16] DB/Misc: Put right fieldnae in delete clause which was causing error on apply --- sql/updates/world/2014_11_02_00_world.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/updates/world/2014_11_02_00_world.sql b/sql/updates/world/2014_11_02_00_world.sql index 33eccda9b32..adf9c036723 100644 --- a/sql/updates/world/2014_11_02_00_world.sql +++ b/sql/updates/world/2014_11_02_00_world.sql @@ -1,4 +1,4 @@ -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceEntry` IN(10111,10028); +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN(10111,10028); INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (15, 10111, 0, 0, 0, 9, 0, 13145, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken The Vile Hold (13145)'), (15, 10111, 0, 0, 1, 9, 0, 13146, 0, 0, 0, 0, 0, '', 'Eye of Dominion - Show gossip option only if player has taken Generosity Abounds (13146)'), From 9cd59c258cdb455850a250842651c426dac36f05 Mon Sep 17 00:00:00 2001 From: MitchesD Date: Sun, 2 Nov 2014 17:16:48 +0100 Subject: [PATCH 13/16] Scripts/CoS: removed SetDespawnAtFar, fixed situation when Artas attacked some NPC and disappeared because he was out of range of players With these lines it's almost impossible to finish properly this dungeon. For example when Arthas moves ahead to attack NPC and then returns back, when this happens, Arthas is despawned. --- .../CullingOfStratholme/culling_of_stratholme.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index fd5e328b7f2..b84d24d66d3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -292,7 +292,6 @@ public: break; } player->CLOSE_GOSSIP_MENU(); - ai->SetDespawnAtFar(true); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); return true; } @@ -574,7 +573,6 @@ public: break; case 45: SetRun(true); - SetDespawnAtFar(false); gossipStep = 4; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetHoldState(true); @@ -901,7 +899,6 @@ public: instance->SetBossState(DATA_ARTHAS, IN_PROGRESS); me->SetReactState(REACT_DEFENSIVE); - SetDespawnAtFar(false); JumpToNextStep(5000); break; // Summon wave groups - start the Infinite Corruptor timer From 11e192cb8157be43b9affa2e429efdeb26ddb649 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 2 Nov 2014 17:44:27 +0000 Subject: [PATCH 14/16] DB/SAI: Clear param2 for Remove Aura Clear exististing data in param2 for sai entries using smart_action 28 as these param was previously unused but some lines of sai still had this param > 0 --- sql/updates/world/2014_11_02_01_world.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2014_11_02_01_world.sql diff --git a/sql/updates/world/2014_11_02_01_world.sql b/sql/updates/world/2014_11_02_01_world.sql new file mode 100644 index 00000000000..9003dd15c74 --- /dev/null +++ b/sql/updates/world/2014_11_02_01_world.sql @@ -0,0 +1 @@ +UPDATE `smart_scripts` SET `action_param2`=0 WHERE `action_type`=28 and `action_param2`>0; From b61098a2d451fde5199ddce132ad3f2ed806e743 Mon Sep 17 00:00:00 2001 From: Discover- Date: Sun, 2 Nov 2014 17:30:44 +0100 Subject: [PATCH 15/16] Core/SAI: Allow dropping a specific amount of aura charges using SMART_ACTION_REMOVEAURASFROMSPELL (action_param2). (cherry picked from commit ed4feec276bd395715c23c58b74a6dae4198039b) --- src/server/game/AI/SmartScripts/SmartScript.cpp | 10 +++++++++- src/server/game/AI/SmartScripts/SmartScriptMgr.h | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index f3060972288..36918231fbb 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -776,7 +776,15 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u continue; if (e.action.removeAura.spell) - (*itr)->ToUnit()->RemoveAurasDueToSpell(e.action.removeAura.spell); + { + if (e.action.removeAura.charges) + { + if (Aura* aur = (*itr)->ToUnit()->GetAura(e.action.removeAura.spell)) + aur->ModCharges(-e.action.removeAura.charges, AURA_REMOVE_BY_EXPIRE); + } + else + (*itr)->ToUnit()->RemoveAurasDueToSpell(e.action.removeAura.spell); + } else (*itr)->ToUnit()->RemoveAllAuras(); diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 9bb34d1347e..71a3ed8156f 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -444,7 +444,7 @@ enum SMART_ACTION SMART_ACTION_FLEE_FOR_ASSIST = 25, // With Emote SMART_ACTION_CALL_GROUPEVENTHAPPENS = 26, // QuestID // none = 27, - SMART_ACTION_REMOVEAURASFROMSPELL = 28, // Spellid, 0 removes all auras + SMART_ACTION_REMOVEAURASFROMSPELL = 28, // Spellid (0 removes all auras), charges (0 removes aura) SMART_ACTION_FOLLOW = 29, // Distance (0 = default), Angle (0 = default), EndCreatureEntry, credit, creditType (0monsterkill, 1event) SMART_ACTION_RANDOM_PHASE = 30, // PhaseId1, PhaseId2, PhaseId3... SMART_ACTION_RANDOM_PHASE_RANGE = 31, // PhaseMin, PhaseMax @@ -656,6 +656,7 @@ struct SmartAction struct { uint32 spell; + uint32 charges; } removeAura; struct From 64e34cdec837f9375d6d2ba6b12def8a534e08e7 Mon Sep 17 00:00:00 2001 From: Duarte Duarte Date: Wed, 22 Oct 2014 23:38:08 +0100 Subject: [PATCH 16/16] Merge pull request #13432 from bloerwald/fix_compiler_detection_on_unix cmake: platform: also detect clang by C_COMPILER_ID: C_COMPILER may vary (cherry picked from commit 774e22ec4a8859664ace0a532c2ab4ae220e5cc9) --- cmake/platform/unix/settings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 42bfefa6994..ab54124b5a1 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -37,7 +37,7 @@ if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake) -elseif(CMAKE_C_COMPILER MATCHES "clang") +elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) else() add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')