mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 18:52:22 +00:00
Merge and fix the loot update branch, ready for merge I think
This commit is contained in:
KimLS
@@ -1,4 +1,5 @@
|
||||
ALTER TABLE `npc_types` ADD COLUMN `special_abilities` TEXT NOT NULL DEFAULT '' AFTER `npcspecialattks`;
|
||||
ALTER TABLE `npc_types` ADD COLUMN `special_abilities` TEXT NULL AFTER `npcspecialattks`;
|
||||
ALTER TABLE `npc_types` MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL;
|
||||
|
||||
UPDATE npc_types SET special_abilities = CONCAT(special_abilities, "1,1^") WHERE npcspecialattks LIKE BINARY '%S%';
|
||||
UPDATE npc_types SET special_abilities = CONCAT(special_abilities, "2,1^") WHERE npcspecialattks LIKE BINARY '%E%';
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
ALTER TABLE `merc_stats` ADD COLUMN `special_abilities` TEXT NOT NULL DEFAULT '' AFTER `specialattks`;
|
||||
|
||||
ALTER TABLE `merc_stats` ADD COLUMN `special_abilities` TEXT NULL AFTER `specialattks`;
|
||||
ALTER TABLE `merc_stats` MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL;
|
||||
|
||||
UPDATE merc_stats SET special_abilities = CONCAT(special_abilities, "1,1^") WHERE specialattks LIKE BINARY '%S%';
|
||||
UPDATE merc_stats SET special_abilities = CONCAT(special_abilities, "2,1^") WHERE specialattks LIKE BINARY '%E%';
|
||||
UPDATE merc_stats SET special_abilities = CONCAT(special_abilities, "3,1^") WHERE specialattks LIKE BINARY '%R%';
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
-- AA MGB update
|
||||
UPDATE altadv_vars SET spellid = 5228 WHERE skill_id = 128;
|
||||
UPDATE aa_actions SET spell_id = 5228, nonspell_action = 0 WHERE aaid = 128;
|
||||
|
||||
-- AA Project Illusion update
|
||||
UPDATE altadv_vars SET spellid = 5227 WHERE skill_id = 643;
|
||||
UPDATE aa_actions SET spell_id = 5227, nonspell_action = 0 WHERE aaid = 643;
|
||||
|
||||
-- AA Improved Reclaim Energy
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('180', '1', '241', '95', '0');
|
||||
|
||||
-- AA Headshot
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('644', '1', '217', '0', '32000');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('644', '2', '346', '46', '0');
|
||||
|
||||
-- AA Anatomy (Rogue Assassinate)
|
||||
INSERT INTO `altadv_vars` (`skill_id`, `name`, `cost`, `max_level`, `hotkey_sid`, `hotkey_sid2`, `title_sid`, `desc_sid`, `type`, `spellid`, `prereq_skill`, `prereq_minpoints`, `spell_type`, `spell_refresh`, `classes`, `berserker`, `class_type`, `cost_inc`, `aa_expansion`, `special_category`, `sof_type`, `sof_cost_inc`, `sof_max_level`, `sof_next_skill`, `clientver`, `account_time_required`, `sof_current_level`,`sof_next_id`,`level_inc`) VALUES ('1604', 'Anatomy', '5', '3', '4294967295', '4294967295', '1604', '1604', '1', '4294967295', '0', '0', '0', '0', '512', '0', '60', '1', '10', '4294967295', '3', '0', '3', '1604', '1', '0', '0', '0', '0');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('1604', '1', '439', '0', '32000');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('1604', '2', '345', '48', '0');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('1605', '1', '439', '0', '32000');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('1605', '2', '345', '51', '0');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('1606', '1', '439', '0', '32000');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('1606', '2', '345', '53', '0');
|
||||
|
||||
-- AA Finishing Blow Fix
|
||||
DELETE FROM aa_effects WHERE aaid = 199 AND slot = 2;
|
||||
DELETE FROM aa_effects WHERE aaid = 200 AND slot = 2;
|
||||
DELETE FROM aa_effects WHERE aaid = 201 AND slot = 2;
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('119', '1', '278', '500', '32000');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('119', '2', '440', '50', '200');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('120', '1', '278', '500', '32000');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('120', '2', '440', '52', '200');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('121', '1', '278', '500', '32000');
|
||||
INSERT INTO `aa_effects` (`aaid`, `slot`, `effectid`, `base1`, `base2`) VALUES ('121', '2', '440', '54', '200');
|
||||
@@ -1 +1 @@
|
||||
ALTER TABLE `account` ADD COLUMN `ban_reason` TEXT NULL DEFAULT NULL AFTER `expansion`, ADD COLUMN `suspend_reason` TEXT NULL DEFAULT NULL AFTER `ban_reason`;
|
||||
ALTER TABLE `account` ADD COLUMN `ban_reason` TEXT NULL DEFAULT NULL, ADD COLUMN `suspend_reason` TEXT NULL DEFAULT NULL AFTER `ban_reason`;
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `raid_details` ADD `motd` varchar(1024);
|
||||
@@ -0,0 +1,9 @@
|
||||
CREATE TABLE `raid_leaders` (
|
||||
`gid` int(4) unsigned NOT NULL,
|
||||
`rid` int(4) unsigned NOT NULL,
|
||||
`marknpc` varchar(64) NOT NULL,
|
||||
`maintank` varchar(64) NOT NULL,
|
||||
`assist` varchar(64) NOT NULL,
|
||||
`puller` varchar(64) NOT NULL,
|
||||
`leadershipaa` tinyblob NOT NULL
|
||||
);
|
||||
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE `group_leaders` ADD `mentoree` VARCHAR(64) NOT NULL;
|
||||
ALTER TABLE `group_leaders` ADD `mentor_percent` INT(4) DEFAULT 0 NOT NULL;
|
||||
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE `raid_leaders` ADD `mentoree` VARCHAR(64) NOT NULL;
|
||||
ALTER TABLE `raid_leaders` ADD `mentor_percent` INT(4) DEFAULT 0 NOT NULL;
|
||||
@@ -0,0 +1,4 @@
|
||||
ALTER TABLE `merc_stats` MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL;
|
||||
|
||||
ALTER TABLE `npc_types` MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL;
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `raid_members` CHANGE COLUMN `groupid` `groupid` INT(4) UNSIGNED NOT NULL DEFAULT '0' AFTER `charid`;
|
||||
@@ -0,0 +1,9 @@
|
||||
-- spells new table update
|
||||
ALTER TABLE `spells_new` CHANGE `field124` `disallow_sit` INT(11) NOT NULL DEFAULT '0';
|
||||
ALTER TABLE `spells_new` CHANGE `field125` `deities0` INT(11) NOT NULL DEFAULT '0';
|
||||
ALTER TABLE `spells_new` CHANGE `field196` `sneaking` INT(11) NOT NULL DEFAULT '0';
|
||||
ALTER TABLE `spells_new` CHANGE `field158` `effectdescnum2` INT(11) NOT NULL DEFAULT '0';
|
||||
ALTER TABLE `spells_new` CHANGE `field165` `ldon_trap` INT(11) NOT NULL DEFAULT '0';
|
||||
ALTER TABLE `spells_new` CHANGE `field205` `no_block` INT(11) NOT NULL DEFAULT '0';
|
||||
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
-- Inventory table update
|
||||
ALTER TABLE `inventory`
|
||||
ADD COLUMN `ornamenticon` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `custom_data`,
|
||||
ADD COLUMN `ornamentidfile` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `ornamenticon`;
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `mercs` ADD `MercSize` float( 0 ) NOT NULL DEFAULT '5' AFTER `Gender`;
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `items` ADD `herosforgemodel` int( 11 ) NOT NULL DEFAULT '0' AFTER `material`;
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `inventory` ADD `ornament_hero_model` int( 11 ) NOT NULL DEFAULT '0' AFTER `ornamentidfile`;
|
||||
@@ -0,0 +1,16 @@
|
||||
/* Add the new Aug Slot 6 Fields to the items table */
|
||||
ALTER TABLE `items` ADD `augslot6type` tinyint( 3 ) NOT NULL DEFAULT '0' AFTER `augslot5visible`;
|
||||
ALTER TABLE `items` ADD `augslot6visible` tinyint( 3 ) NOT NULL DEFAULT '0' AFTER `augslot6type`;
|
||||
ALTER TABLE `items` ADD `augslot6unk2` int( 11 ) NOT NULL DEFAULT '0' AFTER `augslot5unk2`;
|
||||
|
||||
/* Add the new Aug Slot 6 Field to the inventory table */
|
||||
ALTER TABLE `inventory` ADD `augslot6` mediumint( 7 ) NOT NULL DEFAULT '0' AFTER `augslot5`;
|
||||
|
||||
/* Add the new Aug Slot 6 Field to the sharedbank table */
|
||||
ALTER TABLE `sharedbank` ADD `augslot6` mediumint( 7 ) NOT NULL DEFAULT '0' AFTER `augslot5`;
|
||||
|
||||
/* Add the new Aug Slot 6 Field to the object_contents table */
|
||||
ALTER TABLE `object_contents` ADD `augslot6` mediumint( 7 ) NOT NULL DEFAULT '0' AFTER `augslot5`;
|
||||
|
||||
/* Add the new Aug Slot 6 Field to the sharedbank table */
|
||||
ALTER TABLE `character_corpse_items` ADD `aug_6` int( 11 ) NOT NULL DEFAULT '0' AFTER `aug_5`;
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `npc_types` ADD `herosforgemodel` int( 11 ) NOT NULL DEFAULT '0' AFTER `helmtexture`;
|
||||
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE `npc_types` CHANGE `d_meele_texture1` `d_melee_texture1` INT(11) DEFAULT NULL;
|
||||
ALTER TABLE `npc_types` CHANGE `d_meele_texture2` `d_melee_texture2` INT(11) DEFAULT NULL;
|
||||
@@ -0,0 +1,69 @@
|
||||
/* Drop the current Merc View */
|
||||
DROP VIEW vwMercNpcTypes;
|
||||
|
||||
/* Rename fields to match the source changes */
|
||||
ALTER TABLE `merc_weaponinfo` CHANGE `d_meele_texture1` `d_melee_texture1` INT(11) NOT NULL DEFAULT 0;
|
||||
ALTER TABLE `merc_weaponinfo` CHANGE `d_meele_texture2` `d_melee_texture2` INT(11) NOT NULL DEFAULT 0;
|
||||
|
||||
/* Re-Create the Merc View with new field names */
|
||||
CREATE VIEW vwMercNpcTypes AS
|
||||
SELECT
|
||||
ms.merc_npc_type_id,
|
||||
'' AS name,
|
||||
ms.clientlevel,
|
||||
ms.level,
|
||||
mtyp.race_id,
|
||||
mstyp.class_id,
|
||||
ms.hp,
|
||||
ms.mana,
|
||||
0 AS gender,
|
||||
mai.texture,
|
||||
mai.helmtexture,
|
||||
ms.attack_speed,
|
||||
ms.STR,
|
||||
ms.STA,
|
||||
ms.DEX,
|
||||
ms.AGI,
|
||||
ms._INT,
|
||||
ms.WIS,
|
||||
ms.CHA,
|
||||
ms.MR,
|
||||
ms.CR,
|
||||
ms.DR,
|
||||
ms.FR,
|
||||
ms.PR,
|
||||
ms.Corrup,
|
||||
ms.mindmg,
|
||||
ms.maxdmg,
|
||||
ms.attack_count,
|
||||
ms.special_abilities AS special_abilities,
|
||||
mwi.d_melee_texture1,
|
||||
mwi.d_melee_texture2,
|
||||
mwi.prim_melee_type,
|
||||
mwi.sec_melee_type,
|
||||
ms.runspeed,
|
||||
ms.hp_regen_rate,
|
||||
ms.mana_regen_rate,
|
||||
1 AS bodytype,
|
||||
mai.armortint_id,
|
||||
mai.armortint_red,
|
||||
mai.armortint_green,
|
||||
mai.armortint_blue,
|
||||
ms.AC,
|
||||
ms.ATK,
|
||||
ms.Accuracy,
|
||||
ms.spellscale,
|
||||
ms.healscale
|
||||
FROM merc_stats ms
|
||||
INNER JOIN merc_armorinfo mai
|
||||
ON ms.merc_npc_type_id = mai.merc_npc_type_id
|
||||
AND mai.minlevel <= ms.level AND mai.maxlevel >= ms.level
|
||||
INNER JOIN merc_weaponinfo mwi
|
||||
ON ms.merc_npc_type_id = mwi.merc_npc_type_id
|
||||
AND mwi.minlevel <= ms.level AND mwi.maxlevel >= ms.level
|
||||
INNER JOIN merc_templates mtem
|
||||
ON mtem.merc_npc_type_id = ms.merc_npc_type_id
|
||||
INNER JOIN merc_types mtyp
|
||||
ON mtem.merc_type_id = mtyp.merc_type_id
|
||||
INNER JOIN merc_subtypes mstyp
|
||||
ON mtem.merc_subtype_id = mstyp.merc_subtype_id;
|
||||
@@ -0,0 +1,3 @@
|
||||
ALTER TABLE `npc_types` MODIFY `bodytype` INT(11) NOT NULL DEFAULT '1';
|
||||
ALTER TABLE `npc_types` MODIFY `d_melee_texture1` INT(11) NOT NULL DEFAULT '0';
|
||||
ALTER TABLE `npc_types` MODIFY `d_melee_texture2` INT(11) NOT NULL DEFAULT '0';
|
||||
@@ -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');
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `npc_types` ADD `light` tinyint( 2 ) NOT NULL DEFAULT '0';
|
||||
@@ -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');
|
||||
@@ -0,0 +1 @@
|
||||
INSERT INTO `logsys_categories` (`log_category_id`, `log_category_description`, `log_to_gmsay`) VALUES ('38', 'Quest Debug', '1');
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE `merc_stats` ADD `statscale` int( 11 ) NOT NULL DEFAULT '100' AFTER `runspeed`;
|
||||
@@ -0,0 +1,3 @@
|
||||
ALTER TABLE `merc_stats` ADD `attack_delay` TINYINT(3) UNSIGNED DEFAULT '30' NOT NULL AFTER `attack_speed`;
|
||||
UPDATE `merc_stats` SET `attack_delay` = 36 + 36 * (`attack_speed` / 100);
|
||||
UPDATE `merc_stats` SET `attack_delay` = 30 WHERE `attack_speed` = 0;
|
||||
@@ -0,0 +1,7 @@
|
||||
CREATE TABLE `character_item_recast` (
|
||||
`id` int(11) UNSIGNED NOT NULL DEFAULT 0,
|
||||
`recast_type` smallint(11) UNSIGNED NOT NULL DEFAULT 0,
|
||||
`timestamp` int(11) UNSIGNED NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY(`id`, `recast_type`),
|
||||
KEY `id` (`id`)
|
||||
) ENGINE = InnoDB DEFAULT CHARSET = latin1;
|
||||
@@ -0,0 +1,3 @@
|
||||
REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('39', 'Packet: Server -> Client');
|
||||
REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('5', 'Packet: Client -> Server');
|
||||
REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('40', 'Packet: Client -> Server Unhandled');
|
||||
@@ -0,0 +1,2 @@
|
||||
REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('41', 'Packet: Server -> Client With Dump');
|
||||
REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('42', 'Packet: Server -> Client With Dump');
|
||||
@@ -0,0 +1,2 @@
|
||||
ALTER TABLE `loottable` CHANGE COLUMN `avgcoin` `avgcoin` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `maxcash`;
|
||||
UPDATE `loottable` SET avgcoin = 0;
|
||||
Reference in New Issue
Block a user