Merge. Revision history for source files should be all back now.

--HG-- branch : trunk rename : sql/CMakeLists.txt => sql/tools/CMakeLists.txt rename : src/server/game/Pools/PoolHandler.cpp => src/server/game/Pools/PoolMgr.cpp rename : src/server/game/Pools/PoolHandler.h => src/server/game/Pools/PoolMgr.h rename : src/server/game/PrecompiledHeaders/NixCorePCH.cpp => src/server/game/PrecompiledHeaders/gamePCH.cpp rename : src/server/game/PrecompiledHeaders/NixCorePCH.h => src/server/game/PrecompiledHeaders/gamePCH.h
2010-07-20 02:49:28 +02:00
commit 79622802f3
@@ -0,0 +1,254 @@
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: realmd
+-- ------------------------------------------------------
+-- Server version	5.0.45-Debian_1ubuntu3.1-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+-- 
+-- Table structure for table `account_access`
+-- 
+
+DROP TABLE IF EXISTS `account_access`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account_access` (
+  `id` int(11) unsigned NOT NULL,
+  `gmlevel` tinyint(3) unsigned NOT NULL,
+  `RealmID` int(11) NOT NULL default '-1',
+  PRIMARY KEY  (`id`,`RealmID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+-- 
+-- Dumping data for table `account_access`
+-- 
+
+LOCK TABLES `account_access` WRITE;
+/*!40000 ALTER TABLE `account_access` DISABLE KEYS */;
+/*!40000 ALTER TABLE `account_access` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `account`
+--
+
+DROP TABLE IF EXISTS `account`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account` (
+  `id` int(11) unsigned NOT NULL auto_increment COMMENT 'Identifier',
+  `username`      varchar(32) NOT NULL default '',
+  `sha_pass_hash` varchar(40) NOT NULL default '',
+  `sessionkey` longtext,
+  `v` longtext,
+  `s` longtext,
+  `email` text,
+  `joindate` timestamp NOT NULL default CURRENT_TIMESTAMP,
+  `last_ip` varchar(30) NOT NULL default '127.0.0.1',
+  `failed_logins` int(11) unsigned NOT NULL default '0',
+  `locked` tinyint(3) unsigned NOT NULL default '0',
+  `last_login` timestamp NOT NULL default '0000-00-00 00:00:00',
+  `online` tinyint(4) NOT NULL default '0',
+  `expansion` tinyint(3) unsigned NOT NULL default '2',
+  `mutetime` bigint(40) unsigned NOT NULL default '0',
+  `locale` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `idx_username` (`username`)
+) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC COMMENT='Account System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `account`
+--
+
+LOCK TABLES `account` WRITE;
+/*!40000 ALTER TABLE `account` DISABLE KEYS */;
+/*!40000 ALTER TABLE `account` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `account_banned`
+--
+
+DROP TABLE IF EXISTS `account_banned`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account_banned` (
+  `id` int(11) NOT NULL default '0' COMMENT 'Account id',
+  `bandate` bigint(40) NOT NULL default '0',
+  `unbandate` bigint(40) NOT NULL default '0',
+  `bannedby` varchar(50) NOT NULL,
+  `banreason` varchar(255) NOT NULL,
+  `active` tinyint(4) NOT NULL default '1',
+  PRIMARY KEY  (`id`,`bandate`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Ban List';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `account_banned`
+--
+
+LOCK TABLES `account_banned` WRITE;
+/*!40000 ALTER TABLE `account_banned` DISABLE KEYS */;
+/*!40000 ALTER TABLE `account_banned` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `ip_banned`
+--
+
+DROP TABLE IF EXISTS `ip_banned`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ip_banned` (
+  `ip` varchar(32) NOT NULL default '127.0.0.1',
+  `bandate` bigint(40) NOT NULL,
+  `unbandate` bigint(40) NOT NULL,
+  `bannedby` varchar(50) NOT NULL default '[Console]',
+  `banreason` varchar(255) NOT NULL default 'no reason',
+  PRIMARY KEY  (`ip`,`bandate`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Banned IPs';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ip_banned`
+--
+
+LOCK TABLES `ip_banned` WRITE;
+/*!40000 ALTER TABLE `ip_banned` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ip_banned` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `logs`
+--
+
+DROP TABLE IF EXISTS `logs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `logs` (
+  `time` int(14) NOT NULL,
+  `realm` int(4) NOT NULL,
+  `type` int(4) NOT NULL,
+  `string` text
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `logs`
+--
+
+LOCK TABLES `logs` WRITE;
+/*!40000 ALTER TABLE `logs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `logs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `realmcharacters`
+--
+
+DROP TABLE IF EXISTS `realmcharacters`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `realmcharacters` (
+  `realmid` int(11) unsigned NOT NULL default '0',
+  `acctid` bigint(20) unsigned NOT NULL,
+  `numchars` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`realmid`,`acctid`),
+  KEY (acctid)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm Character Tracker';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `realmcharacters`
+--
+
+LOCK TABLES `realmcharacters` WRITE;
+/*!40000 ALTER TABLE `realmcharacters` DISABLE KEYS */;
+/*!40000 ALTER TABLE `realmcharacters` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `realmlist`
+--
+
+DROP TABLE IF EXISTS `realmlist`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `realmlist` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `name` varchar(32) NOT NULL default '',
+  `address` varchar(32) NOT NULL default '127.0.0.1',
+  `port` int(11) NOT NULL default '8085',
+  `icon` tinyint(3) unsigned NOT NULL default '0',
+  `color` tinyint(3) unsigned NOT NULL default '2',
+  `timezone` tinyint(3) unsigned NOT NULL default '0',
+  `allowedSecurityLevel` tinyint(3) unsigned NOT NULL default '0',
+  `population` float unsigned NOT NULL default '0',
+  `gamebuild` int(11) unsigned NOT NULL default '12340',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `idx_name` (`name`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `realmlist`
+--
+
+LOCK TABLES `realmlist` WRITE;
+/*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
+INSERT INTO `realmlist` (`id`,`name`,`address`,`port`,`icon`,`color`,`timezone`,`allowedSecurityLevel`,`population`,`gamebuild`) VALUES
+(1,'Trinity','127.0.0.1',8085,1,0,1,0,0,12340);
+/*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `uptime`
+--
+
+DROP TABLE IF EXISTS `uptime`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `uptime` (
+  `realmid` int(11) unsigned NOT NULL,
+  `starttime` bigint(20) unsigned NOT NULL default '0',
+  `startstring` varchar(64) NOT NULL default '',
+  `uptime` bigint(20) unsigned NOT NULL default '0',
+  `maxplayers` smallint(5) unsigned NOT NULL default '0',
+  `revision` VARCHAR(255) NOT NULL DEFAULT 'Trinitycore',
+  PRIMARY KEY  (`realmid`,`starttime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Uptime system';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `uptime`
+--
+
+LOCK TABLES `uptime` WRITE;
+/*!40000 ALTER TABLE `uptime` DISABLE KEYS */;
+/*!40000 ALTER TABLE `uptime` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2008-01-10 11:37:06
+
+-- Updated on 2010-01-29 23:21:45 GMT+1
@@ -0,0 +1,5 @@
+########### install files ###############
+
+FILE(GLOB _SQL *.sql)
+
+install(FILES ${_SQL} DESTINATION share/trinity/sql/tools)
@@ -0,0 +1,13 @@
+GRANT USAGE ON * . * TO 'trinity'@'localhost' IDENTIFIED BY 'trinity' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 ;
+
+CREATE DATABASE `world` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+CREATE DATABASE `characters` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+CREATE DATABASE `auth` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+GRANT ALL PRIVILEGES ON `world` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
+
+GRANT ALL PRIVILEGES ON `characters` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
+
+GRANT ALL PRIVILEGES ON `auth` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
@@ -0,0 +1,21 @@
+REVOKE ALL PRIVILEGES ON * . * FROM 'trinity'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `world` . * FROM 'trinity'@'localhost';
+
+REVOKE GRANT OPTION ON `world` . * FROM 'trinity'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `characters` . * FROM 'trinity'@'localhost';
+
+REVOKE GRANT OPTION ON `characters` . * FROM 'trinity'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `auth` . * FROM 'trinity'@'localhost';
+
+REVOKE GRANT OPTION ON `auth` . * FROM 'trinity'@'localhost';
+
+DROP USER 'trinity'@'localhost';
+
+DROP DATABASE IF EXISTS `world`;
+
+DROP DATABASE IF EXISTS `characters`;
+
+DROP DATABASE IF EXISTS `auth`;
@@ -1,7 +0,0 @@
-########### install files ###############
-
-FILE(GLOB _SQL *.sql)
-FILE(GLOB README readme.txt)
-
-install(FILES ${_SQL} DESTINATION share/trinity/sql/FULL)
-install(FILES ${README} DESTINATION share/trinity/sql/FULL)
@@ -0,0 +1,5 @@
+########### install files ###############
+
+FILE(GLOB _SQL *.sql)
+
+install(FILES ${README} DESTINATION share/trinity/sql/full)
@@ -423,6 +423,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
   (23861,-1000471,'It was... terrible... the demon...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
   (23864,-1000472,'This land was mine long before your wretched kind set foot here.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
   (23864,-1000473,'All who venture here belong to me, including you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
+   (17375, -1000474, '[Fulborg] The Stillpine furbolgs will not soon forget your bravery!', 0, 0, 'Stillpine Capitive free say text 1'),
+   (17375, -1000475, '[Fulborg] Thank you, $N', 0, 0, 'Stillpine Capitive free say text 2'),
+   (17375, -1000476, '[Fulborg] Those remaining at Stillpine Hold will welcome you as a hero!', 0, 0, 'Stillpine Capitive free say text 3');
   (26588,-1800001, 'Um... I think one of those wolves is back...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, '12027'),
   (26588,-1800002, 'He''s going for Mr. Floppy! ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, '12027'),
   (26588,-1800003, 'Oh, no! Look, it''s another wolf, and it''s a biiiiiig one!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0, '12027'),
@@ -1797,9 +1800,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
 -- Skadi the Ruthless voice
   (26693,-1575004,'What mongrels dare intrude here? Look alive, my brothers! A feast for the one that brings me their heads!' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13497,1,0,0, 'Skadi - SAY_AGGRO'),
   (26693,-1575005,'Not so brash now, are you?' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13504,1,0,0, 'Skadi - SAY_KILL_1'),
-   (26693,-1575006,'I'll mount your skull from the highest tower!' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13505,1,0,0, 'Skadi - SAY_KILL_2'),
+   (26693,-1575006,'I''ll mount your skull from the highest tower!' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13505,1,0,0, 'Skadi - SAY_KILL_2'),
   (26693,-1575007,'%s in within range of the harpoon launchers!' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0, 'Skadi - EMOTE_RANGE'),
-   (26693,-1575008,'ARGH! You call that... an attack? I'll... show... aghhhh...' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13506,1,0,0, 'Skadi - SAY_DEATH'),
+   (26693,-1575008,'ARGH! You call that... an attack? I''ll... show... aghhhh...' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13506,1,0,0, 'Skadi - SAY_DEATH'),
   (26693,-1575009,'%s in within range of the harpoon launchers!' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0, 'Skadi - EMOTE_RANGE'),
   (26693,-1575010,'You motherless knaves! Your corpses will make fine morsels for my new drake!' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13507,1,0,0, 'Skadi - SAY_DRAKE_DEATH'),
   (26693,-1575011,'Sear them to the bone!' ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13498,1,0,0, 'Skadi - SAY_DRAKE_BREATH_1'),
@@ -2257,3 +2257,13 @@ INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`,`location_y`, `l
 (12717, 27, 3621.08, 1138.11, 10.369, 0, 'SAY_MUG_RETURN'),
 (12717, 28, 3615.48, 1145.53, 9.614, 0, ''),
 (12717, 29, 3607.19, 1152.72, 8.871, 0, '');
+
+-- Waypoints for Mimiron Inferno
+DELETE FROM `script_waypoint` WHERE `entry`=33370;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(33370, 1, 331.674, -68.6878, 409.804, 0, '0'),
+(33370, 2, 274.578, -92.1829, 409.804, 0, '0'),
+(33370, 3, 226.433, -66.6652, 409.793, 0, '0'),
+(33370, 4, 206.092, -34.7447, 409.801, 0, '0'),
+(33370, 5, 240.208, 1.10346, 409.802, 0, '0'),
+(33370, 6, 337.199, 11.7051, 409.802, 0, '0');
@@ -36,7 +36,9 @@ INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
 (1737, 'at_scent_larkorwi'),
 (1738, 'at_scent_larkorwi'),
 (1739, 'at_scent_larkorwi'),
-(1740, 'at_scent_larkorwi');
+(1740, 'at_scent_larkorwi'),
+(5369, 'at_RX_214_repair_o_matic_station'),
+(5423, 'at_RX_214_repair_o_matic_station');


 /* WORLD BOSS */
