pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 12:31:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(RoF2) Identified a few Item Fields and resolved an issue with cloth armor not accepting certain augments that they should.

Browse Source
This commit is contained in:
Trevius 2014-12-29 00:29:49 -06:00
parent dab3d1181e
commit 33e88bffe9
3 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -1,5 +1,8 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 12/29/2014 ==
Trevius: (RoF2) Identified a few Item Fields and resolved an issue with cloth armor not accepting certain augments that they should.
== 12/28/2014 == == 12/28/2014 ==
Uleat: Implemented class Client::TextLink as a replacement for the dozens of individual link formatters. Uleat: Implemented class Client::TextLink as a replacement for the dozens of individual link formatters.

23
common/patches/rof2.cpp
View File

@ -4848,10 +4848,9 @@ namespace RoF2
hdr.slot_type = (merchant_slot == 0) ? slot_id.SlotType : 9; // 9 is merchant 20 is reclaim items? hdr.slot_type = (merchant_slot == 0) ? slot_id.SlotType : 9; // 9 is merchant 20 is reclaim items?
hdr.main_slot = (merchant_slot == 0) ? slot_id.MainSlot : merchant_slot; hdr.main_slot = (merchant_slot == 0) ? slot_id.MainSlot : merchant_slot;
hdr.sub_slot = (merchant_slot == 0) ? slot_id.SubSlot : 0xffff; hdr.sub_slot = (merchant_slot == 0) ? slot_id.SubSlot : 0xffff;
hdr.unknown013 = (merchant_slot == 0) ? slot_id.AugSlot : 0xffff; hdr.aug_slot = (merchant_slot == 0) ? slot_id.AugSlot : 0xffff;
hdr.price = inst->GetPrice(); hdr.price = inst->GetPrice();
hdr.merchant_slot = (merchant_slot == 0) ? 1 : inst->GetMerchantCount(); hdr.merchant_slot = (merchant_slot == 0) ? 1 : inst->GetMerchantCount();
//hdr.merchant_slot = (merchant_slot == 0) ? 1 : 0xffffffff;
hdr.scaled_value = inst->IsScaling() ? inst->GetExp() / 100 : 0; hdr.scaled_value = inst->IsScaling() ? inst->GetExp() / 100 : 0;
hdr.instance_id = (merchant_slot == 0) ? inst->GetSerialNumber() : merchant_slot; hdr.instance_id = (merchant_slot == 0) ? inst->GetSerialNumber() : merchant_slot;
hdr.unknown028 = 0; hdr.unknown028 = 0;
@ -5053,7 +5052,7 @@ namespace RoF2
memset(&isbs, 0, sizeof(RoF2::structs::ItemSecondaryBodyStruct)); memset(&isbs, 0, sizeof(RoF2::structs::ItemSecondaryBodyStruct));
isbs.augtype = item->AugType; isbs.augtype = item->AugType;
isbs.augdistiller = 65535; isbs.augrestrict2 = -1;
isbs.augrestrict = item->AugRestrict; isbs.augrestrict = item->AugRestrict;
for (int x = AUG_BEGIN; x < consts::ITEM_COMMON_SIZE; x++) for (int x = AUG_BEGIN; x < consts::ITEM_COMMON_SIZE; x++)
@ -5297,9 +5296,21 @@ namespace RoF2
iqbs.HealAmt = item->HealAmt; iqbs.HealAmt = item->HealAmt;
iqbs.SpellDmg = item->SpellDmg; iqbs.SpellDmg = item->SpellDmg;
iqbs.clairvoyance = item->Clairvoyance; iqbs.clairvoyance = item->Clairvoyance;
iqbs.unknown28 = 0;
iqbs.unknown30 = 0; //unknown18; //Power Source Capacity or evolve filename?
iqbs.unknown37a = 0; //evolve_string; // Some String, but being evolution related is just a guess
iqbs.Heirloom = 0;
iqbs.Placeable = 0;
iqbs.unknown28 = -1;
iqbs.unknown30 = -1;
iqbs.NoZone = 0;
iqbs.NoGround = 0;
iqbs.unknown37a = 0; // (guessed position) New to RoF2
iqbs.unknown38 = 0;
iqbs.unknown39 = 1; iqbs.unknown39 = 1;
iqbs.subitem_count = 0; iqbs.subitem_count = 0;

30
common/patches/rof2_structs.h
View File

