mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-02-23 06:02:08 -05:00
When shuffled to Own Dungeon or below, give vanilla keys, maps, and compasses.
This commit is contained in:
parent
760eaa4d97
commit
35d651f06e
@ -1410,6 +1410,65 @@ s16 Randomizer::GetItemFromGet(RandomizerGet randoGet, GetItemID ogItemId) {
|
|||||||
case RG_BOTTLE_WITH_MILK:
|
case RG_BOTTLE_WITH_MILK:
|
||||||
return GI_MILK_BOTTLE;
|
return GI_MILK_BOTTLE;
|
||||||
|
|
||||||
|
case RG_DEKU_TREE_MAP:
|
||||||
|
case RG_DODONGOS_CAVERN_MAP:
|
||||||
|
case RG_JABU_JABUS_BELLY_MAP:
|
||||||
|
case RG_FOREST_TEMPLE_MAP:
|
||||||
|
case RG_FIRE_TEMPLE_MAP:
|
||||||
|
case RG_WATER_TEMPLE_MAP:
|
||||||
|
case RG_SPIRIT_TEMPLE_MAP:
|
||||||
|
case RG_SHADOW_TEMPLE_MAP:
|
||||||
|
case RG_BOTTOM_OF_THE_WELL_MAP:
|
||||||
|
case RG_ICE_CAVERN_MAP:
|
||||||
|
if (GetRandoSettingValue(RSK_STARTING_MAPS_COMPASSES) < 3) {
|
||||||
|
return GI_MAP;
|
||||||
|
} else {
|
||||||
|
return randoGet;
|
||||||
|
}
|
||||||
|
|
||||||
|
case RG_DEKU_TREE_COMPASS:
|
||||||
|
case RG_DODONGOS_CAVERN_COMPASS:
|
||||||
|
case RG_JABU_JABUS_BELLY_COMPASS:
|
||||||
|
case RG_FOREST_TEMPLE_COMPASS:
|
||||||
|
case RG_FIRE_TEMPLE_COMPASS:
|
||||||
|
case RG_WATER_TEMPLE_COMPASS:
|
||||||
|
case RG_SPIRIT_TEMPLE_COMPASS:
|
||||||
|
case RG_SHADOW_TEMPLE_COMPASS:
|
||||||
|
case RG_BOTTOM_OF_THE_WELL_COMPASS:
|
||||||
|
case RG_ICE_CAVERN_COMPASS:
|
||||||
|
if (GetRandoSettingValue(RSK_STARTING_MAPS_COMPASSES) < 3) {
|
||||||
|
return GI_COMPASS;
|
||||||
|
} else {
|
||||||
|
return randoGet;
|
||||||
|
}
|
||||||
|
|
||||||
|
case RG_FOREST_TEMPLE_BOSS_KEY:
|
||||||
|
case RG_FIRE_TEMPLE_BOSS_KEY:
|
||||||
|
case RG_WATER_TEMPLE_BOSS_KEY:
|
||||||
|
case RG_SPIRIT_TEMPLE_BOSS_KEY:
|
||||||
|
case RG_SHADOW_TEMPLE_BOSS_KEY:
|
||||||
|
case RG_GANONS_CASTLE_BOSS_KEY:
|
||||||
|
if (GetRandoSettingValue(RSK_BOSS_KEYSANITY) < 3) {
|
||||||
|
return GI_KEY_BOSS;
|
||||||
|
} else {
|
||||||
|
return randoGet;
|
||||||
|
}
|
||||||
|
|
||||||
|
case RG_FOREST_TEMPLE_SMALL_KEY:
|
||||||
|
case RG_FIRE_TEMPLE_SMALL_KEY:
|
||||||
|
case RG_WATER_TEMPLE_SMALL_KEY:
|
||||||
|
case RG_SPIRIT_TEMPLE_SMALL_KEY:
|
||||||
|
case RG_SHADOW_TEMPLE_SMALL_KEY:
|
||||||
|
case RG_BOTTOM_OF_THE_WELL_SMALL_KEY:
|
||||||
|
case RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY:
|
||||||
|
case RG_GERUDO_FORTRESS_SMALL_KEY:
|
||||||
|
case RG_GANONS_CASTLE_SMALL_KEY:
|
||||||
|
if (GetRandoSettingValue(RSK_KEYSANITY) < 3) {
|
||||||
|
return GI_KEY_SMALL;
|
||||||
|
} else {
|
||||||
|
return randoGet;
|
||||||
|
}
|
||||||
|
|
||||||
// todo test this with keys in own dungeon
|
// todo test this with keys in own dungeon
|
||||||
case RG_TREASURE_GAME_SMALL_KEY:
|
case RG_TREASURE_GAME_SMALL_KEY:
|
||||||
return GI_DOOR_KEY;
|
return GI_DOOR_KEY;
|
||||||
@ -1619,7 +1678,7 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
|
|||||||
case RG_BUY_BOMBS_535:
|
case RG_BUY_BOMBS_535:
|
||||||
case RG_BUY_RED_POTION_40:
|
case RG_BUY_RED_POTION_40:
|
||||||
case RG_BUY_RED_POTION_50:
|
case RG_BUY_RED_POTION_50:
|
||||||
//RANDO TODO: Fix this to return false if keysanity is on.
|
return true;
|
||||||
case RG_FOREST_TEMPLE_SMALL_KEY:
|
case RG_FOREST_TEMPLE_SMALL_KEY:
|
||||||
case RG_FIRE_TEMPLE_SMALL_KEY:
|
case RG_FIRE_TEMPLE_SMALL_KEY:
|
||||||
case RG_WATER_TEMPLE_SMALL_KEY:
|
case RG_WATER_TEMPLE_SMALL_KEY:
|
||||||
@ -1629,12 +1688,24 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
|
|||||||
case RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY:
|
case RG_GERUDO_TRAINING_GROUNDS_SMALL_KEY:
|
||||||
case RG_GERUDO_FORTRESS_SMALL_KEY:
|
case RG_GERUDO_FORTRESS_SMALL_KEY:
|
||||||
case RG_GANONS_CASTLE_SMALL_KEY:
|
case RG_GANONS_CASTLE_SMALL_KEY:
|
||||||
|
if (GetRandoSettingValue(RSK_KEYSANITY) > 2) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
case RG_FOREST_TEMPLE_BOSS_KEY:
|
case RG_FOREST_TEMPLE_BOSS_KEY:
|
||||||
case RG_FIRE_TEMPLE_BOSS_KEY:
|
case RG_FIRE_TEMPLE_BOSS_KEY:
|
||||||
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:
|
||||||
|
if (GetRandoSettingValue(RSK_BOSS_KEYSANITY) > 2) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
case RG_GANONS_CASTLE_BOSS_KEY:
|
case RG_GANONS_CASTLE_BOSS_KEY:
|
||||||
|
if (GetRandoSettingValue(RSK_GANONS_BOSS_KEY) > 2) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
case RG_DEKU_TREE_COMPASS:
|
case RG_DEKU_TREE_COMPASS:
|
||||||
case RG_DODONGOS_CAVERN_COMPASS:
|
case RG_DODONGOS_CAVERN_COMPASS:
|
||||||
case RG_JABU_JABUS_BELLY_COMPASS:
|
case RG_JABU_JABUS_BELLY_COMPASS:
|
||||||
@ -1655,6 +1726,9 @@ bool Randomizer::IsItemVanilla(RandomizerGet randoGet) {
|
|||||||
case RG_SHADOW_TEMPLE_MAP:
|
case RG_SHADOW_TEMPLE_MAP:
|
||||||
case RG_BOTTOM_OF_THE_WELL_MAP:
|
case RG_BOTTOM_OF_THE_WELL_MAP:
|
||||||
case RG_ICE_CAVERN_MAP:
|
case RG_ICE_CAVERN_MAP:
|
||||||
|
if (GetRandoSettingValue(RSK_STARTING_MAPS_COMPASSES) > 2) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user