@@ -272,8 +274,9 @@ UPDATE `creature_template` SET `ScriptName`='npc_geezle' WHERE `entry`=17318;
 UPDATE `creature_template` SET `ScriptName`='npc_nestlewood_owlkin' WHERE `entry`=16518;
 UPDATE `creature_template` SET `ScriptName`='npc_draenei_survivor' WHERE `entry`=16483;
 UPDATE `creature_template` SET `ScriptName`='npc_death_ravager' WHERE `entry`=17556;
+UPDATE `creature_template` SET `ScriptName`='npc_stillpine_capitive' where `entry`=17375;
 UPDATE `gameobject_template` SET `ScriptName`='go_ravager_cage' WHERE `entry`=181849;
-UPDATE `gameobject_template` SET `ScriptName`='go_stillpine_cage' WHERE `entry`=181714;
+UPDATE `gameobject_template` SET `ScriptName`='go_bristlelimb_cage' WHERE `entry`=181714;

 /* BADLANDS */

@@ -445,6 +448,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_magmoth_crusher' WHERE `entry`=
 UPDATE `creature_template` SET `ScriptName`='npc_valiance_keep_cannoneer' WHERE `entry`=25306;
 UPDATE `creature_template` SET `ScriptName`='npc_warmage_coldarra' WHERE `entry` IN (27173,27904,27906);
 UPDATE `creature_template` SET `ScriptName`='npc_valiance_keep_cannoneer' WHERE `entry`=25306;
+UPDATE `creature_template` SET `ScriptName`= 'npc_seaforium_depth_charge' WHERE `entry`=25401;
+

 /* BURNING STEPPES */
 UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563;
@@ -583,6 +588,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_inquisitor_hallard' WHERE `entr
 /* DESOLACE */
 UPDATE `creature_template` SET `ScriptName`='npc_aged_dying_ancient_kodo' WHERE `entry` IN (4700,4701,4702,11627);
 UPDATE `gameobject_template` SET `ScriptName`='go_iruxos' WHERE `entry`=176581;
+UPDATE `creature_template` SET `ScriptName`='npc_dalinda' WHERE `entry`=5644;


 /* DIRE MAUL */
@@ -1427,6 +1433,19 @@ UPDATE `creature_template` SET `ScriptName`='boss_kologarn' WHERE `entry`=32930;
 UPDATE `creature_template` SET `ScriptName`='boss_algalon' WHERE `entry`=32871;
 UPDATE `creature_template` SET `ScriptName`='mob_collapsing_star' WHERE `entry`=32955;
 UPDATE `gameobject_template` SET `ScriptName`='ulduar_teleporter' WHERE `entry`=194569;
+UPDATE `creature_template` SET `ScriptName`= 'npc_thorims_hammer' WHERE `entry`=33365;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mimirons_inferno' WHERE `entry`=33370;
+UPDATE `creature_template` SET `ScriptName`= 'npc_hodirs_fury' WHERE `entry`=33312;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freyas_ward' WHERE `entry`=33367;
+UPDATE `creature_template` SET `ScriptName`= 'npc_lorekeeper' WHERE `entry`=33686;
+UPDATE `creature_template` SET `ScriptName`= 'npc_brann_bronzebeard' WHERE `entry`=33579;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freya_ward_summon' WHERE `entry`=34275;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mechanolift' WHERE `entry`=33214;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194375;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194371;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194370;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194377;
+

 /* UN'GORO CRATER */
 UPDATE `creature_template` SET `ScriptName`='npc_ame' WHERE `entry`=9623;
