Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.3.4

Browse Source 
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
This commit is contained in:
Spp
2012-11-08 11:25:38 +01:00
parent 9659f0335f fcc524d598
commit 35d63a9799
13 changed files with 160 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
sql/base/characters_database.sql
View File

@@ -1922,24 +1922,6 @@ CREATE TABLE `guild_member` (
`rank` tinyint(3) unsigned NOT NULL,
`pnote` varchar(31) NOT NULL DEFAULT '',
`offnote` varchar(31) NOT NULL DEFAULT '',
`BankResetTimeMoney` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemMoney` int(10) unsigned NOT NULL DEFAULT '0',
`BankResetTimeTab0` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemSlotsTab0` int(10) unsigned NOT NULL DEFAULT '0',
`BankResetTimeTab1` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemSlotsTab1` int(10) unsigned NOT NULL DEFAULT '0',
`BankResetTimeTab2` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemSlotsTab2` int(10) unsigned NOT NULL DEFAULT '0',
`BankResetTimeTab3` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemSlotsTab3` int(10) unsigned NOT NULL DEFAULT '0',
`BankResetTimeTab4` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemSlotsTab4` int(10) unsigned NOT NULL DEFAULT '0',
`BankResetTimeTab5` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemSlotsTab5` int(10) unsigned NOT NULL DEFAULT '0',
`BankResetTimeTab6` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemSlotsTab6` int(10) unsigned NOT NULL DEFAULT '0',
`BankResetTimeTab7` int(10) unsigned NOT NULL DEFAULT '0',
`BankRemSlotsTab7` int(10) unsigned NOT NULL DEFAULT '0',
UNIQUE KEY `guid_key` (`guid`),
KEY `guildid_key` (`guildid`),
KEY `guildid_rank_key` (`guildid`,`rank`)
@@ -1955,33 +1937,66 @@ LOCK TABLES `guild_member` WRITE;
/*!40000 ALTER TABLE `guild_member` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `guild_member_withdraw`
--
DROP TABLE IF EXISTS `guild_member_withdraw`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `guild_member_withdraw` (
`guid` int(10) unsigned NOT NULL,
`tab0` int(10) unsigned NOT NULL DEFAULT '0',
`tab1` int(10) unsigned NOT NULL DEFAULT '0',
`tab2` int(10) unsigned NOT NULL DEFAULT '0',
`tab3` int(10) unsigned NOT NULL DEFAULT '0',
`tab4` int(10) unsigned NOT NULL DEFAULT '0',
`tab5` int(10) unsigned NOT NULL DEFAULT '0',
`tab6` int(10) unsigned NOT NULL DEFAULT '0',
`tab7` int(10) unsigned NOT NULL DEFAULT '0',
`money` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Guild Member Daily Withdraws';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `guild_member_withdraw`
--
LOCK TABLES `guild_member_withdraw` WRITE;
/*!40000 ALTER TABLE `guild_member_withdraw` DISABLE KEYS */;
/*!40000 ALTER TABLE `guild_member_withdraw` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `guild_news_log`
--
DROP TABLE IF EXISTS `guild_news_log`;
DROP TABLE IF EXISTS `guild_newslog`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `guild_news_log` (
`guild` int(10) unsigned NOT NULL,
`id` int(10) unsigned NOT NULL,
`eventType` int(10) unsigned NOT NULL,
`playerGuid` bigint(20) unsigned NOT NULL,
`data` int(10) unsigned NOT NULL,
`flags` int(10) unsigned NOT NULL,
`date` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`guild`,`id`)
`guildid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator',
`LogGuid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Log record identificator - auxiliary column',
`EventType` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event type',
`PlayerGuid` int(10) unsigned NOT NULL DEFAULT '0',
`Flags` int(10) unsigned NOT NULL DEFAULT '0',
`Value` int(10) unsigned NOT NULL DEFAULT '0',
`TimeStamp` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Event UNIX time',
PRIMARY KEY (`guildid`,`LogGuid`)
KEY `guildid_key` (`guildid`),
KEY `Idx_PlayerGuid` (`PlayerGuid`),
KEY `Idx_LogGuid` (`LogGuid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `guild_news_log`
-- Dumping data for table `guild_newslog`
--
LOCK TABLES `guild_news_log` WRITE;
/*!40000 ALTER TABLE `guild_news_log` DISABLE KEYS */;
/*!40000 ALTER TABLE `guild_news_log` ENABLE KEYS */;
UNLOCK TABLES;
LOCK TABLES `guild_newslog` WRITE;
/*!40000 ALTER TABLE `guild_newslog` DISABLE KEYS */;
/*!40000 ALTER TABLE `guild_newslog` ENABLE KEYS */;
--
-- Table structure for table `guild_rank`