Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 13:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved the item location price availability.

Browse source
This commit is contained in:
Anthony Stewart 2025-04-22 21:05:27 -05:00
parent 3c4f38e2f0
commit 243f7e1aa0
2 changed files with 79 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/soh/Enhancements/randomizer/3drando/fill.hpp
View file

@ -70,4 +70,9 @@ void GeneratePlaythrough();
bool CheckBeatable(RandomizerGet ignore=RG_NONE); bool CheckBeatable(RandomizerGet ignore=RG_NONE);
void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess); void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess);
struct PriceSettingsStruct;
extern PriceSettingsStruct shopsanityPrices;
extern PriceSettingsStruct scrubPrices;
extern PriceSettingsStruct merchantPrices;

77
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View file

@ -12,6 +12,7 @@
#include "entrance.h" #include "entrance.h"
#include "location_access.h" #include "location_access.h"
#include "3drando/fill.hpp" #include "3drando/fill.hpp"
#include "3drando/shops.hpp"
#include "soh/Enhancements/debugger/performanceTimer.h" #include "soh/Enhancements/debugger/performanceTimer.h"
#include <string> #include <string>
@ -1958,6 +1959,68 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName,
UIWidgets::PopStyleCombobox(); UIWidgets::PopStyleCombobox();
} }
static RandomizerGet PriceToWallet(uint16_t price) {
if (price <= 0) {
return RG_NONE;
} else if (price <= 99) {
return RG_CHILD_WALLET;
} else if (price <= 200) {
return RG_ADULT_WALLET;
} else if (price <= 500) {
return RG_GIANT_WALLET;
} else if (price <= 999) {
return RG_TYCOON_WALLET;
} else {
return RG_WALLET_INF;
}
}
// Location RCType should be RCTYPE_SHOP, RCTYPE_SCRUB, or RCTYPE_MERCHANT
static RandomizerGet GetMiniumWalletRequirement(const Rando::Location* loc) {
PriceSettingsStruct priceSettings = loc->GetRCType() == RCTYPE_SHOP ? shopsanityPrices
: loc->GetRCType() == RCTYPE_SCRUB ? scrubPrices
: merchantPrices;
auto ctx = Rando::Context::GetInstance();
switch (ctx->GetOption(priceSettings.main).Get()) {
case RO_PRICE_VANILLA: {
uint16_t vanillaPrice = loc->GetVanillaPrice();
return PriceToWallet(vanillaPrice);
}
case RO_PRICE_CHEAP_BALANCED:
return RG_NONE;
case RO_PRICE_BALANCED:
return RG_NONE;
case RO_PRICE_FIXED: {
uint16_t fixedPrice = ctx->GetOption(priceSettings.fixedPrice).Get() * 5;
return PriceToWallet(fixedPrice);
}
case RO_PRICE_RANGE: {
uint16_t range1 = ctx->GetOption(priceSettings.range1).Get() * 5;
uint16_t range2 = ctx->GetOption(priceSettings.range1).Get() * 5;
return PriceToWallet(range1 < range2 ? range1 : range2);
}
case RO_PRICE_SET_BY_WALLET: {
bool includeTycoon = ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET).Get();
if (ctx->GetOption(priceSettings.noWallet).Get()) {
return RG_NONE;
} else if (ctx->GetOption(priceSettings.childWallet).Get()) {
return RG_CHILD_WALLET;
} else if (ctx->GetOption(priceSettings.adultWallet).Get()) {
return RG_ADULT_WALLET;
} else if (ctx->GetOption(priceSettings.giantWallet).Get()) {
return RG_GIANT_WALLET;
} else if (includeTycoon && ctx->GetOption(priceSettings.tycoonWallet).Get()) {
return RG_TYCOON_WALLET;
} else {
return RG_WALLET_INF;
}
}
default:
return RG_NONE;
}
}
void RecalculateAvailableChecks() { void RecalculateAvailableChecks() {
if (!enableAvailableChecks) { if (!enableAvailableChecks) {
return; return;
@ -1967,7 +2030,7 @@ void RecalculateAvailableChecks() {
StartPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS); StartPerformanceTimer(PT_RECALCULATE_AVAILABLE_CHECKS);
std::vector<RandomizerCheck> targetLocations; std::vector<RandomizerCheck> targetLocations;
targetLocations.reserve(RR_MAX); targetLocations.reserve(RC_MAX);
for (auto& location : Rando::StaticData::GetLocationTable()) { for (auto& location : Rando::StaticData::GetLocationTable()) {
RandomizerCheck rc = location.GetRandomizerCheck(); RandomizerCheck rc = location.GetRandomizerCheck();
Rando::ItemLocation* itemLocation = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc); Rando::ItemLocation* itemLocation = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
@ -1981,9 +2044,15 @@ void RecalculateAvailableChecks() {
for (auto& rc : availableChecks) { for (auto& rc : availableChecks) {
const auto& location = Rando::StaticData::GetLocation(rc); const auto& location = Rando::StaticData::GetLocation(rc);
const auto& itemLocation = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc); const auto& itemLocation = OTRGlobals::Instance->gRandoContext->GetItemLocation(rc);
if (location->GetRCType() == RCTYPE_SHOP && itemLocation->GetCheckStatus() == RCSHOW_IDENTIFIED) {
if (CanBuyAnother(rc)) { if (location->GetRCType() == RCTYPE_SHOP || location->GetRCType() == RCTYPE_SCRUB ||
itemLocation->SetAvailable(true); location->GetRCType() == RCTYPE_MERCHANT) {
if (itemLocation->GetCheckStatus() != RCSHOW_IDENTIFIED) {
auto minimumWallet = GetMiniumWalletRequirement(location);
itemLocation->SetAvailable(minimumWallet == RG_NONE || logic->HasItem(minimumWallet));
} else {
auto requiredWallet = PriceToWallet(itemLocation->GetPrice());
itemLocation->SetAvailable(requiredWallet == RG_NONE || logic->HasItem(requiredWallet));
} }
} else { } else {
itemLocation->SetAvailable(true); itemLocation->SetAvailable(true);