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

Requisitions Line Tutorial #5909

Merged
merged 13 commits into from
Jun 12, 2024
Merged

Conversation

fira
Copy link
Member

@fira fira commented Mar 9, 2024

About the pull request

Adds a tutorial/simulator for the Requisitions Line. Players are asked by NPCs to vend them several items. There are 3 training NPCs with pre-made requests and highlights, after which the tutorial enters an endless mode for training against increasingly complex requests.

This still has some rough edges, notably that it can ask randomly for non-obvious names much like in real game such as "Frag" refering to HEDPs. A new player might need for the NPC to repeat the order with a different name before getting it right.

Also it might be worth finding a way to do highlighting in the vendor UI for this...

All items dispensed in the tutorial are cloned as props and will be missing some overlays and be non interactible, because it's the simplest way i found so the player doesn't explode everything.

Explain why it's good for the game

Gives people an opportunity to approach a simple yet potentially stressful activity. Line rush can be tough when starting the game. This only contains a tutorial for the line though, other reqs system will need to be made separately

Testing Photographs and Procedure

Ran through it a few times testing for unintended interactions

Older video of initial implement:
https://cdn.discordapp.com/attachments/964684928161808384/1178420842347102218/reqline-tutorial.mp4?ex=65f747ee&is=65e4d2ee&hm=797dfdfe2693878f4dc69fb976060a285944023935b2e0b5216670102c37366a&

Changelog

🆑
add: Added a Tutorial for tending to the Requisitions Line
/:cl:

@fira fira requested a review from Zonespace27 as a code owner March 9, 2024 14:23
@github-actions github-actions bot added Mapping did you remember to save in tgm format? Feature Feature coder badge labels Mar 9, 2024
@TopHatPenguin

This comment was marked as off-topic.

@Zonespace27
Copy link
Contributor

🎉glad to see this done

Also it might be worth finding a way to do highlighting in the vendor UI for this

You could always set the item to be a recommended one so it becomes a green box instead of a blue one

@ihatethisengine

This comment was marked as off-topic.

Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

at-a-glance, will make a more comprehensive one after testing this locally

code/datums/tutorial/marine/reqs_line.dm Outdated Show resolved Hide resolved
code/game/objects/prop.dm Show resolved Hide resolved
code/game/objects/prop.dm Show resolved Hide resolved
code/datums/tutorial/marine/reqs_line.dm Show resolved Hide resolved
kill_timers()
active_agent = null
loser_agent = null
agents.Cut()
Copy link
Contributor

Choose a reason for hiding this comment

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

Use the qdel list macro, safer to do that since these are atoms

Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

Tried it in-game. I love how it plays, and this really raises the bar for tutorial quality. Thank you for PRing this!

code/datums/tutorial/marine/reqs_line.dm Show resolved Hide resolved
code/datums/tutorial/marine/reqs_line.dm Outdated Show resolved Hide resolved
/obj/item/storage/backpack/marine/engineerpack/flamethrower/kit = list("pyro pack", "pyro backpack", "g4-1 pack", "flamer backpack"),
/obj/item/storage/backpack/marine/satchel/rto = list("phone pack", "phone backpack", "radio pack"),
/obj/item/storage/backpack/general_belt = list("G8", "G8 belt"),
/obj/item/storage/pouch/magazine/large = list("Large pouch", "Large mag pouch", "Large magazine pouch"),
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove "large pouch", this can lead to confusion as there's 3 large pouches (gen, mag, shotgun) next to eachother

code/datums/tutorial/marine/reqs_line.dm Show resolved Hide resolved
code/datums/tutorial/marine/reqs_line.dm Show resolved Hide resolved
@Zonespace27 Zonespace27 marked this pull request as draft March 11, 2024 02:14
github-merge-queue bot pushed a commit that referenced this pull request Mar 13, 2024
# About the pull request
Updates tutorial documentation.
Adds a proc, `mark_completed()`, that makes the tutorial count as
completed regardless of if `end_tutorial()` was called with `TRUE` or
`FALSE` as an argument. Necessary for
#5909

---------

Co-authored-by: SabreML <[email protected]>
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

mapping lgtm

Copy link
Member

Choose a reason for hiding this comment

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

Rubber duck awesome

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Mar 16, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Mar 24, 2024
@github-actions github-actions bot closed this Mar 31, 2024
@Zonespace27 Zonespace27 reopened this Jun 11, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jun 11, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jun 11, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot added the Sprites Remove the soul from the game. label Jun 11, 2024
@Zonespace27 Zonespace27 removed the Stale beg a maintainer to review your PR label Jun 11, 2024
@Zonespace27 Zonespace27 marked this pull request as ready for review June 11, 2024 14:24
@Zonespace27 Zonespace27 added this to the Tutorials milestone Jun 11, 2024
@Zonespace27 Zonespace27 added this pull request to the merge queue Jun 12, 2024
Merged via the queue into cmss13-devs:master with commit 35084b7 Jun 12, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Jun 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants