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

greg bridge in logic #2460

Merged
merged 13 commits into from
Feb 17, 2023
Merged

Conversation

briaguya-ai
Copy link
Contributor

@briaguya-ai briaguya-ai commented Feb 13, 2023

image

includes #2458, so i'm marking this as do not merge until that gets in

Build Artifacts

@briaguya-ai briaguya-ai added the do not merge Not ready or not valid changes label Feb 13, 2023
@briaguya-ai briaguya-ai removed the do not merge Not ready or not valid changes label Feb 17, 2023
Copy link
Contributor

@garrettjoecox garrettjoecox left a comment

Choose a reason for hiding this comment

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

Assuming this has been tested, this looks like all the areas necessary for touching

Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

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

Just a quick suggestion.

Also there should be a hint registered in the hint table for GREG_RUPEE, otherwise the hint for Greg will be broken/crash.

Not sure if it should go in hint_list.cpp or hint_list_exclude_overworld.cpp, probably the overworld one.
Ah there is already a hint in the hint_list_items.cpp

@@ -177,7 +177,7 @@ void ItemTable_Init() { // RandomizerGet
//Generic Items
itemTable[RECOVERY_HEART] = Item(RG_RECOVERY_HEART, Text{"Recovery Heart", "Coeur de Vie", "Corazón"}, ITEMTYPE_ITEM, GI_HEART, false, &noVariable, RECOVERY_HEART);
itemTable[GREEN_RUPEE] = Item(RG_GREEN_RUPEE, Text{"Green Rupee", "Rubis Vert", "Rupia verde"}, ITEMTYPE_ITEM, GI_RUPEE_GREEN, false, &noVariable, GREEN_RUPEE);
itemTable[GREG_RUPEE] = Item(RG_GREG_RUPEE, Text{"Greg Rupee", "Rubis Greg", "Rupia Greg"}, ITEMTYPE_ITEM, GI_RUPEE_GREEN, false, &noVariable, GREG_RUPEE);
itemTable[GREG_RUPEE] = Item(RG_GREG_RUPEE, Text{"Greg Rupee", "Rubis Greg", "Rupia Greg"}, ITEMTYPE_ITEM, GI_RUPEE_GREEN, true, &Greg, GREG_RUPEE);
Copy link
Contributor

@Archez Archez Feb 17, 2023

Choose a reason for hiding this comment

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

Since Greg is marked as an advancement item, this means that Greg will prevent "barren/foolish" hints if Greg is not in logic and is in a foolish area.

Short term solution could be to add a check for Greg and !GregInLogic into the IsMajorItem() in 3drando/item.hpp

@briaguya-ai briaguya-ai merged commit 68c8f50 into HarbourMasters:develop Feb 17, 2023
@briaguya-ai briaguya-ai deleted the greg-bridge branch March 1, 2023 08:06
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.

None yet

4 participants