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

Rando: Shuffle 100 Gold Skulltula Reward #1944

Merged
merged 20 commits into from
Jan 23, 2023

Conversation

lilDavid
Copy link
Contributor

@lilDavid lilDavid commented Nov 9, 2022

After collecting all 100 Golden Skull Tokens, the cursed rich man in the House of Skulltula will give you a random item, and an extra Huge Rupee will be shuffled into the pool. The man will still give you Huge Rupees if you talk to him multiple times. Logic and an "always" hint are included.

  • Add the check and logic
  • Add some extra tokens to the plentiful pool (currently 10)
  • Add option for GBK on 100 token check to free up LACS

Build Artifacts

@lilDavid lilDavid marked this pull request as ready for review November 14, 2022 13:43
@briaguya-ai briaguya-ai added the merge conflicts PR has conflicts that need to be resolved before it can be merged label Dec 5, 2022
@RaelCappra
Copy link
Contributor

Looks like this is using a mismatched revision of libultraship.

@aMannus aMannus removed the merge conflicts PR has conflicts that need to be resolved before it can be merged label Jan 23, 2023
Copy link
Contributor

@briaguya-ai briaguya-ai left a comment

Choose a reason for hiding this comment

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

Overall this is looking great! Since there's an important altar text hint in there that doesn't have french translation yet, i think we should hold off on merging until that happens.

I also left a comment with a question about playing sans tokensanity

hintTable[GANON_BK_SKULLTULA_HINT] = HintText::GanonsBossKey({
// obscure text
Text { "And the %revil one%w's key will be&provided by the cursed rich man&once %r100 Gold Skulltula Tokens%w&are retrieved.",
/*french*/ HINT_TEXT_NEEDS_TRANSLATION_FR,
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

@PurpleHato

Thanks! PRed on their branch :)
lilDavid#6

@@ -798,6 +798,15 @@ void GenerateItemPool() {
AddItemToMainPool(GOLD_SKULLTULA_TOKEN, 100);
}

if (Shuffle100GSReward) {
if (ItemPoolValue.Is(ITEMPOOL_PLENTIFUL)) {
AddItemToPool(PendingJunkPool, GOLD_SKULLTULA_TOKEN, 10);
Copy link
Contributor

Choose a reason for hiding this comment

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

how does this work with tokensanity off? (i wouldn't expect many people to play with 100 skull reward and tokensanity off but it's possible)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I completely forgot about tokensanity. I'll update this to check for it.

@briaguya-ai briaguya-ai merged commit 2422c94 into HarbourMasters:develop Jan 23, 2023
@lilDavid lilDavid deleted the hundred_spider_shuffle branch November 25, 2023 15:05
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

5 participants