mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-30 15:00:13 -05:00
Code Issues Projects Releases Wiki Activity

neither pocket nor gift should be listed in dungeonRewardLocations

Browse Source
This commit is contained in:
Demur Rumed 2025-01-25 15:04:00 +00:00
parent d788eed2be
commit f00c142fc9
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
soh/soh/Enhancements/randomizer/3drando/fill.cpp
View File

@ -900,7 +900,6 @@ static void AssumedFill(const std::vector<RandomizerGet>& items, const std::vect
//setting, or randomize one dungeon reward to Link's Pocket if that setting is on //setting, or randomize one dungeon reward to Link's Pocket if that setting is on
static void RandomizeDungeonRewards() { static void RandomizeDungeonRewards() {
auto ctx = Rando::Context::GetInstance(); auto ctx = Rando::Context::GetInstance();
std::array<uint32_t, 9> rDungeonRewardOverrides{};
//quest item bit mask of each stone/medallion for the savefile //quest item bit mask of each stone/medallion for the savefile
// static constexpr std::array<uint32_t, 9> bitMaskTable = { // static constexpr std::array<uint32_t, 9> bitMaskTable = {
// 0x00040000, //Kokiri Emerald // 0x00040000, //Kokiri Emerald
@ -920,22 +919,20 @@ static void RandomizeDungeonRewards() {
//get stones and medallions //get stones and medallions
std::vector<RandomizerGet> rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;}); std::vector<RandomizerGet> rewards = FilterAndEraseFromPool(ItemPool, [](const auto i) {return Rando::StaticData::RetrieveItem(i).GetItemType() == ITEMTYPE_DUNGEONREWARD;});
// If there are less than 9 dungeon rewards, prioritize actual dungeons for placement over Gift from Rauru
if (rewards.size() < 9) {
ctx->PlaceItemInLocation(RC_GIFT_FROM_RAURU, RG_GREEN_RUPEE);
}
if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) { // Place dungeon rewards in vanilla locations if (ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_VANILLA) || ctx->GetOption(RSK_SHUFFLE_DUNGEON_REWARDS).Is(RO_DUNGEON_REWARDS_VANILLA)) { // Place dungeon rewards in vanilla locations
for (RandomizerCheck loc : Rando::StaticData::dungeonRewardLocations) { for (RandomizerCheck loc : Rando::StaticData::dungeonRewardLocations) {
ctx->GetItemLocation(loc)->PlaceVanillaItem(); ctx->GetItemLocation(loc)->PlaceVanillaItem();
} }
ctx->GetItemLocation(RC_GIFT_FROM_RAURU)->PlaceVanillaItem();
} else { // Randomize dungeon rewards with assumed fill } else { // Randomize dungeon rewards with assumed fill
AssumedFill(rewards, Rando::StaticData::dungeonRewardLocations); std::vector rewardLocations(Rando::StaticData::dungeonRewardLocations);
} // If there are less than 9 dungeon rewards, prioritize actual dungeons for placement
if (rewards.size() < 9) {
for (size_t i = 0; i < Rando::StaticData::dungeonRewardLocations.size(); i++) { ctx->PlaceItemInLocation(RC_LINKS_POCKET, RG_GREEN_RUPEE);
const auto index = ctx->GetItemLocation(Rando::StaticData::dungeonRewardLocations[i])->GetPlacedItem().GetItemID() - baseOffset; } else {
rDungeonRewardOverrides[i] = index; rewardLocations.push_back(RC_LINKS_POCKET);
}
AssumedFill(rewards, rewardLocations);
} }
} else if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_DUNGEON_REWARD)) { } else if (ctx->GetOption(RSK_LINKS_POCKET).Is(RO_LINKS_POCKET_DUNGEON_REWARD)) {
//get 1 stone/medallion //get 1 stone/medallion

1
soh/soh/Enhancements/randomizer/context.cpp
View File

@ -215,6 +215,7 @@ void Context::ItemReset() {
GetItemLocation(il)->ResetVariables(); GetItemLocation(il)->ResetVariables();
} }
GetItemLocation(RC_GIFT_FROM_RAURU)->ResetVariables();
GetItemLocation(RC_LINKS_POCKET)->ResetVariables(); GetItemLocation(RC_LINKS_POCKET)->ResetVariables();
} }

4
soh/soh/Enhancements/randomizer/location_list.cpp
View File

@ -8,8 +8,8 @@ std::multimap<std::tuple<s16, s16, s32>, RandomizerCheck> Rando::StaticData::Che
std::vector<RandomizerCheck> Rando::StaticData::dungeonRewardLocations = { std::vector<RandomizerCheck> Rando::StaticData::dungeonRewardLocations = {
// Bosses // Bosses
RC_QUEEN_GOHMA, RC_KING_DODONGO, RC_BARINADE, RC_GIFT_FROM_RAURU, RC_QUEEN_GOHMA, RC_KING_DODONGO, RC_BARINADE,
RC_PHANTOM_GANON, RC_VOLVAGIA, RC_MORPHA, RC_TWINROVA, RC_BONGO_BONGO, RC_PHANTOM_GANON, RC_VOLVAGIA, RC_MORPHA, RC_TWINROVA, RC_BONGO_BONGO,
}; };
using namespace Rando; using namespace Rando;