[RANDO] Shuffle Pots #4592

aMannus · 2024-11-28T11:31:26Z

This was far from a single person journey.

Credits to @DanaTheElf for providing the custom model for the pot.
Credits to @Caladius for helping me with a bunch of the grunt work and dungeon pot logic.
Credits to @Pepper0ni for the MQ dungeon pot logic.
And probably others that helped along the way that I already forgot about.

The meme is real. Including all needed logic now! This'll need a proper amount of playtesting still, but unless something comes up (like it always does) this should finally be complete now.

Includes hints per area (a hint per every single pot felt like a dumb way to go about it), selection between overworld/dungeon/all (and supports MQ), a custom model when a pot holds a randomized item, and glitchless logic support. Touches surprisingly little vanilla code, with the biggest one being the addition of the potIdentify to the OBJ_TSUBO (pot actor) struct.

Build Artifacts

Removal of WriteIngameSpoilerLog call that was unneeded.

Potsanity v1

Potsanity MQ

Updates to Parameters and RHT information

Vanilla Drop List

soh/include/z64save.h

soh/soh/Enhancements/randomizer/location_list.cpp

GTG MQ Pots

Pepe20129

The only thing apart from this I can think of is the ganondorf boss door stuff.

soh/include/z64actor.h

soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

soh/soh/Enhancements/randomizer/settings.cpp

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp

Pepper0ni

found missing GTG pot things that are likely causing the issue I found

soh/soh/Enhancements/randomizer/randomizer.cpp

soh/soh/Enhancements/debugger/debugSaveEditor.h

soh/soh/Enhancements/randomizer/dungeon.cpp

Archez

Mostly non-critical/cleanup suggestions below. Dropping my approval preemptively anyways 👍

soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h

soh/soh/OTRGlobals.cpp

soh/soh/Enhancements/randomizer/ShufflePots.cpp

soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c

soh/include/z64save.h

Pepe20129

Apart from the things Archez mentioned, looks good. The ganon boss door option can be added in another PR.

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp

Malkierian · 2024-12-08T04:57:58Z

I will hold off on any other logic fix comments for now. I'd say address Archez's final comments and put in the ones I mentioned for Jabu, and we'll

Malkierian · 2024-12-10T06:03:54Z

Sorry, got one conflict to resolve. It should be simple.

Pepper0ni

Bunch of logic issues I noticed, though I ignored some minor stuff that won't affect things that I will clean up later, otherwise the code review was good from what I could check.

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp

Pepper0ni · 2024-12-10T17:29:12Z

soh/soh/Enhancements/randomizer/dungeon.h

-    GERUDO_TRAINING_GROUNDS,
-    GANONS_CASTLE
+    GANONS_CASTLE,
+    GERUDO_TRAINING_GROUNDS


Why was this changed?

