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

Mercenary Tokens #641

Merged
merged 36 commits into from
Sep 14, 2024
Merged

Mercenary Tokens #641

merged 36 commits into from
Sep 14, 2024

Conversation

Cre77
Copy link
Contributor

@Cre77 Cre77 commented Sep 2, 2024

About The Pull Request

Adds a new "Luxury" item for Merchants and gives them one in their loadout. Mercenary Tokens are paper-like items that can be signed ONLY by the Merchant, then sent by any Mercenary through a mailbox for a one-time reward of three triumphs and a background-specific vanity item.
image

image

Why It's Good For The Game

Gives mercenaries a more or less end-game objective to work towards via an item that they cannot acquire by themselves. Merchants now play a more direct role as their handlers, and can choose to sell pre-signed tokens for nobles to do their own recruiting, or send mercenaries on jobs and reward them only when those jobs are completed.
Gives another non-antag way to earn triumphs - an equivalent of half a round's worth that does not require you to survive its entirety.
Tokens can only be signed by the Merchant to prevent Lords rushing their shop and then buying their own mercs out.
The price is a little on the cheaper end - but the intention is for Merchants to jack it up depending on customer or mercenary.

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

@ThePainkiller ThePainkiller added Merge conflict This PR won't compile due to merge conflics Icons This PR adds, edits or deletes icons New features This PR introduces entirely new mechanics or features labels Sep 3, 2024
@Cre77
Copy link
Contributor Author

Cre77 commented Sep 3, 2024

okay, conflicts resolved
pestrans i swear

@ThePainkiller ThePainkiller added Scheduled for testmerge This PR should be testmerged and removed Merge conflict This PR won't compile due to merge conflics labels Sep 3, 2024
@ThePainkiller
Copy link
Contributor

Unfortunately cannot Testmerge as it conflics with #628 , due to both modifying icons/roguetown/items/misc.dmi

Will be on the backburner of TM once nets can be fine-tuned with player input.

@ThePainkiller
Copy link
Contributor

ThePainkiller commented Sep 9, 2024

Now that nets are fullmerged, we can give this one a try, as promised.
EDIT: Nets aren't fullmerged, my bad. Swore Rebel merged them full, looks like they didn't.

@ThePainkiller
Copy link
Contributor

Welp, fml, Dromkii's copper PR made conflicts with this one again... please fix the icon issues so I can testmerge it back...I'm really sorry about this happening twice already.

@crunchypretzels
Copy link

Can't use the token as a Boltslinger; it just gives the 'I do not belong to the Guild' !merc and !merchant message. It may not have been signed, though.

@Cre77
Copy link
Contributor Author

Cre77 commented Sep 11, 2024

Can't use the token as a Boltslinger; it just gives the 'I do not belong to the Guild' !merc and !merchant message. It may not have been signed, though.

weird, i'll test it

@Cre77
Copy link
Contributor Author

Cre77 commented Sep 11, 2024

Can't use the token as a Boltslinger; it just gives the 'I do not belong to the Guild' !merc and !merchant message. It may not have been signed, though.

thank you for pointing this out <3
it was me not testing things properly, it should work now whenever it's updated

Copy link
Contributor

@NPC1314 NPC1314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks in order, mail fix worked by all accounts.

@NPC1314 NPC1314 merged commit 1792327 into Darkrp-community:main Sep 14, 2024
3 checks passed
@NPC1314 NPC1314 removed the Scheduled for testmerge This PR should be testmerged label Sep 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Icons This PR adds, edits or deletes icons New features This PR introduces entirely new mechanics or features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants