mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-13 04:29:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Bugfix] Skull house checks showing as 0 rupees in tracker (#6822)

Browse Source
This commit is contained in:
Chris
2026-06-27 15:58:50 -04:00
committed by GitHub
parent 3ac67f14cc
commit 2ba368e7e7
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/item_location.cpp
+5
View File
@@ -126,6 +126,11 @@ bool ItemLocation::HasCustomPrice() const {
return hasCustomPrice; return hasCustomPrice;
} }
bool ItemLocation::CanBePurchased() const {
const RandomizerCheckType checkType = StaticData::GetLocation(rc)->GetRCType();
return checkType == RCTYPE_SHOP || checkType == RCTYPE_SCRUB || checkType == RCTYPE_MERCHANT;
}
void ItemLocation::SetCustomPrice(const uint16_t price_) { void ItemLocation::SetCustomPrice(const uint16_t price_) {
price = price_; price = price_;
hasCustomPrice = true; hasCustomPrice = true;
soh/soh/Enhancements/randomizer/item_location.h
+1
View File
@@ -32,6 +32,7 @@ class ItemLocation {
void SetPrice(uint16_t price_); void SetPrice(uint16_t price_);
bool HasCustomPrice() const; bool HasCustomPrice() const;
void SetCustomPrice(uint16_t price_); void SetCustomPrice(uint16_t price_);
bool CanBePurchased() const;
bool HasObtained() const; bool HasObtained() const;
void SetCheckStatus(RandomizerCheckStatus status_); void SetCheckStatus(RandomizerCheckStatus status_);
RandomizerCheckStatus GetCheckStatus(); RandomizerCheckStatus GetCheckStatus();
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+1 -1
View File
@@ -2073,7 +2073,7 @@ void DrawLocation(RandomizerCheck rc) {
} else if (revealItemName) { } else if (revealItemName) {
txt = itemLoc->GetPlacedItem().GetName().GetForLanguage(gSaveContext.language); txt = itemLoc->GetPlacedItem().GetName().GetForLanguage(gSaveContext.language);
} }
if (IsVisibleInCheckTracker(rc) && status == RCSHOW_IDENTIFIED) { if (itemLoc->CanBePurchased() && IsVisibleInCheckTracker(rc) && status == RCSHOW_IDENTIFIED) {
auto price = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetPrice(); auto price = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)->GetPrice();
txt = !txt.empty() ? fmt::format("{} - {}", txt, price) : fmt::format("{}", price); txt = !txt.empty() ? fmt::format("{} - {}", txt, price) : fmt::format("{}", price);
} }