Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement trading between players. Includes context menu, dialog, and packets. #215

Merged
merged 18 commits into from
Sep 16, 2022
Merged

Implement trading between players. Includes context menu, dialog, and packets. #215

merged 18 commits into from
Sep 16, 2022

Commits on Jun 14, 2022

  1. Convert Trade network API calls to TradeActions

    @ethanmoffat
    ethanmoffat committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    3f14500 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2022

  1. Convert trade packets to new paradigm. Remove PacketAPI and PacketAPI… 

    …CallbackManager.
    @ethanmoffat
    ethanmoffat committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    1af2c5b View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2022

  1. Calculate inventory weight changes when completing a trade

    @ethanmoffat
    ethanmoffat committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    33bd06b View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Trading WIP

    @ethanmoffat
    ethanmoffat committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    e4d6dc8 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. Merge branch 'master' into trade

    @ethanmoffat
    ethanmoffat committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    aaa474b View commit details
    Browse the repository at this point in the history

  2. Add check for NPC renderer existence before attempting to show damage… 

    … counter
    @ethanmoffat
    ethanmoffat committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    64e1ba7 View commit details
    Browse the repository at this point in the history

  3. Update base dialog to store a NativeGraphicsManager. Allows trade dia… 

    …log to hold ListDialogItems
    @ethanmoffat
    ethanmoffat committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    cc295d6 View commit details
    Browse the repository at this point in the history

  4. Update inventory drag+drop to work with bank deposit

    @ethanmoffat
    ethanmoffat committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    716f636 View commit details
    Browse the repository at this point in the history

  5. First-pass implementation of trade dialog. 

    TODO:
- Wire up to open on trade requests
- Inventory space validator implementation
- Drag+drop from inventory to add items
- Testing
    @ethanmoffat
    ethanmoffat committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    c0d1145 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2022

  1. Implement InventorySpaceValidator.ItemsFit

    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    fdd97b2 View commit details
    Browse the repository at this point in the history

  2. Support drag+drop to add item to trade offer

    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    a4524c2 View commit details
    Browse the repository at this point in the history

  3. Wire up trade actions to context menu. Finish implementing trade dial… 

    …og actions.
    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    a461571 View commit details
    Browse the repository at this point in the history

  4. Fix various minor display bugs in TradeDialog

    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    f1c2cd9 View commit details
    Browse the repository at this point in the history

  5. Ensure equality of InventoryItem/TradeOffer is properly defined

    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    363b619 View commit details
    Browse the repository at this point in the history

  6. Remove TradeSessionID (this is probably not what the mystery byte is … 

    …for)
    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    15e1514 View commit details
    Browse the repository at this point in the history

  7. Ensure trade agree is setting agreement for the correct player

    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    23158cc View commit details
    Browse the repository at this point in the history

  8. Ensure trade offer updates read the break bytes. Ensure weight never … 

    …goes below zero after trade completes.
    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    78a2a54 View commit details
    Browse the repository at this point in the history

  9. Remove erroneously added System.Windows.Documents using statement

    @ethanmoffat
    ethanmoffat committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    dc5e49f View commit details
    Browse the repository at this point in the history