pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-20 00:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Selling for Alternate Currency Merchants for RoF and RoF2.

Browse Source
This commit is contained in:
Trevius 2014-12-19 23:20:10 -06:00
parent cedec3d872
commit 4ef3c7a9f4
6 changed files with 23 additions and 24 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)
Trevius: (RoF2) Fixed Leadership AA Purchasing and Recipe Search by correcting opcodes. Trevius: (RoF2) Fixed Leadership AA Purchasing and Recipe Search by correcting opcodes.
Trevius: Fixed Armor Tinting (players and NPCs) that was broken during a previous update. Trevius: Fixed Armor Tinting (players and NPCs) that was broken during a previous update.
Trevius: (RoF2) Fixed Rest Timer, Show Helm Option, Auto-Consent Options, and identified Krono in the PP. Trevius: (RoF2) Fixed Rest Timer, Show Helm Option, Auto-Consent Options, and identified Krono in the PP.
Trevius: Fixed Selling for Alternate Currency Merchants for RoF and RoF2.
== 12/18/2014 == == 12/18/2014 ==
Trevius: Finished lining up the RoF2 Player Profile Struct. Zone times are now normal, and everything from the PP is accurate in game now. Trevius: Finished lining up the RoF2 Player Profile Struct. Zone times are now normal, and everything from the PP is accurate in game now.

6
common/patches/rof.cpp
View File

@ -205,7 +205,7 @@ namespace RoF
SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct);
OUT(merchant_entity_id); OUT(merchant_entity_id);
eq->slot_id = ServerToRoFSlot(emu->slot_id); eq->slot_id = ServerToRoFMainInvSlot(emu->slot_id);
OUT(charges); OUT(charges);
OUT(cost); OUT(cost);
@ -3881,7 +3881,7 @@ namespace RoF
SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct);
IN(merchant_entity_id); IN(merchant_entity_id);
emu->slot_id = RoFToServerSlot(eq->slot_id); emu->slot_id = RoFToServerMainInvSlot(eq->slot_id);
IN(charges); IN(charges);
IN(cost); IN(cost);
@ -3894,7 +3894,7 @@ namespace RoF
SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct);
IN(merchant_entity_id); IN(merchant_entity_id);
emu->slot_id = RoFToServerSlot(eq->slot_id); emu->slot_id = RoFToServerMainInvSlot(eq->slot_id);
FINISH_DIRECT_DECODE(); FINISH_DIRECT_DECODE();
} }

6
common/patches/rof2.cpp
View File

@ -205,7 +205,7 @@ namespace RoF2
SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct);
OUT(merchant_entity_id); OUT(merchant_entity_id);
eq->slot_id = ServerToRoF2Slot(emu->slot_id); eq->slot_id = ServerToRoF2MainInvSlot(emu->slot_id);
OUT(charges); OUT(charges);
OUT(cost); OUT(cost);
@ -3895,7 +3895,7 @@ namespace RoF2
SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct);
IN(merchant_entity_id); IN(merchant_entity_id);
emu->slot_id = RoF2ToServerSlot(eq->slot_id); emu->slot_id = RoF2ToServerMainInvSlot(eq->slot_id);
IN(charges); IN(charges);
IN(cost); IN(cost);
@ -3908,7 +3908,7 @@ namespace RoF2
SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct);
IN(merchant_entity_id); IN(merchant_entity_id);
emu->slot_id = RoF2ToServerSlot(eq->slot_id); emu->slot_id = RoF2ToServerMainInvSlot(eq->slot_id);
FINISH_DIRECT_DECODE(); FINISH_DIRECT_DECODE();
} }

8
common/patches/rof2_structs.h
View File

@ -2180,8 +2180,8 @@ struct AltCurrencyUpdate_Struct {
//When an item is selected while the alt currency merchant window is open //When an item is selected while the alt currency merchant window is open
struct AltCurrencySelectItem_Struct { struct AltCurrencySelectItem_Struct {
/*000*/ uint32 merchant_entity_id; /*000*/ uint32 merchant_entity_id;
/*004*/ MainInvItemSlotStruct slot_id;
/*004*/ //uint32 slot_id; /*004*/ //uint32 slot_id;
ItemSlotStruct slot_id;
/*008*/ uint32 unknown008; /*008*/ uint32 unknown008;
/*012*/ uint32 unknown012; /*012*/ uint32 unknown012;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
@ -2238,10 +2238,10 @@ struct AltCurrencyReclaim_Struct {
struct AltCurrencySellItem_Struct { struct AltCurrencySellItem_Struct {
/*000*/ uint32 merchant_entity_id; /*000*/ uint32 merchant_entity_id;
/*004*/ MainInvItemSlotStruct slot_id;
/*004*/ //uint32 slot_id; /*004*/ //uint32 slot_id;
ItemSlotStruct slot_id; /*016*/ uint32 charges;
/*008*/ uint32 charges; /*020*/ uint32 cost;
/*012*/ uint32 cost;
}; };
struct Adventure_Purchase_Struct { struct Adventure_Purchase_Struct {

6
common/patches/rof_structs.h
View File

@ -2174,8 +2174,7 @@ struct AltCurrencyUpdate_Struct {
//When an item is selected while the alt currency merchant window is open //When an item is selected while the alt currency merchant window is open
struct AltCurrencySelectItem_Struct { struct AltCurrencySelectItem_Struct {
/*000*/ uint32 merchant_entity_id; /*000*/ uint32 merchant_entity_id;
/*004*/ //uint32 slot_id; /*004*/ MainInvItemSlotStruct slot_id;
ItemSlotStruct slot_id;
/*008*/ uint32 unknown008; /*008*/ uint32 unknown008;
/*012*/ uint32 unknown012; /*012*/ uint32 unknown012;
/*016*/ uint32 unknown016; /*016*/ uint32 unknown016;
@ -2232,8 +2231,7 @@ struct AltCurrencyReclaim_Struct {
struct AltCurrencySellItem_Struct { struct AltCurrencySellItem_Struct {
/*000*/ uint32 merchant_entity_id; /*000*/ uint32 merchant_entity_id;
/*004*/ //uint32 slot_id; /*004*/ MainInvItemSlotStruct slot_id;
ItemSlotStruct slot_id;
/*008*/ uint32 charges; /*008*/ uint32 charges;
/*012*/ uint32 cost; /*012*/ uint32 cost;
}; };

4
common/patches/underfoot_structs.h
View File

@ -4365,8 +4365,8 @@ struct AltCurrencySelectItem_Struct {
struct AltCurrencySellItem_Struct { struct AltCurrencySellItem_Struct {
/*000*/ uint32 merchant_entity_id; /*000*/ uint32 merchant_entity_id;
/*004*/ uint32 slot_id; /*004*/ uint32 slot_id;
/*006*/ uint32 charges; /*008*/ uint32 charges;
/*010*/ uint32 cost; /*012*/ uint32 cost;
}; };
struct AltCurrencyPopulateEntry_Struct struct AltCurrencyPopulateEntry_Struct