@@ -1491,6 +1510,19 @@ UPDATE `creature_template` SET `ScriptName`='boss_moragg' WHERE `entry`=29316;
 UPDATE `creature_template` SET `ScriptName`='boss_xevozz' WHERE `entry`=29266;
 UPDATE `creature_template` SET `ScriptName`='mob_ethereal_sphere' WHERE `entry`=29271;
 UPDATE `creature_template` SET `ScriptName`='boss_cyanigosa' WHERE `entry`=31134;
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30661; 
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30662;
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30663;
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30664;
+update `creature_template` SET `scriptname`='mob_azure_captain' WHERE `entry`=30666;
+update `creature_template` SET `scriptname`='mob_azure_sorceror' WHERE `entry`=30667;
+update `creature_template` SET `scriptname`='mob_azure_raider' WHERE `entry`=30668;
+update `creature_template` SET `scriptname`='mob_azure_stalker' WHERE `entry`=32191;
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30961;
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30962;
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30918;
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30963;
+UPDATE `creature_template` SET `scriptname`='mob_azure_saboteur' WHERE `entry`=31079;
 UPDATE `instance_template` SET `script`='instance_violet_hold' WHERE `map`=608;

 /* WAILING CAVERNS */
@@ -1,5 +1,7 @@
 add_subdirectory(updates)
-add_subdirectory(FULL)
+add_subdirectory(scripts)
+add_subdirectory(base)
+add_subdirectory(create)

 ########### install files ###############

@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_243 *.sql)

-INSTALL(FILES
-${_SQL_243}
-DESTINATION share/trinity/sql/updates/2.4.3_updates)
+INSTALL(FILES ${_SQL_243} DESTINATION share/trinity/sql/updates/2.4.3_old)
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_309 *.sql)

