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

Minor enhancement: Allow toggling on equipment screen #813

Merged

Conversation

Sarge-117
Copy link
Contributor

This small enhancement allows Link to toggle his equipment on the equipment subscreen (by pressing "A" on whatever piece of equipment he currently has on).

Footage: https://cdn.discordapp.com/attachments/936124566764392510/997913791192895508/equipment_toggle.mp4

Specifically:

For swords, he can toggle off the Biggoron Sword (or Giant's Knife) and it will revert him to Master Sword.

For shields, it will allow him to un-equip the shield altogether (this was the original inspiration for this enhancement, because I think Link looks cool without a shield equipped).

For tunics and boots, it will revert him to the Kokiri Tunic/Kokiri Boots.

This does not allow Link to voluntarily go swordless - Kokiri Sword (as child) and Master Sword (as adult) can't be un-equipped. Going swordless can cause some unintended behaviour in some minigames/fishing and possibly other unforeseen areas. Also, in the case of Link having BGS but not having the Master Sword (i.e. Ganon fight), attempting to un-equip your BGS will do nothing.

Thank you to @PurpleHato @jbodner09 for valuable feedback while I was working on this :)

Allow player to toggle equipment on/off on the equipment subscreen.  For tunics and boots, this will revert them to Kokiri Tunic/Kokiri Boots.  For shields, it will un-equip the shield entirely.  For swords, only BGS/Giant's Knife is affected, and it will revert to Master Sword.
Set up the cvar/imgui and add a check that we own the Master Sword (in case we're in the Ganon fight)
@Sarge-117
Copy link
Contributor Author

Verified that this feature doesn't cause any obvious issues with the fixes I made in #834

Copy link
Collaborator

@Kenix3 Kenix3 left a comment

Choose a reason for hiding this comment

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

Just curious - from an inauthentic enhancent perspective: what made you not want to allow Link to go swordless?

@Sarge-117
Copy link
Contributor Author

Sarge-117 commented Jul 22, 2022

Just curious - from an inauthentic enhancent perspective: what made you not want to allow Link to go swordless?

I suppose I might say it felt "irresponsible" to allow Link to go swordless so easily via an in-game menu. It is obviously still possible via the save editor or through glitches, but having it in the pause menu made it feel like it's almost "encouraged", in a way. Since there can be some consequences to going swordless that might confuse casual on inexperienced players (issues with some minigames, or the stick-on-b thing that can happen when going back in time without Kokiri Sword), this restriction felt safer to me, even though allowing it would admittedly be more consistent with the other equipment items. I guess an inexperienced player shouldn't have to be aware of possible weird behaviours in order to use all the cool enhancements soh has to offer.

My true goal with this feature was really to just allow Link to take his shield off at will (I think Link looks kind of badass with no shield equipped, especially with Biggoron Sword). I decided to expand the feature to the other rows for consistency, though.

Edit: With all that said, though - if there are others who feel that it's safe enough to go ahead and allow sword removal here too, then I'd be happy to make the change :)

@dcvz
Copy link
Contributor

dcvz commented Jul 24, 2022

@Sarge-117 looks like something went very wrong with your rebase? Or maybe you just need to tell GitHub to point to zhora and not Rachael.

Either way the diff here is very broken :(

@Sarge-117 Sarge-117 changed the base branch from develop-rachael to develop-zhora July 24, 2022 08:15
@Sarge-117
Copy link
Contributor Author

@Sarge-117 looks like something went very wrong with your rebase? Or maybe you just need to tell GitHub to point to zhora and not Rachael.

Either way the diff here is very broken :(

Yep you're right - it was targeting Rachael by mistake!

@Kenix3
Copy link
Collaborator

Kenix3 commented Jul 24, 2022

I was just asking questions. Your answer makes sense to me. :)

@Kenix3 Kenix3 merged commit b98c8b4 into HarbourMasters:develop-zhora Aug 1, 2022
@Sarge-117 Sarge-117 deleted the Allow-Equipment-Toggle branch September 26, 2022 18:07
Kenix3 pushed a commit to Kenix3/Shipwright that referenced this pull request Oct 19, 2022
…#813)

* Allow Equipment Toggle

Allow player to toggle equipment on/off on the equipment subscreen.  For tunics and boots, this will revert them to Kokiri Tunic/Kokiri Boots.  For shields, it will un-equip the shield entirely.  For swords, only BGS/Giant's Knife is affected, and it will revert to Master Sword.

* Set up Cvar and check for MS

Set up the cvar/imgui and add a check that we own the Master Sword (in case we're in the Ganon fight)
dcvz pushed a commit to briaguya-ai/Shipwright that referenced this pull request Nov 12, 2022
…#813)

* Allow Equipment Toggle

Allow player to toggle equipment on/off on the equipment subscreen.  For tunics and boots, this will revert them to Kokiri Tunic/Kokiri Boots.  For shields, it will un-equip the shield entirely.  For swords, only BGS/Giant's Knife is affected, and it will revert to Master Sword.

* Set up Cvar and check for MS

Set up the cvar/imgui and add a check that we own the Master Sword (in case we're in the Ganon fight)
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.

3 participants