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

Pirate Bounties #1513

Merged
merged 94 commits into from
Jul 24, 2024
Merged

Pirate Bounties #1513

merged 94 commits into from
Jul 24, 2024

Conversation

Salvantrix
Copy link
Contributor

@Salvantrix Salvantrix commented Jun 13, 2024

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

Adds a system that quazi-merges the upstream bounty system with the contraband turn in system.

Pirates will have a console with 4-5 bounties that rotate on an hourly basis with unique objectives that they can then turn in for Doubloons.
Ex. "Plunder a single Cappy" Reward: 10 Doubloons

Not at all complete.

About the PR

Why / Balance

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

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

Not at all complete.
Awaiting further checkiessssssssssss
Added gold ore/ingots and Vending Machines
Everything was Captain, NO LONGER
@github-actions github-actions bot added C# and removed No C# labels Jun 19, 2024
Copy link
Contributor

github-actions bot commented Jul 16, 2024

RSI Diff Bot; head commit 0bc1c6d merging into df926f8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Structures/Machines/computers.rsi

State Old New Status
contraband Modified
piratebounty Added
piratebounty_pad Added

Resources/Textures/_NF/Structures/Machines/piratebounty_pallet.rsi

State Old New Status
base Added
unshaded Added

Resources/Textures/_NF/Structures/Storage/Crates/pirate_bounty.rsi

State Old New Status
crate Added
crate_door Added
crate_icon Added
crate_open Added
sparking Added
welded Added

Edit: diff updated after 0bc1c6d

@github-actions github-actions bot added the UI label Jul 16, 2024
@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Jul 22, 2024
@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Jul 22, 2024
@github-actions github-actions bot added Map-POI Map - POI and removed YML labels Jul 22, 2024
@dvir001 dvir001 self-requested a review July 23, 2024 15:48
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jul 23, 2024
@dvir001
Copy link
Contributor

dvir001 commented Jul 23, 2024

Is this ready or still under work? I was told there were missing sprites, but it seems all there.

@dvir001 dvir001 self-requested a review July 24, 2024 21:26
@dvir001 dvir001 merged commit b468f25 into new-frontiers-14:master Jul 24, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C# FTL Map-POI Map - POI Map-Shuttle Map - Shuttle Sprites Status: Needs Review This PR is awaiting reviews UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants