pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-08 05:52:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Also stop using hack on UF

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-11-15 00:08:16 -05:00
parent 44bfdfebc2
commit 5dc3a5ab20
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -4,6 +4,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
== 11/14/2014 == == 11/14/2014 ==
Secrets: Identified object size and solidtype as flags. Exported them as functions to Perl. Secrets: Identified object size and solidtype as flags. Exported them as functions to Perl.
demonstar55: Don't use the hack for charms that doesn't work on RoF demonstar55: Don't use the hack for charms that doesn't work on RoF
demonstar55: UF too
== 11/13/2014 == == 11/13/2014 ==
Kayen: Implemented target type (44) 'Beams' (which projects an AE infront of caster with a specified length and width). Kayen: Implemented target type (44) 'Beams' (which projects an AE infront of caster with a specified length and width).

5
common/patches/underfoot.cpp
View File

@ -3609,7 +3609,7 @@ namespace Underfoot
std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary); std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
const Item_Struct *item = inst->GetItem(); const Item_Struct *item = inst->GetUnscaledItem();
//_log(NET__ERROR, "Serialize called for: %s", item->Name); //_log(NET__ERROR, "Serialize called for: %s", item->Name);
Underfoot::structs::ItemSerializationHeader hdr; Underfoot::structs::ItemSerializationHeader hdr;
hdr.stacksize = stackable ? charges : 1; hdr.stacksize = stackable ? charges : 1;
@ -3620,7 +3620,7 @@ namespace Underfoot
hdr.slot = (merchant_slot == 0) ? slot_id : merchant_slot; hdr.slot = (merchant_slot == 0) ? slot_id : merchant_slot;
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.unknown020 = 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;
hdr.last_cast_time = ((item->RecastDelay > 1) ? 1212693140 : 0); hdr.last_cast_time = ((item->RecastDelay > 1) ? 1212693140 : 0);
@ -3770,6 +3770,7 @@ namespace Underfoot
ibs.SpellShield = item->SpellShield; ibs.SpellShield = item->SpellShield;
ibs.Avoidance = item->Avoidance; ibs.Avoidance = item->Avoidance;
ibs.Accuracy = item->Accuracy; ibs.Accuracy = item->Accuracy;
ibs.CharmFileID = item->CharmFileID;
ibs.FactionAmt1 = item->FactionAmt1; ibs.FactionAmt1 = item->FactionAmt1;
ibs.FactionMod1 = item->FactionMod1; ibs.FactionMod1 = item->FactionMod1;
ibs.FactionAmt2 = item->FactionAmt2; ibs.FactionAmt2 = item->FactionAmt2;

2
common/patches/underfoot_structs.h
View File

@ -4010,7 +4010,7 @@ struct ItemSerializationHeader
/*008*/ uint32 slot; /*008*/ uint32 slot;
/*012*/ uint32 price; /*012*/ uint32 price;
/*016*/ uint32 merchant_slot; //1 if not a merchant item /*016*/ uint32 merchant_slot; //1 if not a merchant item
/*020*/ uint32 unknown020; //0 /*020*/ uint32 scaled_value; //0
/*024*/ uint32 instance_id; //unique instance id if not merchant item, else is merchant slot /*024*/ uint32 instance_id; //unique instance id if not merchant item, else is merchant slot
/*028*/ uint32 unknown028; //0 /*028*/ uint32 unknown028; //0
/*032*/ uint32 last_cast_time; // Unix Time from PP of last cast for this recast type if recast delay > 0 /*032*/ uint32 last_cast_time; // Unix Time from PP of last cast for this recast type if recast delay > 0