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

Pirate Bounties #1513

Merged
merged 94 commits into from
Jul 24, 2024
Merged

Pirate Bounties #1513

merged 94 commits into from
Jul 24, 2024

Commits on Jun 13, 2024

  1. Pirate Bounties 

    The start of a probably long PR for the pirate bounty system.

Not at all complete.
    @Salvantrix
    Salvantrix committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    b8d7dd7 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Changed Components to ID's 

    Awaiting further checkiessssssssssss
    @Salvantrix
    Salvantrix committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    e59b30a View commit details
    Browse the repository at this point in the history

  2. added additional bounties 

    Added gold ore/ingots and Vending Machines
    @Salvantrix
    Salvantrix committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    948622b View commit details
    Browse the repository at this point in the history

  3. Fixed ID names 

    Everything was Captain, NO LONGER
    @Salvantrix
    Salvantrix committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    b6007a3 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. ID Whitelist, move pirate bounties to _NF folders

    Whatstone committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    3d2c3d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Balance Pass 

    Balanced a couple thing Leander Suggested.
    @Salvantrix
    Salvantrix committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    83bf58f View commit details
    Browse the repository at this point in the history

  2. Pirate bounty components & systems, ROUGH DRAFT.

    @whatston3
    whatston3 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    ccf72b4 View commit details
    Browse the repository at this point in the history

  3. Pirate bounty/pallet console UI (ROUGH DRAFT

    @whatston3
    whatston3 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    bff0941 View commit details
    Browse the repository at this point in the history

  4. Pirate UI (WIP, quarter-baked at best)

    @whatston3
    whatston3 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    fa3e393 View commit details
    Browse the repository at this point in the history

  5. Pirate UI cleanup, first pass

    @whatston3
    whatston3 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    22399e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into PIRATE-BOOTIES
    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    d185bd8 View commit details
    Browse the repository at this point in the history

  2. Booty Crate Sprites 

    Thanks Schbingus
    @Salvantrix
    Salvantrix committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    25df953 View commit details
    Browse the repository at this point in the history

  3. Crate fix dumb

    @Salvantrix
    Salvantrix committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    20b3408 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/PIRATE-BOOTIES-UI-WIP' into PIRA… 

    …TE-BOOTIES
    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    0a679c0 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'salv/PIRATE-BOOTIES' into PIRATE-BOOTIES

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    438817e View commit details
    Browse the repository at this point in the history

  6. Pirate vessels inherit from pirate vessel class

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    2777beb View commit details
    Browse the repository at this point in the history

  7. Pirate bounty consoles and pad 

    YEEEEEEEEEEEEEEEEEEEEEEEEE
    @Salvantrix
    Salvantrix committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    1f829b0 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'PIRATE-BOOTIES' of https://github.com/Salvantrix/fronti… 

    …er-station-14 into PIRATE-BOOTIES
    @Salvantrix
    Salvantrix committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    16cd694 View commit details
    Browse the repository at this point in the history

  9. FIX 

    AAAAAAAAA
    @Salvantrix
    Salvantrix committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    2755142 View commit details
    Browse the repository at this point in the history

  10. Should work -- Console FTL's 

    Pls work
    @Salvantrix
    Salvantrix committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    296b2b0 View commit details
    Browse the repository at this point in the history

  11. Sector service POC, pirate bounty service

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    02a42c7 View commit details
    Browse the repository at this point in the history

  12. Pirate bounty system: use sector service

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    07d0292 View commit details
    Browse the repository at this point in the history

  13. SectorServicePrototype: fix namespace includes

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    c9994ab View commit details
    Browse the repository at this point in the history

  14. SectorServicePrototype: yet more namespace include

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    e7837dc View commit details
    Browse the repository at this point in the history

  15. namespace includes, pt 3

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    9888783 View commit details
    Browse the repository at this point in the history

  16. CargoSystem: fix obsolete code

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    11053c2 View commit details
    Browse the repository at this point in the history

  17. Add pirate bounty and redemption WIP computers

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    f417106 View commit details
    Browse the repository at this point in the history

  18. Pirate bounties: fix whitelist, add blacklist

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    e7b1c94 View commit details
    Browse the repository at this point in the history

  19. SectorServicePrototype: add serializable attribute

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    da700fc View commit details
    Browse the repository at this point in the history

  20. SectorServicePrototype: default name

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    9138ded View commit details
    Browse the repository at this point in the history

  21. SectorServicePrototype to shared

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    0917c98 View commit details
    Browse the repository at this point in the history

  22. YAML linter fixes, no service serialization

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    092918f View commit details
    Browse the repository at this point in the history

  23. ProtoIdWhitelist: use List, adjust bounty values

    @whatston3
    whatston3 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    3c55d8a View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. PirateBounty: use existing Bounty name ID group

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    d3cefc5 View commit details
    Browse the repository at this point in the history

  2. global service: station component, bounty system

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    e91b76f View commit details
    Browse the repository at this point in the history

  3. Redundant functions, generics

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    8477f8f View commit details
    Browse the repository at this point in the history

  4. SectorServiceSystem: interface woes

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    b4c5485 View commit details
    Browse the repository at this point in the history

  5. PirateBounty component work

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    2c4a1b8 View commit details
    Browse the repository at this point in the history

  6. PirateBounty: more sector service fixes

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    c6ce482 View commit details
    Browse the repository at this point in the history

  7. yet more pirate bounty & sector service system

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    c60201e View commit details
    Browse the repository at this point in the history

  8. SectorService: revert to GetServiceEntity for now

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    82066f6 View commit details
    Browse the repository at this point in the history

  9. CargoSystem.PirateBounty.cs: restore entity UIDs

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    bb2211e View commit details
    Browse the repository at this point in the history

  10. partial problems require partial components

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    0879a1d View commit details
    Browse the repository at this point in the history

  11. Remove Cargo UI key, add a few debug prints

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    b10e601 View commit details
    Browse the repository at this point in the history

  12. pirate bounty console and pallet FTL

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    184e713 View commit details
    Browse the repository at this point in the history

  13. Pirate bounty console UI

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    1fa6cd2 View commit details
    Browse the repository at this point in the history

  14. PirateBounty: compilation fixes

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    8cb5758 View commit details
    Browse the repository at this point in the history

  15. PirateBounty

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    a68c652 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'PIRATE-BOOTIES-server-and-client' into PIRATE-BOOTIES

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    a5736fd View commit details
    Browse the repository at this point in the history

  17. Summon chest WIP

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    895780f View commit details
    Browse the repository at this point in the history

  18. More pirate bounty stuff

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    97a01cc View commit details
    Browse the repository at this point in the history

  19. PirateBountyEntry: access button rewrite

    @whatston3
    whatston3 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    2fa0a57 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge branch 'master' into PIRATE-BOOTIES

    @Salvantrix
    Salvantrix committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    f40e954 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. cancel vs. skip, spawning fixes

    @whatston3
    whatston3 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    6f50486 View commit details
    Browse the repository at this point in the history

  2. Undupe pirate-pallet strings

    @whatston3
    whatston3 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    81bc01e View commit details
    Browse the repository at this point in the history

  3. 30 minute cancel

    @whatston3
    whatston3 committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    1b41a26 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. pirate bounty chest and reminder descriptions

    @whatston3
    whatston3 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    2fe347d View commit details
    Browse the repository at this point in the history

  2. Rough pirate contraband console

    @whatston3
    whatston3 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    28f08b9 View commit details
    Browse the repository at this point in the history

  3. Pirate contraband exchange

    @whatston3
    whatston3 committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    4d3fa2f View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Add pirate appraisal tool

    @whatston3
    whatston3 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    269012b View commit details
    Browse the repository at this point in the history

  2. "black market"

    @whatston3
    whatston3 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    87db08f View commit details
    Browse the repository at this point in the history

  3. Half of a bounty redemption algo

    @whatston3
    whatston3 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    80dfd23 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Pirate bounty redemption, part 2

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    c9e57c4 View commit details
    Browse the repository at this point in the history

  2. Pirate bounty redemption: first rough version?

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    1184b24 View commit details
    Browse the repository at this point in the history

  3. closer to compilation

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    d2c5a1a View commit details
    Browse the repository at this point in the history

  4. Compilation fixes

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    6b4d2e6 View commit details
    Browse the repository at this point in the history

  5. Bounty redemption UI

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    8e660ce View commit details
    Browse the repository at this point in the history

  6. Pirate bounty redemption fixes

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    599b533 View commit details
    Browse the repository at this point in the history

  7. Set up label on pirate bounty, fix whitelist check

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    775a495 View commit details
    Browse the repository at this point in the history

  8. Id whitelist

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    297cfec View commit details
    Browse the repository at this point in the history

  9. ID whitelist fixes

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    994429d View commit details
    Browse the repository at this point in the history

  10. Fix crate IDs used for lookup

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    752f931 View commit details
    Browse the repository at this point in the history

  11. fix bounty whitelisting, bounty chests, prices

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    d2a9bc5 View commit details
    Browse the repository at this point in the history

  12. Fix up bounties, fluent entries for bounties

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    da6c212 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'PIRATE-BOOTIES-server-and-client' into PIRATE-BOOTIES

    @whatston3
    whatston3 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    55c9429 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into PIRATE-BOOTIES

    @Salvantrix
    Salvantrix committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    fdeb617 View commit details
    Browse the repository at this point in the history

  15. Bah

    @Salvantrix
    Salvantrix committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    c581137 View commit details
    Browse the repository at this point in the history

  16. Update cove.yml

    @dvir001
    dvir001 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    6d78762 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. pirate bounty consoles, unshaded pad, cove pads

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    489dc09 View commit details
    Browse the repository at this point in the history

  2. piratebounty.png: fix one bad pixel

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    0b13f84 View commit details
    Browse the repository at this point in the history

  3. Revert the mark of the beast

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    e482127 View commit details
    Browse the repository at this point in the history

  4. humility

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    9a20027 View commit details
    Browse the repository at this point in the history

  5. Pirate Bounty cleanup

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    e930597 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into PIRATE-BOOTIES

    @dvir001
    dvir001 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    88e0120 View commit details
    Browse the repository at this point in the history

  7. cleanup contraband.png pixels

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    4d3db72 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'PIRATE-BOOTIES-polish' into PIRATE-BOOTIES

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    c646d3d View commit details
    Browse the repository at this point in the history

  9. fix pirate logo

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    3723dfb View commit details
    Browse the repository at this point in the history

  10. Polish: noises, UI updates & strings

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    b033bcf View commit details
    Browse the repository at this point in the history

  11. Pirate Bounty: redemption text

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    bd62bb3 View commit details
    Browse the repository at this point in the history

  12. Fix spawn chest sound

    @whatston3
    whatston3 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    cfc3dc7 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Merge branch 'master' into PIRATE-BOOTIES

    @dvir001
    dvir001 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    d7e8df9 View commit details
    Browse the repository at this point in the history

  2. Update cove.yml

    @dvir001
    dvir001 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    ca2d372 View commit details
    Browse the repository at this point in the history

  3. Update cove.yml

    @dvir001
    dvir001 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    ed96c21 View commit details
    Browse the repository at this point in the history

  4. Update pirate.yml

    @dvir001
    dvir001 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    0bc1c6d View commit details
    Browse the repository at this point in the history