-INSTALL(FILES
-${_SQL_309}
-DESTINATION share/trinity/sql/updates/3.0.9_old)
+INSTALL(FILES ${_SQL_309} DESTINATION share/trinity/sql/updates/3.0.9_old)
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_313 *.sql)

-INSTALL(FILES
-${_SQL_313}
-DESTINATION share/trinity/sql/updates/3.1.3_old)
+INSTALL(FILES ${_SQL_313} DESTINATION share/trinity/sql/updates/3.1.3_old)
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_322 *.sql)

-INSTALL(FILES
-${_SQL_322}
-DESTINATION share/trinity/sql/updates/3.2.2a_old)
+INSTALL(FILES ${_SQL_322} DESTINATION share/trinity/sql/updates/3.2.2a_old)
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_332 *.sql)

-INSTALL(FILES
-${_SQL_332}
-DESTINATION share/trinity/sql/updates/3.3.2_old)
+INSTALL(FILES ${_SQL_332} DESTINATION share/trinity/sql/updates/3.3.2_old)
@@ -1,5 +1,4 @@
 DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN (52418, -52418);
-
 INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
 (52415, 52418, 0, 'Carrying Seaforium - Add'),
 (52410, -52418, 0, 'Carrying Seaforium - Remove');
@@ -1,6 +1,7 @@
 -- ----------------------------
 -- Table structure for conditions
 -- ----------------------------
