Merge remote-tracking branch 'upstream/master' into Warning_Cleanup

Conflicts:
	zone/Map.cpp

utils/sql/git/optional/2014_04_03_SpellProjectileRules.sql

@@ -1,3 +1,3 @@
 INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:FRProjectileItem_Titanium', '1113', 'Item id for Titanium clients for Fire spell projectile.');
-INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:FRProjectileItem_SOF', '80684', 'Item id for Titanium clients for Fire spell projectile.');
-INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:FRProjectileItem_NPC', '80684', 'Item id for Titanium clients for Fire spell projectile.');
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:FRProjectileItem_SOF', '80684', 'Item id for SOF clients for Fire spell projectile.');
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:FRProjectileItem_NPC', '80684', 'Item id for NPC to use for Fire spell projectile.');

utils/sql/git/optional/2014_04_09_SpellProjectileRule.sql

@@ -0,0 +1,7 @@
+-- Recommend enabling if your server uses an UF+ spell file and your players use UF+ client. This will give the proper graphics for all spell projectiles.
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:UseLiveSpellProjectileGFX', false, ' Use spell projectile graphics set in the spells_new table (player_1). Server must be using UF+ spell file.');
+
+-- Use this query to check if your spell file is compatible
+-- If it returns in the player_1 field IT##### it will work.
+SELECT id,name,player_1 from spells_new WHERE targettype = 1;
+

utils/sql/git/optional/2014_04_10_SwarmPetNotTargetableWithHotKey.sql

@@ -0,0 +1,4 @@
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Pets:SwarmPetNotTargetableWithHotKey', 'false', ' On SOF+ clients this a semi-hack to make swarm pets not F8 targetable. Warning: Turns pet names Yellow');
+
+
+

utils/sql/git/required/2014_04_10_No_Target_With_Hotkey.sql

@@ -0,0 +1,3 @@
+ALTER TABLE  `npc_types` ADD  `no_target_hotkey` tinyint( 1 ) UNSIGNED NOT NULL DEFAULT  '0' AFTER `healscale`;
+
+

utils/sql/git/required/2014_04_12_SlowMitigation.sql

@@ -0,0 +1,7 @@
+-- Convert all values from FLOAT to INT
+UPDATE npc_types SET slow_mitigation = slow_mitigation * 100;
+
+-- Change variable type from FLOAT TO INT
+ALTER TABLE npc_types MODIFY slow_mitigation smallint(4);
+
+

utils/sql/git/required/2014_04_18_Suppress_Command_Error.sql

@@ -0,0 +1 @@
+INSERT INTO `rule_values` VALUES ('0', 'Chat:SuppressCommandErrors', 'true', 'This will suppress "Command is not recognized"');

utils/sql/git/required/2014_04_25_spawn_events.sql

@@ -0,0 +1 @@
+alter table spawn_events add column `strict` tinyint(4) not null default 0;

utils/sql/git/required/2014_04_27_AISpellEffects.sql

