diff options
| author | mckinlee <mckinlee@ymail.com> | 2026-03-19 21:43:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-19 21:43:04 -0400 |
| commit | 6eda20817dbccefd0ec85ec6e0671af950066092 (patch) | |
| tree | 4f9ff98ac58df79900d36f8cd22c50f2edc1da73 /mm/2s2h/Rando/ConvertItem.cpp | |
| parent | ec9e755bb425700484f0b25182a35c79e6723968 (diff) | |
[Rando] Tycoon's Wallet (#1597)
* big boy wallet
* cleaner 4 digit support
* feedback
* #1605 explains this change
---------
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
Diffstat (limited to 'mm/2s2h/Rando/ConvertItem.cpp')
| -rw-r--r-- | mm/2s2h/Rando/ConvertItem.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mm/2s2h/Rando/ConvertItem.cpp b/mm/2s2h/Rando/ConvertItem.cpp index 4506f6140..198bc8f77 100644 --- a/mm/2s2h/Rando/ConvertItem.cpp +++ b/mm/2s2h/Rando/ConvertItem.cpp @@ -211,6 +211,10 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId) case RI_PROGRESSIVE_WALLET: if (hasObtainedCheck) { return false; + } else if (RANDO_SAVE_OPTIONS[RO_SHUFFLE_TYCOON_WALLET] == RO_GENERIC_YES) { + if (CUR_UPG_VALUE(UPG_WALLET) >= 3) { + return false; + } } else if (CUR_UPG_VALUE(UPG_WALLET) >= 2) { return false; } @@ -225,6 +229,11 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId) return false; } break; + case RI_WALLET_TYCOON: + if (CUR_UPG_VALUE(UPG_WALLET) >= 3) { + return false; + } + break; case RI_PROGRESSIVE_SWORD: if (hasObtainedCheck) { return false; @@ -718,6 +727,8 @@ RandoItemId Rando::ConvertItem(RandoItemId randoItemId, RandoCheckId randoCheckI return RI_WALLET_ADULT; } else if (CUR_UPG_VALUE(UPG_WALLET) == 1) { return RI_WALLET_GIANT; + } else if (CUR_UPG_VALUE(UPG_WALLET) == 2) { + return RI_WALLET_TYCOON; } // Shouldn't happen, just in case assert(false); |