+DROP TABLE IF EXISTS `conditions`;
 CREATE TABLE `conditions` (
  `SourceTypeOrReferenceId` mediumint(8) NOT NULL DEFAULT '0',
  `SourceGroup` mediumint(8) unsigned NOT NULL DEFAULT '0',
@@ -0,0 +1 @@
+UPDATE spell_proc_event SET SpellFamilyMask0 = SpellFamilyMask0 | 0x40000000, procEx = ProcEx | 0x0000001 WHERE entry IN(53569,53576);
@@ -0,0 +1 @@
+UPDATE spell_proc_event SET procEx = 0x0 WHERE entry IN(53569,53576);
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name`='reload creature_onkill_reputation';
+INSERT INTO `command` VALUES 
+('reload creature_onkill_reputation','3','Syntax: .reload creature_onkill_reputation\r\nReload creature_onkill_reputation table.');
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry`=70761;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+( 70761, 0x00,  10, 0x00000000, 0x80004000, 0x00000001, 0x00000400, 0x00000000,   0,   0,   0); -- Item - Paladin T10 Protection 4P Bonus
@@ -0,0 +1 @@
+ALTER TABLE npc_vendor CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) NOT NULL default '0' COMMENT 'negative if cost must exclude normal money cost';
@@ -0,0 +1,3 @@
+DELETE FROM trinity_string WHERE entry IN (210);
+INSERT INTO trinity_string VALUES
+(210,'Item \'%i\' (with extended cost %i) already in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -0,0 +1,2 @@
+DELETE FROM command WHERE name = 'reload conditions';
+INSERT INTO command (name, security, help) VALUES ('reload conditions', 3, 'Reload conditions table.');
@@ -0,0 +1 @@
+DELETE FROM command WHERE name = 'reload spell_script_target';
@@ -0,0 +1,4 @@
+DELETE FROM `command` WHERE `name` IN ('reload item_set_names','reload locales_item_set_name');
+INSERT INTO `command` VALUES 
+('reload item_set_names',3,'Syntax: .reload item_set_names\nReload item_set_names table.'),
+('reload locales_item_set_name',3,'Syntax: .reload locales_item_set_name\nReload locales_item_set_name table.');
@@ -0,0 +1,14 @@
+--
+-- Table structure for table `item_set_names`
+--
+
+DROP TABLE IF EXISTS `item_set_names`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_set_names` (
+  `entry` mediumint(8) unsigned NOT NULL,
+  `name` varchar(255) character set utf8 NOT NULL default '',
+  `InventoryType` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
@@ -0,0 +1,20 @@
+--
+-- Table structure for table `locales_item_set_name`
+--
+
+DROP TABLE IF EXISTS `locales_item_set_name`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `locales_item_set_name` (
+  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `name_loc1` varchar(100) NOT NULL DEFAULT '',
+  `name_loc2` varchar(100) NOT NULL DEFAULT '',
+  `name_loc3` varchar(100) NOT NULL DEFAULT '',
+  `name_loc4` varchar(100) NOT NULL DEFAULT '',
+  `name_loc5` varchar(100) NOT NULL DEFAULT '',
+  `name_loc6` varchar(100) NOT NULL DEFAULT '',
+  `name_loc7` varchar(100) NOT NULL DEFAULT '',
+  `name_loc8` varchar(100) NOT NULL DEFAULT '',
+  PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
@@ -0,0 +1 @@
+ALTER TABLE `item_set_names` ADD COLUMN `WDBVerified` smallint(5) signed NOT NULL DEFAULT '1';
@@ -0,0 +1 @@
+UPDATE `spell_proc_event` SET `Cooldown`=30 WHERE `entry` IN (30886, 30885, 30884, 30883, 30881);
@@ -0,0 +1 @@
+ALTER TABLE `playercreateinfo_item` CHANGE `amount` `amount` tinyint(3) NOT NULL DEFAULT '1';
@@ -0,0 +1,2 @@
+UPDATE `pool_creature` SET `description` = `comment` WHERE `comment` <> '' AND `comment` IS NOT NULL AND (`description` = '' OR `description` IS NULL);
+ALTER TABLE `pool_creature` DROP COLUMN `comment`;
@@ -0,0 +1,2 @@
+UPDATE `pool_template` SET `description` = `comment` WHERE `comment` <> '' AND `comment` IS NOT NULL AND (`description` = '' OR `description` IS NULL);
+ALTER TABLE `pool_template` DROP COLUMN `comment`;
@@ -0,0 +1 @@
+ALTER TABLE `pool_creature` DROP PRIMARY KEY, ADD PRIMARY KEY (`guid`);
@@ -0,0 +1 @@
+ALTER TABLE `pool_gameobject` DROP PRIMARY KEY, ADD PRIMARY KEY (`guid`);
@@ -0,0 +1 @@
+ALTER TABLE `pool_pool` DROP PRIMARY KEY, ADD PRIMARY KEY (`pool_id`);
@@ -0,0 +1,12 @@
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30661; -- Azure Invader 1
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30662; -- Azure Spellbreaker
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30663; -- Azure Binder 1
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30664; -- Azure Mage Slayer 1
+update `creature_template` SET `scriptname`='mob_azure_captain' WHERE `entry`=30666; -- Azure Captain
+update `creature_template` SET `scriptname`='mob_azure_sorceror' WHERE `entry`=30667; -- Azure Sorceror
+update `creature_template` SET `scriptname`='mob_azure_raider' WHERE `entry`=30668; -- Azure Raider
+update `creature_template` SET `scriptname`='mob_azure_stalker' WHERE `entry`=32191; -- Azure Stalker
+update `creature_template` SET `scriptname`='mob_azure_invader' WHERE `entry`=30961; -- Azure Invader 2
+update `creature_template` SET `scriptname`='mob_azure_spellbreaker' WHERE `entry`=30962; -- Azure Spellbreaker
+update `creature_template` SET `scriptname`='mob_azure_binder' WHERE `entry`=30918; -- Azure Binder 2
+update `creature_template` SET `scriptname`='mob_azure_mage_slayer' WHERE `entry`=30963; -- Azure Mage Sl
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=20066;
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(20066, -61840, 0, 'Repentance');
@@ -0,0 +1,6 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (54861,55004)AND `spell_effect` IN (-23335,-23333);
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(54861,-23335,0, 'Drop Flag on Nitro Boost WSG'),
+(54861,-23333,0, 'Drop Flag on Nitro Boost WSG'),
+(55004,-23335,0, 'Drop Flag on Nitro Boost WSG'),
+(55004,-23333,0, 'Drop Flag on Nitro Boost WSG');
@@ -0,0 +1,2 @@
+-- Drop forgotten fields after condition implementation
+ALTER TABLE gossip_menu_option DROP COLUMN cond_3,DROP COLUMN cond_3_val_1,DROP COLUMN cond_3_val_2;
@@ -0,0 +1,4 @@
+-- Add serverside spells place holders for future development
+DELETE FROM `spell_dbc` WHERE `Id`=39616;
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(39616, 'Quest 10966 reward serverside spell');
@@ -0,0 +1,4 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (54861,55004)AND `spell_effect` IN (-34976);
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+( 54861,-34976, 0, 'Drop Flag on Nitro Boost EOS'),
+( 55004,-34976, 0, 'Drop Flag on Nitro Boost EOS');
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `transport_events`;
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `scriptname`='mob_azure_saboteur' WHERE `entry`=31079; -- Azure Saboteur
@@ -0,0 +1,4 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5369,5423);
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(5369, 'at_RX_214_repair_o_matic_station'),
+(5423, 'at_RX_214_repair_o_matic_station');
@@ -0,0 +1,9 @@
+-- Waypoints for Mimron Inferno
+DELETE FROM `script_waypoint` WHERE `entry`=33370;
+INSERT INTO `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) VALUES
+(33370, 1, 331.674, -68.6878, 409.804, 0, '0'),
+(33370, 2, 274.578, -92.1829, 409.804, 0, '0'),
+(33370, 3, 226.433, -66.6652, 409.793, 0, '0'),
+(33370, 4, 206.092, -34.7447, 409.801, 0, '0'),
+(33370, 5, 240.208, 1.10346, 409.802, 0, '0'),
+(33370, 6, 337.199, 11.7051, 409.802, 0, '0');
@@ -0,0 +1,12 @@
+UPDATE `creature_template` SET `ScriptName`= 'npc_thorims_hammer' WHERE `entry`=33365;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mimirons_inferno' WHERE `entry`=33370;
+UPDATE `creature_template` SET `ScriptName`= 'npc_hodirs_fury' WHERE `entry`=33312;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freyas_ward' WHERE `entry`=33367;
+UPDATE `creature_template` SET `ScriptName`= 'npc_lorekeeper' WHERE `entry`=33686;
+UPDATE `creature_template` SET `ScriptName`= 'npc_brann_bronzebeard' WHERE `entry`=33579;
+UPDATE `creature_template` SET `ScriptName`= 'npc_freya_ward_summon' WHERE `entry`=34275;
+UPDATE `creature_template` SET `ScriptName`= 'npc_mechanolift' WHERE `entry`=33214;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194375;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194371;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194370;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_ulduar_tower' WHERE `entry`=194377;
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS `locales_item_set_names`;
+RENAME TABLE `locales_item_set_name` TO `locales_item_set_names`;
@@ -0,0 +1,4 @@
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (45284,45297);
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(45284,0.357,-1,-1,-1,'Shaman - LO Lightning Bolt'),
+(45297,0.285,-1,-1,-1,'Shaman - LO Chain Lightning');
@@ -0,0 +1,8 @@
+-- Add serverside spells place holders for future development
+DELETE FROM `spell_dbc` WHERE `Id` IN (11202,25359,40145,45767,71098);
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(11202, 'Item 3776 spellid_1 serverside spell'),
+(25359, 'Item 21293 spellid_2 serverside spell'),
+(40145, 'Quest 11000 RewSpellCast serverside spell'),
+(45767, 'Quest 11670 RewSpellCast serverside spell'),
+(71098, 'Quest 24451 RewSpellCast serverside spell');
@@ -0,0 +1,3 @@
+-- Make the Ardent Defender heal (66235) trigger the visuals (66233)
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=66235;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES (66235,66233,0, 'Ardent Defender Visuals');
@@ -0,0 +1,5 @@
+DELETE FROM script_texts where entry IN (-1000474, -1000475, -1000476);
+INSERT INTO script_texts (`npc_entry`, `entry`, `content_default`, `type`, `language`, `comment`) VALUE
+(17375, -1000474, '[Fulborg] The Stillpine furbolgs will not soon forget your bravery!', 0, 0, 'Stillpine Capitive free say text 1'),
+(17375, -1000475, '[Fulborg] Thank you, $N', 0, 0, 'Stillpine Capitive free say text 2'),
+(17375, -1000476, '[Fulborg] Those remaining at Stillpine Hold will welcome you as a hero!', 0, 0, 'Stillpine Capitive free say text 3');
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='npc_stillpine_capitive' where `entry`=17375;
+UPDATE `gameobject_template` SET `ScriptName`='go_stillpine_cage' WHERE `entry`=181714;
@@ -0,0 +1,2 @@
+UPDATE `gameobject_template` SET `ScriptName`='go_bristlelimb_cage' WHERE `entry`=181714;
+
@@ -1,5 +1,3 @@
 FILE(GLOB _SQL_333 *.sql)