@@ -0,0 +1,104 @@
+-- Note: The data entered into the new table are only examples and can be deleted/modified as needed.
+
+ALTER TABLE  `npc_types` ADD  `npc_spells_effects_id` int( 11 ) UNSIGNED NOT NULL DEFAULT  '0' AFTER `npc_spells_id`;
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for `npc_spells_effects`
+-- ----------------------------
+DROP TABLE IF EXISTS `npc_spells_effects`;
+CREATE TABLE `npc_spells_effects` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` tinytext,
+  `parent_list` int(11) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1080 DEFAULT CHARSET=latin1;
+
+-- ----------------------------
+-- Records of npc_spells_effects
+-- ----------------------------
+INSERT INTO `npc_spells_effects` VALUES ('1', 'Critical Melee [All Skills]', '0');
+INSERT INTO `npc_spells_effects` VALUES ('2', 'Damage Shield', '0');
+INSERT INTO `npc_spells_effects` VALUES ('3', 'Melee Haste', '0');
+INSERT INTO `npc_spells_effects` VALUES ('4', 'Resist Spell Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('5', 'Resist Direct Dmg Spell Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('6', 'Reflect Spell Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('7', 'Spell Damage Shield', '0');
+INSERT INTO `npc_spells_effects` VALUES ('8', 'Melee Mitigation [All]', '0');
+INSERT INTO `npc_spells_effects` VALUES ('9', 'Avoid Melee', '0');
+INSERT INTO `npc_spells_effects` VALUES ('10', 'Riposte Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('11', 'Dodge Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('12', 'Parry Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('13', 'Decrease Dmg Taken [2HS]', '0');
+INSERT INTO `npc_spells_effects` VALUES ('14', 'Increase Dmg Taken [1HS]', '0');
+INSERT INTO `npc_spells_effects` VALUES ('15', 'Block Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('16', 'Melee Lifetap', '0');
+INSERT INTO `npc_spells_effects` VALUES ('17', 'Hit Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('18', 'Increase Dmg [1HS]', '0');
+INSERT INTO `npc_spells_effects` VALUES ('19', 'Increase Archery Dmg', '0');
+INSERT INTO `npc_spells_effects` VALUES ('20', 'Flurry Chance', '0');
+INSERT INTO `npc_spells_effects` VALUES ('21', 'Add Damage [2HS]', '0');
+INSERT INTO `npc_spells_effects` VALUES ('22', 'Divine Aura', '0');
+INSERT INTO `npc_spells_effects` VALUES ('23', 'Cast CH on Kill', '0');
+INSERT INTO `npc_spells_effects` VALUES ('24', 'Critical Heal', '0');
+INSERT INTO `npc_spells_effects` VALUES ('25', 'Critical Direct Dmg', '0');
+INSERT INTO `npc_spells_effects` VALUES ('26', 'Heal Rate', '0');
+INSERT INTO `npc_spells_effects` VALUES ('27', 'Negate Damage Shield', '0');
+INSERT INTO `npc_spells_effects` VALUES ('28', 'Increase Spell Vulnerability [All]', '0');
+INSERT INTO `npc_spells_effects` VALUES ('29', 'Decrease Spell Vulnerability [FR]', '0');
+INSERT INTO `npc_spells_effects` VALUES ('30', 'Movement Speed', '0');
+
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for `npc_spells_effects_entries`
+-- ----------------------------
+DROP TABLE IF EXISTS `npc_spells_effects_entries`;
+CREATE TABLE `npc_spells_effects_entries` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `npc_spells_effects_id` int(11) NOT NULL DEFAULT '0',
+  `spell_effect_id` smallint(5) NOT NULL DEFAULT '0',
+  `minlevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `maxlevel` tinyint(3) unsigned NOT NULL DEFAULT '255',
+  `se_base` int(11) NOT NULL DEFAULT '0',
+  `se_limit` int(11) NOT NULL DEFAULT '0',
+  `se_max` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `spellsid_spellid` (`npc_spells_effects_id`,`spell_effect_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=18374 DEFAULT CHARSET=latin1;
+
+-- ----------------------------
+-- Records of npc_spells_effects_entries
+-- ----------------------------
+INSERT INTO `npc_spells_effects_entries` VALUES ('1', '1', '169', '0', '255', '10000', '-1', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('2', '2', '59', '0', '255', '-60', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('3', '3', '11', '0', '255', '150', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('4', '4', '180', '0', '255', '50', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('5', '5', '378', '0', '255', '85', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('6', '6', '158', '0', '255', '50', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('7', '7', '157', '0', '255', '-300', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('8', '8', '168', '0', '255', '-50', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('9', '9', '172', '0', '255', '10000', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('10', '10', '173', '0', '255', '10000', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('11', '11', '174', '0', '255', '10000', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('12', '12', '175', '0', '255', '10000', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('13', '13', '197', '0', '255', '-80', '3', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('14', '14', '197', '0', '255', '80', '1', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('15', '15', '188', '0', '255', '10000', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('16', '16', '178', '0', '255', '90', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('17', '17', '184', '0', '255', '10000', '-1', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('18', '18', '185', '0', '255', '100', '1', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('19', '19', '301', '0', '255', '100', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('20', '20', '279', '0', '255', '50', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('21', '21', '220', '0', '255', '2000', '1', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('22', '22', '40', '0', '255', '1', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('23', '23', '360', '0', '255', '100', '13', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('24', '24', '274', '0', '255', '90', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('25', '25', '294', '0', '255', '100', '200', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('26', '26', '120', '0', '255', '50', '0', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('27', '27', '382', '0', '255', '0', '55', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('28', '28', '296', '0', '255', '1000', '-1', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('29', '29', '296', '0', '255', '-50', '2', '0');
+INSERT INTO `npc_spells_effects_entries` VALUES ('30', '30', '3', '0', '255', '60', '0', '0');