mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-21 23:01:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in hints (#7046)

Browse Source 
1. fix filtering trials hints when only 1-3 required
2. clearing names per iteration won't work with dual hints
This commit is contained in:
Philip Dubé
2026-08-09 02:07:06 +00:00
committed by GitHub
parent 5ecff16bdb
commit af485bf64c
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/3drando/hints.cpp
+2 -2
View File
@@ -480,8 +480,8 @@ static void CreateTrialHints(uint8_t copies) {
ctx->GetTrials()->GetTrialList(); // there's probably a way to remove this assignment ctx->GetTrials()->GetTrialList(); // there's probably a way to remove this assignment
if (ctx->GetOption(RSK_TRIAL_COUNT).Get() >= 4) { // 4 or 5 required trials, get skipped trials if (ctx->GetOption(RSK_TRIAL_COUNT).Get() >= 4) { // 4 or 5 required trials, get skipped trials
trials = FilterFromPool(trials, [](TrialInfo* trial) { return trial->IsSkipped(); }); trials = FilterFromPool(trials, [](TrialInfo* trial) { return trial->IsSkipped(); });
} else { // 1 to 3 trials, get requried trials } else { // 1 to 3 trials, get required trials
auto requiredTrials = FilterFromPool(trials, [](TrialInfo* trial) { return trial->IsRequired(); }); trials = FilterFromPool(trials, [](TrialInfo* trial) { return trial->IsRequired(); });
} }
for (auto& trial : trials) { // create a hint for each hinted trial for (auto& trial : trials) { // create a hint for each hinted trial
AddGossipStoneHintCopies(copies, HINT_TYPE_TRIAL, "Trial", {}, {}, {}, { trial->GetTrialKey() }); AddGossipStoneHintCopies(copies, HINT_TYPE_TRIAL, "Trial", {}, {}, {}, { trial->GetTrialKey() });
soh/soh/Enhancements/randomizer/hint.cpp
+4 -3
View File
@@ -181,9 +181,10 @@ void Hint::NamesChosen() {
} }
if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_ITEM_AREA) { if (hintType == HINT_TYPE_ITEM || hintType == HINT_TYPE_ITEM_AREA) {
namesTemp.clear();
saveNames = false;
for (size_t c = 0; c < locations.size(); c++) { for (size_t c = 0; c < locations.size(); c++) {
namesTemp = {};
saveNames = false;
uint8_t selection = GetRandomHintTextEntry(GetItemHintText(static_cast<u8>(c))); uint8_t selection = GetRandomHintTextEntry(GetItemHintText(static_cast<u8>(c)));
if (selection > 0) { if (selection > 0) {
saveNames = true; saveNames = true;
@@ -197,7 +198,7 @@ void Hint::NamesChosen() {
if (hintType == HINT_TYPE_FOOLISH || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_WOTH || if (hintType == HINT_TYPE_FOOLISH || hintType == HINT_TYPE_ITEM_AREA || hintType == HINT_TYPE_WOTH ||
hintType == HINT_TYPE_ALTAR_CHILD || hintType == HINT_TYPE_ALTAR_ADULT) { hintType == HINT_TYPE_ALTAR_CHILD || hintType == HINT_TYPE_ALTAR_ADULT) {
namesTemp = {}; namesTemp.clear();
saveNames = false; saveNames = false;
for (uint8_t c = 0; c < areas.size(); c++) { for (uint8_t c = 0; c < areas.size(); c++) {
soh/soh/resource/type/Scene.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
namespace SOH { namespace SOH {
void* Scene::GetPointer() { void* Scene::GetPointer() {
// Scene is a special type that requries C++ processing. As such, we return nothing. // Scene is a special type that requires C++ processing. As such, we return nothing.
return nullptr; return nullptr;
} }