-INSTALL(FILES
-${_SQL_333}
-DESTINATION share/trinity/sql/updates/3.3.3a_old)
+INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.3a_old)
@@ -0,0 +1,3 @@
+UPDATE `realmlist` SET `gamebuild`=12340 WHERE `id`=1;
+ALTER TABLE `realmlist` CHANGE COLUMN `gamebuild` `gamebuild` int(11) unsigned NOT NULL default '12340';
+
@@ -0,0 +1,3 @@
+FILE(GLOB _SQL_335 *.sql)
+
+INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.5a_old)
@@ -0,0 +1,3 @@
+ALTER TABLE `spell_dbc`
+  ADD COLUMN `Stances` int(10) unsigned NOT NULL DEFAULT '0' AFTER `AttributesEx5`,
+  ADD COLUMN `StancesNot` int(10) unsigned NOT NULL DEFAULT '0' AFTER `Stances`;
@@ -0,0 +1,2 @@
+UPDATE `spell_dbc` SET `Stances`=0x90 WHERE `Id`=24899;
+UPDATE `spell_dbc` SET `Stances`=0x1 WHERE `Id`=24900;
@@ -0,0 +1,5 @@
+-- Restore negative ExtendedCost, we now use FlagsExtra value instead
+UPDATE `npc_vendor` SET `ExtendedCost`=-`ExtendedCost` WHERE `ExtendedCost`<0;
+
+-- Set field type to unsigned
+ALTER TABLE npc_vendor CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) UNSIGNED NOT NULL default '0' COMMENT '';
@@ -0,0 +1,2 @@
+-- UPDATE so we don't kill customized locale strings if user has any
+UPDATE `trinity_string` SET `content_default`='Item ''%u'' (with extended cost %u) already in vendor list.' WHERE `entry`=210;
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN(67758);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(67758,0,0,0,0,0,0,2,0,0,2);
@@ -0,0 +1,7 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (47201,47202,47203,47204,47205);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(47201,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47202,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47203,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47204,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0),
+(47205,0,5,0x00004009,0x00040000,0x00000000,0x00000000,0x0000000,0,0,0);
@@ -0,0 +1,5 @@
+-- UPDATE so we don't kill customized locale strings if user has any
+UPDATE `trinity_string` SET `content_default`='The old password is wrong' WHERE `entry`=27;
+-- INSERT as this string has not been used before
+DELETE FROM `trinity_string` WHERE `entry`=62;
+INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES (62, 'One on more parameters have incorrect values', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -0,0 +1,4 @@
+-- Add serverside spells place holders for future development
+DELETE FROM `spell_dbc` WHERE `Id` IN (70878);
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(70878, 'Creature 40160 creature_addon serverside spell');
@@ -0,0 +1,4 @@
+-- For quest: Truce?
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=50141;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(50141,50001,0, 'Blood Oath to Blood Oath Aura');
@@ -0,0 +1 @@
+UPDATE `spell_dbc` SET `Effect1`=6,`EffectApplyAuraName1`=4 WHERE `Id` IN (70878);
@@ -0,0 +1,6 @@
+DELETE FROM `spell_group` WHERE `id` = 1103;
+-- Cast Speed Slow
+INSERT INTO `spell_group` (`id`,`spell_id`) VALUES
+(1103,-1100),
+(1103,-1101),
+(1103,-1102);
@@ -4,9 +4,8 @@ add_subdirectory(3.1.3_old)
 add_subdirectory(3.2.2a_old)
 add_subdirectory(3.3.2_old)
 add_subdirectory(3.3.3a_old)
+add_subdirectory(3.3.5a_old)

 FILE(GLOB _SQL_UPDATES *.sql)

-INSTALL(FILES
-${_SQL_UPDATES}
-DESTINATION share/trinity/sql/updates)
+INSTALL(FILES ${_SQL_UPDATES} DESTINATION share/trinity/sql/updates)
				`@@ -0,0 +1 @@`
				`UPDATE spell_proc_event SET SpellFamilyMask0 = SpellFamilyMask0 \| 0x40000000, procEx = ProcEx \| 0x0000001 WHERE entry IN(53569,53576);`
				`@@ -0,0 +1 @@`
				`UPDATE spell_proc_event SET procEx = 0x0 WHERE entry IN(53569,53576);`
				`@@ -0,0 +1 @@`
				ALTER TABLE npc_vendor CHANGE COLUMN `ExtendedCost` `ExtendedCost` mediumint(8) NOT NULL default '0' COMMENT 'negative if cost must exclude normal money cost';
				`@@ -0,0 +1 @@`
				`DELETE FROM command WHERE name = 'reload spell_script_target';`
				`@@ -0,0 +1 @@`
				ALTER TABLE `item_set_names` ADD COLUMN `WDBVerified` smallint(5) signed NOT NULL DEFAULT '1';
				`@@ -0,0 +1 @@`
				UPDATE `spell_proc_event` SET `Cooldown`=30 WHERE `entry` IN (30886, 30885, 30884, 30883, 30881);
				`@@ -0,0 +1 @@`
				ALTER TABLE `playercreateinfo_item` CHANGE `amount` `amount` tinyint(3) NOT NULL DEFAULT '1';
				`@@ -0,0 +1 @@`
				ALTER TABLE `pool_creature` DROP PRIMARY KEY, ADD PRIMARY KEY (`guid`);
				`@@ -0,0 +1 @@`
				ALTER TABLE `pool_gameobject` DROP PRIMARY KEY, ADD PRIMARY KEY (`guid`);
				`@@ -0,0 +1 @@`
				ALTER TABLE `pool_pool` DROP PRIMARY KEY, ADD PRIMARY KEY (`pool_id`);