mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-17 08:00:48 +01:00
*Temp fix for crash caused by AV creature. Need to find a way to allow summoned creatures to use RandomMovement.
--HG-- branch : trunk
This commit is contained in:
@@ -15,7 +15,39 @@
|
||||
/*!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 `saved_variables`
|
||||
--
|
||||
|
||||
CREATE TABLE `saved_variables` (
|
||||
`NextArenaPointDistributionTime` bigint(40) UNSIGNED NOT NULL DEFAULT '0'
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves';
|
||||
|
||||
--
|
||||
<<<<<<< HEAD:sql/characters.sql
|
||||
=======
|
||||
-- Table structure for table `character_db_version`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `character_db_version`;
|
||||
CREATE TABLE `character_db_version` (
|
||||
`required_2008_12_15_01_character_arenas` bit(1) default NULL
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
|
||||
|
||||
--
|
||||
-- Dumping data for table `character_db_version`
|
||||
--
|
||||
|
||||
LOCK TABLES `character_db_version` WRITE;
|
||||
/*!40000 ALTER TABLE `character_db_version` DISABLE KEYS */;
|
||||
INSERT INTO `character_db_version` VALUES
|
||||
(NULL);
|
||||
/*!40000 ALTER TABLE `character_db_version` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
>>>>>>> upstream/master:sql/characters.sql
|
||||
-- Table structure for table `arena_team`
|
||||
--
|
||||
|
||||
@@ -54,7 +86,11 @@ CREATE TABLE `arena_team_member` (
|
||||
`wons_week` int(10) unsigned NOT NULL default '0',
|
||||
`played_season` int(10) unsigned NOT NULL default '0',
|
||||
`wons_season` int(10) unsigned NOT NULL default '0',
|
||||
<<<<<<< HEAD:sql/characters.sql
|
||||
`points_to_add` int(10) unsigned NOT NULL default '0'
|
||||
=======
|
||||
`personal_rating` int(10) UNSIGNED NOT NULL DEFAULT '0'
|
||||
>>>>>>> upstream/master:sql/characters.sql
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
--
|
||||
@@ -144,6 +180,64 @@ LOCK TABLES `bugreport` WRITE;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
<<<<<<< HEAD:sql/characters.sql
|
||||
=======
|
||||
-- Table structure for table `characters`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `characters`;
|
||||
CREATE TABLE `characters` (
|
||||
`guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier',
|
||||
`account` int(11) unsigned NOT NULL default '0' COMMENT 'Account Identifier',
|
||||
`data` longtext,
|
||||
`name` varchar(12) NOT NULL default '',
|
||||
`race` tinyint(3) unsigned NOT NULL default '0',
|
||||
`class` tinyint(3) unsigned NOT NULL default '0',
|
||||
`position_x` float NOT NULL default '0',
|
||||
`position_y` float NOT NULL default '0',
|
||||
`position_z` float NOT NULL default '0',
|
||||
`map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier',
|
||||
`dungeon_difficulty` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
||||
`orientation` float NOT NULL default '0',
|
||||
`taximask` longtext,
|
||||
`online` tinyint(3) unsigned NOT NULL default '0',
|
||||
`cinematic` tinyint(3) unsigned NOT NULL default '0',
|
||||
`totaltime` int(11) unsigned NOT NULL default '0',
|
||||
`leveltime` int(11) unsigned NOT NULL default '0',
|
||||
`logout_time` bigint(20) unsigned NOT NULL default '0',
|
||||
`is_logout_resting` tinyint(3) unsigned NOT NULL default '0',
|
||||
`rest_bonus` float NOT NULL default '0',
|
||||
`resettalents_cost` int(11) unsigned NOT NULL default '0',
|
||||
`resettalents_time` bigint(20) unsigned NOT NULL default '0',
|
||||
`trans_x` float NOT NULL default '0',
|
||||
`trans_y` float NOT NULL default '0',
|
||||
`trans_z` float NOT NULL default '0',
|
||||
`trans_o` float NOT NULL default '0',
|
||||
`transguid` bigint(20) unsigned NOT NULL default '0',
|
||||
`extra_flags` int(11) unsigned NOT NULL default '0',
|
||||
`stable_slots` tinyint(1) unsigned NOT NULL default '0',
|
||||
`at_login` int(11) unsigned NOT NULL default '0',
|
||||
`zone` int(11) unsigned NOT NULL default '0',
|
||||
`death_expire_time` bigint(20) unsigned NOT NULL default '0',
|
||||
`taxi_path` text,
|
||||
`arena_pending_points` int(10) UNSIGNED NOT NULL default '0',
|
||||
PRIMARY KEY (`guid`),
|
||||
KEY `idx_account` (`account`),
|
||||
KEY `idx_online` (`online`),
|
||||
KEY `idx_name` (`name`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
|
||||
|
||||
--
|
||||
-- Dumping data for table `characters`
|
||||
--
|
||||
|
||||
LOCK TABLES `characters` WRITE;
|
||||
/*!40000 ALTER TABLE `characters` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `characters` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
>>>>>>> upstream/master:sql/characters.sql
|
||||
-- Table structure for table `character_action`
|
||||
--
|
||||
|
||||
|
||||
Reference in New Issue
Block a user