Hey folks,
Rewrote the code submission based on Trevius's recommendation. Turns out it was a fairly simple change with a -lot- less code than before.
The only "interesting" part of it was that I had to add decode functions to the expansion patch files to allow us to shift the slot numbers to the titanium slot numbers. This is done following the same logic as the tradeskill decode functions for the same reason. As I mentioned above, the slot numbers were incorrect between Titanium and SoD due to them using different slightly different slot numbers.
Tested this with ItemID 66180 and also a custom container I created for it - works fine.
Tests ran:
1. Validated that I could still augment slots without issue in aug pool.
2. Validated that I could still remove augments without issue in aug pool.
3. Validated that I could still delete augments without issue in aug pool..
4. Validated that I could agument slots with bags of type 53.
5. Validated that I could remove augments with bags of type 53 (and select which one to remove).
6. Validate that I could delete augments with bags of type 53 (and select which one to remove).
7. Validated that after a successful augmentation, deaugmentation, or augment deletion that the items in your tradeskill container are wiped and the new items are still pushed onto your cursor.
8. Validated all of the above on both Titanium and SoD clients.
9. Validated that items are not lost on zone crash.
You can use the following item ids to test this: 69312, 60332, 47013, 66180
No new logic was added - for the most part this is using the exact same logic that the augmentation pool is using.
Hah - just noticed you responded to my statement - yeah, was testing other things before posting it. Thanks man...
Code:
Index: common/patches/HoT.cpp
===================================================================
--- common/patches/HoT.cpp (revision 1798)
+++ common/patches/HoT.cpp (working copy)
@@ -3105,6 +3105,16 @@
FINISH_DIRECT_DECODE();
}
+DECODE(OP_AugmentItem) {
+ DECODE_LENGTH_EXACT(structs::AugmentItem_Struct);
+ SETUP_DIRECT_DECODE(AugmentItem_Struct, structs::AugmentItem_Struct);
+
+ emu->container_slot = HoTToTitaniumSlot(eq->container_slot);
+ emu->augment_slot = eq->augment_slot;
+
+ FINISH_DIRECT_DECODE();
+}
+
DECODE(OP_TradeSkillCombine) {
DECODE_LENGTH_EXACT(structs::NewCombine_Struct);
SETUP_DIRECT_DECODE(NewCombine_Struct, structs::NewCombine_Struct);
Index: common/patches/HoT_ops.h
===================================================================
--- common/patches/HoT_ops.h (revision 1798)
+++ common/patches/HoT_ops.h (working copy)
@@ -114,5 +114,6 @@
D(OP_ChannelMessage)
D(OP_DeleteItem)
D(OP_ZoneChange)
+D(OP_AugmentItem)
#undef E
#undef D
Index: common/patches/SoD.cpp
===================================================================
--- common/patches/SoD.cpp (revision 1798)
+++ common/patches/SoD.cpp (working copy)
@@ -2771,6 +2771,16 @@
FINISH_DIRECT_DECODE();
}
+DECODE(OP_AugmentItem) {
+ DECODE_LENGTH_EXACT(structs::AugmentItem_Struct);
+ SETUP_DIRECT_DECODE(AugmentItem_Struct, structs::AugmentItem_Struct);
+
+ emu->container_slot = SoDToTitaniumSlot(eq->container_slot);
+ emu->augment_slot = eq->augment_slot;
+
+ FINISH_DIRECT_DECODE();
+}
+
DECODE(OP_TradeSkillCombine) {
DECODE_LENGTH_EXACT(structs::NewCombine_Struct);
SETUP_DIRECT_DECODE(NewCombine_Struct, structs::NewCombine_Struct);
Index: common/patches/SoD_ops.h
===================================================================
--- common/patches/SoD_ops.h (revision 1798)
+++ common/patches/SoD_ops.h (working copy)
@@ -104,5 +104,6 @@
D(OP_LoadSpellSet)
D(OP_ApplyPoison)
D(OP_DeleteItem)
+D(OP_AugmentItem)
#undef E
#undef D
Index: common/patches/SoF.cpp
===================================================================
--- common/patches/SoF.cpp (revision 1798)
+++ common/patches/SoF.cpp (working copy)
@@ -2269,6 +2269,16 @@
FINISH_DIRECT_DECODE();
}
+DECODE(OP_AugmentItem) {
+ DECODE_LENGTH_EXACT(structs::AugmentItem_Struct);
+ SETUP_DIRECT_DECODE(AugmentItem_Struct, structs::AugmentItem_Struct);
+
+ emu->container_slot = SoFToTitaniumSlot(eq->container_slot);
+ emu->augment_slot = eq->augment_slot;
+
+ FINISH_DIRECT_DECODE();
+}
+
DECODE(OP_TradeSkillCombine) {
DECODE_LENGTH_EXACT(structs::NewCombine_Struct);
SETUP_DIRECT_DECODE(NewCombine_Struct, structs::NewCombine_Struct);
Index: common/patches/SoF_ops.h
===================================================================
--- common/patches/SoF_ops.h (revision 1798)
+++ common/patches/SoF_ops.h (working copy)
@@ -88,5 +88,6 @@
D(OP_InspectAnswer)
D(OP_ApplyPoison)
D(OP_DeleteItem)
+D(OP_AugmentItem)
#undef E
#undef D
Index: common/patches/Underfoot.cpp
===================================================================
--- common/patches/Underfoot.cpp (revision 1798)
+++ common/patches/Underfoot.cpp (working copy)
@@ -3000,6 +3000,16 @@
FINISH_DIRECT_DECODE();
}
+DECODE(OP_AugmentItem) {
+ DECODE_LENGTH_EXACT(structs::AugmentItem_Struct);
+ SETUP_DIRECT_DECODE(AugmentItem_Struct, structs::AugmentItem_Struct);
+
+ emu->container_slot = UnderfootToTitaniumSlot(eq->container_slot);
+ emu->augment_slot = eq->augment_slot;
+
+ FINISH_DIRECT_DECODE();
+}
+
DECODE(OP_TradeSkillCombine) {
DECODE_LENGTH_EXACT(structs::NewCombine_Struct);
SETUP_DIRECT_DECODE(NewCombine_Struct, structs::NewCombine_Struct);
Index: common/patches/Underfoot_ops.h
===================================================================
--- common/patches/Underfoot_ops.h (revision 1798)
+++ common/patches/Underfoot_ops.h (working copy)
@@ -113,5 +113,6 @@
D(OP_ChannelMessage)
D(OP_DeleteItem)
D(OP_PetCommands)
+D(OP_AugmentItem)
#undef E
#undef D
Index: zone/tradeskills.cpp
===================================================================
--- zone/tradeskills.cpp (revision 1798)
+++ zone/tradeskills.cpp (working copy)
@@ -45,16 +45,48 @@
LogFile->write(EQEMuLog::Error, "Client or AugmentItem_Struct not set in Object::HandleAugmentation");
return;
}
+
+ ItemInst* container = NULL;
- if(!worldo)
- {
+ if (worldo) {
+ container = worldo->m_inst;
+ }
+ else {
+ // Check to see if they have an inventory container type 53 that is used for this.
+ Inventory& user_inv = user->GetInv();
+ ItemInst* inst = NULL;
+
+ inst = user_inv.GetItem(in_augment->container_slot);
+ if (inst) {
+ const Item_Struct* item = inst->GetItem();
+ if (item && inst->IsType(ItemClassContainer) && item->BagType == 53) {
+ // We have found an appropriate inventory augmentation sealer
+ container = inst;
+
+ // Verify that no more than two items are in container to guarantee no inadvertant wipes.
+ uint8 itemsFound = 0;
+ for (uint8 i=0; i<10; i++){
+ const ItemInst* inst = container->GetItem(i);
+ if (inst) {
+ itemsFound++;
+ }
+ }
+
+ if (itemsFound != 2) {
+ user->Message(13, "Error: Too many/few items in augmentation container.");
+ return;
+ }
+ }
+ }
+ }
+
+ if(!container) {
LogFile->write(EQEMuLog::Error, "Player tried to augment an item without a world object set.");
return;
}
ItemInst *tobe_auged, *auged_with = NULL;
sint8 slot=-1;
- ItemInst* container = worldo->m_inst;
if (!container) {
user->Message(13, "Error: This item is not a container!");
@@ -78,18 +110,14 @@
}
}
+ bool deleteItems = false;
+
// Adding augment
if (in_augment->augment_slot == -1) {
if (((slot=tobe_auged->AvailableAugmentSlot(auged_with->GetAugmentType()))!=-1) && (tobe_auged->AvailableWearSlot(auged_with->GetItem()->Slots))) {
tobe_auged->PutAugment(slot,*auged_with);
user->PushItemOnCursor(*tobe_auged,true);
- container->Clear();
- EQApplicationPacket* outapp = new EQApplicationPacket(OP_ClearObject, sizeof(ClearObject_Struct));
- ClearObject_Struct *cos = (ClearObject_Struct *)outapp->pBuffer;
- cos->Clear = 1;
- user->QueuePacket(outapp);
- safe_delete(outapp);
- database.DeleteWorldContainer(worldo->m_id, zone->GetZoneID());
+ deleteItems = true;
} else {
user->Message(13, "Error: No available slot for augment");
}
@@ -104,14 +132,31 @@
user->PushItemOnCursor(*tobe_auged,true);
if (old_aug)
user->PushItemOnCursor(*old_aug,true);
- container->Clear();
- EQApplicationPacket* outapp = new EQApplicationPacket(OP_ClearObject, sizeof(ClearObject_Struct));
- ClearObject_Struct *cos = (ClearObject_Struct *)outapp->pBuffer;
- cos->Clear = 1;
- user->QueuePacket(outapp);
- safe_delete(outapp);
- database.DeleteWorldContainer(worldo->m_id, zone->GetZoneID());
+ deleteItems = true;
}
+
+ if (deleteItems) {
+ if (worldo) {
+ container->Clear();
+ EQApplicationPacket* outapp = new EQApplicationPacket(OP_ClearObject, sizeof(ClearObject_Struct));
+ ClearObject_Struct *cos = (ClearObject_Struct *)outapp->pBuffer;
+ cos->Clear = 1;
+ user->QueuePacket(outapp);
+ safe_delete(outapp);
+ database.DeleteWorldContainer(worldo->m_id, zone->GetZoneID());
+ }
+ else {
+ // Delete items in our inventory container...
+ for (uint8 i=0; i<10; i++){
+ const ItemInst* inst = container->GetItem(i);
+ if (inst) {
+ user->DeleteItemInInventory(Inventory::CalcSlotId(in_augment->container_slot,i),0,true);
+ }
+ }
+ // Explicitly mark container as cleared.
+ container->Clear();
+ }
+ }
}
// Perform tradeskill combine
Hybrid Mode
