mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-23 14:22:16 -05:00
Code Issues Projects Releases Wiki Activity

More small changes

Browse Source
This commit is contained in:
Garrett Cox 2022-08-29 16:00:47 -05:00
parent ded7ccab3f
commit 8c6774fa35
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -1216,10 +1216,8 @@ CanObtainResult Randomizer::CanObtainRandomizerGet(RandomizerGet randoGet) {
// Equipment // Equipment
case RG_KOKIRI_SWORD: case RG_KOKIRI_SWORD:
return !CHECK_OWNED_EQUIP(EQUIP_SWORD, 0) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE; return !CHECK_OWNED_EQUIP(EQUIP_SWORD, 0) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
// TODO case RG_BIGGORON_SWORD:
// case RG_PROGRESSIVE_GORONSWORD: return !gSaveContext.bgsFlag ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
// case RG_GIANTS_KNIFE:
// case RG_BIGGORON_SWORD:
case RG_DEKU_SHIELD: case RG_DEKU_SHIELD:
case RG_BUY_DEKU_SHIELD: case RG_BUY_DEKU_SHIELD:
return !CHECK_OWNED_EQUIP(EQUIP_SHIELD, 0) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE; return !CHECK_OWNED_EQUIP(EQUIP_SHIELD, 0) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
@ -1287,6 +1285,7 @@ CanObtainResult Randomizer::CanObtainRandomizerGet(RandomizerGet randoGet) {
case RG_BUY_BOMBCHU_10: case RG_BUY_BOMBCHU_10:
case RG_BUY_BOMBCHU_20: case RG_BUY_BOMBCHU_20:
case RG_BUY_BOMBCHU_5: case RG_BUY_BOMBCHU_5:
// TODO: We'll need to account for GetRandoSettingValue(RSK_BOMBCHUS_IN_LOGIC) whenever that's added
return INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE; return INV_CONTENT(ITEM_BOMBCHU) == ITEM_BOMBCHU ? CAN_OBTAIN : CANT_OBTAIN_NEED_UPGRADE;
case RG_PROGRESSIVE_HOOKSHOT: case RG_PROGRESSIVE_HOOKSHOT:
switch (INV_CONTENT(ITEM_HOOKSHOT)) { switch (INV_CONTENT(ITEM_HOOKSHOT)) {
@ -1365,6 +1364,8 @@ CanObtainResult Randomizer::CanObtainRandomizerGet(RandomizerGet randoGet) {
// case RG_EYEBALL_FROG: // case RG_EYEBALL_FROG:
// case RG_EYEDROPS: // case RG_EYEDROPS:
// case RG_CLAIM_CHECK: // case RG_CLAIM_CHECK:
// case RG_PROGRESSIVE_GORONSWORD:
// case RG_GIANTS_KNIFE:
// Misc Items // Misc Items
case RG_STONE_OF_AGONY: case RG_STONE_OF_AGONY: