Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
This commit is contained in:
Vincent-Michael
2014-08-28 21:00:53 +02:00
parent c0c708cf02 d6dbe52e64
commit 3a248fbfec
26 changed files with 382 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
sql/base/characters_database.sql
View File

@@ -2605,6 +2605,66 @@ LOCK TABLES `pool_quest_save` WRITE;
/*!40000 ALTER TABLE `pool_quest_save` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `pvpstats_battlegrounds`
--
DROP TABLE IF EXISTS `pvpstats_battlegrounds`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `pvpstats_battlegrounds` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`winner_faction` tinyint(4) NOT NULL,
`bracket_id` tinyint(3) unsigned NOT NULL,
`type` tinyint(3) unsigned NOT NULL,
`date` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `pvpstats_battlegrounds`
--
LOCK TABLES `pvpstats_battlegrounds` WRITE;
/*!40000 ALTER TABLE `pvpstats_battlegrounds` DISABLE KEYS */;
/*!40000 ALTER TABLE `pvpstats_battlegrounds` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `pvpstats_players`
--
DROP TABLE IF EXISTS `pvpstats_players`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `pvpstats_players` (
`battleground_id` bigint(20) unsigned NOT NULL,
`character_guid` int(10) unsigned NOT NULL,
`score_killing_blows` mediumint(8) unsigned NOT NULL,
`score_deaths` mediumint(8) unsigned NOT NULL,
`score_honorable_kills` mediumint(8) unsigned NOT NULL,
`score_bonus_honor` mediumint(8) unsigned NOT NULL,
`score_damage_done` mediumint(8) unsigned NOT NULL,
`score_healing_done` mediumint(8) unsigned NOT NULL,
`attr_1` mediumint(8) unsigned NOT NULL DEFAULT '0',
`attr_2` mediumint(8) unsigned NOT NULL DEFAULT '0',
`attr_3` mediumint(8) unsigned NOT NULL DEFAULT '0',
`attr_4` mediumint(8) unsigned NOT NULL DEFAULT '0',
`attr_5` mediumint(8) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`battleground_id`,`character_guid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `pvpstats_players`
--
LOCK TABLES `pvpstats_players` WRITE;
/*!40000 ALTER TABLE `pvpstats_players` DISABLE KEYS */;
/*!40000 ALTER TABLE `pvpstats_players` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `reserved_name`
--
@@ -2684,4 +2744,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2014-01-26 14:39:20
-- Dump completed on 2014-08-28 15:30:47

28
sql/updates/characters/2014_08_28_00_characters_pvpstats.sql Normal file
View File

@@ -0,0 +1,28 @@
DROP TABLE IF EXISTS `pvpstats_battlegrounds`;
CREATE TABLE `pvpstats_battlegrounds` (
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
`winner_faction` TINYINT NOT NULL,
`bracket_id` TINYINT UNSIGNED NOT NULL,
`type` TINYINT UNSIGNED NOT NULL,
`date` DATETIME NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
DROP TABLE IF EXISTS `pvpstats_players`;
CREATE TABLE `pvpstats_players` (
`battleground_id` BIGINT UNSIGNED NOT NULL,
`character_guid` INT UNSIGNED NOT NULL,
`score_killing_blows` MEDIUMINT UNSIGNED NOT NULL,
`score_deaths` MEDIUMINT UNSIGNED NOT NULL,
`score_honorable_kills` MEDIUMINT UNSIGNED NOT NULL,
`score_bonus_honor` MEDIUMINT UNSIGNED NOT NULL,
`score_damage_done` MEDIUMINT UNSIGNED NOT NULL,
`score_healing_done` MEDIUMINT UNSIGNED NOT NULL,
`attr_1` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0,
`attr_2` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0,
`attr_3` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0,
`attr_4` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0,
`attr_5` MEDIUMINT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (`battleground_id`, `character_guid`)
) ENGINE=InnoDB;

2
sql/updates/world/2014_08_27_00_world_creature_template.sql Normal file
View File

@@ -0,0 +1,2 @@
--
UPDATE `creature_template` SET `ScriptName`='' WHERE `ScriptName`='npc_valiant';

0
sql/updates/world/2014_08_27_00_world_misc.sql → sql/updates/world/2014_08_27_02_world_misc.sql
View File

22
sql/updates/world/2014_08_28_00_world_misc.sql Normal file
View File

@@ -0,0 +1,22 @@
SET @ENTRY := 28511;
UPDATE `creature_template` SET `spell1`=51859,`spell2`=51904,`spell3`=52006,`spell4`=0,`spell5`=52694,`unit_flags`=16777224,`InhabitType`=5,`ScriptName`='npc_eye_of_acherus' WHERE `entry` = @ENTRY;
DELETE FROM `creature_template_addon` WHERE`entry`=@ENTRY;
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
(@ENTRY, 0, 0, 0x0, 0x1, 0, '51892');
DELETE FROM `waypoint_data` WHERE`id`=@ENTRY * 100;
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(@ENTRY * 100, 0, 2341.571, -5672.797, 538.3942, 0, 0, 1, 0, 100, 0),
(@ENTRY * 100, 1, 1957.396, -5844.105, 273.8667, 0, 0, 1, 0, 100, 0),
(@ENTRY * 100, 2, 1758.007, -5876.785, 166.8667, 0, 0, 1, 0, 100, 0);
DELETE FROM `creature_text` WHERE`entry`=@ENTRY;
INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
(@ENTRY, 0, 0, 'The Eye of Acherus launches towards its destination.', 42, 0, 100, 0, 0, 0, 'Eye of Acherus'),
(@ENTRY, 1, 0, 'The Eye of Acherus is in your control.', 42, 0, 100, 0, 0, 0, 'Eye of Acherus');
DELETE FROM `spell_script_names` WHERE spell_id=52694;
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(52694,'spell_q12641_recall_eye_of_acherus');