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.

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

Add history tab to bounty console #33932

Merged
merged 22 commits into from
Jan 30, 2025
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d45237e
Add struct for holding historical data on cargo bounties
BarryNorfolk Dec 18, 2024
33f5d44
Add localisation strings for bounty history
BarryNorfolk Dec 18, 2024
8df74b6
Add new XAML entry for display bounty history
BarryNorfolk Dec 18, 2024
b7d2f24
Expand cargo bounty menu to include tabs
BarryNorfolk Dec 18, 2024
1b08ef0
Ensure station databases hold historical bounty data
BarryNorfolk Dec 18, 2024
d157ef9
Add to the bounty history when removing one from active
BarryNorfolk Dec 18, 2024
e0a5843
Feed bounty history into cargo's bounty system
BarryNorfolk Dec 18, 2024
a282598
Move tab title setting to constructor
BarryNorfolk Dec 19, 2024
ce1a85c
Remove redundant access specifications
BarryNorfolk Dec 19, 2024
f7680fe
Remove un-needed override
BarryNorfolk Dec 19, 2024
8ac59bf
Fixup BountyHistoryEntry backing code
BarryNorfolk Dec 19, 2024
656c5c4
Fix formatting in CargoBountyMenu
BarryNorfolk Dec 19, 2024
9e6e845
Reformat BountyHistoryData
BarryNorfolk Dec 19, 2024
eb3bda2
Rework TryRemoveBounty to use new Entity type
BarryNorfolk Dec 19, 2024
15c5342
Add Enum for showing bounty results
BarryNorfolk Dec 19, 2024
fe732af
Rework look and feel of History tab
BarryNorfolk Dec 19, 2024
bb7cc2f
Add visible text when no bounties have been completed yet
BarryNorfolk Dec 20, 2024
a5505e3
Remove control
BarryNorfolk Dec 23, 2024
6e2c96b
Swap default to null
BarryNorfolk Dec 23, 2024
fb526c9
Reverse ordering of bounties so last entry comes first
BarryNorfolk Dec 23, 2024
bac73c0
Remove redundant Visible
BarryNorfolk Jan 19, 2025
d9b72e4
Move enum docs into the enum
BarryNorfolk Jan 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove redundant access specifications
BarryNorfolk committed Dec 19, 2024
commit ce1a85c9201e4cb6ca930c62e0fff7fac90cd08e
Original file line number Diff line number Diff line change
@@ -12,20 +12,20 @@ public sealed partial class StationCargoBountyDatabaseComponent : Component
/// <summary>
/// Maximum amount of bounties a station can have.
/// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)]
[DataField]
public int MaxBounties = 6;

/// <summary>
/// A list of all the bounties currently active for a station.
/// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)]
[DataField]
public List<CargoBountyData> Bounties = new();

/// <summary>
/// A list of all the bounties that have been completed or
/// skipped for a station.
/// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)]
[DataField]
public List<CargoBountyHistoryData> History = new();

/// <summary>