mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
Merge branch 'GetItem-renaming' of github.com:garrettjoecox/OOT into shopsanity
This commit is contained in:
commit
680495ab2b
@ -2003,12 +2003,17 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
|
|||||||
case RG_WATER_TEMPLE_BOSS_KEY:
|
case RG_WATER_TEMPLE_BOSS_KEY:
|
||||||
case RG_SPIRIT_TEMPLE_BOSS_KEY:
|
case RG_SPIRIT_TEMPLE_BOSS_KEY:
|
||||||
case RG_SHADOW_TEMPLE_BOSS_KEY:
|
case RG_SHADOW_TEMPLE_BOSS_KEY:
|
||||||
case RG_GANONS_CASTLE_BOSS_KEY:
|
|
||||||
if (GetRandoSettingValue(RSK_BOSS_KEYSANITY) < 3) {
|
if (GetRandoSettingValue(RSK_BOSS_KEYSANITY) < 3) {
|
||||||
return GI_KEY_BOSS;
|
return GI_KEY_BOSS;
|
||||||
} else {
|
} else {
|
||||||
return (GetItemID)randoGet;
|
return (GetItemID)randoGet;
|
||||||
}
|
}
|
||||||
|
case RG_GANONS_CASTLE_BOSS_KEY:
|
||||||
|
if (GetRandoSettingValue(RSK_GANONS_BOSS_KEY) < 3) {
|
||||||
|
return GI_KEY_BOSS;
|
||||||
|
} else {
|
||||||
|
return randoGet;
|
||||||
|
}
|
||||||
|
|
||||||
case RG_FOREST_TEMPLE_SMALL_KEY:
|
case RG_FOREST_TEMPLE_SMALL_KEY:
|
||||||
case RG_FIRE_TEMPLE_SMALL_KEY:
|
case RG_FIRE_TEMPLE_SMALL_KEY:
|
||||||
|
Loading…
Reference in New Issue
Block a user