Merge remote-tracking branch 'upstream/master'

utils/sql/db_update_manifest.txt

@@ -320,6 +320,9 @@
 9064|2014_12_24_npc_types_table_update.sql|SHOW COLUMNS FROM `npc_types` LIKE 'herosforgemodel'|empty|
 9065|2014_12_26_merc_weaponinfo_table_update.sql|SHOW COLUMNS FROM `vwMercNpcTypes` LIKE 'd_melee_texture1'|empty|
 9066|2014_12_31_npc_types_default_values_update.sql|SHOW COLUMNS FROM `npc_types` LIKE 'bodytype'|contains|YES
+9067|2015_01_21_npc_types_update.sql|SHOW COLUMNS FROM `npc_types` LIKE 'light'|empty|
+9068|2015_01_15_logsys_categories_table.sql|SHOW TABLES LIKE 'logsys_categories'|empty|
+9069|2015_01_25_logsys_Mercenaries_category.sql|SELECT * FROM `logsys_categories` WHERE `log_category_description` LIKE 'Mercenaries'|empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not 

utils/sql/git/optional/2015_01_21_NPC_Types_Light_Field_Primer.sql

@@ -0,0 +1,5 @@
+-- 'greater lightstone' light level on 'wisp' race
+UPDATE `npc_types` SET `light` = 11 WHERE `race` = 69;
+
+-- 'fire beetle eye' light level on 'beetle' race with name criteria
+UPDATE `npc_types` SET `light` = 12 WHERE `race` = 22 AND (`name` LIKE '%fire%' OR `name` LIKE '%lava%');

utils/sql/git/required/2015_01_15_logsys_categories_table.sql

@@ -0,0 +1,54 @@
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for logsys_categories
+-- ----------------------------
+DROP TABLE IF EXISTS `logsys_categories`;
+CREATE TABLE `logsys_categories` (
+  `log_category_id` int(11) NOT NULL,
+  `log_category_description` varchar(150) DEFAULT NULL,
+  `log_to_console` smallint(11) DEFAULT '0',
+  `log_to_file` smallint(11) DEFAULT '0',
+  `log_to_gmsay` smallint(11) DEFAULT '0',
+  PRIMARY KEY (`log_category_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- ----------------------------
+-- Records of logsys_categories
+-- ----------------------------
+INSERT INTO `logsys_categories` VALUES ('1', 'AA', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('2', 'AI', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('3', 'Aggro', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('4', 'Attack', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('5', 'Client_Server_Packet', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('6', 'Combat', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('7', 'Commands', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('8', 'Crash', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('9', 'Debug', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('10', 'Doors', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('11', 'Error', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('12', 'Guilds', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('13', 'Inventory', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('14', 'Launcher', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('15', 'Netcode', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('16', 'Normal', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('17', 'Object', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('18', 'Pathing', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('19', 'QS_Server', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('20', 'Quests', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('21', 'Rules', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('22', 'Skills', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('23', 'Spawns', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('24', 'Spells', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('25', 'Status', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('26', 'TCP_Connection', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('27', 'Tasks', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('28', 'Tradeskills', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('29', 'Trading', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('30', 'Tribute', '0', '0', '0');
+INSERT INTO `logsys_categories` VALUES ('31', 'UCS_Server', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('32', 'WebInterface_Server', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('33', 'World_Server', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('34', 'Zone Server', '1', '1', '0');
+INSERT INTO `logsys_categories` VALUES ('35', 'MySQL Error', '1', '1', '1');
+INSERT INTO `logsys_categories` VALUES ('36', 'MySQL Queries', '0', '0', '0');

utils/sql/git/required/2015_01_21_npc_types_update.sql

@@ -0,0 +1 @@
+ALTER TABLE `npc_types` ADD `light` tinyint( 2 ) NOT NULL DEFAULT '0';

utils/sql/git/required/2015_01_25_logsys_Mercenaries_category.sql

@@ -0,0 +1 @@
+INSERT INTO `logsys_categories` (`log_category_id`,`log_category_description`,`log_to_console`,`log_to_file`,`log_to_gmsay`) VALUES ('37', 'Mercenaries', '0', '0', '0');