Skip to content

Menu text revision#3902

Merged
AJenbo merged 21 commits intodiasurgical:masterfrom
kphoenix137:menu-text-revision
Mar 15, 2025
Merged

Menu text revision#3902
AJenbo merged 21 commits intodiasurgical:masterfrom
kphoenix137:menu-text-revision

Conversation

@kphoenix137
Copy link
Copy Markdown
Collaborator

@kphoenix137 kphoenix137 commented Jan 6, 2022

Reorders and renames items on the Escape Menu, and removes "Restart In Town" with a replacement mechanic.

  • Prevents players from accidentally leaving/quitting the game while either in the dying animation, or already dead.
  • "New Game" renamed to "Exit Game" to be more accurate.
  • Being dead now only allows the player to use the Escape/Menu key/button to Load Game in SP and Restart In Town in MP, as a safety mechanism.

SP:
image

image

MP:
image

image

Note: This PR includes 30-c0.clx, which is used for the gamepad icons for size 30 font, which previously didn't exist. It's simply a copy of the existing gamepad icon clx which exists for smaller text, so the buttons are not any visually larger. It works fine, however a future PR will be a good idea to provide larger button icons that are more visually cohesive.

This PR also does not add 30-c0.pcx to https://github.com/diasurgical/devilutionx-assets

@AJenbo AJenbo added this to the 1.5.0 milestone Jan 6, 2022
@Trihedraf
Copy link
Copy Markdown
Collaborator

I think we should still have an exit button without saving.

@kphoenix137
Copy link
Copy Markdown
Collaborator Author

I think we should still have an exit button without saving.

I will update the original post to show most recent changes

@kphoenix137
Copy link
Copy Markdown
Collaborator Author

kphoenix137 commented Mar 24, 2024

Rebased and cleaned up. No longer removes the red screen from death this time, and no longer displays lost gold. Fixed a problem where the game tried to load a save even if a save didn't exist. Players can no longer use the escape menu during the death sequence before the death message appears, preventing accidental saving or exiting. Also turns off the game menu if it's open when you die, helping save scummers to not lose all their stuff in multiplayer. Had to mix draw order around a bit to stop the death message from writing over DiabloMsg. IMO, DiabloMsg should not be turned red anyway.

@kphoenix137
Copy link
Copy Markdown
Collaborator Author

kphoenix137 commented Feb 13, 2025

"Options" was probably between save and load to prevent accidental clicks by spacing them out. I don't think that's worth undoing either.

Kind of like "Restart in Town" was sandwiched between "New Game" and "Quit Diablo" to encourage accidental clicks that make the player lose all their items, as a hardcore feature since Multiplayer is supposed to be more difficult than Single Player.

@kphoenix137 kphoenix137 marked this pull request as draft February 13, 2025 17:27
@kphoenix137
Copy link
Copy Markdown
Collaborator Author

I'll need to address non-M&K control schemes, as well as the fact you can still physically click the menu button to bring up the menu while on the death screen.

@FitzRoyX
Copy link
Copy Markdown

FitzRoyX commented Feb 13, 2025

Kind of like "Restart in Town" was sandwiched between "New Game" and "Quit Diablo" to encourage accidental clicks that make the player lose all their items, as a hardcore feature since Multiplayer is supposed to be more difficult than Single Player.

Well we all know MP was a rushed feature. The arrangement in MP looks like a simple carryover of SP with "Save" going away and "Restart" taking the place of "Load". Just put Restart where Save used to be then.

"Exit Game" is indeed a synonym of "Quit Game". Perhaps "Exit to Main Menu"?

I actually like that "New Game" takes you back to the charselect screen and not title screen. You're more likely to want to load a different game than change modes or settings, so it is effectively a click saver. You can still retreat back from the char screen if you really want.

@kphoenix137
Copy link
Copy Markdown
Collaborator Author

kphoenix137 commented Feb 13, 2025

Kind of like "Restart in Town" was sandwiched between "New Game" and "Quit Diablo" to encourage accidental clicks that make the player lose all their items, as a hardcore feature since Multiplayer is supposed to be more difficult than Single Player.

Well we all know MP was a rushed feature. The arrangement in MP looks like a simple carryover of SP with "Save" going away and "Restart" taking the place of "Load". Just put Restart where Save used to be then.

Making a lot of extrapolations here

"Exit Game" is indeed a synonym of "Quit Game". Perhaps "Exit to Main Menu"?

I actually like that "New Game" takes you back to the charselect screen and not title screen. You're more likely to want to load a different game than change modes or settings, so it is effectively a click saver. You can still retreat back from the char screen if you really want.

I didn't change the functionality of "New Game". "Exit to Main Menu" still goes back to character select. Anything prior to seeing Tristram is considered the main menu. I think glebm hit the nail on the head with most accurate description of what this option does. "New Game" doesn't create a new game, so despite your muscle memory, I think this should be accurate for the sake of people who are newer or new to the game.

Comment thread Source/control.cpp Outdated
@FitzRoyX
Copy link
Copy Markdown

"Exit to Main Menu" still goes back to character select. Anything prior to seeing Tristram is considered the main menu. I think glebm hit the nail on the head with most accurate description of what this option does. "New Game" doesn't create a new game

So the main folder of an application can also be any of its subfolders? Doesnt seem right that nothing is a submenu.

"New" does get used as "different" in English, as in "let me go put on a new shirt". It's not perfect but it's a short word that avoids the exit/quit/leave conflict.

@StephenCWills
Copy link
Copy Markdown
Member

So the main folder of an application can also be any of its subfolders? Doesnt seem right that nothing is a submenu.

Does it also not seem right to you that nothing is a submanager? What do you think of "the character select screen in the main menus"?

@AJenbo
Copy link
Copy Markdown
Member

AJenbo commented Mar 11, 2025

@kphoenix137 what's missing here?

@kphoenix137
Copy link
Copy Markdown
Collaborator Author

@kphoenix137 I started working on larger controller button icons to use and not sure I attached them to the PR yet

@AJenbo
Copy link
Copy Markdown
Member

AJenbo commented Mar 11, 2025

Right, need any help with that :)

@kphoenix137
Copy link
Copy Markdown
Collaborator Author

Right, need any help with that :)

The file is ready to go, although currently not consistent with the existing button graphics (Remember I was also going to make a smaller version of my new button graphics, but for a different PR). I will work on getting that ready on Thursday. Feel free to bug me if I forget.

@AJenbo
Copy link
Copy Markdown
Member

AJenbo commented Mar 12, 2025

Thanks for the update :)

@kphoenix137 kphoenix137 marked this pull request as ready for review March 15, 2025 16:18
@kphoenix137
Copy link
Copy Markdown
Collaborator Author

Modified original post for clarity about the clx file.

@AJenbo AJenbo merged commit aca06e8 into diasurgical:master Mar 15, 2025
23 checks passed
@kphoenix137 kphoenix137 deleted the menu-text-revision branch March 15, 2025 20:55
Yggdrasill pushed a commit to Yggdrasill/DevilutionX that referenced this pull request Mar 23, 2025
Yggdrasill pushed a commit to Yggdrasill/DevilutionX that referenced this pull request Mar 23, 2025
Yggdrasill added a commit to Yggdrasill/DevilutionX that referenced this pull request Mar 23, 2025
Yggdrasill added a commit to Yggdrasill/DevilutionX that referenced this pull request Mar 23, 2025
Yggdrasill added a commit to Yggdrasill/DevilutionX that referenced this pull request Mar 23, 2025
Yggdrasill added a commit to Yggdrasill/DevilutionX that referenced this pull request Mar 23, 2025
Trihedraf pushed a commit to Trihedraf/devilutionX that referenced this pull request May 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants