[Feature] Add RoF2 Bazaar Support #4315

neckkola · 2024-05-22T00:58:23Z

Description

This PR will re-write much of the bazaar functionality with the intent to be phase 1 of RoF2 support. Phase 2 will be to enable the barter/buyer system. I am separating the two to allow for easier testing/review. I have marked this draft, as I believe it is ready for folks to kick the tires and comment upon. More changes will occur as I test further and respond to any feedback, suggestions, bugs, etc. I trust this is a good approach.

Specifically, this change;

rewrites much of the encode/decode functions to be base on action keys instead of packet length
rewrites much, though not all, of the pre-existing merchant/bazaar functionality, again to be based on action instead of packet length.
the change to action allows for backwards compatibility with Ti, UF, and RoF2
Enables /bazaar functionality for RoF2
Enable co-existence with UF/RoF2 traders including the 80/200 limits
supports tradeable augmented items
supports RoF2 clients to purchase via parcel delivery outside of bazaar at a delivery cost. I set this to 20% as a default. Not sure what live is atm.
creates several rules to adjust parcel delivery cost(implemented) and voucher delivery (not yet implemented)

Type of change

Please delete options that are not relevant.

New feature (non-breaking change which adds functionality)
This change requires a documentation update

Testing

I have tested via RoF2 and UF. Ti compatibility is not yet complete. I will tackle this next.

Clients tested:
RoF2 and UF

Checklist

I have tested my changes
I have performed a self-review of my code. Ensuring variables, functions and methods are named in a human-readable way, comments are added only where naming of variables, functions and methods can't give enough context.
[TODO] I have made corresponding changes to the documentation (if applicable, if not delete this line)
I own the changes of my code and take responsibility for the potential issues that occur
If my changes make database schema changes, I have tested the changes on a local database (attach image). Updated version.h CURRENT_BINARY_DATABASE_VERSION to the new version. (Delete this if not applicable)

Comments

Ti integration not complete.
The client, at least with the old implementation of the bazaar, and with these updates, has a limitation where duplicate item ids within a trader will have the same sale price. For example, if you have two stacks of item 8517 (Class 6 Arrows) they will be the same price. I will investigate this more, though this is how it previously functioned, so I have not spent much time at the moment.
Augmented items are supported. Due to the client issue above, if you have two items, one augmented and one not, they will have the same price.
RoF2 direct delivery via vouchers is not enabled. Are expedient delivery vouchers enabled within alt currency? I can look into this if folks would like this functionality.

Any suggests, or feedback are welcome, including any testing that people could do.

Thanks, and enjoy.
Neckkola

fryguy503 · 2024-05-23T12:45:59Z

Can we completely disable parcel delivery and force users to visit the bazaar stalls?

neckkola · 2024-05-23T15:59:54Z

Can we completely disable parcel delivery and force users to visit the bazaar stalls?

I can add that. No problem

common/database/database_update_manifest.cpp

neckkola · 2024-05-24T01:30:42Z

Can we completely disable parcel delivery and force users to visit the bazaar stalls?

I can add that. No problem

@fryguy503 Added a new rule. Default is to allow delivery so you will have to flip to false.

Enable RoF2 bazaar features

Cleanup of formatting and unused functions

…her cleanup.

Add parcel delivery price functionality via rules and new delivery cost struct.

Further testing and a few fixes and messages added. Add active transaction check to ensure two clients cannot purchase from the bazaar window at the same time

Cleanup and Formatting updates

…der table

Add a rule Bazaar:EnableParcelDelivery to enable/disable bazaar parcel delivery. Default is True.

Adds/Tested bazaar search with move to content_db - race, class, money, number of returned items, stats, name, slot, level, traders, local traders, specific trader. Outstanding - type, more stats to add (heroic, etc)

Updates the bazaar search for item types. They should be working as per RoF2+ types.

Add search by augmentation slots available on the item. This enables all but Prestige, which I believe are not implemented yet.

Add Titanium /trader /bazaar functionality. Added itemtype=armor bazaar search. It was missed in the search work

neckkola · 2024-05-26T20:20:35Z

Good afternoon. I have worked through the remaining bazaar search items. Everything should now be working in search except for prestige items as I understand that they are not implemented. Others should work; item name, local/all/specific traders, race, class, stats, type, level, cost and number of returned items.

I have also now added Titanium support for both /trader and /bazaar.

A previous version has been running in PEQ for several days, no reported issues that I am aware of, other than the limited search functionality. Should be ready to go.

I will need to do some cleanup as well, as there are some unused functions, duplicate enums. Will look after this for sure, then add some documentation, videos.

Neckkola

Valorith · 2024-05-26T20:22:33Z

Good afternoon. I have worked through the remaining bazaar search items. Everything should now be working in search except for prestige items as I understand that they are not implemented. Others should work; item name, local/all/specific traders, race, class, stats, type, level, cost and number of returned items.

I have also now added Titanium support for both /trader and /bazaar.

A previous version has been running in PEQ for several days, no reported issues that I am aware of, other than the limited search functionality. Should be ready to go.

I will need to do some cleanup as well, as there are some unused functions, duplicate enums. Will look after this for sure, then add some documentation, videos.

Neckkola

You're a legend!

fryguy503 · 2024-05-26T20:24:48Z

Can I add a request?

Currently to use barter, you must use the new bazaar. Before I had hardcoded a location in the old bazaar stalls to use barter.

Now with using the old bazaar, we need a door down for players to stand on. Can we code this in as an option for barter. So a different door to stand on will trigger barter allowance?

In era there was two old bazaars one for traders and one for barters, that did not last long before the new and arguably worse bazaar was added.

Akkadius · 2024-05-26T20:37:16Z

Been testing on PEQ for a good week, been solid

* Add RoF2 Bazaar Support Enable RoF2 bazaar features * Add augments to Trader Items * Cleanup Cleanup of formatting and unused functions * Update PlayerProfile for correct char_id in trader transactions. Further cleanup. * Add parcel delivery price functionality Add parcel delivery price functionality via rules and new delivery cost struct. * Add RoF support for bazaar window outside of bazaar with parcel delivery * Further Testing and ActiveTransaction added Further testing and a few fixes and messages added. Add active transaction check to ensure two clients cannot purchase from the bazaar window at the same time * Cleanup and Formatting updates Cleanup and Formatting updates * Update database manifest for the trader table against default peq trader table * Logs and formatting * Update bazaarsearch to be content_db aware * Fix crash * Simplify search * Search fixes * Push up more search logging * More search fixes * Formatting * Update trader_repository.h * Add Rule for Bazaar Parcel Delivery Add a rule Bazaar:EnableParcelDelivery to enable/disable bazaar parcel delivery. Default is True. * Fix crash * Update Bazaar Search Adds/Tested bazaar search with move to content_db - race, class, money, number of returned items, stats, name, slot, level, traders, local traders, specific trader. Outstanding - type, more stats to add (heroic, etc) * Formatting * Push * Update bazaarsearch to include all stats that are available in RoF2 * Update BazaarSearch Updates the bazaar search for item types. They should be working as per RoF2+ types. * Formatting * Final updates to BazaarSearch Add search by augmentation slots available on the item. This enables all but Prestige, which I believe are not implemented yet. * Add Titanium functionality correct ItemType Search Add Titanium /trader /bazaar functionality. Added itemtype=armor bazaar search. It was missed in the search work * Close off for loops --------- Co-authored-by: Akkadius <[email protected]>

Akkadius reviewed May 23, 2024

View reviewed changes

common/database/database_update_manifest.cpp Outdated Show resolved Hide resolved

neckkola force-pushed the FeatureBazaarRoF2 branch 4 times, most recently from 5eac2a4 to c57b5e7 Compare May 26, 2024 12:04

neckkola and others added 22 commits May 26, 2024 17:09

Add RoF2 Bazaar Support

5e9051e

Enable RoF2 bazaar features

Add augments to Trader Items

16fd6f8

Cleanup

751576f

Cleanup of formatting and unused functions

Update PlayerProfile for correct char_id in trader transactions. Furt…

d64712e

…her cleanup.

Add parcel delivery price functionality

3397109

Add parcel delivery price functionality via rules and new delivery cost struct.

Add RoF support for bazaar window outside of bazaar with parcel delivery

b1f4c2d

Further Testing and ActiveTransaction added

ea7ec81

Further testing and a few fixes and messages added. Add active transaction check to ensure two clients cannot purchase from the bazaar window at the same time

Cleanup and Formatting updates

58b4abe

Cleanup and Formatting updates

Update database manifest for the trader table against default peq tra…

6760479

…der table

Logs and formatting

fac3f59

Update bazaarsearch to be content_db aware

1443aec

Fix crash

346415e

Simplify search

a1f8f32

Search fixes

ba2665e

Push up more search logging

07733f2

More search fixes

188950b

Formatting

257c5d4

Update trader_repository.h

b598d60

Add Rule for Bazaar Parcel Delivery

800d6fb

Add a rule Bazaar:EnableParcelDelivery to enable/disable bazaar parcel delivery. Default is True.

Fix crash

d4e6413

Update Bazaar Search

5513851

Adds/Tested bazaar search with move to content_db - race, class, money, number of returned items, stats, name, slot, level, traders, local traders, specific trader. Outstanding - type, more stats to add (heroic, etc)

Formatting

b1eb268

Akkadius and others added 6 commits May 26, 2024 17:09

Push

f8ee361

Update bazaarsearch to include all stats that are available in RoF2

46cc62c

Update BazaarSearch

f7a5d04

Updates the bazaar search for item types. They should be working as per RoF2+ types.

Formatting

63c3963

Final updates to BazaarSearch

b1201e2

Add search by augmentation slots available on the item. This enables all but Prestige, which I believe are not implemented yet.

Add Titanium functionality correct ItemType Search

2954388

Add Titanium /trader /bazaar functionality. Added itemtype=armor bazaar search. It was missed in the search work

neckkola force-pushed the FeatureBazaarRoF2 branch from c57b5e7 to 2954388 Compare May 26, 2024 20:09

Akkadius marked this pull request as ready for review May 26, 2024 20:22

Close off for loops

a5fe46c

Akkadius approved these changes May 26, 2024

View reviewed changes

Akkadius merged commit fc79614 into EQEmu:master May 26, 2024
1 check was pending

Akkadius mentioned this pull request May 26, 2024

[Release] 22.51.0 #4347

Merged

joligario added a commit to ProjectEQ/peqphpeditor that referenced this pull request May 31, 2024

No changes required for EQEmu/Server#4315

fde8cb8

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Feature] Add RoF2 Bazaar Support #4315

[Feature] Add RoF2 Bazaar Support #4315

neckkola commented May 22, 2024

fryguy503 commented May 23, 2024

neckkola commented May 23, 2024

neckkola commented May 24, 2024

neckkola commented May 26, 2024 •

edited

Loading

Valorith commented May 26, 2024

fryguy503 commented May 26, 2024

Akkadius commented May 26, 2024

[Feature] Add RoF2 Bazaar Support #4315

[Feature] Add RoF2 Bazaar Support #4315

Conversation

neckkola commented May 22, 2024

Description

Type of change

Testing

Checklist

Comments

fryguy503 commented May 23, 2024

neckkola commented May 23, 2024

neckkola commented May 24, 2024

neckkola commented May 26, 2024 • edited Loading

Valorith commented May 26, 2024

fryguy503 commented May 26, 2024

Akkadius commented May 26, 2024

neckkola commented May 26, 2024 •

edited

Loading