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

Accounted for missing RG_POCKET_CUCCO in logic HasItem and ApplyItemEffect.

Browse source
This commit is contained in:
Anthony Stewart 2025-03-08 17:22:06 -06:00
commit 7799336bee
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/soh/Enhancements/randomizer/logic.cpp
View file

@ -222,6 +222,7 @@ namespace Rando {
case RG_GOLDEN_SCALE: case RG_GOLDEN_SCALE:
return CurrentUpgrade(UPG_SCALE) >= 2; return CurrentUpgrade(UPG_SCALE) >= 2;
case RG_POCKET_EGG: case RG_POCKET_EGG:
return CheckRandoInf(RAND_INF_ADULT_TRADES_HAS_POCKET_EGG);
case RG_COJIRO: case RG_COJIRO:
case RG_ODD_MUSHROOM: case RG_ODD_MUSHROOM:
case RG_ODD_POTION: case RG_ODD_POTION:
@ -231,7 +232,7 @@ namespace Rando {
case RG_EYEBALL_FROG: case RG_EYEBALL_FROG:
case RG_EYEDROPS: case RG_EYEDROPS:
case RG_CLAIM_CHECK: case RG_CLAIM_CHECK:
return CheckRandoInf(itemName - RG_POCKET_EGG + RAND_INF_ADULT_TRADES_HAS_POCKET_EGG); return CheckRandoInf(itemName - RG_COJIRO + RAND_INF_ADULT_TRADES_HAS_COJIRO);
case RG_BOTTLE_WITH_BIG_POE: case RG_BOTTLE_WITH_BIG_POE:
case RG_BOTTLE_WITH_BLUE_FIRE: case RG_BOTTLE_WITH_BLUE_FIRE:
case RG_BOTTLE_WITH_BLUE_POTION: case RG_BOTTLE_WITH_BLUE_POTION:
@ -1505,6 +1506,8 @@ namespace Rando {
mSaveContext->isDoubleDefenseAcquired = state; mSaveContext->isDoubleDefenseAcquired = state;
break; break;
case RG_POCKET_EGG: case RG_POCKET_EGG:
SetRandoInf(RAND_INF_ADULT_TRADES_HAS_POCKET_EGG, state);
break;
case RG_COJIRO: case RG_COJIRO:
case RG_ODD_MUSHROOM: case RG_ODD_MUSHROOM:
case RG_ODD_POTION: case RG_ODD_POTION:
@ -1514,7 +1517,7 @@ namespace Rando {
case RG_EYEBALL_FROG: case RG_EYEBALL_FROG:
case RG_EYEDROPS: case RG_EYEDROPS:
case RG_CLAIM_CHECK: case RG_CLAIM_CHECK:
SetRandoInf(randoGet - RG_POCKET_EGG + RAND_INF_ADULT_TRADES_HAS_POCKET_EGG, state); SetRandoInf(randoGet - RG_COJIRO + RAND_INF_ADULT_TRADES_HAS_COJIRO, state);
break; break;
case RG_PROGRESSIVE_HOOKSHOT: case RG_PROGRESSIVE_HOOKSHOT:
{ {