mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix better bombchu shopping

This commit is contained in:
Pepper0ni 2024-05-10 18:23:31 +01:00
parent d3ba90a893
commit 335ee6daea
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/OTRGlobals.cpp
View File

@ -2775,7 +2775,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
messageEntry.Replace("[[gsCount]]", std::to_string(gsCount));
}
} else if ((IS_RANDO || CVarGetInteger("gBetterBombchuShopping", 0)) &&
} else if ((IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("gBetterBombchuShopping"), 0)) &&
(textId == TEXT_BUY_BOMBCHUS_10_DESC || textId == TEXT_BUY_BOMBCHUS_10_PROMPT)) {
messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
} else if (textId == TEXT_HEART_CONTAINER && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts"), 0)) {

10
soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View File

@ -329,7 +329,7 @@ void EnGirlA_SetupAction(EnGirlA* this, EnGirlAActionFunc func) {
// #region SOH [Enhancement] [Randomizer]
s32 EnGirlA_TryChangeShopItemShip(EnGirlA* this, PlayState* play) {
if (!(IS_RANDO || CVarGetInteger("gBetterBombchuShopping", 0))){
if (!(IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("gBetterBombchuShopping"), 0))){
switch (this->actor.params) {
case SI_BOMBCHU_10_2:
if (Flags_GetItemGetInf(ITEMGETINF_06)) {
@ -516,7 +516,7 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
void EnGirlA_Init(Actor* thisx, PlayState* play) {
// #region [Randomizer] [Enhancment]
if (IS_RANDO || CVarGetInteger("gBetterBombchuShopping", 0)){
if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("gBetterBombchuShopping"), 0)){
EnGirlA* this = (EnGirlA*)thisx;
EnGirlA_TryChangeShopItemShip(this, play);
@ -1105,7 +1105,7 @@ void EnGirlA_BuyEvent_ObtainBombchuPack(PlayState* play, EnGirlA* this) {
// Normally, buying a bombchu pack sets a flag indicating the pack is now sold out
// If they're in logic for rando, skip setting that flag so they can be purchased repeatedly
// #region [Enhancment]
if (IS_RANDO || CVarGetInteger("gBetterBombchuShopping", 0)) {
if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("gBetterBombchuShopping"), 0)) {
return;
}
// #endregion
@ -1224,7 +1224,7 @@ void EnGirlA_SetItemOutOfStock(PlayState* play, EnGirlA* this) {
void EnGirlA_UpdateStockedItem(PlayState* play, EnGirlA* this) {
// #region [Randomizer] [Enhancment]
if (IS_RANDO || CVarGetInteger("gBetterBombchuShopping", 0)){
if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("gBetterBombchuShopping"), 0)){
ShopItemEntry* itemEntry;
if (EnGirlA_TryChangeShopItemShip(this, play)) {
EnGirlA_InitItem(this, play);
@ -1340,7 +1340,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) {
EnGirlA_SetItemDescription(play, this);
}
// #region [Enhancment] [Randomizer]
if (IS_RANDO || CVarGetInteger("gBetterBombchuShopping", 0)) {
if (IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("gBetterBombchuShopping"), 0)) {
this->setOutOfStockFunc = EnGirlA_SetItemOutOfStock;
this->updateStockedItemFunc = EnGirlA_UpdateStockedItem;
this->getItemId = itemEntry->getItemId;