pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-24 13:32:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates

Browse Source 
Tested ok
This commit is contained in:
Mitch Freeman 2025-09-21 11:07:14 -03:00 committed by Vayle
parent 8175ae6187
commit a9d3e1bfe1
5 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/eq_packet_structs.h
View File

@ -6499,7 +6499,7 @@ struct PickZone_Struct {
struct EvolveItemToggle { struct EvolveItemToggle {
uint32 action; uint32 action;
uint32 unknown_004; uint32 item_id;
uint64 unique_id; uint64 unique_id;
uint32 percentage; uint32 percentage;
uint32 activated; uint32 activated;

3
common/patches/rof2.cpp
View File

@ -6499,10 +6499,9 @@ namespace RoF2
ob.write((const char*)&hdr, sizeof(RoF2::structs::ItemSerializationHeader)); ob.write((const char*)&hdr, sizeof(RoF2::structs::ItemSerializationHeader));
if (item->EvolvingItem > 0) { if (item->EvolvingItem > 0) {
RoF2::structs::EvolvingItem_Struct evotop; RoF2::structs::EvolvingItem_Struct evotop{};
inst->CalculateEvolveProgression(); inst->CalculateEvolveProgression();
evotop.final_item_id = inst->GetEvolveFinalItemID();
evotop.evolve_level = item->EvolvingLevel; evotop.evolve_level = item->EvolvingLevel;
evotop.progress = inst->GetEvolveProgression(); evotop.progress = inst->GetEvolveProgression();
evotop.activated = inst->GetEvolveActivated(); evotop.activated = inst->GetEvolveActivated();

18
zone/client_evolving_items.cpp
View File

@ -286,9 +286,9 @@ void Client::DoEvolveItemDisplayFinalResult(const EQApplicationPacket *app)
{ {
const auto in = reinterpret_cast<EvolveItemToggle *>(app->pBuffer); const auto in = reinterpret_cast<EvolveItemToggle *>(app->pBuffer);
const uint32 item_id = static_cast<uint32>(in->unique_id & 0xFFFFFFFF); const uint32 item_id = in->item_id;
if (item_id == 0) { if (item_id == 0) {
LogEvolveItem("Error - Item ID of final evolve item is blank."); LogEvolveItem("Error - Item ID of evolve item display final request is blank.");
return; return;
} }
@ -297,19 +297,23 @@ void Client::DoEvolveItemDisplayFinalResult(const EQApplicationPacket *app)
return; return;
} }
auto final_id = EvolvingItemsManager::Instance()->GetFinalItemID(*inst);
std::unique_ptr<EQ::ItemInstance> const final_inst(database.CreateItem(final_id));
if (!final_inst) {
return;
}
LogEvolveItemDetail( LogEvolveItemDetail(
"Character ID <green>[{}] requested to view final evolve item id <yellow>[{}] for evolve item id <yellow>[{}]", "Character ID <green>[{}] requested to view final evolve item id <yellow>[{}] for evolve item id <yellow>[{}]",
CharacterID(), CharacterID(),
item_id, final_id,
EvolvingItemsManager::Instance()->GetFirstItemInLoreGroupByItemID(item_id) item_id
); );
inst->SetEvolveProgression(100);
LogEvolveItemDetail( LogEvolveItemDetail(
"Sending final result for item id <yellow>[{}] to Character ID <green>[{}]", item_id, CharacterID() "Sending final result for item id <yellow>[{}] to Character ID <green>[{}]", item_id, CharacterID()
); );
SendItemPacket(0, inst.get(), ItemPacketViewLink); SendItemPacket(0, final_inst.get(), ItemPacketViewLink);
} }
bool Client::DoEvolveCheckProgression(EQ::ItemInstance &inst) bool Client::DoEvolveCheckProgression(EQ::ItemInstance &inst)

2
zone/client_packet.cpp
View File

@ -14404,6 +14404,8 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
inst2->SetPrice(price); inst2->SetPrice(price);
inst2->SetMerchantSlot(freeslot); inst2->SetMerchantSlot(freeslot);
inst2->SetEvolveCurrentAmount(0);
inst2->CalculateEvolveProgression();
uint32 merchant_quantity = zone->GetTempMerchantQuantity(vendor->GetNPCTypeID(), freeslot); uint32 merchant_quantity = zone->GetTempMerchantQuantity(vendor->GetNPCTypeID(), freeslot);

29
zone/parcels.cpp
View File

@ -134,20 +134,21 @@ void Client::SendParcel(Parcel_Struct &parcel_in)
CharacterParcelsRepository::CharacterParcels p{}; CharacterParcelsRepository::CharacterParcels p{};
p.from_name = r.from_name; p.from_name = r.from_name;
p.id = r.id; p.id = r.id;
p.note = r.note; p.note = r.note;
p.quantity = r.quantity; p.quantity = r.quantity;
p.sent_date = r.sent_date; p.sent_date = r.sent_date;
p.item_id = r.item_id; p.item_id = r.item_id;
p.aug_slot_1 = r.aug_slot_1; p.aug_slot_1 = r.aug_slot_1;
p.aug_slot_2 = r.aug_slot_2; p.aug_slot_2 = r.aug_slot_2;
p.aug_slot_3 = r.aug_slot_3; p.aug_slot_3 = r.aug_slot_3;
p.aug_slot_4 = r.aug_slot_4; p.aug_slot_4 = r.aug_slot_4;
p.aug_slot_5 = r.aug_slot_5; p.aug_slot_5 = r.aug_slot_5;
p.aug_slot_6 = r.aug_slot_6; p.aug_slot_6 = r.aug_slot_6;
p.slot_id = r.slot_id; p.slot_id = r.slot_id;
p.char_id = r.char_id; p.char_id = r.char_id;
p.evolve_amount = r.evolve_amount;
auto item = database.GetItem(p.item_id); auto item = database.GetItem(p.item_id);
if (item) { if (item) {