github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a seed gen bug surrounding new area enum (#3497)

Browse source 
* Fix a seed gen bug surrounding new area enum

* Sets areas after shuffling entrances.
This commit is contained in:
Christopher Leggett 2023-12-08 13:07:27 -05:00 • committed by GitHub
commit 65d893bc85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/3drando/fill.cpp
View file

@ -1026,6 +1026,7 @@ int Fill() {
} }
printf("\x1b[7;32HDone"); printf("\x1b[7;32HDone");
} }
SetAreas();
//erase temporary shop items //erase temporary shop items
FilterAndEraseFromPool(ItemPool, [](const auto item) { return Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_SHOP; }); FilterAndEraseFromPool(ItemPool, [](const auto item) { return Rando::StaticData::RetrieveItem(item).GetItemType() == ITEMTYPE_SHOP; });
@ -1137,7 +1138,6 @@ int Fill() {
if(ctx->playthroughBeatable && !placementFailure) { if(ctx->playthroughBeatable && !placementFailure) {
printf("Done"); printf("Done");
printf("\x1b[9;10HCalculating Playthrough..."); printf("\x1b[9;10HCalculating Playthrough...");
SetAreas();
PareDownPlaythrough(); PareDownPlaythrough();
CalculateWotH(); CalculateWotH();
CalculateBarren(); CalculateBarren();

2
soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
View file

@ -30,7 +30,7 @@ int Playthrough_Init(uint32_t seed, std::unordered_map<RandomizerSettingKey, uin
std::string settingsStr; std::string settingsStr;
for (const Rando::OptionGroup& optionGroup : ctx->GetSettings()->GetOptionGroups()) { for (const Rando::OptionGroup& optionGroup : ctx->GetSettings()->GetOptionGroups()) {
// don't go through non-menus // don't go through non-menus
if (optionGroup.GetContainsType() != Rando::OptionGroupType::SUBGROUP) { if (optionGroup.GetContainsType() == Rando::OptionGroupType::SUBGROUP) {
continue; continue;
} }