nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixed recieving items from chests

Browse Source
This commit is contained in:
Jerom Venneker
2025-05-13 22:02:59 +02:00
parent e2d0d8f511
commit ea13bc635f
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
soh/soh/Enhancements/randomizer/context.cpp
View File

@@ -485,16 +485,14 @@ void Context::ParseArchipelagoItemsLocations(const std::vector<ArchipelagoClient
// init the item table with regular items first // init the item table with regular items first
for(int rc = 1; rc <= RC_MAX; rc++) { for(int rc = 1; rc <= RC_MAX; rc++) {
itemLocationTable[rc].SetPlacedItem(StaticData::GetLocation(static_cast<RandomizerCheck>(rc))->GetVanillaItem()); // This may not even be needed
const RandomizerGet vanillaItem = StaticData::GetLocation(static_cast<RandomizerCheck>(rc))->GetVanillaItem();
itemLocationTable[rc].SetPlacedItem(vanillaItem);
} }
for(const ArchipelagoClient::ApItem& ap_item: scouted_items) { for(const ArchipelagoClient::ApItem& ap_item: scouted_items) {
const RandomizerCheck rc = StaticData::APcheckToSoh.find(ap_item.locationName)->second; const RandomizerCheck rc = StaticData::APcheckToSoh.find(ap_item.locationName)->second;
if(rc == RC_KF_MIDOS_TOP_RIGHT_CHEST) {
continue;
}
if(SlotName == ap_item.playerName) { if(SlotName == ap_item.playerName) {
// our item // our item
SPDLOG_TRACE("Populated item {} at location {}", ap_item.itemName, ap_item.locationName); SPDLOG_TRACE("Populated item {} at location {}", ap_item.itemName, ap_item.locationName);

3
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@@ -312,8 +312,7 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
} else { } else {
RandomizerGet vanillaRandomizerGet = Rando::StaticData::GetLocation(rc)->GetVanillaItem(); RandomizerGet vanillaRandomizerGet = Rando::StaticData::GetLocation(rc)->GetVanillaItem();
GetItemID vanillaItem = (GetItemID)Rando::StaticData::RetrieveItem(vanillaRandomizerGet).GetItemID(); GetItemID vanillaItem = (GetItemID)Rando::StaticData::RetrieveItem(vanillaRandomizerGet).GetItemID();
GetItemEntry getItemEntry = getItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet);
Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet);
} }
SPDLOG_TRACE("RC found!"); SPDLOG_TRACE("RC found!");