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

Move Triforce Hunt counter out of CRT unsafe area and enable L button to switch to a permanent Triforce counter/Gold Skull token counter #2084

Open
wants to merge 3 commits into
base: Dev
Choose a base branch
from

Conversation

GSKirox
Copy link
Collaborator

@GSKirox GSKirox commented Sep 6, 2023

This PR moves the triforce hunt counter from the bottom of the screen to a symmetric in X of the rupee counter placement.
The current placement is slighty off the CRT safe area, according to flagrama's simulation :
CRT

New placement :

THsmall
THbig

Since it now shows up on the minimap, new behaviour added to the L button :

  • Switches between 3 states instead of 2 (in vanilla, it switches between show minimap/doesn't show minimap)
    State 1 is show minimap. The minimap will hide when you pick up a piece and come back when the counter fades out.
    State 2 is show triforce counter/token counter.
    State 3 is show nothing. Picking up a triforce piece will still display and fade out after a time, like previously.
    The states are kept between scene changes and reloads, unlike vanilla behaviour where it always default back to 1.

@fenhl fenhl added Type: Bug Something isn't working Component: ASM/C Changes some internals of the ASM/C libraries labels Sep 6, 2023
@ETR-BTF
Copy link

ETR-BTF commented Sep 6, 2023

How does it look when there are over 999 Triforce Pieces? I believe we can now have over 2000 locations after all. Maybe it'd be easier to just put a hard cap on the number of Triforce Pieces in the pool lol. Or can the font be automatically made smaller if there are 4 digits?

@GSKirox
Copy link
Collaborator Author

GSKirox commented Sep 6, 2023

image
Yeah this does look a bit silly haha.
I think there's a problem in the file select screen anyway if you try to have more than 999 since it was hardcoded for max 3 values 😬

@ETR-BTF
Copy link

ETR-BTF commented Sep 6, 2023

What does it say on the file select screen for this save file that has 1234/4321 pieces?

@GSKirox
Copy link
Collaborator Author

GSKirox commented Sep 7, 2023

The file select screen will show 999/999, the computation of the digits is stuck at 3 digits.
Note that right now it's not an issue since it's not possible to roll a seed with more than 1000 pieces, it's currently prevented in the UI.
You can override it with plando but i'm not even sure there's enough locations in the game for 1000 pieces, even with full robsanity.

@GSKirox GSKirox changed the title Move Triforce Hunt counter out of CRT unsafe area Move Triforce Hunt counter out of CRT unsafe area and enable L button to switch to a permanent Triforce counter/Gold Skull token counter Sep 14, 2023
@r0bd0g
Copy link

r0bd0g commented Sep 14, 2023

Is it the case that this display is mutually exclusive with the minimap? I quite like the minimap, so I'm not a fan of that, if so.

I was wondering if the skulltula counter is always displayed?
I think it should only be given such an important place on the screen if they unlock bridge or bk? If they're not wincon, I don't think it makes sense to display the skulltula counter over, idk, shadow temple keys. Probably the shadow keys are more important.
Are both of those counters displayed even while you have 0? (And if so, what if the seed has no tokens in the pool?)

@GSKirox
Copy link
Collaborator Author

GSKirox commented Sep 14, 2023

It is mutually exclusive with the minimap yes, else they would overlap.
If you let minimap on (don't press L at all) then this PR doesn't change anything, except when you pick up a triforce piece where the minimap will briefly hide until the counter fades out.

Skull counter is always displayed, but it's only an important place on screen if you press L though.
And they're both displayed at 0 yes. Of course Triforce counter is only displayed if TH is on.

@Cuphat
Copy link
Collaborator

Cuphat commented Sep 14, 2023

The file select screen will show 999/999, the computation of the digits is stuck at 3 digits. Note that right now it's not an issue since it's not possible to roll a seed with more than 1000 pieces, it's currently prevented in the UI. You can override it with plando but i'm not even sure there's enough locations in the game for 1000 pieces, even with full robsanity.

It is possible, it just requires a multiworld seed since the setting is pieces per world. The file select screen should probably be fixed since a MW triforce hunt could easily eclipse 3 digits. IMO 4 digits should be somewhat graceful and 5 digits should at least be possible (but that is a lot less likely given that it'd require a large MW with a lot of pieces scattered about). Speaking of which, I am pretty sure the actual limit is 2^16 - 1 but I am not sure if that is actually enforced.

Most of that isn't totally relevant for this PR, just throwing it out there.

@r0bd0g
Copy link

r0bd0g commented Sep 15, 2023

Especially since each one says how many you've got when you pick it up, I don't think we need the skull counter.

ASM/c/triforce.c Outdated
break;
case TRIFORCE_OR_SKULL_ON_SCREEN:
R_MINIMAP_DISABLED = 1;
PlaySFX(0x4845); //NA_SE_SY_CARROT_RECOVER
Copy link

Choose a reason for hiding this comment

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

Instead of carrot is "Notification" distinct enough to put it here so when people ask what it sounds like we can just start pointing to this, both answering that constant question, and exposing this feature to more people?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

That's a good idea ! I'll try it and drop a video on discord.

ASM/c/triforce.c Outdated Show resolved Hide resolved
@cjohnson57 cjohnson57 added Status: Under Consideration Developers are considering whether to accept or decline the feature described Status: Waiting for Release This PR is ready for merge, but we're holding off on it until after the next release Status: Needs Testing Probably should be tested and removed Status: Waiting for Release This PR is ready for merge, but we're holding off on it until after the next release labels Nov 11, 2023
@cjohnson57
Copy link
Collaborator

Can you post a video of what it looks like if you pick up a triforce while the minimap is open?

@fenhl fenhl added the Type: Enhancement New feature or request label Jan 31, 2024
@GSKirox
Copy link
Collaborator Author

GSKirox commented Mar 20, 2024

Better late than never 😅 Here's a video showing what it looks like if you pick up a triforce while the minimap is open.
https://github.com/OoTRandomizer/OoT-Randomizer/assets/65768236/f1c1a918-fba0-4daf-875c-7d7cdd6ee2ce

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: ASM/C Changes some internals of the ASM/C libraries Status: Needs Testing Probably should be tested Status: Under Consideration Developers are considering whether to accept or decline the feature described Type: Bug Something isn't working Type: Enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants