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

Mentor fixes and TGUIification #12255

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

Gilgaxx
Copy link
Contributor

@Gilgaxx Gilgaxx commented Feb 10, 2025

About The Pull Request

Fixes this issue #8150 (the second half, it went stale, but never fixed) where a mentoree who requests an mrat and then clicks on the kick mentor button, the "are you sure" alert would shoup up to the mentor instead of the mentoree by changing a "friend" to "friend.owner" in the alert.

TGUIfies 4 prompts related to mentors (Asking for an Mrat, kicking an mrat from the mentoree perspective, leaving as an mrat from the mentor perspective, the Mrat naming window and the actual mhelps (this used to be bugged)).

Also ACTUALLY brings back the hotpink chat for Msay (#12228 did not fix it)

Why It's Good For The Game

In order:
Fixes a bug, duh. (Mentors shouldn't be like "nuh uh, I'm staying")
TGUI is nicer looking.
I only heard mentors being sad that we lost the hotpink chat.

Testing Photographs and Procedure

Screenshots&Videos Loaded in with 2 seperate clients to try this out: Asking for an Mrat: dreamseeker_O1fcvoojgg

The Mrat naming:
dreamseeker_itL5XPMHIW

Here is the two clients running at the same time (mentor on the right, mentoree on the left)
dreamseeker_LYvFqhG5Gt

Leaving as the mentor is now TGUI:
dreamseeker_VIcvn2p7Ft

Kicking the Mrat as the mentoree is now on TGUI and it's on the right client (tabbing out and back in showed that this prompt was on the right client):
chrome_Q4jPGSfu2c

The TGUI mhelp (it used to be a tall white box with "Mentorhelp "text"" at the top):
dreamseeker_MsTvFfAbDV
(it still works)
dreamseeker_dCOcN5skHO

Disabled local_host_rank in the configs, added myself to the mentor.txt and this is the msay chat now:
dreamseeker_k4TR4l6qX2

Changelog

🆑
fix: Mentors can no longer go "nuh uh" when a mentoree tries to kick out their Mrat.
tweak: TGUIfied most mentor related prompts.
tweak: Made Msay for mentors hot pink again!
/:cl:

changes a "friend" to "friend.owner" in the alert.
changed some inputs related to mentor actions from the old style to TGUI (the prompt or both mentor and mentoree to leave/kick the mrat, the name requrest for mrat on the mentor side, and the actual mhelp which seemed to be bugged).
Just as the title says
@Gilgaxx Gilgaxx changed the title Fixes wrong user alert to remove mrat Mentor fixes and TGUIification Feb 10, 2025
@Gilgaxx
Copy link
Contributor Author

Gilgaxx commented Feb 10, 2025

@itsmeow I took your review and decided to keep tweaking this PR while I was at it. I ended up TGUIfing the other mentor prompts and also making the mentor chat actually hotpink again. Updated the PR description and name to reflect these changes.
If this is too varied for a PR do let me know!
Oh also the fix I used to make the mhelps themselves TGUI again was a bit bodged, since the code was already there, could you review it to make sure it's all good?

var/msg = tgui_input_text(src, "Please describe your problem concisely and a mentor will help as soon as they're able. Remember: Mentors cannot see you or what you're doing. Describe the problem in full detail.", "Mentorhelp contents", multiline = TRUE, encode = FALSE) // we don't encode/sanitize here bc it's done for us later
mentorhelp(msg)

/client/verb/mentorhelp(msg as message)
Copy link
Member

Choose a reason for hiding this comment

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

Just make sure this is consistent with ahelp. The reason the msg argument exists is so you can type in the chat box instead of clicking the verb

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You know that's a good point, which made me also aware that the ahelp prompt is ALSO broken and not TGUI 😅
I'll try to come up with a way to fix the TGUI while still maintaining the functionality of beng able to type the message in the verb bar (and probably also apply it to ahelp too).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After some more time spent on this, I've noticed this is a much bigger problem, there is not a single verb on the top right that displays the TGUI on the top right. I'm also not great at coding myself and can't think of a solution that fixes this issue while leaving the funcionality of being able to type the message in the verb bar intact. I'll keep trying, but I'd apriciate some help, or I might be forced to drop this part of the PR, which would be a shame.

It's too big in scope for this PR.
@Gilgaxx
Copy link
Contributor Author

Gilgaxx commented Feb 11, 2025

I undid the change to the mentorhelp verb for now, from what I understand, it's a much deeper problem that arises with the ability to type out a message with a verb being tied to the white default popup text prompt showing up. Although I'm now questioning the need to be able to type out in the command bar in the first place. Or perhaps having a workaround like adding an mhelp hotkey like the ahelp works, although I'd need feedback on that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants