Skip to content

[Rando] Adds Man in the Tree Rupees #1348

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.

Sign up for GitHub

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

Closed
Caladius wants to merge 1 commit into from
Closed

[Rando] Adds Man in the Tree Rupees #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion mm/2s2h/Rando/ActorBehavior/EnItem00.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ std::map<std::pair<float, float>, RandoCheckId> freestandingMap = {
{ { 370.359039f, 1368.999390f }, RC_DEKU_PALACE_FREESTANDING_RUPEE_16 },
{ { 405.0, 1389.0 }, RC_DEKU_PALACE_FREESTANDING_RUPEE_17 },
{ { 405.0, 1349.0 }, RC_DEKU_PALACE_FREESTANDING_RUPEE_18 },

// Termina Field //
{ { 3508.0f, 1879.0f }, RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_01 },
{ { 3488.0f, 1909.0f }, RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_02 },
};

void Rando::ActorBehavior::InitEnItem00Behavior() {
Expand Down Expand Up @@ -67,7 +71,9 @@ void Rando::ActorBehavior::InitEnItem00Behavior() {
itemParams |= CustomItem::ABLE_TO_ZORA_RANG;
}
// The heart piece in the bio baba grotto beehive needs to be tossed to fall to the ground
if (randoStaticCheck.randoCheckId == RC_TERMINA_FIELD_BIO_BABA_GROTTO) {
if (randoStaticCheck.randoCheckId == RC_TERMINA_FIELD_BIO_BABA_GROTTO ||
randoStaticCheck.randoCheckId == RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_01 ||
randoStaticCheck.randoCheckId == RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_02) {
itemParams |= CustomItem::TOSS_ON_SPAWN;
}

Expand Down
2 changes: 2 additions & 0 deletions mm/2s2h/Rando/Logic/Regions/TerminaField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ static RegisterShipInitFunc initFunc([]() {
CHECK(RC_TERMINA_FIELD_GRASS_214, true),
CHECK(RC_TERMINA_FIELD_GRASS_215, true),
CHECK(RC_TERMINA_FIELD_GRASS_216, true),
CHECK(RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_01, true),
CHECK(RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_02, true),
},
.exits = { // TO FROM
EXIT(ENTRANCE(GROTTOS, 0), ENTRANCE(TERMINA_FIELD, 0), CAN_USE_EXPLOSIVE || CAN_BE_GORON), // TODO: Grotto mapping Gossip Stone #3
Expand Down
2 changes: 2 additions & 0 deletions mm/2s2h/Rando/StaticData/Checks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,8 @@ std::map<RandoCheckId, RandoStaticCheck> Checks = {
RC(RC_TERMINA_FIELD_GUAY_RUPEE_DROP_19, RCTYPE_FREESTANDING, SCENE_00KEIKOKU, FLAG_NONE, 0x00, RI_RUPEE_BLUE),
RC(RC_TERMINA_FIELD_GUAY_RUPEE_DROP_20, RCTYPE_FREESTANDING, SCENE_00KEIKOKU, FLAG_NONE, 0x00, RI_RUPEE_RED),
RC(RC_TERMINA_FIELD_FREESTANDING_RUPEE_01, RCTYPE_FREESTANDING, SCENE_00KEIKOKU, FLAG_CYCL_SCENE_COLLECTIBLE, 0x02, RI_RUPEE_RED),
RC(RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_01, RCTYPE_FREESTANDING, SCENE_00KEIKOKU, FLAG_NONE, 0x00, RI_RUPEE_RED),
RC(RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_02, RCTYPE_FREESTANDING, SCENE_00KEIKOKU, FLAG_NONE, 0x00, RI_RUPEE_RED),
RC(RC_TERMINA_FIELD_POT, RCTYPE_POT, SCENE_00KEIKOKU, FLAG_CYCL_SCENE_COLLECTIBLE, 0x20, RI_FAIRY_REFILL),
RC(RC_TERMINA_FIELD_SCRUB_LARGE_CRATE, RCTYPE_CRATE, SCENE_KAKUSIANA, FLAG_NONE, 0x0, RI_NONE),
RC(RC_TERMINA_FIELD_SCRUB_POT, RCTYPE_POT, SCENE_KAKUSIANA, FLAG_CYCL_SCENE_COLLECTIBLE, 0x07, RI_RECOVERY_HEART),
Expand Down
2 changes: 2 additions & 0 deletions mm/2s2h/Rando/Types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,8 @@ typedef enum {
RC_TERMINA_FIELD_GUAY_RUPEE_DROP_19,
RC_TERMINA_FIELD_GUAY_RUPEE_DROP_20,
RC_TERMINA_FIELD_FREESTANDING_RUPEE_01,
RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_01,
RC_TERMINA_FIELD_MAN_IN_THE_TREE_RUPEE_02,
RC_TERMINA_FIELD_POT,
RC_TERMINA_FIELD_SCRUB_LARGE_CRATE,
RC_TERMINA_FIELD_SCRUB_POT,
Expand Down
Loading