[Rando] Add Junk Customization Options #1326
Conversation
| if (Rando::IsItemObtainable(randJunkItem)) { | ||
| lastJunkItem = randJunkItem; | ||
| } | ||
| if (failOver >= FAIL_OVER_MAX) { |
There was a problem hiding this comment.
| if (failOver >= FAIL_OVER_MAX) { | |
| // Reached max number of attempts, default to nothing | |
| if (failOver >= FAIL_OVER_MAX) { |
|
|
||
| switch (CVarGetInteger("gRando.Junk.ItemType", (uint32_t)RO_JUNK_TYPE_DEFAULT)) { | ||
| case RO_JUNK_TYPE_DEFAULT: | ||
| if (gPlayState != NULL && ABS(gPlayState->gameplayFrames - lastChosenAt) > 20) { |
There was a problem hiding this comment.
Is it even possible for gPlayState to be null in a function that relies on an Actor* argument?
|
|
||
| totalWeight += weight; | ||
| } | ||
| if (totalWeight == 0) { |
There was a problem hiding this comment.
| if (totalWeight == 0) { | |
| // No obtainable items have weight, default to nothing | |
| if (totalWeight == 0) { |
| break; | ||
| case RI_MAGIC_JAR_SMALL: | ||
| if (Rando::IsItemObtainable(itemId)) { | ||
| if (gSaveContext.save.saveInfo.playerData.magic <= threshold) { |
There was a problem hiding this comment.
Magic never seems to drop even if I have an empty magic bar and nothing else has reached its threshold. Looking through this code, I'm not certain why that is.
| if (weight == 0) { | ||
| continue; | ||
| } | ||
| if (!Rando::IsItemObtainable(itemId)) { |
There was a problem hiding this comment.
While this does exclude the item from the weight calculation, it is still possible to get items that should not be obtainable. For example, I can still get arrows from the weighted option even if I don't have a bow.
| break; | ||
| } | ||
|
|
||
| weightedValue = rand() % totalWeight; |
There was a problem hiding this comment.
Can you implement lastChosenAt for weighted as well? Depending on what configuration you have, the resulting item can rapidly change every frame.
Threshold is more or less deterministic and does not share this problem.
| } | ||
| break; | ||
| case RI_MAGIC_JAR_SMALL: | ||
| if (Rando::IsItemObtainable(itemId)) { |
There was a problem hiding this comment.
You may be able to just wrap the entire switch block with Rando::IsItemObtainable(itemId). Hearts, nuts, and sticks should already just return true.
| } | ||
| if (lastJunkItem == RI_UNKNOWN) { | ||
| if (lastRupee != gSaveContext.save.saveInfo.playerData.rupees) { | ||
| selectedRupee = rupeeList[rand() % rupeeList.size()]; |
There was a problem hiding this comment.
Maybe lastChosenAt should be implemented for threshold after all, at least for this particular case. If you have multiple Rupee junk items in view and acquire a larger Rupee, the remaining junk Rupees will rapidly flash through the different types as the Rupee counter increments.
Edit: Upon further thought, maybe just always do lastChosenAt at the start of CurrentJunkItem. No need to implement it three separate times.
3 participants
This adds 3 modes to RI_JUNK items:
TODO:
Build Artifacts