pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-13 02:38:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge from master, probably wont compile but will fix that soon

Browse Source
This commit is contained in:
KimLS
2015-06-21 01:38:19 -07:00
parent ff3cb9fc54 32e880f571
commit 5995afa1b8
125 changed files with 7658 additions and 8436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/patches/patch_RoF.conf
+3 -2
View File
@@ -194,6 +194,7 @@ OP_Consent=0x400e
OP_ConsentDeny=0x34c1
OP_AutoFire=0x314e
OP_PetCommands=0x0093
OP_PetHoTT=0x0df4
OP_DeleteSpell=0x305c
OP_Surname=0x1a87
OP_ClearSurname=0x17b6
@@ -269,8 +270,8 @@ OP_RequestDuel=0x1ea9
OP_MobRename=0x5040
OP_AugmentItem=0x1627 # Was 0x37cb
OP_WeaponEquip1=0x35c3
OP_WeaponEquip2=0x012f # Was 0x6022
OP_WeaponUnequip2=0x1076 # Was 0x0110
OP_PlayerStateAdd=0x012f # Was 0x6022
OP_PlayerStateRemove=0x1076 # Was 0x0110
OP_ApplyPoison=0x1499
OP_Save=0x2e6f
OP_TestBuff=0x046e # Was 0x3772
utils/patches/patch_RoF2.conf
+5 -4
View File
@@ -193,6 +193,7 @@ OP_Consent=0x1fd1
OP_ConsentDeny=0x7a45
OP_AutoFire=0x241e
OP_PetCommands=0x0159
OP_PetHoTT=0x794a
OP_DeleteSpell=0x3358
OP_Surname=0x0423
OP_ClearSurname=0x3fb0
@@ -268,8 +269,8 @@ OP_RequestDuel=0x3af1
OP_MobRename=0x2c57
OP_AugmentItem=0x661b
OP_WeaponEquip1=0x34a7
OP_WeaponEquip2=0x559a
OP_WeaponUnequip2=0x2d25
OP_PlayerStateAdd=0x559a
OP_PlayerStateRemove=0x2d25
OP_ApplyPoison=0x31e6
OP_Save=0x4a39
OP_TestBuff=0x7cb8
@@ -294,8 +295,8 @@ OP_MarkNPC=0x1fb5
OP_MarkRaidNPC=0x5a58 #unimplemented
OP_ClearNPCMarks=0x2003
OP_ClearRaidNPCMarks=0x20d3 #unimplemented
OP_DelegateAbility=0x4c9d
OP_SetGroupTarget=0x026
OP_DelegateAbility=0x76b8
OP_SetGroupTarget=0x2814
OP_Charm=0x5d92
OP_Stun=0x36a4
OP_SendFindableNPCs=0x4613
utils/patches/patch_SoD.conf
+2 -2
View File
@@ -266,8 +266,8 @@ OP_RequestDuel=0x79e0 # C
OP_MobRename=0x0a1d # C
OP_AugmentItem=0x0370 # C
OP_WeaponEquip1=0x719e # C
OP_WeaponEquip2=0x7b6e # C
OP_WeaponUnequip2=0x19a8 # C
OP_PlayerStateAdd=0x7b6e # C
OP_PlayerStateRemove=0x19a8 # C
OP_ApplyPoison=0x405b # C
OP_Save=0x5c85 # C
OP_TestBuff=0x5fc7 # C
utils/patches/patch_SoF.conf
+2 -2
View File
@@ -262,8 +262,8 @@ OP_RequestDuel=0x3A2B #Xinu 02/22/09
OP_MobRename=0x6be5 #Trevius 01/16/09
OP_AugmentItem=0x172A #Trevius 03/14/09
OP_WeaponEquip1=0x7260 #Trevius 02/27/09
OP_WeaponEquip2=0x5C2F #Trevius 02/27/09
OP_WeaponUnequip2=0x6213 #Trevius 02/27/09
OP_PlayerStateAdd=0x5C2F #Trevius 02/27/09
OP_PlayerStateRemove=0x6213 #Trevius 02/27/09
OP_ApplyPoison=0x4543 #WildcardX 03/6/09
OP_Save=0x72F2 #Trevius 03/15/09
OP_TestBuff=0x07BF #/testbuff
utils/patches/patch_Titanium.conf
+2 -2
View File
@@ -534,8 +534,8 @@ OP_PVPLeaderBoardDetailsRequest=0x06a2
OP_PVPLeaderBoardDetailsReply=0x246a
OP_PickLockSuccess=0x40E7
OP_WeaponEquip1=0x6c5e
OP_WeaponEquip2=0x63da
OP_WeaponUnequip2=0x381d
OP_PlayerStateAdd=0x63da
OP_PlayerStateRemove=0x381d
OP_VoiceMacroIn=0x2866 # Client to Server
OP_VoiceMacroOut=0x2ec6 # Server to Client
OP_CameraEffect=0x0937 # Correct
utils/patches/patch_UF.conf
+3 -2
View File
@@ -197,6 +197,7 @@ OP_Consent=0x6bb9 # C
OP_ConsentDeny=0x4cd1 # C
OP_AutoFire=0x5db5 # C
OP_PetCommands=0x7706 # C
OP_PetHoTT=0x2528
OP_DeleteSpell=0x0698 # C
OP_Surname=0x44ae # C
OP_ClearSurname=0x6705 # C
@@ -272,8 +273,8 @@ OP_RequestDuel=0x6cfe # C
OP_MobRename=0x0507 # C
OP_AugmentItem=0x7c87 # C
OP_WeaponEquip1=0x4572 # C
OP_WeaponEquip2=0x399b # C
OP_WeaponUnequip2=0x416b # C
OP_PlayerStateAdd=0x399b # C
OP_PlayerStateRemove=0x416b # C
OP_ApplyPoison=0x5cd3 # C
OP_Save=0x6618 # C
OP_TestBuff=0x3415 # C
utils/sql/db_update_manifest.txt
+7 -1
View File
@@ -331,9 +331,15 @@
9075|2015_02_02_logsys_packet_logs_with_dump.sql|SELECT * FROM `logsys_categories` WHERE `log_category_description` LIKE 'Packet: Server -> Client With Dump'|empty|
9076|2015_02_04_average_coin.sql|SHOW COLUMNS FROM `loottable` WHERE Field = 'avgcoin'|contains|smallint
9077|2015_02_12_zone_gravity.sql|SHOW COLUMNS FROM `zone` LIKE 'gravity'|empty|
9078|2015_05_20_BuffInstrumentMod.sql|SHOW COLUMNS FROM `character_buffs` LIKE 'instrument_mod'|empty|
9079|2015_05_23_BuffDurations.sql|SHOW COLUMNS FROM `character_buffs` LIKE 'ticsremaining'|contains|unsigned|
9080|2015_05_23_PetBuffInstrumentMod.sql|SHOW COLUMNS FROM `character_pet_buffs` LIKE 'instrument_mod'|empty|
9081|2015_05_23_dbstr_us.sql|SHOW TABLES LIKE 'db_str'|empty|
9082|2015_05_25_npc_types_texture_fields.sql|SHOW COLUMNS FROM `npc_types` LIKE 'armtexture'|empty|
9083|2015_06_07_aa_update.sql|SHOW COLUMNS FROM `character_alternate_abilities` LIKE 'charges'|empty|
# Upgrade conditions:
# This won't be needed after this system is implemented, but it is used database that are not
# This won't be needed after this system is implemented, but it is used database that are not
# yet using the versioning system to figure out where the database is schema wise to determine
# which updates are necessary to run
#
utils/sql/git/optional/2014_03_17_EnforceAugmentRules.sql
+1 -1
View File
@@ -1,3 +1,3 @@
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:EnforceAugmentRestriction', 'false', 'Forces augment slot restrictions.');
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:EnforceAugmentUsability', 'false', 'Forces augmented item usability.');
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:EnforceAugmentWear', 'false', 'Forces augment wear slot validation.');
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:EnforceAugmentWear', 'false', 'Forces augment wear slot validation.');
utils/sql/git/optional/2015_2_5_UseAdditiveFocusFromWornSlot.sql → utils/sql/git/optional/2015_02_05_UseAdditiveFocusFromWornSlot.sql
View File
utils/sql/git/optional/2015_2_6_AdditiveBonusWornType.sql → utils/sql/git/optional/2015_02_06_AdditiveBonusWornType.sql
View File
utils/sql/git/optional/2015_04_30_MeleePush.sql
+2
View File
@@ -0,0 +1,2 @@
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Combat:MeleePush', 'true', 'Turns on Melee Push.');
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Combat:MeleePushChance', '50', 'Chance that an NPC can be pushed from melee.');
utils/sql/git/optional/2015_05_18_FishingLineLength.sql
+1
View File
@@ -0,0 +1 @@
UPDATE rule_values SET rule_value=100 WHERE rule_name='Watermap:FishingLineLength';
utils/sql/git/optional/2015_06_07_SpellsTargetBuffsRule.sql
+1
View File
@@ -0,0 +1 @@
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:AlwaysSendTargetBuffs', 'false', 'Allows the server to send the targets buffs ignoring the LAA.');
utils/sql/git/optional/2015_06_07_TransformSummonedBagsRule.sql
+1
View File
@@ -0,0 +1 @@
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:TransformSummonedBags', 'true', 'Transforms summoned bags into disenchanted ones instead of deleting.');
utils/sql/git/required/2015_05_20_BuffInstrumentMod.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE `character_buffs` ADD COLUMN `instrument_mod` int(10) DEFAULT 10 NOT NULL;
utils/sql/git/required/2015_05_23_BuffDurations.sql
+2
View File
@@ -0,0 +1,2 @@
ALTER TABLE `character_buffs` CHANGE COLUMN `ticsremaining` `ticsremaining` INT(11) SIGNED NOT NULL;
ALTER TABLE `merc_buffs` CHANGE COLUMN `TicsRemaining` `TicsRemaining` INT(11) SIGNED NOT NULL DEFAULT 0;
utils/sql/git/required/2015_05_23_PetBuffInstrumentMod.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE `character_pet_buffs` ADD COLUMN `instrument_mod` tinyint UNSIGNED DEFAULT 10 NOT NULL;
utils/sql/git/required/2015_05_23_dbstr_us.sql
+6
View File
@@ -0,0 +1,6 @@
CREATE TABLE `db_str` (
`id` INT(10) NOT NULL,
`type` INT(10) NOT NULL,
`value` TEXT NOT NULL,
PRIMARY KEY (`id`, `type`)
);
utils/sql/git/required/2015_05_25_npc_types_texture_fields.sql
+6
View File
@@ -0,0 +1,6 @@
ALTER TABLE npc_types
ADD COLUMN `armtexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `raid_target`,
ADD COLUMN `bracertexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `armtexture`,
ADD COLUMN `handtexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `bracertexture`,
ADD COLUMN `legtexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `handtexture`,
ADD COLUMN `feettexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `legtexture`;
utils/sql/git/required/2015_06_07_aa_update.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE character_alternate_abilities ADD COLUMN charges SMALLINT(11) UNSIGNED NOT NULL DEFAULT 0;