Rando Enhancement: Mysterious Shuffled Items #3227

Malkierian · 2023-09-24T22:00:30Z

Adds a rando enhancement toggle which obfuscates shuffled freestanding/drawn-in-world items (PoH, tokens, shop items, keys, etc) with a custom question mark model so you never know what you're getting until you get it. Also utilizes GetMerchantMessage's mysterious option directly based on the setting, so is applied to all item names in purchasable situations.

Color is editable with cosmetics editor under the World & NPCs tab, and can be rainbow.

Also hides item names in shops for items with the Seen/Identified status when the enhancement is on.

Adds IsCheckShuffled to allow for the distinction between seed settings and visibility options, which is used to determine whether to feed the fake GetItemEntry for the mystery model to GetItemEntry_Draw, which then calls the custom draw function associated with it.

Credit to @PurpleHato for the model.

Build Artifacts

Malkierian · 2023-09-24T22:32:08Z

soh_6a8a5Xhn1y.mp4

soh/soh/SohMenuBar.cpp

Malkierian · 2023-10-22T22:35:45Z

This is now ready for merge scrutiny.

I will mention, currently there's a bug in rando loading that holds onto merchantPrices across file/spoiler loading, so while this is setup to show/hide shuffled item names properly in the check tracker, that may not be displayed properly because you might have other saves with items shuffled that aren't shuffled on your current save that the check against merchantPrices would then find. This can be mitigated by deleting all other saves, generating a new seed, restarting SoH entirely, and then creating the new file without generating a different seed during the playthrough.

Malkierian · 2023-10-23T20:45:37Z

OK, this is broken now because of the changes to OTRExporter and the model stuff I had going away. I don't think I can fix that until the SoH asset location PRs get merged, so in the meantime, if you want to test it, use the attached soh.otr to avoid crashes.
soh.zip

Malkierian · 2023-10-25T04:36:33Z

OK, this should be back to normal now. 🤞

…huffled freestanding/drawn-in-world items (PoH, tokens, shop items) with a custom question mark model (thanks Hato), and uses the "mysterious item" functionality of `GetMerchantMessage` for everything that supports it, regardless of hint status on generation.

Malkierian · 2023-12-07T05:52:32Z

OK, now that I know the slowdown in main file select isn't my fault, this is fully ready to go.

…s Shuffle not being on for the gem rotation fix to apply.

…tanding-mystery

Malkierian · 2024-02-11T05:49:23Z

Guess I'm going to have to remake this for rando v3.

…tanding-mystery

…lling the mystery draw function. Needs more work.

…ht into freestanding-mystery

Added `IsCheckShuffled` as preliminary function for checking *only* if a check is shuffled, not necessarily if it is just visible on the tracker. This accounts for the difference between tokensanity and "Always Show GS On Tracker", where you don't want to obfuscate the latter.

Malkierian · 2024-02-17T06:14:05Z

Hopefully ready to go for the last time XD.

soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c

soh/soh/OTRGlobals.h

soh/soh/OTRGlobals.cpp

soh/src/code/z_en_item00.c

soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c

soh/src/overlays/actors/ovl_En_Si/z_en_si.c

soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c

soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c

…handle this fake GIE, I'm all ears.

…tanding-mystery

Pepper0ni · 2024-04-30T23:31:39Z

Also utilizes GetMerchantMessage's mysterious option directly based on the setting, so is applied to all item names in purchasable situations.

Does this apply to only shops or to Scrubs and Solo merchants too?

Malkierian · 2024-04-30T23:33:00Z

Also utilizes GetMerchantMessage's mysterious option directly based on the setting, so is applied to all item names in purchasable situations.

Does this apply to only shops or to Scrubs and Solo merchants too?

I believe I made it apply to scrubs and merchants as well. And even the bean salesman, I think.

…tanding-mystery

Pepper0ni · 2024-04-30T23:58:39Z

I don't like the idea of having merchant and scrub "mysterious item" settings being both in seed generation and in an enhancement. It's redundant and will end in confusion when people set their seed to do 1 thing and the game does another because of an enhancement.

Shops Make sense to be tied to the visual so I don't especially mind those, but it does beg the question as to why 1 set of mysteriousness is in enhancements and 1 is in seed generation.

I don't consider this blocking as it's pointed at develop, but for v3 I would want something consistent, especially as scrub item names pose me problems I don't know how to properly deal with just yet.

Malkierian · 2024-05-01T00:05:01Z

The only counter I could give to that is spoiler sharing, where a person might get a spoiler with merchant and scrub hints there, but still want to obfuscate them for their own run, but I don't know how often that would happen.

Pepper0ni · 2024-05-01T09:48:45Z

If that is desirable, then all the mysterious settings should be in enhancements, which is reasonable as they don't affect seed generation in any way.

