mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 02:40:30 -05:00
Code Issues Projects Releases Wiki Activity

Add translation for bottle item RGs to itemIDs for assigning to slots in logic.cpp (#4954)

Browse Source 
Change `CanEmptyBigPoes` to reset to false instead of true.
This commit is contained in:
Malkierian 2025-01-27 09:48:13 -07:00 committed by GitHub
parent 83000e2f6a
commit ef0350d830
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
soh/soh/Enhancements/randomizer/logic.cpp
View File

@ -1431,6 +1431,18 @@ namespace Rando {
{ RG_GERUDO_MEMBERSHIP_CARD, QUEST_GERUDO_CARD }, { RG_GERUDO_MEMBERSHIP_CARD, QUEST_GERUDO_CARD },
}; };
std::map<uint32_t, uint32_t> BottleRandomizerGetToItemID = {
{ RG_BOTTLE_WITH_RED_POTION, ITEM_POTION_RED },
{ RG_BOTTLE_WITH_GREEN_POTION, ITEM_POTION_GREEN },
{ RG_BOTTLE_WITH_BLUE_POTION, ITEM_POTION_BLUE },
{ RG_BOTTLE_WITH_FAIRY, ITEM_FAIRY },
{ RG_BOTTLE_WITH_FISH, ITEM_FISH },
{ RG_BOTTLE_WITH_BLUE_FIRE, ITEM_BLUE_FIRE },
{ RG_BOTTLE_WITH_BUGS, ITEM_BUG },
{ RG_BOTTLE_WITH_POE, ITEM_POE },
{ RG_BOTTLE_WITH_BIG_POE, ITEM_BIG_POE },
};
uint32_t HookshotLookup[3] = { ITEM_NONE, ITEM_HOOKSHOT, ITEM_LONGSHOT }; uint32_t HookshotLookup[3] = { ITEM_NONE, ITEM_HOOKSHOT, ITEM_LONGSHOT };
uint32_t OcarinaLookup[3] = { ITEM_NONE, ITEM_OCARINA_FAIRY, ITEM_OCARINA_TIME }; uint32_t OcarinaLookup[3] = { ITEM_NONE, ITEM_OCARINA_FAIRY, ITEM_OCARINA_TIME };
@ -1675,7 +1687,11 @@ namespace Rando {
} }
slot++; slot++;
} }
mSaveContext->inventory.items[slot] = item.GetGIEntry()->itemId; uint16_t itemId = item.GetGIEntry()->itemId;
if (BottleRandomizerGetToItemID.contains(randoGet)) {
itemId = BottleRandomizerGetToItemID[randoGet];
}
mSaveContext->inventory.items[slot] = itemId;
} break; } break;
case RG_RUTOS_LETTER: case RG_RUTOS_LETTER:
SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER, state); SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER, state);
@ -2201,7 +2217,7 @@ namespace Rando {
//Bottle Count //Bottle Count
Bottles = 0; Bottles = 0;
NumBottles = 0; NumBottles = 0;
CanEmptyBigPoes = true; CanEmptyBigPoes = false;
//Drops and Bottle Contents Access //Drops and Bottle Contents Access
NutPot = false; NutPot = false;