mirror of
https://github.com/HarbourMasters/Shipwright
synced 2026-08-30 18:00:00 -04:00
Rando: Shuffle consumable bags (#3959)
* Main implementation * Fix sticks & nuts from shops & checks * Change the models to normal stick & nut Worth noting that before you have the bags, the refills are blue rupees so there will not be model collision * Update hook_handlers.cpp
This commit is contained in:
@@ -123,6 +123,10 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
|
||||
case RG_PROGRESSIVE_STICK_UPGRADE:
|
||||
switch (CUR_UPG_VALUE(UPG_STICKS)) {
|
||||
case 0:
|
||||
if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_STICK_BAG)) {
|
||||
actual = RG_DEKU_STICK_BAG;
|
||||
break;
|
||||
}
|
||||
case 1:
|
||||
actual = RG_DEKU_STICK_CAPACITY_20;
|
||||
break;
|
||||
@@ -137,6 +141,10 @@ std::shared_ptr<GetItemEntry> Item::GetGIEntry() const { // NOLINT(*-no-recursio
|
||||
case RG_PROGRESSIVE_NUT_UPGRADE:
|
||||
switch (CUR_UPG_VALUE(UPG_NUTS)) {
|
||||
case 0:
|
||||
if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_DEKU_NUT_BAG)) {
|
||||
actual = RG_DEKU_NUT_BAG;
|
||||
break;
|
||||
}
|
||||
case 1:
|
||||
actual = RG_DEKU_NUT_CAPACITY_30;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user