Pepper0ni · 2024-05-02T12:39:55Z

colours for mystery items do not seem to be working.

Pepper0ni · 2024-05-02T12:47:52Z

Also, whenever I pick up a mysterious item, it's a heart piece, regardless of what the actual item is, unless it's from a shop

Malkierian · 2024-05-02T14:59:25Z

Sigh How many times am I going to have to actually fix this before it finally gets merged...

…tanding-mystery

Fix mysterious item model colors.

Malkierian · 2024-05-02T15:55:23Z

Alright, I fixed the colors and the heart piece freestanding item gives. From what I could tell, gold skulltulas, small keys, heart containers, and the OoT were still working. If you come across any specific source that isn't working, let me know.

Pepper0ni · 2024-05-03T13:31:46Z

Is it intended for bombchu bowling to be unaffected?

Malkierian · 2024-05-03T16:15:42Z

No, that is not intended. I'll look into it.

Malkierian · 2024-05-03T16:40:38Z

Fixed.

Pepper0ni · 2024-05-03T17:47:06Z

game crashes when loading 3rd round of bombchu bowling (first non-check round), going to set up a build now to get a call stack

Malkierian · 2024-05-03T17:57:57Z

Couldn't replicate in debug mode. Might need more specific steps.

Pepper0ni

The other small issue I noticed is that having mysterious items on causes the check tracker to hide the prices of things in shops as well as the item identity, which is inconvenient, but that's a small thing I'm willing to kick to the v3 implementation given that large chunks of related code is being redone there anyway.

otherwise, LGTM.

Pepper0ni · 2024-05-05T15:14:36Z

soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp

@@ -322,6 +322,7 @@ static std::map<std::string, CosmeticOption> cosmeticOptions = {
    COSMETIC_OPTION("World.Moon",                    "Moon",                 COSMETICS_GROUP_WORLD,        ImVec4(240, 255, 180, 255), false, true, true),
    COSMETIC_OPTION("World.GossipStone",             "Gossip Stone",         COSMETICS_GROUP_WORLD,        ImVec4(200, 200, 200, 255), false, true, true),
    COSMETIC_OPTION("World.RedIce",                  "Red Ice",              COSMETICS_GROUP_WORLD,        ImVec4(255,   0,   0, 255), false, true, false),
+    COSMETIC_OPTION("World.MysteryItem",             "Mystery Item",         COSMETICS_GROUP_WORLD,        ImVec4(0,    60, 100, 255), false, true, false),


I'm not sure if world is the best category for this, as I looked all the way through items looking for this first, but there's no good section in items for it either and this is subjective so should get more feedback, so I will not consider this blocking.

inspectredc

LGTM! just a couple unimportant things in the draw section

soh/soh/Enhancements/randomizer/draw.cpp

Malkierian force-pushed the freestanding-mystery branch from f0078e4 to 82d40bd Compare September 24, 2023 22:27

jbodner09 suggested changes Sep 25, 2023

View reviewed changes

soh/soh/SohMenuBar.cpp Outdated Show resolved Hide resolved

Malkierian force-pushed the freestanding-mystery branch 2 times, most recently from 85e98a1 to 25dfcf2 Compare October 12, 2023 18:38

Malkierian force-pushed the freestanding-mystery branch from 25dfcf2 to 42312e3 Compare October 22, 2023 20:17

Malkierian changed the title ~~Rando Enhancement: Freestanding Mystery Items~~ Rando Enhancement: Mysterious Shuffled Items Oct 22, 2023

Malkierian marked this pull request as ready for review October 22, 2023 20:21

Malkierian force-pushed the freestanding-mystery branch from 42312e3 to 42b7012 Compare October 22, 2023 22:34

Malkierian force-pushed the freestanding-mystery branch from 42b7012 to 9fd8bbf Compare October 25, 2023 04:34

Caladius mentioned this pull request Oct 26, 2023

Hurt Container Mode #3336

Merged

Malkierian force-pushed the freestanding-mystery branch 2 times, most recently from 8b53490 to 98ed30b Compare December 7, 2023 05:51

Reverted back to rando enhancement, but added condition for Mysteriou…

98ed30b

…s Shuffle not being on for the gem rotation fix to apply.

stratomaster64 approved these changes Dec 8, 2023

View reviewed changes

Merge branch 'develop' of github.com:Malkierian/Shipwright into frees…

d215510

…tanding-mystery

Malkierian closed this Feb 11, 2024

Malkierian added 2 commits February 15, 2024 19:41

Merge branch 'develop' of github.com:Malkierian/Shipwright into frees…

2974d5a

…tanding-mystery

First attempt at changing to fake GetItemEntry instead of directly ca…

6b7a7e2

…lling the mystery draw function. Needs more work.

Malkierian reopened this Feb 16, 2024

Malkierian added the do not merge Not ready or not valid changes label Feb 16, 2024

Malkierian added 3 commits February 16, 2024 20:52

Merge branch 'freestanding-mystery' of github.com:Malkierian/Shipwrig…

710a153

…ht into freestanding-mystery

Bit of cleanup.

0723a94

Malkierian removed the do not merge Not ready or not valid changes label Feb 17, 2024

briaguya-ai reviewed Feb 17, 2024

View reviewed changes

Cross-platform building edits. If anyone has a better idea of how to …

a3f5f08

…handle this fake GIE, I'm all ears.

garrettjoecox approved these changes Mar 9, 2024

View reviewed changes

Malkierian added 2 commits April 21, 2024 14:40

Merge branch 'develop' of github.com:Malkierian/Shipwright into frees…

b31f263

…tanding-mystery

Update to CVar macros.

35ae75d

Merge branch 'develop' of github.com:Malkierian/Shipwright into frees…

6da3a61

…tanding-mystery

Malkierian added 2 commits May 2, 2024 08:14

Merge branch 'develop' of github.com:Malkierian/Shipwright into frees…

8546056

…tanding-mystery

Fix freestanding item gives.

645c438

Fix mysterious item model colors.

Fix bombchu bowling mystery.

56e3a89

Remove bowling bomchus check obfuscation (unused, removed in v3).

4fda570

Pepper0ni approved these changes May 5, 2024

View reviewed changes

inspectredc approved these changes May 6, 2024

View reviewed changes

soh/soh/Enhancements/randomizer/draw.cpp Show resolved Hide resolved

soh/soh/Enhancements/randomizer/draw.cpp Show resolved Hide resolved

garrettjoecox merged commit b3d5144 into HarbourMasters:develop May 7, 2024
6 checks passed

Malkierian deleted the freestanding-mystery branch May 7, 2024 00:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rando Enhancement: Mysterious Shuffled Items #3227

Rando Enhancement: Mysterious Shuffled Items #3227

Malkierian commented Sep 24, 2023 •

edited by github-actions bot

Loading

Malkierian commented Sep 24, 2023

Malkierian commented Oct 22, 2023 •

edited

Loading

Malkierian commented Oct 23, 2023

Malkierian commented Oct 25, 2023

Malkierian commented Dec 7, 2023

Malkierian commented Feb 11, 2024

Malkierian commented Feb 17, 2024

Pepper0ni commented Apr 30, 2024

Malkierian commented Apr 30, 2024

Pepper0ni commented Apr 30, 2024

Malkierian commented May 1, 2024

Pepper0ni commented May 1, 2024

Pepper0ni commented May 2, 2024

Pepper0ni commented May 2, 2024 •

edited

Loading

Malkierian commented May 2, 2024

Malkierian commented May 2, 2024

Pepper0ni commented May 3, 2024

Malkierian commented May 3, 2024

Malkierian commented May 3, 2024

Pepper0ni commented May 3, 2024

Malkierian commented May 3, 2024

Pepper0ni left a comment

Pepper0ni May 5, 2024

inspectredc left a comment

Rando Enhancement: Mysterious Shuffled Items #3227

Rando Enhancement: Mysterious Shuffled Items #3227

Conversation

Malkierian commented Sep 24, 2023 • edited by github-actions bot Loading

Build Artifacts

Malkierian commented Sep 24, 2023

Malkierian commented Oct 22, 2023 • edited Loading

Malkierian commented Oct 23, 2023

Malkierian commented Oct 25, 2023

Malkierian commented Dec 7, 2023

Malkierian commented Feb 11, 2024

Malkierian commented Feb 17, 2024

Pepper0ni commented Apr 30, 2024

Malkierian commented Apr 30, 2024

Pepper0ni commented Apr 30, 2024

Malkierian commented May 1, 2024

Pepper0ni commented May 1, 2024

Pepper0ni commented May 2, 2024

Pepper0ni commented May 2, 2024 • edited Loading

Malkierian commented May 2, 2024

Malkierian commented May 2, 2024

Pepper0ni commented May 3, 2024

Malkierian commented May 3, 2024

Malkierian commented May 3, 2024

Pepper0ni commented May 3, 2024

Malkierian commented May 3, 2024

Pepper0ni left a comment

Choose a reason for hiding this comment

Pepper0ni May 5, 2024

Choose a reason for hiding this comment

inspectredc left a comment

Choose a reason for hiding this comment

Malkierian commented Sep 24, 2023 •

edited by github-actions bot

Loading

Malkierian commented Oct 22, 2023 •

edited

Loading

Pepper0ni commented May 2, 2024 •

edited

Loading