Skip to content

Commit

Permalink
Cosmetics texts fixes (#604)
Browse files Browse the repository at this point in the history
* branch init + few fixes

* Reset button

* Several texts fixes and default color to GameCube

* space issues

* some more extra space that was not needed.

* space yes last time ...

* Arrows being able to be rainbow some more texts fixes

* more texts fixes

* c-buttons some plurial fix
  • Loading branch information
Baoulettes authored Jul 6, 2022
1 parent 58f3786 commit 260669f
Show file tree
Hide file tree
Showing 3 changed files with 224 additions and 209 deletions.
10 changes: 6 additions & 4 deletions libultraship/libultraship/ImGuiImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ namespace SohImGui {
const char* RainbowColorCvarList[] = {
//This is the list of possible CVars that has rainbow effect.
"gTunic_Kokiri_", "gTunic_Goron_", "gTunic_Zora_",
"gCCHeartsPrim", "gDDCCHeartsPrim", "gCCDDHeartsPrim",
"gFireArrowCol", "gIceArrowCol", "gTunic_Zora_",
"gFireArrowColEnv", "gIceArrowColEnv", "gLightArrowColEnv",
"gCCHeartsPrim", "gDDCCHeartsPrim", "gLightArrowCol",
"gCCABtnPrim", "gCCBBtnPrim", "gCCCBtnPrim", "gCCStartBtnPrim",
"gCCCUBtnPrim", "gCCCLBtnPrim", "gCCCRBtnPrim", "gCCCDBtnPrim", "gCCDpadPrim",
"gCCMagicBorderNormPrim", "gCCMagicBorderPrim", "gCCMagicPrim", "gCCMagicUsePrim",
Expand Down Expand Up @@ -588,7 +590,7 @@ namespace SohImGui {
CVar_SetS32(Cvar_RBM.c_str(), 0); //On click disable rainbow mode.
needs_save = true;
}
Tooltip("Clicking this button will make a random color for the colors at it's right.\nPrevious color will be overwrite and will not be recoverable");
Tooltip("Chooses a random color\nOverwrites previously chosen color");
}

void RainbowColor(const char* cvarName, ImVec4* colors) {
Expand All @@ -600,7 +602,7 @@ namespace SohImGui {
MakeInvisible += "Rainbow";

EnhancementCheckbox(MakeInvisible.c_str(), Cvar_RBM.c_str());
Tooltip("Clicking this button will make color cycling\nPrevious color will be overwrite and will not be recoverable");
Tooltip("Cycles through colors on a timer\nOverwrites previously chosen color");
}

void ResetColor(const char* cvarName, ImVec4* colors, ImVec4 defaultcolors, bool has_alpha) {
Expand Down Expand Up @@ -630,7 +632,7 @@ namespace SohImGui {
CVar_SetS32(Cvar_RBM.c_str(), 0); //On click disable rainbow mode.
needs_save = true;
}
Tooltip("Clicking this button will to the game original color (GameCube version)\nPrevious color will be overwrite and will not be recoverable");
Tooltip("Revert colors to the game original colors (GameCube version)\nOverwrites previously chosen color");
}

void EnhancementColor(const char* text, const char* cvarName, ImVec4 ColorRGBA, ImVec4 default_colors, bool allow_rainbow, bool has_alpha, bool TitleSameLine) {
Expand Down
Loading

0 comments on commit 260669f

Please sign in to comment.