[Feature] Bazaar Unique Item ID and Offline Trading #4878
Conversation
neckkola
force-pushed
the
AddUniqueItemSerialNumberWithOfflineTrading
branch
2 times, most recently
from
6b09e22 to
7140751
Compare
|
You sir, are amazing! |
|
I do not believe the offline trader portion will fully function with the current public login server however, it will require a private login server or public server revamp. Neckkola can chime in on that. |
You are more than welcome to take what I did there, though it is intensely rudimentary. |
neckkola
force-pushed
the
AddUniqueItemSerialNumberWithOfflineTrading
branch
from
a1a046a to
7bf464b
Compare
|
client_packet.cpp:834 will need changed: From: To: |
neckkola
force-pushed
the
AddUniqueItemSerialNumberWithOfflineTrading
branch
from
522484f to
7d58dc9
Compare
|
@Akkadius, or others with knowledge. Looking for some help on the build failure. Looks like the tests.exe is failing in IPCMutexTest. Any assistance or point me in the right direction would be appreciated. I compiled locally and tests.exe runs correctly. Thanks! |
|
I know it doesn't solve your issue, but just general feedback, been running this PR for a while now and no major issues. |
common/bazaar.cpp
Outdated
| std::vector<std::string> trader_items_ids{}; | ||
| std::unordered_set<std::string> trader_items_ids{}; | ||
|
|
||
| // auto const trader_results = TraderRepository::GetBazaarTraderDetails(db, search_criteria_trader, search.max_results); |
common/bazaar.cpp
Outdated
| if (trader_results.empty()) { | ||
| LogTradingDetail("Bazaar - No traders found in bazaar search."); | ||
| return all_entries; | ||
| } | ||
|
|
||
| for (auto const &i: trader_results) { | ||
| trader_items_ids.push_back(std::to_string(i.trader.item_id)); | ||
| trader_items_ids.emplace(std::to_string(i.trader.item_id)); | ||
| //trader_items_ids.push_back(std::to_string(i.trader.item_id)); |
common/bazaar.cpp
Outdated
| // for (auto const& t:item_results) { | ||
| // BazaarSearchResultsFromDB_Struct r{}; | ||
| // r.count = 1; | ||
| // r.trader_id = t.trader.character_id; | ||
| // r.item_unique_id = t.trader.item_unique_id; | ||
| // r.cost = t.trader.item_cost; | ||
| // r.slot_id = t.trader.slot_id; | ||
| // r.charges = t.trader.item_charges; | ||
| // r.stackable = t.stackable; | ||
| // r.icon_id = t.icon; | ||
| // r.trader_zone_id = t.trader.char_zone_id; | ||
| // r.trader_zone_instance_id = t.trader.char_zone_instance_id; | ||
| // r.trader_entity_id = t.trader.char_entity_id; | ||
| // r.item_name = fmt::format("{:.63}\0", t.name); | ||
| // r.trader_name = fmt::format("{:.63}\0", t.trader_name); | ||
| // r.item_stat = t.stats; | ||
| // | ||
| // if (RuleB(Bazaar, UseAlternateBazaarSearch)) { | ||
| // if (convert || | ||
| // char_zone_id != Zones::BAZAAR || | ||
| // (char_zone_id == Zones::BAZAAR && r.trader_zone_instance_id != char_zone_instance_id) | ||
| // ) { | ||
| // r.trader_id = TraderRepository::TRADER_CONVERT_ID + r.trader_zone_instance_id; | ||
| // } | ||
| // } | ||
| // | ||
| // all_entries.push_back(r); | ||
| // } | ||
|
|
||
| // if (all_entries.size() > search.max_results) { |
common/patches/rof2.cpp
Outdated
| @@ -439,7 +439,7 @@ namespace RoF2 | |||
| break; | |||
| } | |||
| default: { | |||
| LogTradingDetail("Unhandled action <red>[{}]", sub_action); | |||
| //LogTradingDetail("Unhandled action <red>[{}]", sub_action); | |||
common/patches/rof2.cpp
Outdated
| @@ -533,7 +533,7 @@ namespace RoF2 | |||
| break; | |||
| } | |||
| default: { | |||
| LogTrading("(RoF2) Unhandled action <red>[{}]", action); | |||
| //LogTradingDetail("(RoF2) Unhandled action <red>[{}]", action); | |||
| @@ -622,10 +622,10 @@ namespace RoF2 | |||
| break; | |||
| } | |||
| default: { | |||
| LogTrading( | |||
common/patches/rof2.cpp
Outdated
|
|
||
| FINISH_DIRECT_DECODE(); | ||
| break; | ||
| } | ||
| default: { | ||
| LogTrading("(RoF2) Unhandled action <red>[{}]", action); | ||
| //LogTradingDetail("(RoF2) Unhandled action <red>[{}]", action); |
common/patches/titanium.cpp
Outdated
| @@ -2529,7 +2529,7 @@ namespace Titanium | |||
|
|
|||
| IN(action); | |||
| memcpy(emu->player_name, eq->player_name, sizeof(emu->player_name)); | |||
| IN(serial_number); | |||
| //FIXIN(serial_number); | |||
common/patches/uf.cpp
Outdated
| @@ -3618,7 +3618,7 @@ namespace UF | |||
|
|
|||
| IN(action); | |||
| memcpy(emu->player_name, eq->player_name, sizeof(emu->player_name)); | |||
| IN(serial_number); | |||
| //FIXIN(serial_number); | |||
| del_time -= RuleI(Character, InvSnapshotHistoryD) * 86400; | ||
| } | ||
|
|
||
| DeleteWhere(db, fmt::format("`character_id` = '{}' AND `time_index` <= '{}'", character_id, del_time)); |
There was a problem hiding this comment.
Numbers shouldn't be quoted in queries, it throws off the query planner
| static void ListCharacterInvSnapshots(Database &db, uint32 character_id, std::list<std::pair<uint32, int>> &is_list) | ||
| { | ||
| const std::string &query = fmt::format( | ||
| "SELECT `time_index`, COUNT(*) FROM `inventory_snapshots` WHERE " |
There was a problem hiding this comment.
Numbers shouldn't be quoted in queries, it throws off the query planner
| } | ||
|
|
||
| const std::string &query = fmt::format( | ||
| "SELECT * FROM `inventory_snapshots` WHERE `character_id` = '{}' " |
There was a problem hiding this comment.
Numbers shouldn't be quoted in queries, it throws off the query planner
| { | ||
| const std::string &query = fmt::format( | ||
| "SELECT `slot_id`, `item_id` FROM `inventory_snapshots` " | ||
| "WHERE `character_id` = '{}' AND `time_index` = '{}' ORDER BY `slot_id`", |
There was a problem hiding this comment.
Numbers shouldn't be quoted in queries, it throws off the query planner
| { | ||
| const std::string &query = fmt::format( | ||
| "SELECT slot_id, item_id FROM `inventory_snapshots` " | ||
| "WHERE `time_index` = '{0}' AND `character_id` = '{1}' AND `slot_id` NOT IN (" |
There was a problem hiding this comment.
Numbers shouldn't be quoted in queries, it throws off the query planner
| { | ||
| const std::string &query = fmt::format( | ||
| "SELECT `slot_id`, `item_id` FROM `inventory` WHERE " | ||
| "`character_id` = '{0}' AND `slot_id` NOT IN (" |
There was a problem hiding this comment.
Numbers shouldn't be quoted in queries, it throws off the query planner
| uint32 time_index = time(nullptr); | ||
| std::vector<InventorySnapshots> queue{}; | ||
|
|
||
| auto inventory = InventoryRepository::GetWhere(db, fmt::format("`character_id` = '{}'", character_id)); |
There was a problem hiding this comment.
Numbers shouldn't be quoted in queries, it throws off the query planner
|
|
||
| static bool RestoreCharacterInvSnapshot(Database &db, uint32 character_id, uint32 timestamp) | ||
| { | ||
| InventoryRepository::DeleteWhere(db, fmt::format("`character_id` = '{}'", character_id)); |
There was a problem hiding this comment.
Numbers shouldn't be quoted in queries, it throws off the query planner
Cleanup and testing Zone updated builds ok World updated builds ok Update guild_base.h
Fix a few compiler warnings
Updates based on comment review.
neckkola
force-pushed
the
AddUniqueItemSerialNumberWithOfflineTrading
branch
from
a620e91 to
d21147f
Compare
|
I have rebased, and updated based on comments. Ran some basic tests. I do need to update the GetSerialNumber functions to remove them and clean up that side. Will work on that later. |
… they are no longer used. Updated sharedbank to store unique_item_id instead of guid.
…ed now. Added sharedbank conversion to create unique item ids on world load.
|
Ran more tests. Corrected a few issues and also implemented shared bank for unique ids. Should be ready for another review. Also cleaned up unused functions. Thank you. |
Description
This update allows for proper unique item ids within the bazaar, utilizing the RoF2 model of a 17 character string. It is generated using a random hash generator which is unique across zones. It also allows for easier determination of multi-instance bazaars to ensure 100% accuracy in unique ids.
Further, it removes the workaround for hot bars. Previously, there was code upon character login to ensure that item ids (which were simple uint32s, reused across zones) were not reused to ensure that hot bar items would not 'change'. This code was expensive now that there are large bags. This is removed.
On first boot of world, a conversion routine runs to create unique ids for all character inventory items. This is done once, though I left the routine in zone inventory load as a fail safe.
Trader, Buyer, Barter, Parcels, Evolving Items have been updated to reflect the new unique item id.
This feature also allows off line trading for traders/buyers. Using the 'offline mode' will remove the active player, and place them in offline mode. /who and /who all have been updated along with the Guild Status window. Therefore, there are login server changes to manage the offline status, displaying the appropriate messaging to clients when they login, should they have an offline character active.
I have also rewritten most of the bazaar code to be more efficient and better manage resources. I have also added more graceful transaction rollbacks for when a bazaar transaction fails.
This is not ready for merge. I would like to ask if there are any interested parties in testing? I have been trough many, though would always appreciate another set of eyes, and attempts to break things. :-) Testing with the alternate bazaar functionality (multi-instance) would also be appreciated.
It does not have 'Direct to Inventory' functionality (which the previous version also did not have) though THJ has implemented so I will see if they will allow me to add to this in a future version.
Thank you!
Type of change
Testing
I have tested locally, and the offline functionality has been tested in a prod environment (not with the new unique item id) for several weeks. Is ok at present.
Clients tested:
RoF2
Checklist