[svn] * Merge Temp dev SVN with Assembla.
* Changes include: - Implementation of w12x's Outdoor PvP and Game Event Systems. - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed). - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql). - Improved Config cleanup. - And many more changes. --HG-- branch : trunk
This commit is contained in:
1 parent
222cbfd464
commit
2265aef916
463 files changed
+10750
-7723
No files matched your search
@@ -15,9 +15,9 @@ INSERT INTO `command` (`name`, `security`, `help`) VALUES
|
||||
('debug arena',3,'Syntax: .debug arena\r\n\r\n Toggles arena 1v1 or normal mode.');
|
||||
|
||||
|
||||
DELETE FROM mangos_string WHERE entry IN (711,712);
|
||||
DELETE FROM mangos_string WHERE entry BETWEEN 730 AND 745;
|
||||
INSERT INTO mangos_string (entry, content_default) VALUES
|
||||
DELETE FROM trinity_string WHERE entry IN (711,712);
|
||||
DELETE FROM trinity_string WHERE entry BETWEEN 730 AND 745;
|
||||
INSERT INTO trinity_string (entry, content_default) VALUES
|
||||
(711,'Your group is too large for this battleground. Please regroup to join.'),
|
||||
(712,'Your group is too large for this arena. Please regroup to join.'),
|
||||
(730,'Your group has members not in your arena team. Please regroup to join.'),
|
||||
|
||||
@@ -69,7 +69,9 @@ CREATE TABLE `IRC_AutoAnnounce` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='IRC Module System';
|
||||
|
||||
-- Add ircpm command.
|
||||
delete from `command` WHERE `name`='ircpm';
|
||||
insert into `command` (`name`, `security`, `help`) values ('ircpm', 0, 'Syntax: .ircpm <user> <text>\n\nSends a PM with <text> to <user> on IRC.');
|
||||
|
||||
-- Add auto announce string.
|
||||
insert into `mangos_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) values('746','|cffff0000[Automatic]:|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
|
||||
DELETE FROM `trinity_string` WHERE `entry`=746;
|
||||
insert into `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) values('746','|cffff0000[Automatic]:|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
|
||||
@@ -0,0 +1,13 @@
|
||||
CREATE TABLE `game_event_save` (
|
||||
`event_id` mediumint(8) unsigned NOT NULL,
|
||||
`state` tinyint(3) unsigned NOT NULL default '1',
|
||||
`next_start` timestamp NOT NULL default '0000-00-00 00:00:00',
|
||||
PRIMARY KEY (`event_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `game_event_condition_save` (
|
||||
`event_id` mediumint(8) unsigned NOT NULL,
|
||||
`condition_id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`done` float default '0',
|
||||
PRIMARY KEY (`event_id`,`condition_id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
@@ -0,0 +1,68 @@
|
||||
ALTER TABLE game_event ADD COLUMN world_event tinyint(3) unsigned not null default 0 comment '0 if normal event, 1 if world event';
|
||||
|
||||
CREATE TABLE `game_event_quest_condition` (
|
||||
`quest` mediumint(8) unsigned NOT NULL default '0',
|
||||
`event_id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`condition_id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`num` float default '0',
|
||||
PRIMARY KEY (`quest`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `game_event_condition` (
|
||||
`event_id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`condition_id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`req_num` float default '0',
|
||||
`max_world_state_field` smallint(5) unsigned NOT NULL default '0',
|
||||
`done_world_state_field` smallint(5) unsigned NOT NULL default '0',
|
||||
`description` varchar(25) NOT NULL default '',
|
||||
PRIMARY KEY (`event_id`,`condition_id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `game_event_npcflag` (
|
||||
`guid` mediumint(8) unsigned NOT NULL default '0',
|
||||
`event_id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`npcflag` int(10) unsigned NOT NULL default '0',
|
||||
PRIMARY KEY (`guid`,`event_id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `game_event_prerequisite` (
|
||||
`event_id` mediumint(8) unsigned NOT NULL,
|
||||
`prerequisite_event` mediumint(8) unsigned NOT NULL,
|
||||
PRIMARY KEY (`event_id`,`prerequisite_event`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `game_event_npc_gossip` (
|
||||
`guid` int(10) unsigned NOT NULL,
|
||||
`event_id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`textid` mediumint(8) unsigned NOT NULL default '0',
|
||||
PRIMARY KEY (`guid`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `game_event_gameobject_quest` (
|
||||
`id` mediumint(8) unsigned NOT NULL default '0',
|
||||
`quest` mediumint(8) unsigned NOT NULL default '0',
|
||||
`event` smallint(5) unsigned NOT NULL default '0',
|
||||
PRIMARY KEY (`quest`,`event`,`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `game_event_npc_vendor` (
|
||||
`event` mediumint(8) unsigned NOT NULL default '0',
|
||||
`guid` mediumint(8) unsigned NOT NULL default '0',
|
||||
`item` mediumint(8) unsigned NOT NULL default '0',
|
||||
`maxcount` mediumint(8) unsigned NOT NULL default '0',
|
||||
`incrtime` mediumint(8) unsigned NOT NULL default '0',
|
||||
`ExtendedCost` mediumint(8) unsigned NOT NULL default '0',
|
||||
PRIMARY KEY (`guid`,`item`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
ALTER TABLE game_event_creature_quest DROP PRIMARY KEY, ADD PRIMARY KEY (quest, event, id);
|
||||
|
||||
ALTER TABLE game_event_creature DROP PRIMARY KEY, ADD PRIMARY KEY (guid, event);
|
||||
|
||||
ALTER TABLE game_event_gameobject DROP PRIMARY KEY, ADD PRIMARY KEY (guid, event);
|
||||
|
||||
DELETE FROM `command` WHERE `name` LIKE 'debug threatlist';
|
||||
DELETE FROM `command` WHERE `name` LIKE 'debug hostilrefs';
|
||||
INSERT INTO `command` VALUES
|
||||
('debug threatlist', 3, 'Syntax: .debug threatlist\n\n Prints out the current threatlist of the targetted creature.'),
|
||||
('debug hostilrefs', 3, 'Syntax: .debug hostilrefs\n\n Prints out the hostil refs of the targetted unit.');
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `mangos_string` RENAME TO `trinity_string`;
|
||||
Reference in new issue
Block a user