mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-26 11:22:17 -05:00
Fix L/R buttons color in Kaleido menu (#172)
* Fix L/R buttons color in Kaleido menu. I know this is a bug even official game but that definitely a logic bug. That could be considered are a mods. This make both button L and R have the same color on Hover and normal. * Update z_kaleido_scope_PAL.c * Condition to be on Added condition to be on only if toggled on * Cvar registers * bool addition * Added the item in menu * Added bool in bootcommands By default it is on. * Hide and make it forced on by default * Hide menu entry for that fix
This commit is contained in:
parent
b82871e62f
commit
0e6ca5361e
@ -75,6 +75,10 @@ namespace Game {
|
|||||||
Settings.enhancements.mm_bunny_hood = stob(Conf[EnhancementSection]["mm_bunny_hood"]);
|
Settings.enhancements.mm_bunny_hood = stob(Conf[EnhancementSection]["mm_bunny_hood"]);
|
||||||
CVar_SetS32("gMMBunnyHood", Settings.enhancements.mm_bunny_hood);
|
CVar_SetS32("gMMBunnyHood", Settings.enhancements.mm_bunny_hood);
|
||||||
|
|
||||||
|
Settings.enhancements.uniform_lr = stob(Conf[EnhancementSection]["uniform_lr"]);
|
||||||
|
//CVar_SetS32("gUniformLR", Settings.enhancements.uniform_lr);
|
||||||
|
CVar_SetS32("gUniformLR", 1);
|
||||||
|
|
||||||
Settings.enhancements.newdrops = stob(Conf[EnhancementSection]["newdrops"]);
|
Settings.enhancements.newdrops = stob(Conf[EnhancementSection]["newdrops"]);
|
||||||
CVar_SetS32("gNewDrops", Settings.enhancements.newdrops);
|
CVar_SetS32("gNewDrops", Settings.enhancements.newdrops);
|
||||||
|
|
||||||
@ -264,6 +268,7 @@ namespace Game {
|
|||||||
Conf[EnhancementSection]["newdrops"] = std::to_string(Settings.enhancements.newdrops);
|
Conf[EnhancementSection]["newdrops"] = std::to_string(Settings.enhancements.newdrops);
|
||||||
Conf[EnhancementSection]["visualagony"] = std::to_string(Settings.enhancements.visualagony);
|
Conf[EnhancementSection]["visualagony"] = std::to_string(Settings.enhancements.visualagony);
|
||||||
Conf[EnhancementSection]["mm_bunny_hood"] = std::to_string(Settings.enhancements.mm_bunny_hood);
|
Conf[EnhancementSection]["mm_bunny_hood"] = std::to_string(Settings.enhancements.mm_bunny_hood);
|
||||||
|
Conf[EnhancementSection]["uniform_lr"] = std::to_string(Settings.enhancements.uniform_lr);
|
||||||
|
|
||||||
|
|
||||||
// Controllers
|
// Controllers
|
||||||
|
@ -29,7 +29,7 @@ struct SoHConfigType {
|
|||||||
bool newdrops = false;
|
bool newdrops = false;
|
||||||
bool visualagony = false;
|
bool visualagony = false;
|
||||||
bool mm_bunny_hood = false;
|
bool mm_bunny_hood = false;
|
||||||
|
bool uniform_lr = true;
|
||||||
} enhancements;
|
} enhancements;
|
||||||
|
|
||||||
// Controller
|
// Controller
|
||||||
|
@ -474,6 +474,11 @@ namespace SohImGui {
|
|||||||
needs_save = true;
|
needs_save = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*if (ImGui::Checkbox("Fix L&R Pause menu", &Game::Settings.enhancements.uniform_lr)) {
|
||||||
|
CVar_SetS32("gUniformLR", Game::Settings.enhancements.uniform_lr);
|
||||||
|
needs_save = true;
|
||||||
|
}*/
|
||||||
|
|
||||||
if (ImGui::Checkbox("Visual Stone of Agony", &Game::Settings.enhancements.visualagony)) {
|
if (ImGui::Checkbox("Visual Stone of Agony", &Game::Settings.enhancements.visualagony)) {
|
||||||
CVar_SetS32("gVisualAgony", Game::Settings.enhancements.visualagony);
|
CVar_SetS32("gVisualAgony", Game::Settings.enhancements.visualagony);
|
||||||
needs_save = true;
|
needs_save = true;
|
||||||
|
@ -25,9 +25,9 @@ void BootCommands_Init()
|
|||||||
CVar_RegisterS32("gDebugEnabled", 0);
|
CVar_RegisterS32("gDebugEnabled", 0);
|
||||||
CVar_RegisterS32("gPauseLiveLink", 0);
|
CVar_RegisterS32("gPauseLiveLink", 0);
|
||||||
CVar_RegisterS32("gMinimalUI", 0);
|
CVar_RegisterS32("gMinimalUI", 0);
|
||||||
|
CVar_RegisterS32("gUniformLR", 1);
|
||||||
CVar_RegisterS32("gNewDrops", 0);
|
CVar_RegisterS32("gNewDrops", 0);
|
||||||
CVar_RegisterS32("gVisualAgony", 0);
|
CVar_RegisterS32("gVisualAgony", 0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//void BootCommands_ParseBootArgs(char* str)
|
//void BootCommands_ParseBootArgs(char* str)
|
||||||
|
@ -1614,14 +1614,24 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
|
|||||||
|
|
||||||
if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->unk_1E4 == 0)) {
|
if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->unk_1E4 == 0)) {
|
||||||
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
|
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
|
||||||
|
} else {
|
||||||
|
if (CVar_GetS32("gUniformLR", 0) != 0) {
|
||||||
|
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 180, 210, 255, 255);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gSPDisplayList(POLY_KAL_DISP++, gLButtonIconDL);
|
gSPDisplayList(POLY_KAL_DISP++, gLButtonIconDL);
|
||||||
|
|
||||||
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 180, 210, 255, 220);
|
if (CVar_GetS32("gUniformLR", 0) == 0) { //Restore the misplace gDPSetPrimColor
|
||||||
|
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 180, 210, 255, 255);
|
||||||
|
}
|
||||||
|
|
||||||
if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->unk_1E4 == 0)) {
|
if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->unk_1E4 == 0)) {
|
||||||
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
|
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
|
||||||
|
} else {
|
||||||
|
if (CVar_GetS32("gUniformLR", 0) != 0) {
|
||||||
|
gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 180, 210, 255, 255);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gSPDisplayList(POLY_KAL_DISP++, gRButtonIconDL);
|
gSPDisplayList(POLY_KAL_DISP++, gRButtonIconDL);
|
||||||
|
Loading…
Reference in New Issue
Block a user