Remove scaling hack for SoF

This commit is contained in:
Michael Cook (mackal) 2014-11-15 00:54:21 -05:00
parent 96242f6c5e
commit 10ae97e42f
3 changed files with 5 additions and 3 deletions

View File

@ -6,6 +6,7 @@ Secrets: Identified object size and solidtype as flags. Exported them as functio
demonstar55: Don't use the hack for charms that doesn't work on RoF
demonstar55: UF too
demonstar55: Tit
demonstar55: SoF
== 11/13/2014 ==
Kayen: Implemented target type (44) 'Beams' (which projects an AE infront of caster with a specified length and width).

View File

@ -2519,7 +2519,7 @@ namespace SoF
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);
SoF::structs::ItemSerializationHeader hdr;
hdr.stacksize = stackable ? charges : 1;
@ -2530,7 +2530,7 @@ namespace SoF
hdr.slot = (merchant_slot == 0) ? slot_id : merchant_slot;
hdr.price = inst->GetPrice();
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.unknown028 = 0;
hdr.last_cast_time = ((item->RecastDelay > 1) ? 1212693140 : 0);
@ -2652,6 +2652,7 @@ namespace SoF
ibs.SpellShield = item->SpellShield;
ibs.Avoidance = item->Avoidance;
ibs.Accuracy = item->Accuracy;
ibs.CharmFileID = item->CharmFileID;
ibs.FactionAmt1 = item->FactionAmt1;
ibs.FactionMod1 = item->FactionMod1;
ibs.FactionAmt2 = item->FactionAmt2;

View File

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