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

Radio: Create new UI for remote useable radio #1437

Merged
merged 16 commits into from
Mar 6, 2024
Merged

Conversation

ZenBre4ker
Copy link
Contributor

@ZenBre4ker ZenBre4ker commented Feb 25, 2024

Before this you had to navigate to the shop tabs to use it, which is really unintuitive and currently blocks our idea to do a new shop.
grafik

Now you can use the 'Use'-Key from any distance on the focussed radio marker
grafik
and get the following new UI, which triggers the sounds in the same way as before
grafik

This will be waiting for the approval of the remote trigger feature in #1436

@ZenBre4ker ZenBre4ker added status/waiting Depends on another Pull Request to be merged before type/rework Big changes or overhaul of an existing feature labels Feb 25, 2024
@ZenBre4ker ZenBre4ker requested a review from TimGoll February 25, 2024 16:30
@ZenBre4ker ZenBre4ker self-assigned this Feb 25, 2024
@ZenBre4ker ZenBre4ker changed the base branch from master to remote_triggerable February 25, 2024 16:31
@TimGoll
Copy link
Member

TimGoll commented Feb 25, 2024

We should add some sort of indication that the radio supports this kind of stuff, right now no one can figure that out I think

@ZenBre4ker ZenBre4ker force-pushed the remote_triggerable branch from bb659f3 to c71a1cb Compare March 3, 2024 11:24
@ZenBre4ker ZenBre4ker force-pushed the remote_trigger_radio branch from 7289aac to ee1dd37 Compare March 3, 2024 12:16
@ZenBre4ker ZenBre4ker added this to the v0.14.0b milestone Mar 3, 2024
@ZenBre4ker ZenBre4ker force-pushed the remote_triggerable branch 2 times, most recently from f77b943 to 1f90813 Compare March 3, 2024 17:45
@ZenBre4ker ZenBre4ker force-pushed the remote_trigger_radio branch from c3222f2 to 1354356 Compare March 3, 2024 18:16
Base automatically changed from remote_triggerable to master March 4, 2024 21:18
@ZenBre4ker ZenBre4ker force-pushed the remote_trigger_radio branch from 1354356 to d8476d7 Compare March 4, 2024 21:23
@ZenBre4ker
Copy link
Contributor Author

This is ready as well now.
grafik

I added a general name for the translation string, because I could imagine to use this generally for all entities Use / UseOverride / ClientUse and RemoteUse. Normally UI descriptions should be kept shortm if you want more information it should be standing somewhere else. So I dont want to add "this {radio_name}" or "remotely" as this is kinda self explaining if you just try to press E.

@ZenBre4ker ZenBre4ker marked this pull request as ready for review March 4, 2024 22:21
@ZenBre4ker ZenBre4ker requested a review from TimGoll March 4, 2024 22:21
@ZenBre4ker ZenBre4ker requested review from saibotk and Histalek March 4, 2024 22:21
Copy link
Member

@Histalek Histalek left a comment

Choose a reason for hiding this comment

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

Nice!

gamemodes/terrortown/entities/entities/ttt_radio.lua Outdated Show resolved Hide resolved
@ZenBre4ker ZenBre4ker removed the status/waiting Depends on another Pull Request to be merged before label Mar 5, 2024
@TimGoll
Copy link
Member

TimGoll commented Mar 5, 2024

Could you please put the keybind in the subtitle instead of a "random" description line? Right now it gets kind of lost and it is also not in-line with the other targetID implementations:

https://github.com/TTT-2/TTT2/blob/master/lua/ttt2/libraries/targetid.lua#L621-L628

Edit: Ah well, there is no subtitle for marker vision. I can add it in a PR this week and then you can use it. Would that be ok?

@ZenBre4ker
Copy link
Contributor Author

I get what you mean, but you could also improve it yourself when its implemented.
I'd rather merge it, get some feedback earlier, then wait for a feature thats not necessarily needed, its only an improvement. 😄
It's also just a placeholder, as I would rather generalize it for all remote enabled entities, so it probably wont stay like this in the radar anyway.

Copy link
Member

@TimGoll TimGoll left a comment

Choose a reason for hiding this comment

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

LGTM, I'll rework the tooltip today or tomorrow then! Please merge the two open suggestions before merging the PR though, thanks.

gamemodes/terrortown/gamemode/client/cl_tradio.lua Outdated Show resolved Hide resolved
ZenBre4ker and others added 3 commits March 6, 2024 10:29
Co-authored-by: Tim Goll <github@timgoll.de>
Co-authored-by: Histalek <16392835+Histalek@users.noreply.github.com>
@ZenBre4ker ZenBre4ker merged commit 270a8a3 into master Mar 6, 2024
4 checks passed
@ZenBre4ker ZenBre4ker deleted the remote_trigger_radio branch March 6, 2024 16:30
TimGoll added a commit that referenced this pull request Mar 7, 2024
After testing #1437 I notices that it feels really weird to not have any
kind of feedback when interacting with entities. When picking up
entities, there already is a sound, but not when opening UIs. Therefore
I added `sound.ConditionalPlay` that plays a sound if the sound type is
enabled in the settings.

I also extended this to body search and UI buttons.

See this demo video: https://www.youtube.com/watch?v=c6ixkuFSYfw

Note: I also pulled in the changes from #1351 and added them to the same
system. They are disabled by default.

Menu to disable sounds by type:

![image](https://github.com/TTT-2/TTT2/assets/13639408/fe57417b-f55f-42cd-952d-c632b4aaab1e)

---------

Co-authored-by: EntranceJew <EntranceJew@gmail.com>
@TimGoll TimGoll mentioned this pull request Mar 9, 2024
Histalek added a commit that referenced this pull request Jan 3, 2025
This is a followup to #1437 where this was initially missed.

I've also removed the duplicated `SWEP.EquipMenuData`.
Histalek added a commit that referenced this pull request Jan 3, 2025
This is a followup to #1437 where this was initially missed.

I've also removed the duplicated `SWEP.EquipMenuData`.
Histalek added a commit that referenced this pull request Jan 3, 2025
This is a followup to #1437 where this was initially missed.

I've also removed the duplicated `SWEP.EquipMenuData`.
Histalek added a commit that referenced this pull request Jan 18, 2025
This is a followup to #1437 where this was initially missed.

I've also removed the duplicated `SWEP.EquipMenuData`.
Histalek added a commit that referenced this pull request Jan 31, 2025
This is a followup to #1437 where this was initially missed.

I've also removed the duplicated `SWEP.EquipMenuData`.
Histalek added a commit that referenced this pull request Jan 31, 2025
…1754)

This is a followup to #1437 where this was initially missed.

I've also removed the duplicated `SWEP.EquipMenuData`.

Fixes #1708
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/rework Big changes or overhaul of an existing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants