From cc4771b4548a59c3dcee67550a9ac1bf18a2e7a6 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sat, 30 Mar 2024 17:03:37 -0400 Subject: [PATCH] Changes a few of the longer names --- .../hint_list/hint_list_exclude_dungeon.cpp | 4 +-- .../randomizer/3drando/item_pool.cpp | 4 +-- .../location_access/locacc_spirit_temple.cpp | 20 ++++++------- soh/soh/Enhancements/randomizer/dungeon.cpp | 24 +++++++-------- soh/soh/Enhancements/randomizer/item_list.cpp | 8 ++--- .../Enhancements/randomizer/location_list.cpp | 20 ++++++------- .../Enhancements/randomizer/randomizerTypes.h | 28 ++++++++--------- .../Enhancements/randomizer/randomizer_inf.h | 20 ++++++------- .../Enhancements/randomizer/silver_rupee.cpp | 30 +++++++++---------- 9 files changed, 79 insertions(+), 79 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp index 358f2e3b4..1c1ba21ca 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp @@ -1152,11 +1152,11 @@ void HintTable_Init_Exclude_Dungeon() { }); //TODO: Translate - hintTable[RHT_SPIRIT_CHILD_GATE_SILVER_RUPEE] = HintText::Exclude({ + hintTable[RHT_SPIRIT_GATE_SILVER_RUPEE] = HintText::Exclude({ //obscure text Text{"a #gate# in the Spirit Temple guards"} }); - hintTable[RHT_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE] = HintText::Exclude({ + hintTable[RHT_SPIRIT_BEAMOS_SILVER_RUPEE] = HintText::Exclude({ //obscure text Text{"#Beamos and blocks# in the Spirit Temple guard"} }); diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp index 306333c37..404a31409 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp @@ -1083,8 +1083,8 @@ void GenerateItemPool() { silversToAdd.push_back(RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE); } if (ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsVanilla()) { - silversToAdd.push_back(RG_SPIRIT_CHILD_GATE_SILVER_RUPEE); - silversToAdd.push_back(RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE); + silversToAdd.push_back(RG_SPIRIT_GATE_SILVER_RUPEE); + silversToAdd.push_back(RG_SPIRIT_BEAMOS_SILVER_RUPEE); silversToAdd.push_back(RG_SPIRIT_BOULDER_SILVER_RUPEE); } if (ctx->GetDungeon(Rando::SHADOW_TEMPLE)->IsVanilla()) { diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp index 0bbe1d04f..37845be47 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp @@ -32,11 +32,11 @@ void AreaTable_Init_SpiritTemple() { }, { //Locations LocationAccess(RC_SPIRIT_TEMPLE_CHILD_BRIDGE_CHEST, {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)));}}), - LocationAccess(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_1, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ - LocationAccess(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_2, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ - LocationAccess(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_3, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ - LocationAccess(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_4, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ - LocationAccess(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_5, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_GATE_SILVER_RUPEE_1, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_GATE_SILVER_RUPEE_2, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_GATE_SILVER_RUPEE_3, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_GATE_SILVER_RUPEE_4, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_GATE_SILVER_RUPEE_5, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ LocationAccess(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot))) && (logic->Sticks || logic->CanUse(RG_DINS_FIRE));}}), LocationAccess(RC_SPIRIT_TEMPLE_GS_METAL_FENCE, {[]{return (logic->Boomerang || logic->Slingshot || (logic->HasBombchus && randoCtx->GetTrickOption(RT_SPIRIT_CHILD_CHU))) && (logic->HasExplosives || ((logic->Nuts || logic->Boomerang) && (logic->Sticks || logic->KokiriSword || logic->Slingshot)));}}), }, { @@ -52,11 +52,11 @@ void AreaTable_Init_SpiritTemple() { (logic->CanTakeDamage && (logic->CanJumpslash || logic->HasProjectile(HasProjectileAge::Child))) || (logic->IsChild && logic->SmallKeys(RR_SPIRIT_TEMPLE, 5) && logic->HasProjectile(HasProjectileAge::Child)) || ((logic->SmallKeys(RR_SPIRIT_TEMPLE, 3) || (logic->SmallKeys(RR_SPIRIT_TEMPLE, 2) && randoCtx->GetOption(RSK_BOMBCHUS_IN_LOGIC) && randoCtx->GetOption(RSK_SHUFFLE_DUNGEON_ENTRANCES).Is(RO_DUNGEON_ENTRANCE_SHUFFLE_OFF))) && logic->CanUse(RG_SILVER_GAUNTLETS) && (logic->HasProjectile(HasProjectileAge::Adult) || (logic->CanTakeDamage && logic->CanJumpslash)));}}), - LocationAccess(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ - LocationAccess(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ - LocationAccess(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ - LocationAccess(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ - LocationAccess(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_BEAMOS_SILVER_RUPEE_1, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_BEAMOS_SILVER_RUPEE_2, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_BEAMOS_SILVER_RUPEE_3, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_BEAMOS_SILVER_RUPEE_4, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ + LocationAccess(RC_SPIRIT_BEAMOS_SILVER_RUPEE_5, {[]{return true;}}), /*TODO: Silver Rupee Logic*/ }, { //Exits Entrance(RR_SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return logic->HasExplosives || (randoCtx->GetOption(RSK_SUNLIGHT_ARROWS) && logic->CanUse(RG_LIGHT_ARROWS));}}), diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp index 5ed2fce19..d961c0f2d 100644 --- a/soh/soh/Enhancements/randomizer/dungeon.cpp +++ b/soh/soh/Enhancements/randomizer/dungeon.cpp @@ -436,9 +436,9 @@ Dungeons::Dungeons() { dungeonList[SPIRIT_TEMPLE] = DungeonInfo("Spirit Temple", RHT_SPIRIT_TEMPLE, RG_SPIRIT_TEMPLE_MAP, RG_SPIRIT_TEMPLE_COMPASS, RG_SPIRIT_TEMPLE_SMALL_KEY, RG_SPIRIT_TEMPLE_KEY_RING, RG_SPIRIT_TEMPLE_BOSS_KEY, { - RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, + RG_SPIRIT_BEAMOS_SILVER_RUPEE, RG_SPIRIT_BOULDER_SILVER_RUPEE, - RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, + RG_SPIRIT_GATE_SILVER_RUPEE, }, { RG_SPIRIT_MQ_LOBBY_SILVER_RUPEE, }, RA_SPIRIT_TEMPLE, 5, 7, @@ -466,16 +466,16 @@ Dungeons::Dungeons() { RC_SPIRIT_TEMPLE_GS_LOBBY, RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM, RC_SPIRIT_TEMPLE_GS_METAL_FENCE, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_1, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_2, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_3, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_4, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_5, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5, + RC_SPIRIT_GATE_SILVER_RUPEE_1, + RC_SPIRIT_GATE_SILVER_RUPEE_2, + RC_SPIRIT_GATE_SILVER_RUPEE_3, + RC_SPIRIT_GATE_SILVER_RUPEE_4, + RC_SPIRIT_GATE_SILVER_RUPEE_5, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_1, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_2, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_3, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_4, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_5, RC_SPIRIT_BOULDER_SILVER_RUPEE_1, RC_SPIRIT_BOULDER_SILVER_RUPEE_2, RC_SPIRIT_BOULDER_SILVER_RUPEE_3, diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp index ad952f054..34c1cf46c 100644 --- a/soh/soh/Enhancements/randomizer/item_list.cpp +++ b/soh/soh/Enhancements/randomizer/item_list.cpp @@ -303,10 +303,10 @@ void Rando::StaticData::InitItemTable() { itemTable[RG_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE].SetCustomDrawFunc(Randomizer_DrawSilverRupee); itemTable[RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE] = Item(RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE, Text{ "GTG Toilet Room Silver Rupee", "GTG Whirlpool Room Silver Rupee", "GTG Whirlpool Room Silver Rupee" }, ITEMTYPE_SILVERRUPEE, 0, true, &logic->noVariable, RHT_GERUDO_TRAINING_GROUNDS_SILVER_RUPEE, RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE, OBJECT_GI_RUPY, GID_RUPEE_GOLD, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_SILVER_RUPEE, MOD_RANDOMIZER); itemTable[RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE].SetCustomDrawFunc(Randomizer_DrawSilverRupee); - itemTable[RG_SPIRIT_CHILD_GATE_SILVER_RUPEE] = Item(RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, Text{ "Spirit Temple Child Gate Room Silver Rupee", "Spirit Temple Child Gate Room Silver Rupee", "Spirit Temple Child Gate Room Silver Rupee" }, ITEMTYPE_SILVERRUPEE, 0, true, &logic->noVariable, RHT_SPIRIT_TEMPLE_SILVER_RUPEE, RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, OBJECT_GI_RUPY, GID_RUPEE_GOLD, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_SILVER_RUPEE, MOD_RANDOMIZER); - itemTable[RG_SPIRIT_CHILD_GATE_SILVER_RUPEE].SetCustomDrawFunc(Randomizer_DrawSilverRupee); - itemTable[RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE] = Item(RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, Text{ "Spirit Temple Child Block Pushing Room Silver Rupee", "Spirit Temple Child Block Pushing Room Silver Rupee", "Spirit Temple Child Block Pushing Room Silver Rupee"}, ITEMTYPE_SILVERRUPEE, 0, true, &logic->noVariable, RHT_SPIRIT_TEMPLE_SILVER_RUPEE, RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, OBJECT_GI_RUPY, GID_RUPEE_GOLD, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_SILVER_RUPEE, MOD_RANDOMIZER); - itemTable[RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE].SetCustomDrawFunc(Randomizer_DrawSilverRupee); + itemTable[RG_SPIRIT_GATE_SILVER_RUPEE] = Item(RG_SPIRIT_GATE_SILVER_RUPEE, Text{ "Spirit Temple Child Gate Room Silver Rupee", "Spirit Temple Child Gate Room Silver Rupee", "Spirit Temple Child Gate Room Silver Rupee" }, ITEMTYPE_SILVERRUPEE, 0, true, &logic->noVariable, RHT_SPIRIT_TEMPLE_SILVER_RUPEE, RG_SPIRIT_GATE_SILVER_RUPEE, OBJECT_GI_RUPY, GID_RUPEE_GOLD, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_SILVER_RUPEE, MOD_RANDOMIZER); + itemTable[RG_SPIRIT_GATE_SILVER_RUPEE].SetCustomDrawFunc(Randomizer_DrawSilverRupee); + itemTable[RG_SPIRIT_BEAMOS_SILVER_RUPEE] = Item(RG_SPIRIT_BEAMOS_SILVER_RUPEE, Text{ "Spirit Temple Child Block Pushing Room Silver Rupee", "Spirit Temple Child Block Pushing Room Silver Rupee", "Spirit Temple Child Block Pushing Room Silver Rupee"}, ITEMTYPE_SILVERRUPEE, 0, true, &logic->noVariable, RHT_SPIRIT_TEMPLE_SILVER_RUPEE, RG_SPIRIT_BEAMOS_SILVER_RUPEE, OBJECT_GI_RUPY, GID_RUPEE_GOLD, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_SILVER_RUPEE, MOD_RANDOMIZER); + itemTable[RG_SPIRIT_BEAMOS_SILVER_RUPEE].SetCustomDrawFunc(Randomizer_DrawSilverRupee); itemTable[RG_SPIRIT_BOULDER_SILVER_RUPEE] = Item(RG_SPIRIT_BOULDER_SILVER_RUPEE, Text{ "Spirit Temple Boulder Room Silver Rupee", "Spirit Temple Boulder Room Silver Rupee", "Spirit Temple Boulder Room Silver Rupee"}, ITEMTYPE_SILVERRUPEE, 0, true, &logic->noVariable, RHT_SPIRIT_TEMPLE_SILVER_RUPEE, RG_SPIRIT_BOULDER_SILVER_RUPEE, OBJECT_GI_RUPY, GID_RUPEE_GOLD, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_SILVER_RUPEE, MOD_RANDOMIZER); itemTable[RG_SPIRIT_BOULDER_SILVER_RUPEE].SetCustomDrawFunc(Randomizer_DrawSilverRupee); itemTable[RG_SHADOW_SCYTHE_SILVER_RUPEE] = Item(RG_SHADOW_SCYTHE_SILVER_RUPEE, Text{ "Shadow Temple Scythe Room Silver Rupee", "Shadow Temple Scythe Room Silver Rupee", "Shadow Temple Scythe Room Silver Rupee"}, ITEMTYPE_SILVERRUPEE, 0, true, &logic->noVariable, RHT_SHADOW_TEMPLE_SILVER_RUPEE, RG_SHADOW_SCYTHE_SILVER_RUPEE, OBJECT_GI_RUPY, GID_RUPEE_GOLD, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_SILVER_RUPEE, MOD_RANDOMIZER); diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp index e56d958b5..55ebe5746 100644 --- a/soh/soh/Enhancements/randomizer/location_list.cpp +++ b/soh/soh/Enhancements/randomizer/location_list.cpp @@ -1550,17 +1550,17 @@ void Rando::StaticData::InitLocationTable() { locationTable[RC_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_4] = Location::Base(RC_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_4, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, 0, 0x0, "Whirlpool Room Silver Rupee 4", "GTG Whirlpool Room Silver Rupee 4", RHT_GERUDO_TRAINING_GROUND_TOILET_SILVER_RUPEE, RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_GERUDO_TRAINING_GROUND, RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_4)); locationTable[RC_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_5] = Location::Base(RC_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_5, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_GERUDO_TRAINING_GROUND, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, 0, 0x0, "Whirlpool Room Silver Rupee 5", "GTG Whirlpool Room Silver Rupee 5", RHT_GERUDO_TRAINING_GROUND_TOILET_SILVER_RUPEE, RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_GERUDO_TRAINING_GROUND, RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_5)); - locationTable[RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_1] = Location::Base(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_1, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 1", "Spirit Temple Child Gate Silver Rupee 1", RHT_SPIRIT_CHILD_GATE_SILVER_RUPEE, RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_1)); - locationTable[RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_2] = Location::Base(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_2, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 2", "Spirit Temple Child Gate Silver Rupee 2", RHT_SPIRIT_CHILD_GATE_SILVER_RUPEE, RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_2)); - locationTable[RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_3] = Location::Base(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_3, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 3", "Spirit Temple Child Gate Silver Rupee 3", RHT_SPIRIT_CHILD_GATE_SILVER_RUPEE, RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_3)); - locationTable[RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_4] = Location::Base(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_4, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 4", "Spirit Temple Child Gate Silver Rupee 4", RHT_SPIRIT_CHILD_GATE_SILVER_RUPEE, RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_4)); - locationTable[RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_5] = Location::Base(RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_5, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 5", "Spirit Temple Child Gate Silver Rupee 5", RHT_SPIRIT_CHILD_GATE_SILVER_RUPEE, RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_5)); + locationTable[RC_SPIRIT_GATE_SILVER_RUPEE_1] = Location::Base(RC_SPIRIT_GATE_SILVER_RUPEE_1, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 1", "Spirit Temple Child Gate Silver Rupee 1", RHT_SPIRIT_GATE_SILVER_RUPEE, RG_SPIRIT_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_GATE_SILVER_RUPEE_1)); + locationTable[RC_SPIRIT_GATE_SILVER_RUPEE_2] = Location::Base(RC_SPIRIT_GATE_SILVER_RUPEE_2, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 2", "Spirit Temple Child Gate Silver Rupee 2", RHT_SPIRIT_GATE_SILVER_RUPEE, RG_SPIRIT_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_GATE_SILVER_RUPEE_2)); + locationTable[RC_SPIRIT_GATE_SILVER_RUPEE_3] = Location::Base(RC_SPIRIT_GATE_SILVER_RUPEE_3, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 3", "Spirit Temple Child Gate Silver Rupee 3", RHT_SPIRIT_GATE_SILVER_RUPEE, RG_SPIRIT_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_GATE_SILVER_RUPEE_3)); + locationTable[RC_SPIRIT_GATE_SILVER_RUPEE_4] = Location::Base(RC_SPIRIT_GATE_SILVER_RUPEE_4, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 4", "Spirit Temple Child Gate Silver Rupee 4", RHT_SPIRIT_GATE_SILVER_RUPEE, RG_SPIRIT_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_GATE_SILVER_RUPEE_4)); + locationTable[RC_SPIRIT_GATE_SILVER_RUPEE_5] = Location::Base(RC_SPIRIT_GATE_SILVER_RUPEE_5, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Gate Silver Rupee 5", "Spirit Temple Child Gate Silver Rupee 5", RHT_SPIRIT_GATE_SILVER_RUPEE, RG_SPIRIT_GATE_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_GATE_SILVER_RUPEE_5)); - locationTable[RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1] = Location::Base(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Block Pushing Silver Rupee 1", "Spirit Child Block Pushing Silver Rupee 1", RHT_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1)); - locationTable[RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2] = Location::Base(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Block Pushing Silver Rupee 2", "Spirit Child Block Pushing Silver Rupee 2", RHT_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2)); - locationTable[RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3] = Location::Base(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Block Pushing Silver Rupee 3", "Spirit Child Block Pushing Silver Rupee 3", RHT_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3)); - locationTable[RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4] = Location::Base(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Block Pushing Silver Rupee 4", "Spirit Child Block Pushing Silver Rupee 4", RHT_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4)); - locationTable[RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5] = Location::Base(RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Child Block Pushing Silver Rupee 5", "Spirit Child Block Pushing Silver Rupee 5", RHT_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5)); + locationTable[RC_SPIRIT_BEAMOS_SILVER_RUPEE_1] = Location::Base(RC_SPIRIT_BEAMOS_SILVER_RUPEE_1, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Beamos Room Silver Rupee 1", "Spirit Beamos Room Silver Rupee 1", RHT_SPIRIT_BEAMOS_SILVER_RUPEE, RG_SPIRIT_BEAMOS_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_1)); + locationTable[RC_SPIRIT_BEAMOS_SILVER_RUPEE_2] = Location::Base(RC_SPIRIT_BEAMOS_SILVER_RUPEE_2, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Beamos Room Silver Rupee 2", "Spirit Beamos Room Silver Rupee 2", RHT_SPIRIT_BEAMOS_SILVER_RUPEE, RG_SPIRIT_BEAMOS_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_2)); + locationTable[RC_SPIRIT_BEAMOS_SILVER_RUPEE_3] = Location::Base(RC_SPIRIT_BEAMOS_SILVER_RUPEE_3, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Beamos Room Silver Rupee 3", "Spirit Beamos Room Silver Rupee 3", RHT_SPIRIT_BEAMOS_SILVER_RUPEE, RG_SPIRIT_BEAMOS_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_3)); + locationTable[RC_SPIRIT_BEAMOS_SILVER_RUPEE_4] = Location::Base(RC_SPIRIT_BEAMOS_SILVER_RUPEE_4, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Beamos Room Silver Rupee 4", "Spirit Beamos Room Silver Rupee 4", RHT_SPIRIT_BEAMOS_SILVER_RUPEE, RG_SPIRIT_BEAMOS_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_4)); + locationTable[RC_SPIRIT_BEAMOS_SILVER_RUPEE_5] = Location::Base(RC_SPIRIT_BEAMOS_SILVER_RUPEE_5, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Beamos Room Silver Rupee 5", "Spirit Beamos Room Silver Rupee 5", RHT_SPIRIT_BEAMOS_SILVER_RUPEE, RG_SPIRIT_BEAMOS_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_5)); locationTable[RC_SPIRIT_BOULDER_SILVER_RUPEE_1] = Location::Base(RC_SPIRIT_BOULDER_SILVER_RUPEE_1, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Boulder Room Silver Rupee 1", "Spirit Boulder Room Silver Rupee 1", RHT_SPIRIT_BOULDER_SILVER_RUPEE, RG_SPIRIT_BOULDER_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_1)); locationTable[RC_SPIRIT_BOULDER_SILVER_RUPEE_2] = Location::Base(RC_SPIRIT_BOULDER_SILVER_RUPEE_2, RCQUEST_VANILLA, RCTYPE_SILVER_RUPEE, RCAREA_SPIRIT_TEMPLE, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, 0, 0x0, "Boulder Room Silver Rupee 2", "Spirit Boulder Room Silver Rupee 2", RHT_SPIRIT_BOULDER_SILVER_RUPEE, RG_SPIRIT_BOULDER_SILVER_RUPEE, {Category::cSilverRupee}, SpoilerCollectionCheck::RandomizerInf(SCENE_SPIRIT_TEMPLE, RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_2)); diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h index 7019c70c3..ed0bd7e81 100644 --- a/soh/soh/Enhancements/randomizer/randomizerTypes.h +++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h @@ -1327,16 +1327,16 @@ typedef enum { RC_SPIRIT_TEMPLE_NEAR_FOUR_ARMOS_CHEST, RC_SPIRIT_TEMPLE_HALLWAY_RIGHT_INVISIBLE_CHEST, RC_SPIRIT_TEMPLE_HALLWAY_LEFT_INVISIBLE_CHEST, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_1, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_2, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_3, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_4, - RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_5, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4, - RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5, + RC_SPIRIT_GATE_SILVER_RUPEE_1, + RC_SPIRIT_GATE_SILVER_RUPEE_2, + RC_SPIRIT_GATE_SILVER_RUPEE_3, + RC_SPIRIT_GATE_SILVER_RUPEE_4, + RC_SPIRIT_GATE_SILVER_RUPEE_5, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_1, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_2, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_3, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_4, + RC_SPIRIT_BEAMOS_SILVER_RUPEE_5, RC_SPIRIT_BOULDER_SILVER_RUPEE_1, RC_SPIRIT_BOULDER_SILVER_RUPEE_2, RC_SPIRIT_BOULDER_SILVER_RUPEE_3, @@ -2116,8 +2116,8 @@ typedef enum { RG_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE, RG_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE, RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE, - RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, - RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, + RG_SPIRIT_GATE_SILVER_RUPEE, + RG_SPIRIT_BEAMOS_SILVER_RUPEE, RG_SPIRIT_BOULDER_SILVER_RUPEE, RG_SHADOW_SCYTHE_SILVER_RUPEE, RG_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE, @@ -3156,8 +3156,8 @@ typedef enum { RHT_GERUDO_TRAINING_GROUND_BOULDER_SILVER_RUPEE, RHT_GERUDO_TRAINING_GROUND_LAVA_SILVER_RUPEE, RHT_GERUDO_TRAINING_GROUND_TOILET_SILVER_RUPEE, - RHT_SPIRIT_CHILD_GATE_SILVER_RUPEE, - RHT_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, + RHT_SPIRIT_GATE_SILVER_RUPEE, + RHT_SPIRIT_BEAMOS_SILVER_RUPEE, RHT_SPIRIT_BOULDER_SILVER_RUPEE, RHT_SHADOW_SPINNING_SCYTHE_SILVER_RUPEE, RHT_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE, diff --git a/soh/soh/Enhancements/randomizer/randomizer_inf.h b/soh/soh/Enhancements/randomizer/randomizer_inf.h index 60fd2366c..4a9b53445 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_inf.h +++ b/soh/soh/Enhancements/randomizer/randomizer_inf.h @@ -296,16 +296,16 @@ typedef enum { RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_3, RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_4, RAND_INF_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_5, - RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_1, - RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_2, - RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_3, - RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_4, - RAND_INF_SPIRIT_CHILD_GATE_SILVER_RUPEE_5, - RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1, - RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2, - RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3, - RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4, - RAND_INF_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5, + RAND_INF_SPIRIT_GATE_SILVER_RUPEE_1, + RAND_INF_SPIRIT_GATE_SILVER_RUPEE_2, + RAND_INF_SPIRIT_GATE_SILVER_RUPEE_3, + RAND_INF_SPIRIT_GATE_SILVER_RUPEE_4, + RAND_INF_SPIRIT_GATE_SILVER_RUPEE_5, + RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_1, + RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_2, + RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_3, + RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_4, + RAND_INF_SPIRIT_BEAMOS_SILVER_RUPEE_5, RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_1, RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_2, RAND_INF_SPIRIT_BOULDER_SILVER_RUPEE_3, diff --git a/soh/soh/Enhancements/randomizer/silver_rupee.cpp b/soh/soh/Enhancements/randomizer/silver_rupee.cpp index 84032a55d..5aec18ae7 100644 --- a/soh/soh/Enhancements/randomizer/silver_rupee.cpp +++ b/soh/soh/Enhancements/randomizer/silver_rupee.cpp @@ -12,8 +12,8 @@ namespace Rando { { { SCENE_GERUDO_TRAINING_GROUND, RCQUEST_VANILLA, 348 }, RG_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE }, { { SCENE_GERUDO_TRAINING_GROUND, RCQUEST_VANILLA, 332 }, RG_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE }, { { SCENE_GERUDO_TRAINING_GROUND, RCQUEST_VANILLA, 347 }, RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, 325 }, RG_SPIRIT_CHILD_GATE_SILVER_RUPEE }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, 330 }, RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, 325 }, RG_SPIRIT_GATE_SILVER_RUPEE }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, 330 }, RG_SPIRIT_BEAMOS_SILVER_RUPEE }, { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, 322 }, RG_SPIRIT_BOULDER_SILVER_RUPEE }, { { SCENE_SHADOW_TEMPLE, RCQUEST_VANILLA, 321 }, RG_SHADOW_SCYTHE_SILVER_RUPEE }, { { SCENE_SHADOW_TEMPLE, RCQUEST_VANILLA, 329 }, RG_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE }, @@ -68,16 +68,16 @@ namespace Rando { { { SCENE_GERUDO_TRAINING_GROUND, RCQUEST_VANILLA, { 2453.0f, -890.0f, -1612.0f } }, RC_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_3 }, { { SCENE_GERUDO_TRAINING_GROUND, RCQUEST_VANILLA, { 2497.0f, -605.0f, -1465.0f } }, RC_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_4 }, { { SCENE_GERUDO_TRAINING_GROUND, RCQUEST_VANILLA, { 2308.0f, -961.0f, -1464.0f } }, RC_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE_5 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -335.0f, 30.0f, -1409.0f } }, RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_1 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -347.0f, 229.0f, -1075.0f } }, RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_2 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -511.0f, 50.0f, -1075.0f } }, RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_3 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -672.0f, 50.0f, -1075.0f } }, RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_4 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -766.0f, 229.0f, -1075.0f } }, RC_SPIRIT_CHILD_GATE_SILVER_RUPEE_5 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -984.0f, 923.0f, -450.0f } }, RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_1 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -1123.0f, 923.0f, 428.0f } }, RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_2 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -1275.0f, 922.0f, -247.0f } }, RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_3 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -1433.0f, 913.0f, -283.0f } }, RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_4 }, - { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -1836.0f, 923.0f, -446.0f } }, RC_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE_5 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -335.0f, 30.0f, -1409.0f } }, RC_SPIRIT_GATE_SILVER_RUPEE_1 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -347.0f, 229.0f, -1075.0f } }, RC_SPIRIT_GATE_SILVER_RUPEE_2 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -511.0f, 50.0f, -1075.0f } }, RC_SPIRIT_GATE_SILVER_RUPEE_3 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -672.0f, 50.0f, -1075.0f } }, RC_SPIRIT_GATE_SILVER_RUPEE_4 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -766.0f, 229.0f, -1075.0f } }, RC_SPIRIT_GATE_SILVER_RUPEE_5 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -984.0f, 923.0f, -450.0f } }, RC_SPIRIT_BEAMOS_SILVER_RUPEE_1 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -1123.0f, 923.0f, 428.0f } }, RC_SPIRIT_BEAMOS_SILVER_RUPEE_2 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -1275.0f, 922.0f, -247.0f } }, RC_SPIRIT_BEAMOS_SILVER_RUPEE_3 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -1433.0f, 913.0f, -283.0f } }, RC_SPIRIT_BEAMOS_SILVER_RUPEE_4 }, + { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { -1836.0f, 923.0f, -446.0f } }, RC_SPIRIT_BEAMOS_SILVER_RUPEE_5 }, { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { 1573.0f, -33.0f, -920.0f } }, RC_SPIRIT_BOULDER_SILVER_RUPEE_1 }, { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { 1856.0f, -33.0f, -1219.0f } }, RC_SPIRIT_BOULDER_SILVER_RUPEE_2 }, { { SCENE_SPIRIT_TEMPLE, RCQUEST_VANILLA, { 1856.0f, -33.0f, -944.0f } }, RC_SPIRIT_BOULDER_SILVER_RUPEE_3 }, @@ -198,8 +198,8 @@ namespace Rando { { RG_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE, { "Boulder Maze in the Gerudo Training Grounds", "Boulder Maze in the Gerudo Training Grounds", "Boulder Maze in the Gerudo Training Grounds" } }, { RG_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE, { "Lava room in the Gerudo Training Grounds", "Lava room in the Gerudo Training Grounds", "Lava room in the Gerudo Training Grounds" } }, { RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE, { "Whirlpool room in the Gerudo Training Grounds", "Whirlpool room in the Gerudo Training Grounds", "Whirlpool room in the Gerudo Training Grounds" } }, - { RG_SPIRIT_CHILD_GATE_SILVER_RUPEE, { "Child-side Gate room in the Spirit Temple", "Child-side Gate room in the Spirit Temple", "Child-side Gate room in the Spirit Temple" } }, - { RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE, { "Child-side Block Pushing room in the Spirit Temple", "Child-side Block Pushing room in the Spirit Temple", "Child-side Block Pushing room in the Spirit Temple" } }, + { RG_SPIRIT_GATE_SILVER_RUPEE, { "Gate room in the Spirit Temple", "Gate room in the Spirit Temple", "Gate room in the Spirit Temple" } }, + { RG_SPIRIT_BEAMOS_SILVER_RUPEE, { "Beamos room in the Spirit Temple", "Beamos room in the Spirit Temple", "Beamos room in the Spirit Temple" } }, { RG_SPIRIT_BOULDER_SILVER_RUPEE, { "Boulder room in the Spirit Temple", "Boulder room in the Spirit Temple", "Boulder room in the Spirit Temple" } }, { RG_SHADOW_SCYTHE_SILVER_RUPEE, { "Spinning Scythes room in the Shadow Temple", "Spinning Scythes room in the Shadow Temple", "Spinning Scythes room in the Shadow Temple" } }, { RG_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE, { "door to the Falling Spikes room in the Shadow Temple", "door to the Falling Spikes room in the Shadow Temple", "door to the Falling Spikes room in the Shadow Temple" } }, @@ -231,7 +231,7 @@ namespace Rando { SilverRupeesInfo(5, RG_GERUDO_TRAINING_GROUNDS_BOULDER_SILVER_RUPEE), SilverRupeesInfo(5, RG_GERUDO_TRAINING_GROUNDS_LAVA_SILVER_RUPEE), SilverRupeesInfo(5, RG_GERUDO_TRAINING_GROUNDS_TOILET_SILVER_RUPEE), - SilverRupeesInfo(5, RG_SPIRIT_CHILD_BLOCK_PUSH_SILVER_RUPEE), + SilverRupeesInfo(5, RG_SPIRIT_BEAMOS_SILVER_RUPEE), SilverRupeesInfo(5, RG_SPIRIT_BOULDER_SILVER_RUPEE), SilverRupeesInfo(5, RG_SHADOW_SCYTHE_SILVER_RUPEE), SilverRupeesInfo(5, RG_SHADOW_OUTSIDE_SPIKE_RAIN_SILVER_RUPEE),