@ -4352,7 +4352,7 @@ struct ItemSerializationHeader
/*025*/ uint8 slot_type; // 0 = normal, 1 = bank, 2 = shared bank, 9 = merchant, 20 = ? /*025*/ uint8 slot_type; // 0 = normal, 1 = bank, 2 = shared bank, 9 = merchant, 20 = ?
/*026*/ uint16 main_slot; /*026*/ uint16 main_slot;
/*028*/ uint16 sub_slot; /*028*/ uint16 sub_slot;
/*030*/ uint16 unknown013; // 0xffff /*030*/ uint16 aug_slot; // 0xffff
/*032*/ uint32 price; /*032*/ uint32 price;
/*036*/ uint32 merchant_slot; //1 if not a merchant item /*036*/ uint32 merchant_slot; //1 if not a merchant item
/*040*/ uint32 scaled_value; //0 /*040*/ uint32 scaled_value; //0
@ -4493,7 +4493,7 @@ struct ItemSecondaryBodyStruct
// swapped augrestrict and augdistiller positions // swapped augrestrict and augdistiller positions
// (this swap does show the proper augment restrictions in Item Information window now) // (this swap does show the proper augment restrictions in Item Information window now)
// unsure what the purpose of augdistiller is at this time -U 3/17/2014 // unsure what the purpose of augdistiller is at this time -U 3/17/2014
uint32 augdistiller; // New to December 10th 2012 client - NEW int32 augrestrict2; // New to December 10th 2012 client - Hidden Aug Restriction
uint32 augrestrict; uint32 augrestrict;
AugSlotStruct augslots[6]; AugSlotStruct augslots[6];
@ -4598,7 +4598,7 @@ struct ItemQuaternaryBodyStruct
uint8 quest_item; uint8 quest_item;
uint32 Power; // Enables "Power" percentage field used by Power Sources uint32 Power; // Enables "Power" percentage field used by Power Sources
uint32 Purity; uint32 Purity;
uint8 unknown16; // RoF2 uint8 unknown16; // RoF
uint32 BackstabDmg; uint32 BackstabDmg;
uint32 DSMitigation; uint32 DSMitigation;
int32 HeroicStr; int32 HeroicStr;
@ -4620,15 +4620,19 @@ struct ItemQuaternaryBodyStruct
uint8 unknown18; //Power Source Capacity or evolve filename? uint8 unknown18; //Power Source Capacity or evolve filename?
uint32 evolve_string; // Some String, but being evolution related is just a guess uint32 evolve_string; // Some String, but being evolution related is just a guess
uint8 unknown19; uint8 unknown19;
uint32 unknown20; // Bard Stuff? uint16 unknown20;
//uint32 unknown21; uint8 unknown21;
uint8 unknown22; uint8 Heirloom;
uint8 Placeable;
uint8 unknown22b;
uint8 unknown22c;
uint8 unknown22d;
uint32 unknown23; uint32 unknown23;
uint32 unknown24; uint32 unknown24;
uint32 unknown25; uint32 unknown25;
float unknown26; float unknown26;
float unknown27; float unknown27;
uint32 unknown_RoF26; // 0 New to March 21 2012 client uint32 unknown_RoF_6; // 0 New to March 21 2012 client
uint32 unknown28; // 0xffffffff uint32 unknown28; // 0xffffffff
uint16 unknown29; uint16 unknown29;
uint32 unknown30; // 0xffffffff uint32 unknown30; // 0xffffffff
@ -4639,9 +4643,15 @@ struct ItemQuaternaryBodyStruct
uint32 unknown35; uint32 unknown35;
uint32 unknown36; uint32 unknown36;
uint32 unknown37; uint32 unknown37;
uint32 unknown_RoF27; uint8 NoZone; // Item will disappear upon zoning?
uint32 unknown_RoF28; uint8 unknown_RoF_7b; // Maybe Uint32 ?
uint8 unknown37a; // (guessed position) New to RoF2 uint8 unknown_RoF_7c;
uint8 unknown_RoF_7d;
uint8 unknown_RoF_8a;
uint8 NoGround; // Item cannot be dropped on the ground?
uint8 unknown_RoF_8c;
uint8 unknown_RoF_8d;
uint8 unknown37a; // New to RoF2 - Probably variable length string
uint8 unknown38; // 0 uint8 unknown38; // 0
uint8 unknown39; // 1 uint8 unknown39; // 1
uint32 subitem_count; uint32 subitem_count;