Add setting tooltip and fixed an oopsie
This commit is contained in:
parent
715a4f7315
commit
36d451eb85
|
@ -3923,7 +3923,17 @@ void DrawRandoEditor(bool& open) {
|
||||||
|
|
||||||
// Shuffle Tokens
|
// Shuffle Tokens
|
||||||
ImGui::Text(Settings::Tokensanity.GetName().c_str());
|
ImGui::Text(Settings::Tokensanity.GetName().c_str());
|
||||||
InsertHelpHoverText("Spoopy");
|
InsertHelpHoverText(
|
||||||
|
"Shuffles Golden Skulltula Tokens into the item pool.\n"
|
||||||
|
"\n"
|
||||||
|
"Off - GS tokens will not be shuffled.\n"
|
||||||
|
"\n"
|
||||||
|
"Dungeons - Only shuffle GS tokens that are within dungeons.\n"
|
||||||
|
"\n"
|
||||||
|
"Overworld - Only shuffle GS tokens that are outside of dungeons.\n"
|
||||||
|
"\n"
|
||||||
|
"All Tokens - Shuffle all 100 GS tokens."
|
||||||
|
);
|
||||||
SohImGui::EnhancementCombobox("gRandomizeShuffleTokens", randoShuffleTokens, 4, 0);
|
SohImGui::EnhancementCombobox("gRandomizeShuffleTokens", randoShuffleTokens, 4, 0);
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
|
|
|
@ -106,9 +106,8 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) {
|
||||||
textId = sGetItemTable[getItemId - 1].textId;
|
textId = sGetItemTable[getItemId - 1].textId;
|
||||||
giveItemId = sGetItemTable[getItemId - 1].itemId;
|
giveItemId = sGetItemTable[getItemId - 1].itemId;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
Item_Give(globalCtx, giveItemId);
|
|
||||||
}
|
}
|
||||||
|
Item_Give(globalCtx, giveItemId);
|
||||||
if (CVar_GetS32("gSkulltulaFreeze", 0) != 1 || giveItemId != ITEM_SKULL_TOKEN) {
|
if (CVar_GetS32("gSkulltulaFreeze", 0) != 1 || giveItemId != ITEM_SKULL_TOKEN) {
|
||||||
player->actor.freezeTimer = 20;
|
player->actor.freezeTimer = 20;
|
||||||
}
|
}
|
||||||
|
@ -140,9 +139,8 @@ void func_80AFB89C(EnSi* this, GlobalContext* globalCtx) {
|
||||||
textId = sGetItemTable[getItemId - 1].textId;
|
textId = sGetItemTable[getItemId - 1].textId;
|
||||||
giveItemId = sGetItemTable[getItemId - 1].itemId;
|
giveItemId = sGetItemTable[getItemId - 1].itemId;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
Item_Give(globalCtx, giveItemId);
|
|
||||||
}
|
}
|
||||||
|
Item_Give(globalCtx, giveItemId);
|
||||||
Message_StartTextbox(globalCtx, textId, NULL);
|
Message_StartTextbox(globalCtx, textId, NULL);
|
||||||
Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
|
Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
|
||||||
this->actionFunc = func_80AFB950;
|
this->actionFunc = func_80AFB950;
|
||||||
|
@ -178,13 +176,12 @@ void EnSi_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||||
if (!gSaveContext.n64ddFlag) {
|
if (!gSaveContext.n64ddFlag) {
|
||||||
GetItem_Draw(globalCtx, GID_SKULL_TOKEN_2);
|
GetItem_Draw(globalCtx, GID_SKULL_TOKEN_2);
|
||||||
} else {
|
} else {
|
||||||
f32 mtxScale;
|
|
||||||
getItemId = Randomizer_GetRandomizedItemId(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
|
getItemId = Randomizer_GetRandomizedItemId(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
|
||||||
if (getItemId >= GI_MINUET_OF_FOREST && getItemId <= GI_DOUBLE_DEFENSE) {
|
if (getItemId >= GI_MINUET_OF_FOREST && getItemId <= GI_DOUBLE_DEFENSE) {
|
||||||
EnItem00_CustomItemsParticles(&this->actor, globalCtx, getItemId);
|
EnItem00_CustomItemsParticles(&this->actor, globalCtx, getItemId);
|
||||||
}
|
}
|
||||||
if (getItemId != ITEM_SKULL_TOKEN) {
|
if (getItemId != ITEM_SKULL_TOKEN) {
|
||||||
mtxScale = 1.5f;
|
f32 mtxScale = 1.5f;
|
||||||
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
|
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
|
||||||
}
|
}
|
||||||
GetItem_Draw(globalCtx, Randomizer_GetItemModelFromId(getItemId));
|
GetItem_Draw(globalCtx, Randomizer_GetItemModelFromId(getItemId));
|
||||||
|
|
Loading…
Reference in New Issue