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

Skip CanBuy check when calculating accessible checks, it spoils that some items can't be bought with the current wallet.

Browse source
This commit is contained in:
Anthony Stewart 2025-02-22 16:34:48 -06:00
commit 999de5b369
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -398,7 +398,7 @@ bool AddCheckToLogic(LocationAccess& locPair, GetAccessibleLocationsStruct& gals
Rando::ItemLocation* location = ctx->GetItemLocation(loc); Rando::ItemLocation* location = ctx->GetItemLocation(loc);
RandomizerGet locItem = location->GetPlacedRandomizerGet(); RandomizerGet locItem = location->GetPlacedRandomizerGet();
if (!location->IsAddedToPool() && locPair.ConditionsMet(parentRegion)) { if (!location->IsAddedToPool() && locPair.ConditionsMet(parentRegion, gals.calculatingAccessibleChecks)) {
location->AddToPool(); location->AddToPool();
if (gals.calculatingAccessibleChecks) { if (gals.calculatingAccessibleChecks) {

4
soh/soh/Enhancements/randomizer/location_access.cpp
View file

@ -27,7 +27,7 @@ bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
return GetConditionsMet(); return GetConditionsMet();
} }
bool LocationAccess::ConditionsMet(Region* parentRegion) const { bool LocationAccess::ConditionsMet(Region* parentRegion, bool calculatingAccessibleChecks) const {
//WARNING enterance validation can run this after resetting the access for sphere 0 validation //WARNING enterance validation can run this after resetting the access for sphere 0 validation
//When refactoring ToD access, either fix the above or do not assume that we //When refactoring ToD access, either fix the above or do not assume that we
//have any access at all just because this is being run //have any access at all just because this is being run
@ -42,7 +42,7 @@ bool LocationAccess::ConditionsMet(Region* parentRegion) const {
conditionsMet = true; conditionsMet = true;
} }
return conditionsMet && CanBuy(); return conditionsMet && (calculatingAccessibleChecks || CanBuy());
} }
bool LocationAccess::CanBuy() const { bool LocationAccess::CanBuy() const {

2
soh/soh/Enhancements/randomizer/location_access.h
View file

@ -75,7 +75,7 @@ class LocationAccess {
bool CheckConditionAtAgeTime(bool& age, bool& time) const; bool CheckConditionAtAgeTime(bool& age, bool& time) const;
bool ConditionsMet(Region* parentRegion) const; bool ConditionsMet(Region* parentRegion, bool calculatingAccessibleChecks) const;
RandomizerCheck GetLocation() const { RandomizerCheck GetLocation() const {
return location; return location;