github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-25 23:55:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix issue from bad merge and a few other small things

Browse source
This commit is contained in:
Garrett Cox 2022-08-24 11:00:02 -05:00
commit b7e3a72f85
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -3394,6 +3394,16 @@ void DrawRandoEditor(bool& open) {
SohImGui::EnhancementCombobox("gRandomizeShuffleSongs", randoShuffleSongs, 3, 0); SohImGui::EnhancementCombobox("gRandomizeShuffleSongs", randoShuffleSongs, 3, 0);
PaddedSeparator(); PaddedSeparator();
// Shuffle Scrubs
ImGui::Text(Settings::Scrubsanity.GetName().c_str());
InsertHelpHoverText(
"Off - Scrubs will not be shuffled.\n"
"\n"
"Affordable - Scrubs will be shuffled and their item will cost 10 rupees.\n"
);
SohImGui::EnhancementCombobox("gRandomizeShuffleScrubs", randoShuffleScrubs, 4, 0);
PaddedSeparator();
// Shuffle Tokens // Shuffle Tokens
ImGui::Text(Settings::Tokensanity.GetName().c_str()); ImGui::Text(Settings::Tokensanity.GetName().c_str());
InsertHelpHoverText("Shuffles Golden Skulltula Tokens into the item pool. This means " InsertHelpHoverText("Shuffles Golden Skulltula Tokens into the item pool. This means "
@ -3414,15 +3424,6 @@ void DrawRandoEditor(bool& open) {
"expected to be collected after getting Sun's Song."); "expected to be collected after getting Sun's Song.");
PaddedSeparator(); PaddedSeparator();
// Shuffle Scrubs
ImGui::Text(Settings::Scrubsanity.GetName().c_str());
InsertHelpHoverText(
"Off - Scrubs will not be shuffled.\n"
"\n"
"Affordable - Scrubs will be shuffled and their item will cost 10 rupees.\n"
);
SohImGui::EnhancementCombobox("gRandomizeShuffleScrubs", randoShuffleScrubs, 4, 0);
PaddedSeparator();
// Shuffle Cows // Shuffle Cows
SohImGui::EnhancementCheckbox(Settings::ShuffleCows.GetName().c_str(), "gRandomizeShuffleCows"); SohImGui::EnhancementCheckbox(Settings::ShuffleCows.GetName().c_str(), "gRandomizeShuffleCows");

23
soh/soh/OTRGlobals.cpp
View file

@ -1578,18 +1578,17 @@ extern "C" RandomizerCheck Randomizer_GetCheckFromActor(s16 sceneNum, s16 actorI
return OTRGlobals::Instance->gRandomizer->GetCheckFromActor(sceneNum, actorId, actorParams); return OTRGlobals::Instance->gRandomizer->GetCheckFromActor(sceneNum, actorId, actorParams);
} }
extern "C" CustomMessageEntry Randomizer_GetScrubMessage(u16 scrubTextId) { extern "C" ScrubIdentity Randomizer_IdentifyScrub(s32 sceneNum, s32 actorParams, s32 respawnData) {
int price = 0; return OTRGlobals::Instance->gRandomizer->IdentifyScrub(sceneNum, actorParams, respawnData);
switch (scrubTextId) { }
case TEXT_SCRUB_POH:
price = 10; extern "C" CustomMessageEntry Randomizer_GetScrubMessage(s16 itemPrice) {
break; return CustomMessageManager::Instance->RetrieveMessage(Randomizer::scrubMessageTableID, itemPrice);
case TEXT_SCRUB_STICK_UPGRADE: }
case TEXT_SCRUB_NUT_UPGRADE:
price = 40; extern "C" CustomMessageEntry Randomizer_GetNaviMessage() {
break; u16 naviTextId = rand() % NUM_NAVI_MESSAGES;
} return CustomMessageManager::Instance->RetrieveMessage(Randomizer::NaviRandoMessageTableID, naviTextId);
return CustomMessageManager::Instance->RetrieveMessage(Randomizer::scrubMessageTableID, price);
} }
extern "C" CustomMessageEntry Randomizer_GetAltarMessage() { extern "C" CustomMessageEntry Randomizer_GetAltarMessage() {