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
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
b8d7dd7
Pirate Bounties
Salvantrix Jun 13, 2024
e59b30a
Changed Components to ID's
Salvantrix Jun 14, 2024
948622b
added additional bounties
Salvantrix Jun 14, 2024
b6007a3
Fixed ID names
Salvantrix Jun 14, 2024
3d2c3d0
ID Whitelist, move pirate bounties to _NF folders
Jun 16, 2024
83bf58f
Balance Pass
Salvantrix Jun 19, 2024
ccf72b4
Pirate bounty components & systems, ROUGH DRAFT.
whatston3 Jun 19, 2024
bff0941
Pirate bounty/pallet console UI (ROUGH DRAFT
whatston3 Jun 19, 2024
fa3e393
Pirate UI (WIP, quarter-baked at best)
whatston3 Jun 19, 2024
22399e1
Pirate UI cleanup, first pass
whatston3 Jun 19, 2024
d185bd8
Merge branch 'master' of https://github.com/new-frontiers-14/frontier…
whatston3 Jul 16, 2024
25df953
Booty Crate Sprites
Salvantrix Jul 16, 2024
20b3408
Crate fix dumb
Salvantrix Jul 16, 2024
0a679c0
Merge remote-tracking branch 'origin/PIRATE-BOOTIES-UI-WIP' into PIRA…
whatston3 Jul 16, 2024
438817e
Merge remote-tracking branch 'salv/PIRATE-BOOTIES' into PIRATE-BOOTIES
whatston3 Jul 16, 2024
2777beb
Pirate vessels inherit from pirate vessel class
whatston3 Jul 16, 2024
1f829b0
Pirate bounty consoles and pad
Salvantrix Jul 16, 2024
16cd694
Merge branch 'PIRATE-BOOTIES' of https://github.com/Salvantrix/fronti…
Salvantrix Jul 16, 2024
2755142
FIX
Salvantrix Jul 16, 2024
296b2b0
Should work -- Console FTL's
Salvantrix Jul 16, 2024
02a42c7
Sector service POC, pirate bounty service
whatston3 Jul 16, 2024
07d0292
Pirate bounty system: use sector service
whatston3 Jul 16, 2024
c9994ab
SectorServicePrototype: fix namespace includes
whatston3 Jul 16, 2024
e7837dc
SectorServicePrototype: yet more namespace include
whatston3 Jul 16, 2024
9888783
namespace includes, pt 3
whatston3 Jul 16, 2024
11053c2
CargoSystem: fix obsolete code
whatston3 Jul 16, 2024
f417106
Add pirate bounty and redemption WIP computers
whatston3 Jul 16, 2024
e7b1c94
Pirate bounties: fix whitelist, add blacklist
whatston3 Jul 16, 2024
da700fc
SectorServicePrototype: add serializable attribute
whatston3 Jul 16, 2024
9138ded
SectorServicePrototype: default name
whatston3 Jul 16, 2024
0917c98
SectorServicePrototype to shared
whatston3 Jul 16, 2024
092918f
YAML linter fixes, no service serialization
whatston3 Jul 16, 2024
3c55d8a
ProtoIdWhitelist: use List, adjust bounty values
whatston3 Jul 16, 2024
d3cefc5
PirateBounty: use existing Bounty name ID group
whatston3 Jul 17, 2024
e91b76f
global service: station component, bounty system
whatston3 Jul 17, 2024
8477f8f
Redundant functions, generics
whatston3 Jul 17, 2024
b4c5485
SectorServiceSystem: interface woes
whatston3 Jul 17, 2024
2c4a1b8
PirateBounty component work
whatston3 Jul 17, 2024
c6ce482
PirateBounty: more sector service fixes
whatston3 Jul 17, 2024
c60201e
yet more pirate bounty & sector service system
whatston3 Jul 17, 2024
82066f6
SectorService: revert to GetServiceEntity for now
whatston3 Jul 17, 2024
bb2211e
CargoSystem.PirateBounty.cs: restore entity UIDs
whatston3 Jul 17, 2024
0879a1d
partial problems require partial components
whatston3 Jul 17, 2024
b10e601
Remove Cargo UI key, add a few debug prints
whatston3 Jul 17, 2024
184e713
pirate bounty console and pallet FTL
whatston3 Jul 17, 2024
1fa6cd2
Pirate bounty console UI
whatston3 Jul 17, 2024
8cb5758
PirateBounty: compilation fixes
whatston3 Jul 17, 2024
a68c652
PirateBounty
whatston3 Jul 17, 2024
a5736fd
Merge branch 'PIRATE-BOOTIES-server-and-client' into PIRATE-BOOTIES
whatston3 Jul 17, 2024
895780f
Summon chest WIP
whatston3 Jul 17, 2024
97a01cc
More pirate bounty stuff
whatston3 Jul 17, 2024
2fa0a57
PirateBountyEntry: access button rewrite
whatston3 Jul 17, 2024
f40e954
Merge branch 'master' into PIRATE-BOOTIES
Salvantrix Jul 18, 2024
6f50486
cancel vs. skip, spawning fixes
whatston3 Jul 19, 2024
81bc01e
Undupe pirate-pallet strings
whatston3 Jul 19, 2024
1b41a26
30 minute cancel
whatston3 Jul 19, 2024
2fe347d
pirate bounty chest and reminder descriptions
whatston3 Jul 20, 2024
28f08b9
Rough pirate contraband console
whatston3 Jul 20, 2024
4d3fa2f
Pirate contraband exchange
whatston3 Jul 20, 2024
269012b
Add pirate appraisal tool
whatston3 Jul 21, 2024
87db08f
"black market"
whatston3 Jul 21, 2024
80dfd23
Half of a bounty redemption algo
whatston3 Jul 21, 2024
c9e57c4
Pirate bounty redemption, part 2
whatston3 Jul 22, 2024
1184b24
Pirate bounty redemption: first rough version?
whatston3 Jul 22, 2024
d2c5a1a
closer to compilation
whatston3 Jul 22, 2024
6b4d2e6
Compilation fixes
whatston3 Jul 22, 2024
8e660ce
Bounty redemption UI
whatston3 Jul 22, 2024
599b533
Pirate bounty redemption fixes
whatston3 Jul 22, 2024
775a495
Set up label on pirate bounty, fix whitelist check
whatston3 Jul 22, 2024
297cfec
Id whitelist
whatston3 Jul 22, 2024
994429d
ID whitelist fixes
whatston3 Jul 22, 2024
752f931
Fix crate IDs used for lookup
whatston3 Jul 22, 2024
d2a9bc5
fix bounty whitelisting, bounty chests, prices
whatston3 Jul 22, 2024
da6c212
Fix up bounties, fluent entries for bounties
whatston3 Jul 22, 2024
55c9429
Merge branch 'PIRATE-BOOTIES-server-and-client' into PIRATE-BOOTIES
whatston3 Jul 22, 2024
fdeb617
Merge branch 'master' into PIRATE-BOOTIES
Salvantrix Jul 22, 2024
c581137
Bah
Salvantrix Jul 22, 2024
6d78762
Update cove.yml
dvir001 Jul 22, 2024
489dc09
pirate bounty consoles, unshaded pad, cove pads
whatston3 Jul 23, 2024
0b13f84
piratebounty.png: fix one bad pixel
whatston3 Jul 23, 2024
e482127
Revert the mark of the beast
whatston3 Jul 23, 2024
9a20027
humility
whatston3 Jul 23, 2024
e930597
Pirate Bounty cleanup
whatston3 Jul 23, 2024
88e0120
Merge branch 'master' into PIRATE-BOOTIES
dvir001 Jul 23, 2024
4d3db72
cleanup contraband.png pixels
whatston3 Jul 23, 2024
c646d3d
Merge branch 'PIRATE-BOOTIES-polish' into PIRATE-BOOTIES
whatston3 Jul 23, 2024
3723dfb
fix pirate logo
whatston3 Jul 23, 2024
b033bcf
Polish: noises, UI updates & strings
whatston3 Jul 23, 2024
bd62bb3
Pirate Bounty: redemption text
whatston3 Jul 23, 2024
cfc3dc7
Fix spawn chest sound
whatston3 Jul 23, 2024
d7e8df9
Merge branch 'master' into PIRATE-BOOTIES
dvir001 Jul 24, 2024
ca2d372
Update cove.yml
dvir001 Jul 24, 2024
ed96c21
Update cove.yml
dvir001 Jul 24, 2024
0bc1c6d
Update pirate.yml
dvir001 Jul 24, 2024
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
36 changes: 36 additions & 0 deletions Resources/Locale/en-US/cargo/bounties.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,39 @@ bounty-item-cardboard-box = Cardboard box
bounty-item-wine = Wine bottle
bounty-item-cotton-boll = Cotton boll
bounty-item-microwave-machine-board = Microwave machine board
bounty-item-mail = Mail
bounty-item-pda = PDA
bounty-item-extinguisher = Fire Extinguisher
bounty-item-captainGloves = Captain Gloves
bounty-item-gyro = Ship Gyroscope
bounty-item-defib = Defibrillator
bounty-item-researchDisk = Research Disk
bounty-item-alcohol = Booze Dispenser
bounty-item-thruster = Thruster
bounty-item-gravGen = Gravity Generator
bounty-item-chemVend = Chemical Vending Machine
bounty-item-vendingmachine = Vending Machine
bounty-item-mercSuit = Mercenary Hardsuit
bounty-item-cappy = Cappy
bounty-item-cultistNeck = Cultist Necklace
bounty-item-nfsdCampaign = Nfsd Small Campaign Hat
bounty-item-scafsuit = SCAF Suit
bounty-item-rtg = RTG
bounty-item-mercgas = Mercenary Gas Mask
bounty-item-rdhardsuit = Experimental RD Hardsuit
bounty-item-mk58 = MK58
bounty-item-artifactanalyzer = Artifact Analyzer Machine
bounty-item-hotplate = Hotplate
bounty-item-deepfryer = Deep Fryer
bounty-item-keycommon = Common Key
bounty-item-medicalfabboard = Medical Tech Fab Board
bounty-item-orebox = Ore Box
bounty-item-autolathe = Autolathe
bounty-item-gold = Gold
bounty-item-plasmacanister = Plasma Canister
bounty-item-contracrate = Contraband Crate
bounty-item-hydrotray = Hydroponics Tray


bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it.
bounty-description-baseball-bat = Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream.
Expand Down Expand Up @@ -132,3 +165,6 @@ bounty-description-cardobard-box = "The Cardborgs Cometh" is a new play premieri
bounty-description-wine = The new librarian and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well.
bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed.
bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers.
bounty-description-pirate = Go now you goon! Plunder me this!


Loading
Loading