When making the check in item_pool.cpp (for (uint8_t i = SCENE_DEKU_TREE; i <= SCENE_GERUDO_TRAINING_GROUND; i++) {) I noticed they were in a different order than the vanilla scene nums, so I rectified it.

soh/soh/Enhancements/randomizer/logic.cpp

aMannus and others added 30 commits December 14, 2023 12:19

Potsanity proof of concept

fe7476a

Hide pot item cutscenes for very frequent items

0628cb9

Add 1 new pot to the item pool

b803a04

V1 custom pot model

6a3176b

V2 pot model

55e2b8b

Pushing for help. lol

025be67

Format clean up on added hint_list entries.

c80a7b7

Removal of WriteIngameSpoilerLog call that was unneeded.

Merge pull request #31 from Caladius/potsanity_v1

afef389

Potsanity v1

THREE_ACTOR_PARAMS -> TWO_ACTOR_PARAMS and hints in a loop

7c6253e

Lost woods pots logic

6879323

Realign Pot Checklist in Location_list.cpp

9c93580

Correcting some values and adding Master Quest pots.

34fc890

Merge pull request #32 from Caladius/potsanity_v1

532824e

Potsanity MQ

Merge branch 'develop-rando' into potsanity

637e905

Remove vanilla placements

e6755ff

Re-order enums + start hints per region

90c49d7

Fix build

76c2c5c

Break up shuffle pot options to dungeon/overworld/all

8c78154

Fixes

350d521

Prepare default pot contents, fix/add dungeons

a61594d

Fix dungeon/overworld only settings

ff2df9c

Updates to Parameters and RHT information

9bc837d

Merge pull request #33 from Caladius/potsanity_v1

5bd5025

Updates to Parameters and RHT information

Remove unused hints

1865669

Add proper check tracker entry exclusion

039ddff

Merge branch 'develop-rando' into potsanity

ba9577c

Tweak items to skip cutscenes for

ded58e4

Vanilla Drop List

6157471

Merge pull request #34 from Caladius/potsanity_v1

fe9e1e0

Vanilla Drop List

Update magic to blue rupees

59aef33

Pepe20129 reviewed Nov 28, 2024

View reviewed changes

soh/include/z64save.h Outdated Show resolved Hide resolved

Pepper0ni reviewed Nov 28, 2024

View reviewed changes

soh/soh/Enhancements/randomizer/location_list.cpp Outdated Show resolved Hide resolved

GTG MQ Pots

a300d81

SuperBro64 mentioned this pull request Dec 1, 2024

Lock overworld doors Randomizer option #4489

Open

2 tasks

aMannus added 3 commits December 4, 2024 19:09

Merge branch 'develop' into potsanity

3e44a36

Review comments round 1 & code cleanup

4a447ec

Merge pull request #43 from Caladius/potsanity-gtg

d7ad541

GTG MQ Pots

Pepe20129 reviewed Dec 4, 2024

View reviewed changes

soh/include/z64actor.h Outdated Show resolved Hide resolved

soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c Outdated Show resolved Hide resolved

aMannus and others added 3 commits December 4, 2024 20:34

Fix ganon's lair pots being behind GBK in logic

a5c8da7

Update soh/include/z64actor.h

bb61b44

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

Update soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c

ba1649e

Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>

Pepper0ni reviewed Dec 4, 2024

View reviewed changes

soh/soh/Enhancements/randomizer/settings.cpp Outdated Show resolved Hide resolved

aMannus added 2 commits December 4, 2024 22:41

Address review comment

61ae3f6

Merge branch 'develop' into potsanity

fb5a2a0

Pepper0ni suggested changes Dec 6, 2024

View reviewed changes

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp Outdated Show resolved Hide resolved

aMannus added 2 commits December 6, 2024 19:57

Merge branch 'develop' into potsanity

60a133d

Fix logic for pots in Fire Temple

7d51773

Malkierian reviewed Dec 6, 2024

View reviewed changes

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp Outdated Show resolved Hide resolved

Pepper0ni suggested changes Dec 7, 2024

View reviewed changes

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

soh/soh/Enhancements/debugger/debugSaveEditor.h Show resolved Hide resolved

soh/soh/Enhancements/randomizer/dungeon.cpp Outdated Show resolved Hide resolved

Fix GtG MQ pots, fix water temple pot logic

e86cc5b

Archez approved these changes Dec 7, 2024

View reviewed changes

Pepe20129 approved these changes Dec 7, 2024

View reviewed changes

Malkierian reviewed Dec 8, 2024

View reviewed changes

soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp Outdated Show resolved Hide resolved

Review Comments

4f29624

Pepper0ni suggested changes Dec 10, 2024

View reviewed changes

aMannus added 3 commits December 13, 2024 12:16

Logic review part 1

ca6c7aa

Logic comments part 2

a0c9069

Merge branch 'develop' into potsanity

44cf709

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RANDO] Shuffle Pots #4592

[RANDO] Shuffle Pots #4592

aMannus commented Nov 28, 2024 •

edited by github-actions bot

Loading

Pepe20129 left a comment

Pepper0ni left a comment

Archez left a comment

Pepe20129 left a comment

Malkierian commented Dec 8, 2024

Malkierian commented Dec 10, 2024

Pepper0ni left a comment

Pepper0ni Dec 10, 2024

aMannus Dec 13, 2024

[RANDO] Shuffle Pots #4592

Are you sure you want to change the base?

[RANDO] Shuffle Pots #4592

Conversation

aMannus commented Nov 28, 2024 • edited by github-actions bot Loading

Build Artifacts

Pepe20129 left a comment

Choose a reason for hiding this comment

Pepper0ni left a comment

Choose a reason for hiding this comment

Archez left a comment

Choose a reason for hiding this comment

Pepe20129 left a comment

Choose a reason for hiding this comment

Malkierian commented Dec 8, 2024

Malkierian commented Dec 10, 2024

Pepper0ni left a comment

Choose a reason for hiding this comment

Pepper0ni Dec 10, 2024

Choose a reason for hiding this comment

aMannus Dec 13, 2024

Choose a reason for hiding this comment

aMannus commented Nov 28, 2024 •

edited by github-actions bot

Loading