Tweak for Titanium::SerializeItem() rework

This commit is contained in:
Uleat 2016-05-08 23:43:47 -04:00
parent 1a1f5ae619
commit 59728c5115

View File

@ -2080,192 +2080,284 @@ namespace Titanium
std::string SerializeItem(const ItemInst *inst, int16 slot_id_in, uint8 depth) std::string SerializeItem(const ItemInst *inst, int16 slot_id_in, uint8 depth)
{ {
std::string serialization; std::string serialization;
std::string instance; const char* protection = "\\\\\\\\\\";
std::string protection = "\\\\\\\\\\";
const Item_Struct* item = inst->GetUnscaledItem(); const Item_Struct* item = inst->GetUnscaledItem();
instance = StringFormat("%i|", (inst->IsStackable() ? inst->GetCharges() : 0)); // stack count serialization = StringFormat("%.*s%s", (depth ? (depth - 1) : 0), protection, (depth ? "\"" : "")); // For leading quotes (and protection) if a subitem;
instance.append("0|"); // unknown
instance.append(StringFormat("%i|", (!inst->GetMerchantSlot() ? slot_id_in : inst->GetMerchantSlot()))); // inst slot/merchant slot // Instance data
instance.append(StringFormat("%i|", inst->GetPrice())); // merchant price serialization.append(
instance.append(StringFormat("%i|", (!inst->GetMerchantSlot() ? 1 : inst->GetMerchantCount()))); // inst count/merchant count StringFormat(
instance.append(StringFormat("%i|", (inst->IsScaling() ? (inst->GetExp() / 100) : 0))); // inst experience "%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|",
instance.append(StringFormat("%i|", (!inst->GetMerchantSlot() ? inst->GetSerialNumber() : inst->GetMerchantSlot()))); // merchant serial number (inst->IsStackable() ? inst->GetCharges() : 0), // stack count
instance.append(StringFormat("%i|", inst->GetRecastTimestamp())); // recast timestamp 0, // unknown
instance.append(StringFormat("%i|", ((inst->IsStackable() ? ((inst->GetItem()->ItemType == ItemTypePotion) ? 1 : 0) : inst->GetCharges())))); // charge count (!inst->GetMerchantSlot() ? slot_id_in : inst->GetMerchantSlot()), // inst slot/merchant slot
instance.append(StringFormat("%i|", (inst->IsAttuned() ? 1 : 0))); // inst attuned inst->GetPrice(), // merchant price
instance.append("0|"); // unknown (!inst->GetMerchantSlot() ? 1 : inst->GetMerchantCount()), // inst count/merchant count
(inst->IsScaling() ? (inst->GetExp() / 100) : 0), // inst experience
serialization = StringFormat("%.*s%s", (depth ? (depth - 1) : 0), protection.c_str(), (depth ? "\"" : "")); // For leading quotes (and protection) if a subitem; (!inst->GetMerchantSlot() ? inst->GetSerialNumber() : inst->GetMerchantSlot()), // merchant serial number
serialization.append(StringFormat("%s", instance.c_str())); // Instance data inst->GetRecastTimestamp(), // recast timestamp
serialization.append(StringFormat("%.*s\"", depth, protection.c_str())); // Quotes (and protection, if needed) around static data ((inst->IsStackable() ? ((inst->GetItem()->ItemType == ItemTypePotion) ? 1 : 0) : inst->GetCharges())), // charge count
(inst->IsAttuned() ? 1 : 0), // inst attuned
0 // unknown
)
);
serialization.append(StringFormat("%.*s\"", depth, protection)); // Quotes (and protection, if needed) around static data
serialization.append(StringFormat("%i", item->ItemClass)); // item->ItemClass so we can do |%s instead of %s| serialization.append(StringFormat("%i", item->ItemClass)); // item->ItemClass so we can do |%s instead of %s|
serialization.append(
StringFormat(
"|%s|%s|%s|%i|%i|%i|%i|%i|%i|%i|%i|%s|%s|%i|%i",
item->Name,
item->Lore,
item->IDFile,
item->ID,
((item->Weight > 255) ? 255 : item->Weight),
item->NoRent,
item->NoDrop,
item->Size,
item->Slots,
item->Price,
item->Icon,
"0", // unknown
"0", // unknown
item->BenefitFlag,
item->Tradeskills
)
);
//#include "titanium_itemfields_a.h" - begin serialization.append(
serialization.append(StringFormat("|%s", item->Name)); StringFormat(
serialization.append(StringFormat("|%s", item->Lore)); "|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i",
serialization.append(StringFormat("|%s", item->IDFile)); item->CR,
serialization.append(StringFormat("|%i", item->ID)); item->DR,
//#include "titanium_itemfields_a.h" - end item->PR,
serialization.append(StringFormat("|%i", ((item->Weight > 255) ? 255 : item->Weight))); item->MR,
//#include "titanium_itemfields_b.h" - begin item->FR,
serialization.append(StringFormat("|%i", item->NoRent)); item->AStr,
serialization.append(StringFormat("|%i", item->NoDrop)); item->ASta,
serialization.append(StringFormat("|%i", item->Size)); item->AAgi,
serialization.append(StringFormat("|%i", item->Slots)); item->ADex,
serialization.append(StringFormat("|%i", item->Price)); item->ACha,
serialization.append(StringFormat("|%i", item->Icon)); item->AInt,
serialization.append("|0"); // unknown item->AWis,
serialization.append("|0"); // unknown item->HP,
serialization.append(StringFormat("|%i", item->BenefitFlag)); item->Mana,
serialization.append(StringFormat("|%i", item->Tradeskills)); item->AC
serialization.append(StringFormat("|%i", item->CR)); )
serialization.append(StringFormat("|%i", item->DR)); );
serialization.append(StringFormat("|%i", item->PR));
serialization.append(StringFormat("|%i", item->MR));
serialization.append(StringFormat("|%i", item->FR)); serialization.append(
serialization.append(StringFormat("|%i", item->AStr)); StringFormat(
serialization.append(StringFormat("|%i", item->ASta)); "|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i",
serialization.append(StringFormat("|%i", item->AAgi)); item->Deity,
serialization.append(StringFormat("|%i", item->ADex)); item->SkillModValue,
serialization.append(StringFormat("|%i", item->ACha)); item->SkillModMax,
serialization.append(StringFormat("|%i", item->AInt)); item->SkillModType,
serialization.append(StringFormat("|%i", item->AWis)); item->BaneDmgRace,
serialization.append(StringFormat("|%i", item->HP)); item->BaneDmgAmt,
serialization.append(StringFormat("|%i", item->Mana)); item->BaneDmgBody,
serialization.append(StringFormat("|%i", item->AC)); item->Magic,
serialization.append(StringFormat("|%i", item->Deity)); item->CastTime_,
serialization.append(StringFormat("|%i", item->SkillModValue)); item->ReqLevel,
serialization.append(StringFormat("|%i", item->SkillModMax)); item->BardType,
serialization.append(StringFormat("|%i", item->SkillModType)); item->BardValue,
serialization.append(StringFormat("|%i", item->BaneDmgRace)); item->Light,
serialization.append(StringFormat("|%i", item->BaneDmgAmt)); item->Delay
serialization.append(StringFormat("|%i", item->BaneDmgBody)); )
serialization.append(StringFormat("|%i", item->Magic)); );
serialization.append(StringFormat("|%i", item->CastTime_));
serialization.append(StringFormat("|%i", item->ReqLevel)); serialization.append(
serialization.append(StringFormat("|%i", item->BardType)); StringFormat(
serialization.append(StringFormat("|%i", item->BardValue)); "|%i|%i|%i|%i|%i|%i|%i|%i|%i|%s|%i|%i|%i|%i",
serialization.append(StringFormat("|%i", item->Light)); item->RecLevel,
serialization.append(StringFormat("|%i", item->Delay)); item->RecSkill,
serialization.append(StringFormat("|%i", item->RecLevel)); item->ElemDmgType,
serialization.append(StringFormat("|%i", item->RecSkill)); item->ElemDmgAmt,
serialization.append(StringFormat("|%i", item->ElemDmgType)); item->Range,
serialization.append(StringFormat("|%i", item->ElemDmgAmt)); item->Damage,
serialization.append(StringFormat("|%i", item->Range)); item->Color,
serialization.append(StringFormat("|%i", item->Damage)); item->Classes,
serialization.append(StringFormat("|%i", item->Color)); item->Races,
serialization.append(StringFormat("|%i", item->Classes)); "0", // unknown
serialization.append(StringFormat("|%i", item->Races)); item->MaxCharges,
serialization.append("|0"); // unknown item->ItemType,
serialization.append(StringFormat("|%i", item->MaxCharges)); item->Material,
serialization.append(StringFormat("|%i", item->ItemType)); item->SellRate
serialization.append(StringFormat("|%i", item->Material)); )
serialization.append(StringFormat("|%i", item->SellRate)); );
serialization.append("|0"); // unknown
serialization.append(StringFormat("|%i", item->CastTime_)); serialization.append(
serialization.append("|0"); // unknown StringFormat(
serialization.append(StringFormat("|%i", item->ProcRate)); "|%s|%i|%s|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i",
serialization.append(StringFormat("|%i", item->CombatEffects)); "0", // unknown
serialization.append(StringFormat("|%i", item->Shielding)); item->CastTime_,
serialization.append(StringFormat("|%i", item->StunResist)); "0", // unknown
serialization.append(StringFormat("|%i", item->StrikeThrough)); item->ProcRate,
serialization.append(StringFormat("|%i", item->ExtraDmgSkill)); item->CombatEffects,
serialization.append(StringFormat("|%i", item->ExtraDmgAmt)); item->Shielding,
serialization.append(StringFormat("|%i", item->SpellShield)); item->StunResist,
serialization.append(StringFormat("|%i", item->Avoidance)); item->StrikeThrough,
serialization.append(StringFormat("|%i", item->Accuracy)); item->ExtraDmgSkill,
serialization.append(StringFormat("|%i", item->CharmFileID)); item->ExtraDmgAmt,
serialization.append(StringFormat("|%i", item->FactionMod1)); item->SpellShield,
serialization.append(StringFormat("|%i", item->FactionMod2)); item->Avoidance,
serialization.append(StringFormat("|%i", item->FactionMod3)); item->Accuracy,
serialization.append(StringFormat("|%i", item->FactionMod4)); item->CharmFileID
serialization.append(StringFormat("|%i", item->FactionAmt1)); )
serialization.append(StringFormat("|%i", item->FactionAmt2)); );
serialization.append(StringFormat("|%i", item->FactionAmt3));
serialization.append(StringFormat("|%i", item->FactionAmt4)); serialization.append(
serialization.append(StringFormat("|%s", item->CharmFile)); StringFormat(
serialization.append(StringFormat("|%i", item->AugType)); "|%i|%i|%i|%i|%i|%i|%i|%i|%s",
serialization.append(StringFormat("|%i", item->AugSlotType[0])); item->FactionMod1,
serialization.append(StringFormat("|%i", item->AugSlotVisible[0])); item->FactionMod2,
serialization.append(StringFormat("|%i", item->AugSlotType[1])); item->FactionMod3,
serialization.append(StringFormat("|%i", item->AugSlotVisible[1])); item->FactionMod4,
serialization.append(StringFormat("|%i", item->AugSlotType[2])); item->FactionAmt1,
serialization.append(StringFormat("|%i", item->AugSlotVisible[2])); item->FactionAmt2,
serialization.append(StringFormat("|%i", item->AugSlotType[3])); item->FactionAmt3,
serialization.append(StringFormat("|%i", item->AugSlotVisible[3])); item->FactionAmt4,
serialization.append(StringFormat("|%i", item->AugSlotType[4])); item->CharmFile
serialization.append(StringFormat("|%i", item->AugSlotVisible[4])); )
serialization.append(StringFormat("|%i", item->LDoNTheme)); );
serialization.append(StringFormat("|%i", item->LDoNPrice));
serialization.append(StringFormat("|%i", item->LDoNSold)); serialization.append(
serialization.append(StringFormat("|%i", item->BagType)); StringFormat(
serialization.append(StringFormat("|%i", item->BagSlots)); "|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i",
serialization.append(StringFormat("|%i", item->BagSize)); item->AugType,
serialization.append(StringFormat("|%i", item->BagWR)); item->AugSlotType[0],
serialization.append(StringFormat("|%i", item->Book)); item->AugSlotVisible[0],
serialization.append(StringFormat("|%i", item->BookType)); item->AugSlotType[1],
serialization.append(StringFormat("|%s", item->Filename)); item->AugSlotVisible[1],
serialization.append(StringFormat("|%i", item->BaneDmgRaceAmt)); item->AugSlotType[2],
serialization.append(StringFormat("|%i", item->AugRestrict)); item->AugSlotVisible[2],
serialization.append(StringFormat("|%i", item->LoreGroup)); item->AugSlotType[3],
serialization.append(StringFormat("|%i", item->PendingLoreFlag)); item->AugSlotVisible[3],
serialization.append(StringFormat("|%i", item->ArtifactFlag)); item->AugSlotType[4],
serialization.append(StringFormat("|%i", item->SummonedFlag)); item->AugSlotVisible[4]
serialization.append(StringFormat("|%i", item->Favor)); )
serialization.append(StringFormat("|%i", item->FVNoDrop)); );
serialization.append(StringFormat("|%i", item->Endur));
serialization.append(StringFormat("|%i", item->DotShielding)); serialization.append(
serialization.append(StringFormat("|%i", item->Attack)); StringFormat(
serialization.append(StringFormat("|%i", item->Regen)); "|%i|%i|%i|%i|%i|%i|%i|%i|%i|%s|%i|%i|%i|%i|%i|%i",
serialization.append(StringFormat("|%i", item->ManaRegen)); item->LDoNTheme,
serialization.append(StringFormat("|%i", item->EnduranceRegen)); item->LDoNPrice,
serialization.append(StringFormat("|%i", item->Haste)); item->LDoNSold,
serialization.append(StringFormat("|%i", item->DamageShield)); item->BagType,
serialization.append(StringFormat("|%i", item->RecastDelay)); item->BagSlots,
serialization.append(StringFormat("|%i", item->RecastType)); item->BagSize,
serialization.append(StringFormat("|%i", item->GuildFavor)); item->BagWR,
serialization.append(StringFormat("|%i", item->AugDistiller)); item->Book,
serialization.append("|0"); // unknown item->BookType,
serialization.append("|0"); // unknown item->Filename,
serialization.append(StringFormat("|%i", item->Attuneable)); item->BaneDmgRaceAmt,
serialization.append(StringFormat("|%i", item->NoPet)); item->AugRestrict,
serialization.append("|0"); // unknown item->LoreGroup,
serialization.append(StringFormat("|%i", item->PointType)); item->PendingLoreFlag,
serialization.append(StringFormat("|%i", item->PotionBelt)); item->ArtifactFlag,
serialization.append(StringFormat("|%i", item->PotionBeltSlots)); item->SummonedFlag
serialization.append(StringFormat("|%i", item->StackSize)); )
serialization.append(StringFormat("|%i", item->NoTransfer)); );
serialization.append(StringFormat("|%i", item->Stackable));
serialization.append(StringFormat("|%i", item->Click.Effect)); serialization.append(
serialization.append(StringFormat("|%i", item->Click.Type)); StringFormat(
serialization.append(StringFormat("|%i", item->Click.Level2)); "|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i|%i",
serialization.append(StringFormat("|%i", item->Click.Level)); item->Favor,
serialization.append("|0"); // Click name item->FVNoDrop,
serialization.append(StringFormat("|%i", item->Proc.Effect)); item->Endur,
serialization.append(StringFormat("|%i", item->Proc.Type)); item->DotShielding,
serialization.append(StringFormat("|%i", item->Proc.Level2)); item->Attack,
serialization.append(StringFormat("|%i", item->Proc.Level)); item->Regen,
serialization.append("|0"); // Proc name item->ManaRegen,
serialization.append(StringFormat("|%i", item->Worn.Effect)); item->EnduranceRegen,
serialization.append(StringFormat("|%i", item->Worn.Type)); item->Haste,
serialization.append(StringFormat("|%i", item->Worn.Level2)); item->DamageShield,
serialization.append(StringFormat("|%i", item->Worn.Level)); item->RecastDelay,
serialization.append("|0"); // Worn name item->RecastType,
serialization.append(StringFormat("|%i", item->Focus.Effect)); item->GuildFavor,
serialization.append(StringFormat("|%i", item->Focus.Type)); item->AugDistiller
serialization.append(StringFormat("|%i", item->Focus.Level2)); )
serialization.append(StringFormat("|%i", item->Focus.Level)); );
serialization.append("|0"); // Focus name
serialization.append(StringFormat("|%i", item->Scroll.Effect)); serialization.append(
serialization.append(StringFormat("|%i", item->Scroll.Type)); StringFormat(
serialization.append(StringFormat("|%i", item->Scroll.Level2)); "|%s|%s|%i|%i|%s|%i|%i|%i|%i|%i|%i",
serialization.append(StringFormat("|%i", item->Scroll.Level)); "0", // unknown
serialization.append("|0"); // Scroll name "0", // unknown
//#include "titanium_itemfields_b.h" - end item->Attuneable,
item->NoPet,
"0", // unknown
item->PointType,
item->PotionBelt,
item->PotionBeltSlots,
item->StackSize,
item->NoTransfer,
item->Stackable
)
);
serialization.append(
StringFormat(
"|%i|%i|%i|%i|%s",
item->Click.Effect,
item->Click.Type,
item->Click.Level2,
item->Click.Level,
"0" // Click name
)
);
serialization.append(
StringFormat(
"|%i|%i|%i|%i|%s",
item->Proc.Effect,
item->Proc.Type,
item->Proc.Level2,
item->Proc.Level,
"0" // Proc name
)
);
serialization.append(
StringFormat(
"|%i|%i|%i|%i|%s",
item->Worn.Effect,
item->Worn.Type,
item->Worn.Level2,
item->Worn.Level,
"0" // Worn name
)
);
serialization.append(
StringFormat(
"|%i|%i|%i|%i|%s",
item->Focus.Effect,
item->Focus.Type,
item->Focus.Level2,
item->Focus.Level,
"0" // Focus name
)
);
serialization.append(
StringFormat(
"|%i|%i|%i|%i|%s",
item->Scroll.Effect,
item->Scroll.Type,
item->Scroll.Level2,
item->Scroll.Level,
"0" // Scroll name
)
);
serialization.append(StringFormat("%.*s\"", depth, protection)); // Quotes (and protection, if needed) around static data
serialization.append(StringFormat("%.*s\"", depth, protection.c_str())); // Quotes (and protection, if needed) around static data
for (int index = SUB_INDEX_BEGIN; index < consts::ITEM_CONTAINER_SIZE; ++index) { for (int index = SUB_INDEX_BEGIN; index < consts::ITEM_CONTAINER_SIZE; ++index) {
ItemInst *sub = inst->GetItem(index); ItemInst *sub = inst->GetItem(index);
if (!sub) { if (!sub) {
@ -2276,7 +2368,8 @@ namespace Titanium
serialization.append(StringFormat("|%s", sub_item.c_str())); // Sub items serialization.append(StringFormat("|%s", sub_item.c_str())); // Sub items
} }
} }
serialization.append(StringFormat("%.*s%s", (depth ? (depth - 1) : 0), protection.c_str(), (depth ? "\"" : ""))); // For trailing quotes (and protection) if a subitem;
serialization.append(StringFormat("%.*s%s", (depth ? (depth - 1) : 0), protection, (depth ? "\"" : ""))); // For trailing quotes (and protection) if a subitem;
return serialization; return serialization;
} }