Compare commits

..

17 Commits

Author SHA1 Message Date
ShinDarth a183ab1646 Merge remote-tracking branch 'upstream/master' 2016-08-11 12:21:11 +02:00
ShinDarth 269b2b726d Add missing world_db_version table update 2016-08-11 12:06:27 +02:00
Yehonal eda5f7bac4 Merge pull request #52 from Luth31/master
Fix CMake on Windows
2016-08-11 00:01:20 +02:00
Luth31 a2c8a0a24e Fix CMake on Windows 2016-08-11 00:03:15 +03:00
ShinDarth 2ba9f6f17b Script/Commands: imported .instance get/setbossstate commands from TrinityCore 2016-08-10 20:00:40 +02:00
ShinDarth f2dfe2b8e3 Core/Strings: imported 157 LANG_* strings from TrinityCore 2016-08-10 19:17:26 +02:00
ShinDarth 9919649b0c Core/CMake: update revision display format 2016-08-10 18:41:36 +02:00
Yehonal 8c8f8f5577 Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git 2016-08-10 12:41:06 +02:00
Yehonal fc8599299e [CORE] Allowing compilation with c++11 2016-08-10 12:39:53 +02:00
ShinDarth b024b64bd4 Merge remote-tracking branch 'upstream/master' 2016-08-09 16:22:33 +02:00
ShinDarth 4a73a00b9e Script/Commands: show revision in .server info
- Closes #49
2016-08-09 16:21:18 +02:00
Francesco Borzì fbddac64c8 Merge pull request #51 from Helias/patch-1
Core/build: fixed build on Linux
2016-08-09 16:17:13 +02:00
Stefano Borzì 5c815d3083 Core/build: fixed build on Linux
Fixed an error about nullptr on cs_ticket.cpp
2016-08-09 16:14:13 +02:00
ShinDarth 7e14d05f71 CMake: fixed git informations 2016-08-09 16:09:37 +02:00
ShinDarth 4338156745 Script/Commands: enhance .ticket complete command 2016-08-09 13:38:56 +02:00
Francesco Borzì b1f08b6910 Merge pull request #48 from ShinDarth/db-dump
DB/dumps: update base files
2016-08-08 21:35:51 +02:00
ShinDarth c5108fc680 DB/dumps: update base files 2016-08-08 19:16:06 +02:00
22 changed files with 862 additions and 112 deletions
+4 -4
View File
@@ -59,7 +59,7 @@ include(CheckPlatform)
# basic packagesearching and setup (further support will be needed, this is a preliminary release!)
set(OPENSSL_EXPECTED_VERSION 1.0.0)
set(ACE_EXPECTED_VERSION 5.8.3)
set(ACE_EXPECTED_VERSION 6.0.3)
find_package(PCHSupport)
find_package(ACE REQUIRED)
@@ -73,9 +73,9 @@ if( UNIX )
find_package(BZip2)
endif()
#if(NOT WITHOUT_GIT)
# find_package(Git)
#endif()
if(NOT WITHOUT_GIT)
find_package(Git)
endif()
# Find revision ID and hash of the sourcetree
include(src/cmake/genrev.cmake)
@@ -1,8 +1,8 @@
-- MySQL dump 10.13 Distrib 5.6.10, for Win64 (x86_64)
-- MySQL dump 10.13 Distrib 5.5.42, for osx10.6 (i386)
--
-- Host: localhost Database: clean_auth
-- Host: localhost Database: auth
-- ------------------------------------------------------
-- Server version 5.6.10
-- Server version 5.5.42
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -110,6 +110,52 @@ LOCK TABLES `account_banned` WRITE;
/*!40000 ALTER TABLE `account_banned` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `auth_db_version`
--
DROP TABLE IF EXISTS `auth_db_version`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `auth_db_version` (
`2016_07_10_00` bit(1) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Last applied sql update to DB';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `auth_db_version`
--
LOCK TABLES `auth_db_version` WRITE;
/*!40000 ALTER TABLE `auth_db_version` DISABLE KEYS */;
/*!40000 ALTER TABLE `auth_db_version` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `autobroadcast`
--
DROP TABLE IF EXISTS `autobroadcast`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `autobroadcast` (
`realmid` int(11) NOT NULL DEFAULT '-1',
`id` tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
`weight` tinyint(3) unsigned DEFAULT '1',
`text` longtext NOT NULL,
PRIMARY KEY (`id`,`realmid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `autobroadcast`
--
LOCK TABLES `autobroadcast` WRITE;
/*!40000 ALTER TABLE `autobroadcast` DISABLE KEYS */;
/*!40000 ALTER TABLE `autobroadcast` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `ip_banned`
--
@@ -192,7 +238,7 @@ CREATE TABLE `realmlist` (
LOCK TABLES `realmlist` WRITE;
/*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
INSERT INTO `realmlist` VALUES (1,'MyRealm','127.0.0.1','127.0.0.1','255.255.255.0',8085,1,0,5,0,0,12340);
INSERT INTO `realmlist` VALUES (1,'AzerothCore','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,2,1,0,0,12340);
/*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -205,4 +251,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2016-02-16 6:03:39
-- Dump completed on 2016-08-08 19:00:58
@@ -1,8 +1,8 @@
-- MySQL dump 10.13 Distrib 5.6.10, for Win64 (x86_64)
-- MySQL dump 10.13 Distrib 5.5.42, for osx10.6 (i386)
--
-- Host: localhost Database: clean_characters
-- Host: localhost Database: characters
-- ------------------------------------------------------
-- Server version 5.6.10
-- Server version 5.5.42
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -215,6 +215,29 @@ LOCK TABLES `auctionhouse` WRITE;
/*!40000 ALTER TABLE `auctionhouse` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `battleground_deserters`
--
DROP TABLE IF EXISTS `battleground_deserters`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `battleground_deserters` (
`guid` int(10) unsigned NOT NULL COMMENT 'characters.guid',
`type` tinyint(3) unsigned NOT NULL COMMENT 'type of the desertion',
`datetime` datetime NOT NULL COMMENT 'datetime of the desertion'
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `battleground_deserters`
--
LOCK TABLES `battleground_deserters` WRITE;
/*!40000 ALTER TABLE `battleground_deserters` DISABLE KEYS */;
/*!40000 ALTER TABLE `battleground_deserters` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `bugreport`
--
@@ -1372,6 +1395,27 @@ LOCK TABLES `characters` WRITE;
/*!40000 ALTER TABLE `characters` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `characters_db_version`
--
DROP TABLE IF EXISTS `characters_db_version`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `characters_db_version` (
`2016_07_10_00` bit(1) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Last applied sql update to DB';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `characters_db_version`
--
LOCK TABLES `characters_db_version` WRITE;
/*!40000 ALTER TABLE `characters_db_version` DISABLE KEYS */;
/*!40000 ALTER TABLE `characters_db_version` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `cheaters`
--
@@ -1475,7 +1519,7 @@ CREATE TABLE `creature_respawn` (
LOCK TABLES `creature_respawn` WRITE;
/*!40000 ALTER TABLE `creature_respawn` DISABLE KEYS */;
INSERT INTO `creature_respawn` VALUES (40270,1454189252,571,0);
INSERT INTO `creature_respawn` VALUES (40270,1470675514,571,0);
/*!40000 ALTER TABLE `creature_respawn` ENABLE KEYS */;
UNLOCK TABLES;
@@ -1606,42 +1650,44 @@ LOCK TABLES `gm_surveys` WRITE;
UNLOCK TABLES;
--
-- Table structure for table `gm_tickets`
-- Table structure for table `gm_ticket`
--
DROP TABLE IF EXISTS `gm_tickets`;
DROP TABLE IF EXISTS `gm_ticket`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `gm_tickets` (
`ticketId` int(10) unsigned NOT NULL AUTO_INCREMENT,
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator',
CREATE TABLE `gm_ticket` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`type` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '0 open, 1 closed, 2 character deleted',
`playerGuid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator',
`name` varchar(12) NOT NULL COMMENT 'Name of ticket creator',
`message` text NOT NULL,
`description` text NOT NULL,
`createTime` int(10) unsigned NOT NULL DEFAULT '0',
`mapId` smallint(5) unsigned NOT NULL DEFAULT '0',
`posX` float NOT NULL DEFAULT '0',
`posY` float NOT NULL DEFAULT '0',
`posZ` float NOT NULL DEFAULT '0',
`lastModifiedTime` int(10) unsigned NOT NULL DEFAULT '0',
`closedBy` int(10) NOT NULL DEFAULT '0',
`closedBy` int(10) unsigned NOT NULL DEFAULT '0',
`assignedTo` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
`comment` text NOT NULL,
`response` text NOT NULL,
`completed` tinyint(3) unsigned NOT NULL DEFAULT '0',
`escalated` tinyint(3) unsigned NOT NULL DEFAULT '0',
`viewed` tinyint(3) unsigned NOT NULL DEFAULT '0',
`haveTicket` tinyint(3) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ticketId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
`needMoreHelp` tinyint(3) unsigned NOT NULL DEFAULT '0',
`resolvedBy` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of GM who resolved the ticket',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=10572 DEFAULT CHARSET=utf8 COMMENT='Player System';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `gm_tickets`
-- Dumping data for table `gm_ticket`
--
LOCK TABLES `gm_tickets` WRITE;
/*!40000 ALTER TABLE `gm_tickets` DISABLE KEYS */;
/*!40000 ALTER TABLE `gm_tickets` ENABLE KEYS */;
LOCK TABLES `gm_ticket` WRITE;
/*!40000 ALTER TABLE `gm_ticket` DISABLE KEYS */;
/*!40000 ALTER TABLE `gm_ticket` ENABLE KEYS */;
UNLOCK TABLES;
--
@@ -2023,7 +2069,7 @@ CREATE TABLE `instance_reset` (
LOCK TABLES `instance_reset` WRITE;
/*!40000 ALTER TABLE `instance_reset` DISABLE KEYS */;
INSERT INTO `instance_reset` VALUES (249,0,1454731200),(249,1,1454731200),(269,1,1454212800),(309,0,1454385600),(409,0,1454731200),(469,0,1454731200),(509,0,1454385600),(531,0,1454731200),(532,0,1454731200),(533,0,1454731200),(533,1,1454731200),(534,0,1454731200),(540,1,1454212800),(542,1,1454212800),(543,1,1454212800),(544,0,1454731200),(545,1,1454212800),(546,1,1454212800),(547,1,1454212800),(548,0,1454731200),(550,0,1454731200),(552,1,1454212800),(553,1,1454212800),(554,1,1454212800),(555,1,1454212800),(556,1,1454212800),(557,1,1454212800),(558,1,1454212800),(560,1,1454212800),(564,0,1454731200),(565,0,1454731200),(568,0,1454385600),(574,1,1454212800),(575,1,1454212800),(576,1,1454212800),(578,1,1454212800),(580,0,1454731200),(585,1,1454212800),(595,1,1454212800),(598,1,1454212800),(599,1,1454212800),(600,1,1454212800),(601,1,1454212800),(602,1,1454212800),(603,0,1454731200),(603,1,1454731200),(604,1,1454212800),(608,1,1454212800),(615,0,1454731200),(615,1,1454731200),(616,0,1454731200),(616,1,1454731200),(619,1,1454212800),(624,0,1454731200),(624,1,1454731200),(631,0,1454731200),(631,1,1454731200),(631,2,1454731200),(631,3,1454731200),(632,1,1454212800),(649,0,1454731200),(649,1,1454731200),(649,2,1454731200),(649,3,1454731200),(650,1,1454212800),(658,1,1454212800),(668,1,1454212800),(724,0,1454731200),(724,1,1454731200),(724,2,1454731200),(724,3,1454731200);
INSERT INTO `instance_reset` VALUES (249,0,1471060800),(249,1,1471060800),(269,1,1470715200),(309,0,1470715200),(409,0,1471060800),(469,0,1471060800),(509,0,1470715200),(531,0,1471060800),(532,0,1471060800),(533,0,1471060800),(533,1,1471060800),(534,0,1471060800),(540,1,1470715200),(542,1,1470715200),(543,1,1470715200),(544,0,1471060800),(545,1,1470715200),(546,1,1470715200),(547,1,1470715200),(548,0,1471060800),(550,0,1471060800),(552,1,1470715200),(553,1,1470715200),(554,1,1470715200),(555,1,1470715200),(556,1,1470715200),(557,1,1470715200),(558,1,1470715200),(560,1,1470715200),(564,0,1471060800),(565,0,1471060800),(568,0,1470715200),(574,1,1470715200),(575,1,1470715200),(576,1,1470715200),(578,1,1470715200),(580,0,1471060800),(585,1,1470715200),(595,1,1470715200),(598,1,1470715200),(599,1,1470715200),(600,1,1470715200),(601,1,1470715200),(602,1,1470715200),(603,0,1471060800),(603,1,1471060800),(604,1,1470715200),(608,1,1470715200),(615,0,1471060800),(615,1,1471060800),(616,0,1471060800),(616,1,1471060800),(619,1,1470715200),(624,0,1471060800),(624,1,1471060800),(631,0,1471060800),(631,1,1471060800),(631,2,1471060800),(631,3,1471060800),(632,1,1470715200),(649,0,1471060800),(649,1,1471060800),(649,2,1471060800),(649,3,1471060800),(650,1,1470715200),(658,1,1470715200),(668,1,1470715200),(724,0,1471060800),(724,1,1471060800),(724,2,1471060800),(724,3,1471060800);
/*!40000 ALTER TABLE `instance_reset` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2530,9 +2576,71 @@ CREATE TABLE `pool_quest_save` (
LOCK TABLES `pool_quest_save` WRITE;
/*!40000 ALTER TABLE `pool_quest_save` DISABLE KEYS */;
INSERT INTO `pool_quest_save` VALUES (348,24635),(349,14102),(350,13889),(351,13914),(352,11379),(353,11666),(354,13425),(356,11370),(357,11500),(358,14074),(359,14112),(360,14144),(361,14141),(362,12760),(363,14108),(380,12737),(381,12734),(382,12761),(384,13191),(385,13153),(386,12563),(5662,13673),(5663,13764),(5664,13770),(5665,13774),(5666,13780),(5667,13783),(5668,13669),(5669,13616),(5670,13743),(5671,13748),(5672,13757),(5673,13753),(5674,13103),(5675,13116),(5676,13836),(5677,12962),(5678,24586);
/*!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,
`winner` bit(1) 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`
--
@@ -2625,7 +2733,7 @@ CREATE TABLE `worldstates` (
LOCK TABLES `worldstates` WRITE;
/*!40000 ALTER TABLE `worldstates` DISABLE KEYS */;
INSERT INTO `worldstates` VALUES (3781,9000000,NULL),(3801,0,NULL),(3802,1,NULL),(20001,1454691600,NULL),(20002,1454562000,NULL),(20003,1454216400,NULL),(20005,1454216400,NULL),(20006,1454216400,NULL),(20007,1454302800,NULL);
INSERT INTO `worldstates` VALUES (3781,9000000,NULL),(3801,0,NULL),(3802,1,NULL),(20001,1454691600,NULL),(20002,1470888000,NULL),(20003,1470715200,NULL),(20005,1470715200,NULL),(20006,1470715200,NULL),(20007,1472702400,NULL);
/*!40000 ALTER TABLE `worldstates` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -2638,4 +2746,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2016-02-16 6:03:29
-- Dump completed on 2016-08-08 19:00:21
File diff suppressed because one or more lines are too long
+161
View File
@@ -0,0 +1,161 @@
ALTER TABLE world_db_version CHANGE COLUMN 2016_08_03_00 2016_08_10_00 bit;
# Import some trinity_string from TrinityCore
INSERT IGNORE INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)VALUES
(63, 'Wrong parameter, id: %u does not exist.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(64, 'Wrong parameter realmId: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(65, 'Account %u (%s) granted permissions:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(66, 'Account %u (%s) denied permissions:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(67, 'Account %u (%s) inherited permissions by sec level %u:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(68, 'Permissions:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(69, 'Linked permissions:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(70, 'Empty List', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(71, '- %u (%s)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(72, 'Couldn\'t grant permission %u (%s) realmId %d. Account %u (%s) already has that permission', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(73, 'Couldn\'t grant permission %u (%s) realmId %d. Account %u (%s) has that permission in deny list', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(74, 'Granted permission %u (%s) realmId %d to account %u (%s)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(75, 'Couldn\'t deny permission %u (%s) realmId %d. Account %u (%s) already has that permission', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(76, 'Couldn\'t deny permission %u (%s) realmId %d. Account %u (%s) has that permission in deny list', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(77, 'Denied permission %u (%s) realmId %d to account %u (%s)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(78, 'Revoked permission %u (%s) realmId %d to account %u (%s)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(79, 'Couldn\'t revoke permission %u (%s) realmId %d. Account %u (%s) does not have that permission', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(80, 'BattleGround victories in the last 7 days\nAlliance: %d\nHorde: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(81, 'BattleGround scores storing is disabled!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(96, 'The guild name \'%s\' is already taken', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(97, 'Changed guild name \'%s\' to \'%s\'', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(98, '\'%s\' already exists as character name, choose another one', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(99, 'Player \'%s\' forced rename to \'%s\'', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(167, 'This name is reserved, choose another one', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(176, 'Invalid gameobject type, must be a destructible building.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(177, 'Gameobject %s (GUID: %u) damaged %u (actual health: %u).', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(178, 'grid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u MMap: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(186, 'TransMapID: %u TransOffsetX: %f TransOffsetY: %f TransOffsetZ: %f TransOffsetO: %f (Transport ID: %u %s)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(357, 'Cheat Command Status:', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(358, 'Godmode: %s.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(359, 'Casttime: %s.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(360, 'Cooldown: %s.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(361, 'Power: %s.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(362, 'Waterwalk: %s.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(363, 'Player %s cannot whisper you any longer.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(364, 'Taxinodes: %s.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(453, 'Player %s %s (guid: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(548, ' GM Mode active, Phase: -1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(549, ' Banned: (Type: %s, Reason: %s, Time: %s, By: %s)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(550, ' Muted: (Reason: %s, Time: %s, By: %s)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(714, ' Account: %s (ID: %u), GMLevel: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(716, ' Last Login: %s (Failed Logins: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(749, ' OS: %s - Latency: %u ms', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(752, ' Last IP: %s (Locked: %s)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(843, ' Level: %u (%u/%u XP (%u XP left))', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(844, ' Race: %s %s, %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(845, ' Alive ?: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(846, ' Phase: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(847, ' Money: %ug%us%uc', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(848, ' Map: %s, Area: %s, Zone: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(849, ' Guild: %s (ID: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(850, ' Rank: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(851, ' Note: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(852, ' O. Note: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(853, ' Played time: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(854, ' Mails: %d Read/%u Total', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(855, 'Male', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(856, 'Female', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(857, 'Arena team [%u] not found', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(858, 'There is already an arena team named \"%s\"', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(859, '%s is already in an arena team of that size', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(860, 'Arena Team In Combat', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(861, 'Arena with name: \"%s\" or silmilar not found', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(862, '[%s] not member of the team \"%s\"', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(863, '[%s] already capitan in the team \"%s\"', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(864, 'New ArenaTeam created [Name: \"%s\"][Id: %u][Type: %u][Captain GUID: %u]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(865, 'Arena team Name: \"%s\"[Id: %u] disbanded', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(866, 'Arena team [Id: %u] change from \"%s\" to \"%s\"', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(867, 'Arena team Name: \"%s\"[Id: %u] change capitan from[%s] to [%s]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(868, 'Arena team: \"%s\"[%u] - Rating: %u - Type: %ux%u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(869, 'Name:\"%s\"[guid:%u] - PR: %u - %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(870, '|\"%s\"[ID:%u](%ux%u)|', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(871, ' Level: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(872, 'Entered email is not equal to registration email, check input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(873, 'The new emails do not match', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(874, 'The email was changed', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(875, 'Your email can\'t be longer than 64 characters, email not changed!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(876, 'Email not changed (unknown error)!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(877, 'Email change unnecessary, new email is equal to old email', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(878, 'Your email is: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(879, '└ Registration Email: %s - Email: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(880, 'Security Level: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(881, 'An email address is required to change your password.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1151, 'Mail List Info: # of mails: %u, Player: %s(%u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1152, 'Mail Id: %u Title: \"%s\" Money: %ug%us%uc', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1153, 'Sender: %s(%u), Receiver: %s(%u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1154, 'Time deliver: %s, Time expire: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1155, 'Item: %s[Entry:%u Guid:%u Count:%u]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1156, 'Mail List Info: No mail found for this character.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1157, 'All configs are reloaded from the configuration file(s).', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1158, '==========================================================', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1159, '|--------------------------------------------------------|', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1160, '| | Alliance | Horde | Neutral | Total |', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1161, ' Alliance/Horde/Neutral/Total', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1162, '| %-10s | %8u | %8u | %8u | %8u |', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1163, '%-10s = %6u / %6u / %6u / %6u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1164, 'Count', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1165, 'Item Ratio', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1166, '| | Alliance | Horde | Neutral | Amount |', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1167, ' Alliance/Horde/Neutral/Amount', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1168, 'Gray', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1169, 'White', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1170, 'Green', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1171, 'Blue', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1172, 'Purple', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1173, 'Orange', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1174, 'Yellow', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1175, 'Amount of %s items is set to %u.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1176, 'Items ratio for %s is set to %u.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1177, 'Displaying Guild Details for %s (Id: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1178, '| Guild Master: %s (GUID: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1179, '| Guild Creation Date: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1180, '| Guild Members: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1181, '| Guild Bank: %u gold', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1182, '| Guild MOTD: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(1183, '| Guild Information: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(2030, '|cff00ff00Completed by|r:|cff00ccff %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5037, 'MechanicImmuneMask: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5038, 'Unit Flags: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5039, 'Console', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5040, 'Character', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5041, 'Permanently', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5042, 'You are outdoors.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5043, 'You are indoors.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5044, 'no VMAP available for area info', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5045, 'Map: %d | ID: %d | perm: %s | extended: %s | diff: %d | canReset: %s | TTR: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5046, 'Player binds: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5047, 'Group binds: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5048, 'Unbinding map: %d inst: %d perm: %s diff: %d canReset: %s TTR: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5049, 'Instances unbound: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5050, 'Instances loaded: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5051, 'Players in instances: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5052, 'Instance saves: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5053, 'Players bound: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5054, 'Groups bound: %d', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5055, 'Map is not a dungeon.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5056, 'Map has no instance data.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5057, 'Boss id %i state is now set to %i (%s).', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5058, 'Boss id %i state is %i (%s).', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5059, 'Mutes for account: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5060, 'No mutes for account: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(5061, 'Mute Date: %20s Mutetime: %10u mins. Reason: %s Set by: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11002, 'Server: %s has kicked %s, reason: %s', '', '', '', '', '', '', '', ''),
(11003, 'Server: %s has muted %s for %u minutes, reason: %s', '', '', '', '', '', '', '', ''),
(11004, 'Server: %s has banned character %s for %s, reason: %s', '', '', '', '', '', '', '', ''),
(11005, 'Server: %s has banned character %s permanetly, reason: %s', '', '', '', '', '', '', '', ''),
(11006, 'Server: %s has banned %s for %s, reason: %s', '', '', '', '', '', '', '', ''),
(11007, 'Server: %s has banned %s permanetly, reason: %s', '', '', '', '', '', '', '', ''),
(11008, 'InhabitType: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11009, 'Flags Extra: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11010, 'You didn\'t get kicked out of the instance even if Player::CheckInstanceLoginValid() returned false and without .gm on flag', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11011, 'VisualizeBoundary warning: No interior point of the creature\'s boundary could be found - check if you have mutually exclusive boundaries!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11012, 'VisualizeBoundary error: Creature movement is unbounded', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11013, 'VisualizeBoundary warning: Reached fail-safe flood boundary - check is your boundary is unbounded!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11014, 'You are already locked to %s.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11015, 'This creature does not have an active CreatureAI assigned to it.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(11016, 'Select a player or player pet.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+5
View File
@@ -0,0 +1,5 @@
ALTER TABLE world_db_version CHANGE COLUMN 2016_08_10_00 2016_08_10_01 bit;
INSERT IGNORE INTO `command` (`name`, `security`, `help`) VALUES
('instance setbossstate', 2, 'Syntax: .instance setbossstate $bossId $encounterState [$Name]\r\nSets the EncounterState for the given boss id to a new value. EncounterStates range from 0 to 5.\r\nIf no character name is provided, the current map will be used as target.'),
('instance getbossstate', 2, 'Syntax: .instance getbossstate $bossId [$Name]\r\nGets the current EncounterState for the provided boss id.\r\nIf no character name is provided, the current map will be used as target.');
+3 -3
View File
@@ -10,11 +10,11 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Include the platform-specific file.
include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/os/Windows.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/os/Windows.cmake)
# Add macros
include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/character_sets.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/mysql_version.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/character_sets.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/mysql_version.cmake)
# Advanced options (mostly useless, but usually still in config.h, so they need to be set...)
set(CYBOZU OFF)
+1 -1
View File
@@ -6,7 +6,7 @@
#define VER_COMPANYNAME_STR "AzerothCore"
#define VER_LEGALCOPYRIGHT_STR "AzerothCore"
#define VER_FILEVERSION 0,0,0
#define VER_FILEVERSION_STR "@rev_date@ (@rev_hash@)"
#define VER_FILEVERSION_STR "@rev_hash@ @rev_date@"
#define VER_PRODUCTVERSION VER_FILEVERSION
#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR
#endif // __REVISION_H__
+2
View File
@@ -13,3 +13,5 @@ if(WITH_COREDEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
message(STATUS "Clang: Debug-flags set (-g3)")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register")
+12
View File
@@ -1,6 +1,18 @@
# Set build-directive (used in core to tell which buildtype we used)
add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
set(GCC_EXPECTED_VERSION 4.8.2)
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION)
message(FATAL_ERROR "GCC: AzerothCore requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
message(STATUS "GCC: Enabled c++11 support")
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
#message(STATUS "GCC: Enabled C99 support")
if(PLATFORM EQUAL 32)
# Required on 32-bit systems to enable SSE2 (standard on x64)
set(SSE_FLAGS "-msse2 -mfpmath=sse")
+64 -22
View File
@@ -1,4 +1,4 @@
# Copyright (C)
# Copyright (C) TrinityCore, AzerothCore
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -8,34 +8,76 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
include(${CMAKE_SOURCE_DIR}/src/cmake/macros/EnsureVersion.cmake)
# User has manually chosen to ignore the git-tests, so throw them a warning.
# This is done EACH compile so they can be alerted about the consequences.
set(_REQUIRED_GIT_VERSION "1.7")
# Its not set during initial run
if(NOT BUILDDIR)
# Workaround for funny MSVC behaviour - this segment is only used when using cmake gui
set(BUILDDIR ${CMAKE_BINARY_DIR})
endif()
FIND_PROGRAM(SVN_EXECUTABLE svn DOC "subversion command line client")
if(WITHOUT_GIT)
set(rev_date "1970-01-01 00:00:00 +0000")
set(rev_hash "unknown")
set(rev_branch "Archived")
else()
# Workaround for not correctly detecting git
if (NOT GIT_EXECUTABLE)
set(GIT_EXECUTABLE "git")
endif()
# only do this if we have an svn client.
if (SVN_EXECUTABLE)
MACRO(Subversion_GET_REVISION dir variable)
EXECUTE_PROCESS(COMMAND ${SVN_EXECUTABLE} info ${dir}
OUTPUT_VARIABLE ${variable}
OUTPUT_STRIP_TRAILING_WHITESPACE)
STRING(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
"\\2" ${variable} "${${variable}}")
ENDMACRO(Subversion_GET_REVISION)
if(GIT_EXECUTABLE)
# Create a revision-string that we can use
execute_process(
COMMAND "${GIT_EXECUTABLE}" describe --long --match 0.1 --dirty=+ --abbrev=12
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE rev_info
OUTPUT_STRIP_TRAILING_WHITESPACE
Subversion_GET_REVISION(${CMAKE_SOURCE_DIR} REV2)
endif ()
)
set(rev_hash_str ${REV2})
set(rev_hash ${REV2})
set(rev_id_str ${REV2})
set(rev_id ${REV2})
# And grab the commits timestamp
execute_process(
COMMAND "${GIT_EXECUTABLE}" show -s --format=%ci
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE rev_date
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
# Also retrieve branch name
execute_process(
COMMAND "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE rev_branch
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
endif()
configure_file ( ${CMAKE_SOURCE_DIR}/revision.h.in.cmake ${BUILDDIR}/revision.h )
# Last minute check - ensure that we have a proper revision
# If everything above fails (means the user has erased the git revision control directory or removed the origin/HEAD tag)
if(NOT rev_info)
# No valid ways available to find/set the revision/hash, so let's force some defaults
message(STATUS "
Could not find a proper repository signature (hash) - you may need to pull tags with git fetch -t
Continuing anyway - note that the versionstring will be set to \"unknown 1970-01-01 00:00:00 (Archived)\"")
set(rev_date "1970-01-01 00:00:00 +0000")
set(rev_hash "unknown")
set(rev_branch "Archived")
else()
# Extract information required to build a proper versionstring
string(REGEX REPLACE 0.1-|[0-9]+-g "" rev_hash ${rev_info})
endif()
endif()
# Create the actual revision.h file from the above params
if(NOT "${rev_hash_cached}" MATCHES "${rev_hash}" OR NOT "${rev_branch_cached}" MATCHES "${rev_branch}" OR NOT EXISTS "${BUILDDIR}/revision_data.h")
configure_file(
"${CMAKE_SOURCE_DIR}/revision.h.in.cmake"
"${BUILDDIR}/revision.h"
@ONLY
)
set(rev_hash_cached "${rev_hash}" CACHE INTERNAL "Cached commit-hash")
set(rev_branch_cached "${rev_branch}" CACHE INTERNAL "Cached branch name")
endif()
@@ -446,3 +446,25 @@ void InstanceScript::SendEncounterUnit(uint32 type, Unit* unit /*= NULL*/, uint8
instance->SendToPlayers(&data);
}
std::string InstanceScript::GetBossStateName(uint8 state)
{
// See enum EncounterState in InstanceScript.h
switch (state)
{
case NOT_STARTED:
return "NOT_STARTED";
case IN_PROGRESS:
return "IN_PROGRESS";
case FAIL:
return "FAIL";
case DONE:
return "DONE";
case SPECIAL:
return "SPECIAL";
case TO_BE_DECIDED:
return "TO_BE_DECIDED";
default:
return "INVALID";
}
}
@@ -197,6 +197,7 @@ class InstanceScript : public ZoneScript
virtual bool SetBossState(uint32 id, EncounterState state);
EncounterState GetBossState(uint32 id) const { return id < bosses.size() ? bosses[id].state : TO_BE_DECIDED; }
static std::string GetBossStateName(uint8 state);
BossBoundaryMap const* GetBossBoundary(uint32 id) const { return id < bosses.size() ? &bosses[id].boundary : NULL; }
BossInfo const* GetBossInfo(uint32 id) const { return &bosses[id]; }
@@ -216,6 +217,8 @@ class InstanceScript : public ZoneScript
virtual void FillInitialWorldStates(WorldPacket& /*data*/) {}
uint32 GetEncounterCount() const { return bosses.size(); }
protected:
void SetBossNumber(uint32 number) { bosses.resize(number); }
void LoadDoorData(DoorData const* data);
+197 -24
View File
@@ -1,6 +1,5 @@
/*
* Copyright (C)
* Copyright (C)
* Copyright (C) MaNGOS, TrinityCore, AzerothCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -86,7 +85,32 @@ enum TrinityStrings
LANG_CONNECTED_PLAYERS = 60,
LANG_ACCOUNT_ADDON = 61,
LANG_IMPROPER_VALUE = 62,
// Room for more level 0 63-99 not used
LANG_RBAC_WRONG_PARAMETER_ID = 63,
LANG_RBAC_WRONG_PARAMETER_REALM = 64,
LANG_RBAC_LIST_HEADER_GRANTED = 65,
LANG_RBAC_LIST_HEADER_DENIED = 66,
LANG_RBAC_LIST_HEADER_BY_SEC_LEVEL = 67,
LANG_RBAC_LIST_PERMISSIONS_HEADER = 68,
LANG_RBAC_LIST_PERMS_LINKED_HEADER = 69,
LANG_RBAC_LIST_EMPTY = 70,
LANG_RBAC_LIST_ELEMENT = 71,
LANG_RBAC_PERM_GRANTED_IN_LIST = 72,
LANG_RBAC_PERM_GRANTED_IN_DENIED_LIST = 73,
LANG_RBAC_PERM_GRANTED = 74,
LANG_RBAC_PERM_DENIED_IN_LIST = 75,
LANG_RBAC_PERM_DENIED_IN_GRANTED_LIST = 76,
LANG_RBAC_PERM_DENIED = 77,
LANG_RBAC_PERM_REVOKED = 78,
LANG_RBAC_PERM_REVOKED_NOT_IN_LIST = 79,
LANG_PVPSTATS = 80,
LANG_PVPSTATS_DISABLED = 81,
// Free 82 - 95
LANG_GUILD_RENAME_ALREADY_EXISTS = 96,
LANG_GUILD_RENAME_DONE = 97,
LANG_RENAME_PLAYER_ALREADY_EXISTS = 98,
LANG_RENAME_PLAYER_WITH_NEW_NAME = 99,
// level 1 chat
LANG_GLOBAL_NOTIFY = 100,
@@ -163,7 +187,7 @@ enum TrinityStrings
LANG_COMMAND_TELE_NOTFOUND = 164,
LANG_COMMAND_TELE_PARAMETER = 165,
LANG_COMMAND_TELE_NOLOCATION = 166,
// 167 // not used
LANG_RESERVED_NAME = 167,
LANG_COMMAND_TELE_LOCATION = 168,
LANG_MAIL_SENT = 169,
@@ -173,7 +197,12 @@ enum TrinityStrings
LANG_YOU_CHANGE_RUNIC_POWER = 173,
LANG_YOURS_RUNIC_POWER_CHANGED = 174,
LANG_LIQUID_STATUS = 175,
// Room for more level 1 176-199 not used
LANG_INVALID_GAMEOBJECT_TYPE = 176,
LANG_GAMEOBJECT_DAMAGED = 177,
LANG_GRID_POSITION = 178,
// 179-185 used in other client versions
LANG_TRANSPORT_POSITION = 186,
// Room for more level 1 187-199 not used
// level 2 chat
LANG_NO_SELECTION = 200,
@@ -337,7 +366,15 @@ enum TrinityStrings
LANG_TITLE_REMOVE_RES = 354,
LANG_TITLE_CURRENT_RES = 355,
LANG_CURRENT_TITLE_RESET = 356,
// Room for more level 2 357-399 not used
LANG_COMMAND_CHEAT_STATUS = 357,
LANG_COMMAND_CHEAT_GOD = 358,
LANG_COMMAND_CHEAT_CT = 359,
LANG_COMMAND_CHEAT_CD = 360,
LANG_COMMAND_CHEAT_POWER = 361,
LANG_COMMAND_CHEAT_WW = 362,
LANG_COMMAND_WHISPEROFFPLAYER = 363,
LANG_COMMAND_CHEAT_TAXINODES = 364,
// Room for more level 2 365-399 not used
// level 3 chat
LANG_SCRIPTS_RELOADED = 400,
@@ -365,8 +402,8 @@ enum TrinityStrings
LANG_BANINFO_HISTORYENTRY = 418,
LANG_BANINFO_INFINITE = 419,
LANG_BANINFO_NEVER = 420,
LANG_BANINFO_YES = 421,
LANG_BANINFO_NO = 422,
LANG_YES = 421,
LANG_NO = 422,
LANG_BANINFO_IPENTRY = 423,
LANG_BANLIST_NOIP = 424,
@@ -700,10 +737,10 @@ enum TrinityStrings
LANG_DIST_ARENA_POINTS_END = 746,
LANG_BG_DISABLED = 747,
LANG_ARENA_DISABLED = 748,
// = 749, not used
// = 749, see LANG_PINFO_ACC_OS
LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING = 750, // "Not enough players. This game will close in %u mins."
LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS = 751, // "Not enough players. This game will close in %u seconds."
// = 752, not used
// = 752, see LANG_PINFO_ACC_IP
// LANG_BG_WS_START_TWO_MINUTES = 753, - defined above
// LANG_BG_AB_START_TWO_MINUTES = 754, - defined above
// LANG_BG_EY_START_TWO_MINUTES = 755, - defined above
@@ -760,8 +797,60 @@ enum TrinityStrings
LANG_NPCINFO_SPELLCLICK = 840,
LANG_NPCINFO_MAILBOX = 841,
LANG_NPCINFO_PLAYER_VEHICLE = 842,
// Room for in-game strings 843-999 not used
// Pinfo commands
LANG_PINFO_PLAYER = 453,
LANG_PINFO_GM_ACTIVE = 548,
LANG_PINFO_BANNED = 549,
LANG_PINFO_MUTED = 550,
LANG_PINFO_ACC_ACCOUNT = 714,
LANG_PINFO_ACC_LASTLOGIN = 716,
LANG_PINFO_ACC_OS = 749,
LANG_PINFO_ACC_REGMAILS = 879,
LANG_PINFO_ACC_IP = 752,
LANG_PINFO_CHR_LEVEL_LOW = 843,
LANG_PINFO_CHR_RACE = 844,
LANG_PINFO_CHR_ALIVE = 845,
LANG_PINFO_CHR_PHASE = 846,
LANG_PINFO_CHR_MONEY = 847,
LANG_PINFO_CHR_MAP = 848,
LANG_PINFO_CHR_GUILD = 849,
LANG_PINFO_CHR_GUILD_RANK = 850,
LANG_PINFO_CHR_GUILD_NOTE = 851,
LANG_PINFO_CHR_GUILD_ONOTE = 852,
LANG_PINFO_CHR_PLAYEDTIME = 853,
LANG_PINFO_CHR_MAILS = 854,
LANG_PINFO_CHR_LEVEL_HIGH = 871,
LANG_CHARACTER_GENDER_MALE = 855,
LANG_CHARACTER_GENDER_FEMALE = 856,
LANG_ARENA_ERROR_NOT_FOUND = 857,
LANG_ARENA_ERROR_NAME_EXISTS = 858,
LANG_ARENA_ERROR_SIZE = 859,
LANG_ARENA_ERROR_COMBAT = 860,
LANG_AREAN_ERROR_NAME_NOT_FOUND = 861,
LANG_ARENA_ERROR_NOT_MEMBER = 862,
LANG_ARENA_ERROR_CAPTAIN = 863,
LANG_ARENA_CREATE = 864,
LANG_ARENA_DISBAND = 865,
LANG_ARENA_RENAME = 866,
LANG_ARENA_CAPTAIN = 867,
LANG_ARENA_INFO_HEADER = 868,
LANG_ARENA_INFO_MEMBERS = 869,
LANG_ARENA_LOOKUP = 870,
// = 871, see LANG_PINFO_CHR_LEVEL_HIGH
LANG_COMMAND_WRONGEMAIL = 872,
LANG_NEW_EMAILS_NOT_MATCH = 873,
LANG_COMMAND_EMAIL = 874,
LANG_EMAIL_TOO_LONG = 875,
LANG_COMMAND_NOTCHANGEEMAIL = 876,
LANG_OLD_EMAIL_IS_NEW_EMAIL = 877,
LANG_COMMAND_EMAIL_OUTPUT = 878,
// = 879, see LANG_PINFO_CHR_REGMAILS
LANG_ACCOUNT_SEC_TYPE = 880,
LANG_RBAC_EMAIL_REQUIRED = 881,
// Room for in-game strings 882-999 not used
// Level 4 (CLI only commands)
LANG_COMMAND_EXIT = 1000,
@@ -793,7 +882,9 @@ enum TrinityStrings
LANG_CHARACTER_DELETED_LIST_LINE_CHAT = 1026,
LANG_SQLDRIVER_QUERY_LOGGING_ENABLED = 1027,
LANG_SQLDRIVER_QUERY_LOGGING_DISABLED = 1028,
// Room for more level 4 1029-1099 not used
// 1029-1030 used in other client versions
// Room for more level 4 1031-1099 not used
// Level 3 (continue)
LANG_ACCOUNT_SETADDON = 1100,
@@ -847,16 +938,48 @@ enum TrinityStrings
LANG_GROUP_FULL = 1148,
LANG_GROUP_TYPE = 1149,
LANG_GROUP_PLAYER_NAME_GUID = 1150,
// Room for more level 3 1151-1199 not used
LANG_LIST_MAIL_HEADER = 1151,
LANG_LIST_MAIL_INFO_1 = 1152,
LANG_LIST_MAIL_INFO_2 = 1153,
LANG_LIST_MAIL_INFO_3 = 1154,
LANG_LIST_MAIL_INFO_ITEM = 1155,
LANG_LIST_MAIL_NOT_FOUND = 1156,
LANG_AHBOT_RELOAD_OK = 1157,
LANG_AHBOT_STATUS_BAR_CONSOLE = 1158,
LANG_AHBOT_STATUS_MIDBAR_CONSOLE = 1159,
LANG_AHBOT_STATUS_TITLE1_CONSOLE = 1160,
LANG_AHBOT_STATUS_TITLE1_CHAT = 1161,
LANG_AHBOT_STATUS_FORMAT_CONSOLE = 1162,
LANG_AHBOT_STATUS_FORMAT_CHAT = 1163,
LANG_AHBOT_STATUS_ITEM_COUNT = 1164,
LANG_AHBOT_STATUS_ITEM_RATIO = 1165,
LANG_AHBOT_STATUS_TITLE2_CONSOLE = 1166,
LANG_AHBOT_STATUS_TITLE2_CHAT = 1167,
LANG_AHBOT_QUALITY_GRAY = 1168,
LANG_AHBOT_QUALITY_WHITE = 1169,
LANG_AHBOT_QUALITY_GREEN = 1170,
LANG_AHBOT_QUALITY_BLUE = 1171,
LANG_AHBOT_QUALITY_PURPLE = 1172,
LANG_AHBOT_QUALITY_ORANGE = 1173,
LANG_AHBOT_QUALITY_YELLOW = 1174,
LANG_AHBOT_ITEMS_AMOUNT = 1175,
LANG_AHBOT_ITEMS_RATIO = 1176,
LANG_GUILD_INFO_NAME = 1177,
LANG_GUILD_INFO_GUILD_MASTER = 1178,
LANG_GUILD_INFO_CREATION_DATE = 1179,
LANG_GUILD_INFO_MEMBER_COUNT = 1180,
LANG_GUILD_INFO_BANK_GOLD = 1181,
LANG_GUILD_INFO_MOTD = 1182,
LANG_GUILD_INFO_EXTRA_INFO = 1183,
// Room for more level 3 1184-1198 not used
// Debug commands
LANG_DO_NOT_USE_6X_DEBUG_AREATRIGGER_LEFT = 1999,
LANG_CINEMATIC_NOT_EXIST = 1200,
LANG_MOVIE_NOT_EXIST = 1201,
LANG_DEBUG_AREATRIGGER_ON = 1202,
LANG_DEBUG_AREATRIGGER_OFF = 1203,
LANG_DEBUG_AREATRIGGER_REACHED = 1204,
// Room for more debug 1205-1299 not used
// Isle of Conquest
LANG_BG_IC_START_TWO_MINUTES = 1205,
@@ -879,11 +1002,11 @@ enum TrinityStrings
LANG_BG_IC_REFINERY = 1222,
LANG_BG_IC_QUARRY = 1223,
LANG_BG_IC_HANGAR = 1224,
// 1225-1299
LANG_BG_IC_ALLIANCE = 1300,
LANG_BG_IC_HORDE = 1301,
// FREE IDS 1228-9999
// 1302-1325
// AV
LANG_BG_AV_ALLY = 1300,
LANG_BG_AV_HORDE = 1301,
@@ -924,7 +1047,7 @@ enum TrinityStrings
LANG_BG_AV_START_TWO_MINUTES = 1333,
// FREE IDS 1334-1999
// Ticket Strings 2000-2029
// Ticket Strings 2000-2030
LANG_COMMAND_TICKETNEW = 2000,
LANG_COMMAND_TICKETUPDATED = 2001,
LANG_COMMAND_TICKETPLAYERABANDON = 2002,
@@ -955,6 +1078,7 @@ enum TrinityStrings
LANG_COMMAND_TICKETPENDING = 2027,
LANG_COMMAND_TICKETRESET = 2028,
LANG_COMMAND_TICKETLISTRESPONSE = 2029,
LANG_COMMAND_TICKETCOMPLETED = 2030,
// Trinity strings 5000-9999
LANG_COMMAND_FREEZE = 5000,
@@ -977,7 +1101,7 @@ enum TrinityStrings
LANG_ARENA = 5016,
LANG_RAID = 5017,
//= 5018,
//= 5019,
LANG_COMMAND_TEMP_FROZEN_PLAYER = 5019,
LANG_NPCINFO_PHASEMASK = 5020,
LANG_NPCINFO_ARMOR = 5021,
LANG_CHANNEL_ENABLE_OWNERSHIP = 5022,
@@ -995,7 +1119,37 @@ enum TrinityStrings
LANG_COMMAND_NO_OUTDOOR_PVP_FORUND = 5034,
LANG_CALL_FOR_HELP = 5035,
LANG_NPCINFO_EQUIPMENT = 5036,
// Room for more Trinity strings 5037-9999
LANG_NPCINFO_MECHANIC_IMMUNE = 5037,
LANG_NPCINFO_UNIT_FIELD_FLAGS = 5038,
LANG_CONSOLE = 5039,
LANG_CHARACTER = 5040,
LANG_PERMANENTLY = 5041,
LANG_GPS_POSITION_OUTDOORS = 5042,
LANG_GPS_POSITION_INDOORS = 5043,
LANG_GPS_NO_VMAP = 5044,
// Instance commands
LANG_COMMAND_LIST_BIND_INFO = 5045,
LANG_COMMAND_LIST_BIND_PLAYER_BINDS = 5046,
LANG_COMMAND_LIST_BIND_GROUP_BINDS = 5047,
LANG_COMMAND_INST_UNBIND_UNBINDING = 5048,
LANG_COMMAND_INST_UNBIND_UNBOUND = 5049,
LANG_COMMAND_INST_STAT_LOADED_INST = 5050,
LANG_COMMAND_INST_STAT_PLAYERS_IN = 5051,
LANG_COMMAND_INST_STAT_SAVES = 5052,
LANG_COMMAND_INST_STAT_PLAYERSBOUND = 5053,
LANG_COMMAND_INST_STAT_GROUPSBOUND = 5054,
LANG_NOT_DUNGEON = 5055, // Map is not a dungeon.
LANG_NO_INSTANCE_DATA = 5056, // Map has no instance data.
LANG_COMMAND_INST_SET_BOSS_STATE = 5057,
LANG_COMMAND_INST_GET_BOSS_STATE = 5058,
// Mutehistory commands
LANG_COMMAND_MUTEHISTORY = 5059,
LANG_COMMAND_MUTEHISTORY_EMPTY = 5060,
LANG_COMMAND_MUTEHISTORY_OUTPUT = 5061,
// Room for more Trinity strings 5062-9999
// Level requirement notifications
LANG_SAY_REQ = 6604,
@@ -1127,8 +1281,27 @@ enum TrinityStrings
LANG_AUTO_BROADCAST = 11000,
LANG_INVALID_REALMID = 11001,
// NOT RESERVED IDS 12000-1999999999
// `db_script_string` table index 2000000000-2000009999 (MIN_DB_SCRIPT_STRING_ID-MAX_DB_SCRIPT_STRING_ID)
// For other tables maybe 2000010000-2147483647 (max index)
// Show Kick in world
LANG_COMMAND_KICKMESSAGE_WORLD = 11002,
// Show Mute in world
LANG_COMMAND_MUTEMESSAGE_WORLD = 11003,
// Show Ban in world
LANG_BAN_CHARACTER_YOUBANNEDMESSAGE_WORLD = 11004,
LANG_BAN_CHARACTER_YOUPERMBANNEDMESSAGE_WORLD = 11005,
LANG_BAN_ACCOUNT_YOUBANNEDMESSAGE_WORLD = 11006,
LANG_BAN_ACCOUNT_YOUPERMBANNEDMESSAGE_WORLD = 11007,
LANG_NPCINFO_INHABIT_TYPE = 11008,
LANG_NPCINFO_FLAGS_EXTRA = 11009,
LANG_INSTANCE_LOGIN_GAMEMASTER_EXCEPTION = 11010,
LANG_CREATURE_NO_INTERIOR_POINT_FOUND = 11011,
LANG_CREATURE_MOVEMENT_NOT_BOUNDED = 11012,
LANG_CREATURE_MOVEMENT_MAYBE_UNBOUNDED = 11013,
LANG_INSTANCE_BIND_MISMATCH = 11014,
LANG_CREATURE_NOT_AI_ENABLED = 11015,
LANG_SELECT_PLAYER_OR_PET = 11016,
};
#endif
+2 -2
View File
@@ -266,7 +266,7 @@ public:
bool permanent = (fields[1].GetUInt64() == uint64(0));
std::string banTime = permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true);
handler->PSendSysMessage(LANG_BANINFO_HISTORYENTRY,
fields[0].GetCString(), banTime.c_str(), active ? handler->GetTrinityString(LANG_BANINFO_YES) : handler->GetTrinityString(LANG_BANINFO_NO), fields[4].GetCString(), fields[5].GetCString());
fields[0].GetCString(), banTime.c_str(), active ? handler->GetTrinityString(LANG_YES) : handler->GetTrinityString(LANG_NO), fields[4].GetCString(), fields[5].GetCString());
}
while (result->NextRow());
@@ -314,7 +314,7 @@ public:
bool permanent = (fields[1].GetUInt32() == uint32(0));
std::string banTime = permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].GetUInt64(), true);
handler->PSendSysMessage(LANG_BANINFO_HISTORYENTRY,
fields[0].GetCString(), banTime.c_str(), active ? handler->GetTrinityString(LANG_BANINFO_YES) : handler->GetTrinityString(LANG_BANINFO_NO), fields[4].GetCString(), fields[5].GetCString());
fields[0].GetCString(), banTime.c_str(), active ? handler->GetTrinityString(LANG_YES) : handler->GetTrinityString(LANG_NO), fields[4].GetCString(), fields[5].GetCString());
}
while (result->NextRow());
+137
View File
@@ -29,6 +29,7 @@ EndScriptData */
#include "InstanceScript.h"
#include "MapManager.h"
#include "Player.h"
#include "Language.h"
class instance_commandscript : public CommandScript
{
@@ -43,6 +44,8 @@ public:
{ "unbind", SEC_ADMINISTRATOR, false, &HandleInstanceUnbindCommand, "", NULL },
{ "stats", SEC_ADMINISTRATOR, true, &HandleInstanceStatsCommand, "", NULL },
{ "savedata", SEC_ADMINISTRATOR, false, &HandleInstanceSaveDataCommand, "", NULL },
{ "setbossstate", SEC_GAMEMASTER, true, &HandleInstanceSetBossStateCommand, "", NULL },
{ "getbossstate", SEC_GAMEMASTER, true, &HandleInstanceGetBossStateCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
@@ -176,6 +179,140 @@ public:
return true;
}
static bool HandleInstanceSetBossStateCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
char* param1 = strtok((char*)args, " ");
char* param2 = strtok(NULL, " ");
char* param3 = strtok(NULL, " ");
uint32 encounterId = 0;
int32 state = 0;
Player* player = NULL;
std::string playerName;
// Character name must be provided when using this from console.
if (!param2 || (!param3 && !handler->GetSession()))
{
handler->PSendSysMessage(LANG_CMD_SYNTAX);
handler->SetSentErrorMessage(true);
return false;
}
if (!param3)
player = handler->GetSession()->GetPlayer();
else
{
playerName = param3;
if (normalizePlayerName(playerName))
player = ObjectAccessor::FindPlayerByName(playerName);
}
if (!player)
{
handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND);
handler->SetSentErrorMessage(true);
return false;
}
InstanceMap* map = player->GetMap()->ToInstanceMap();
if (!map)
{
handler->PSendSysMessage(LANG_NOT_DUNGEON);
handler->SetSentErrorMessage(true);
return false;
}
if (!map->GetInstanceScript())
{
handler->PSendSysMessage(LANG_NO_INSTANCE_DATA);
handler->SetSentErrorMessage(true);
return false;
}
encounterId = atoi(param1);
state = atoi(param2);
// Reject improper values.
if (state > TO_BE_DECIDED || encounterId > map->GetInstanceScript()->GetEncounterCount())
{
handler->PSendSysMessage(LANG_BAD_VALUE);
handler->SetSentErrorMessage(true);
return false;
}
map->GetInstanceScript()->SetBossState(encounterId, EncounterState(state));
std::string stateName = InstanceScript::GetBossStateName(state);
handler->PSendSysMessage(LANG_COMMAND_INST_SET_BOSS_STATE, encounterId, state, stateName.c_str());
return true;
}
static bool HandleInstanceGetBossStateCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
char* param1 = strtok((char*)args, " ");
char* param2 = strtok(NULL, " ");
uint32 encounterId = 0;
Player* player = NULL;
std::string playerName;
// Character name must be provided when using this from console.
if (!param1 || (!param2 && !handler->GetSession()))
{
handler->PSendSysMessage(LANG_CMD_SYNTAX);
handler->SetSentErrorMessage(true);
return false;
}
if (!param2)
player = handler->GetSession()->GetPlayer();
else
{
playerName = param2;
if (normalizePlayerName(playerName))
player = ObjectAccessor::FindPlayerByName(playerName);
}
if (!player)
{
handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND);
handler->SetSentErrorMessage(true);
return false;
}
InstanceMap* map = player->GetMap()->ToInstanceMap();
if (!map)
{
handler->PSendSysMessage(LANG_NOT_DUNGEON);
handler->SetSentErrorMessage(true);
return false;
}
if (!map->GetInstanceScript())
{
handler->PSendSysMessage(LANG_NO_INSTANCE_DATA);
handler->SetSentErrorMessage(true);
return false;
}
encounterId = atoi(param1);
if (encounterId > map->GetInstanceScript()->GetEncounterCount())
{
handler->PSendSysMessage(LANG_BAD_VALUE);
handler->SetSentErrorMessage(true);
return false;
}
uint32 state = map->GetInstanceScript()->GetBossState(encounterId);
std::string stateName = InstanceScript::GetBossStateName(state);
handler->PSendSysMessage(LANG_COMMAND_INST_GET_BOSS_STATE, encounterId, state, stateName.c_str());
return true;
}
};
void AddSC_instance_commandscript()
+1 -2
View File
@@ -117,8 +117,7 @@ public:
uint32 updateTime = sWorld->GetUpdateTime();
uint32 avgUpdateTime = avgDiffTracker.getAverage();
handler->PSendSysMessage("%s Realm, revision: %s.", realmName.c_str(), _REVISION);
handler->PSendSysMessage("This server runs on AzerothCore.");
handler->PSendSysMessage("%s", _FULLVERSION);
if (!queuedSessionCount)
handler->PSendSysMessage("Connected players: %u. Characters in world: %u.", activeSessionCount, playerCount);
else
+17 -1
View File
@@ -223,7 +223,9 @@ public:
if (!*args)
return false;
uint32 ticketId = atoi(args);
char* ticketIdStr = strtok((char*)args, " ");
uint32 ticketId = atoi(ticketIdStr);
GmTicket* ticket = sTicketMgr->GetTicket(ticketId);
if (!ticket || ticket->IsClosed() || ticket->IsCompleted())
{
@@ -231,6 +233,20 @@ public:
return true;
}
char* response = strtok(NULL, "\n");
if (response)
{
// Cannot add response to ticket, assigned to someone else
//! Console excluded
Player* player = handler->GetSession() ? handler->GetSession()->GetPlayer() : NULL;
if (player && ticket->IsAssignedNotTo(player->GetGUID()))
{
handler->PSendSysMessage(LANG_COMMAND_TICKETALREADYASSIGNED, ticket->GetId());
return true;
}
ticket->AppendResponse(response);
}
if (Player* player = ticket->GetPlayer())
ticket->SendResponse(player->GetSession());
@@ -242,7 +242,7 @@ public:
case SPELL_SUMMON_MENAGERIE_3:
{
for( uint8 i=0; i<4; ++i )
+ me->SummonCreature(summons[2][i], cords[2][0] + ((i%2) ? 4.0f : -4.0f), cords[2][1] + (i<2 ? 4.0f : -4.0f), cords[2][2], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
me->SummonCreature(summons[2][i], cords[2][0] + ((i%2) ? 4.0f : -4.0f), cords[2][1] + (i<2 ? 4.0f : -4.0f), cords[2][2], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
uint8 phase = GetPhaseByCurrentPosition();
me->SetHomePosition(cords[phase+1][0], cords[phase+1][1], cords[phase+1][2], cords[phase+1][3]);
me->DestroyForNearbyPlayers();
+1 -1
View File
@@ -139,7 +139,7 @@ inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; }
#if COMPILER == COMPILER_MICROSOFT
inline bool myisfinite(float f) { return _finite(f) && !_isnan(f); }
#else
inline bool myisfinite(float f) { return finite(f) && !isnan(f); }
inline bool myisfinite(float f) { return finite(f) && !std::isnan(f); }
#endif
#define atol(a) strtoul( a, NULL, 10)
+1
View File
@@ -20,6 +20,7 @@
#define AZEROTHCORE_LOG_H
#include "Common.h"
#include <ace/Task.h>
#include <ace/Singleton.h>
class WorldPacket;
+2
View File
@@ -19,6 +19,8 @@
#ifndef THREADING_H
#define THREADING_H
#include "Common.h"
#include <ace/ACE.h>
#include <ace/Thread.h>
#include <ace/TSS_T.h>
#include <ace/Atomic_Op.h>