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

Add rainbow option for tunics

Browse source
This commit is contained in:
Viktor Holta 2022-05-20 00:06:05 +02:00
commit 12c6e44b2b
2 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libultraship/libultraship/SohImGuiImpl.cpp
View file

@ -724,8 +724,15 @@ namespace SohImGui {
ImGui::Separator(); ImGui::Separator();
EnhancementColor3("Kokiri Tunic", "gTunic_Kokiri", kokiri_col); EnhancementColor3("Kokiri Tunic", "gTunic_Kokiri", kokiri_col);
ImGui::SameLine();
EnhancementCheckbox("Rainbow##Kokiri", "gTunic_KokiriRainbow");
EnhancementColor3("Goron Tunic", "gTunic_Goron", goron_col); EnhancementColor3("Goron Tunic", "gTunic_Goron", goron_col);
ImGui::SameLine();
EnhancementCheckbox("Rainbow##Goron", "gTunic_GoronRainbow");
EnhancementColor3("Zora Tunic", "gTunic_Zora", zora_col); EnhancementColor3("Zora Tunic", "gTunic_Zora", zora_col);
ImGui::SameLine();
EnhancementCheckbox("Rainbow##Zora", "gTunic_ZoraRainbow");
EnhancementSliderInt("Rainbow Speed: %dx", "##RainbowTunicSpeed", "gTunic_RainbowSpeed", 1, 6, "");
ImGui::Text("Navi"); ImGui::Text("Navi");
ImGui::Separator(); ImGui::Separator();

35
soh/src/code/z_player_lib.c
View file

@ -746,7 +746,40 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
#endif #endif
Color_RGB8 sTemp; Color_RGB8 sTemp;
color = &sTemp; color = &sTemp;
if (tunic == PLAYER_TUNIC_KOKIRI) { if (tunic == PLAYER_TUNIC_KOKIRI && CVar_GetS32("gTunic_KokiriRainbow", 0) != 0 ||
tunic == PLAYER_TUNIC_GORON && CVar_GetS32("gTunic_GoronRainbow", 0) != 0 ||
tunic == PLAYER_TUNIC_ZORA && CVar_GetS32("gTunic_ZoraRainbow", 0) != 0) {
u16 hue = CVar_GetS32("gTunic_RainbowHue", 0);
u16 hueDelta = CVar_GetS32("gTunic_RainbowSpeed", 1) * 36.0f / 20.0f;
CVar_SetS32("gTunic_RainbowHue", (hue + hueDelta) % 360);
if (hue < 60) {
color->r = 255;
color->g = (hue / 60.0f) * 255;
color->b = 0;
} else if (hue < 120) {
color->r = (-hue / 60.0f + 2.0f) * 255;
color->g = 255;
color->b = 0;
} else if (hue < 180) {
color->r = 0;
color->g = 255;
color->b = (hue / 60.0f - 2.0f) * 255;
} else if (hue < 240) {
color->r = 0;
color->g = (-hue / 60.0f + 4.0f) * 255;
color->b = 255;
} else if (hue < 300) {
color->r = (hue / 60.0f - 4.0f) * 255;
color->g = 0;
color->b = 255;
} else {
color->r = 255;
color->g = 0;
color->b = (-hue / 60.0f + 6.0f) * 255;
}
}
else if (tunic == PLAYER_TUNIC_KOKIRI) {
color->r = CVar_GetS32("gTunic_Kokiri_Red", sTunicColors[PLAYER_TUNIC_KOKIRI].r); color->r = CVar_GetS32("gTunic_Kokiri_Red", sTunicColors[PLAYER_TUNIC_KOKIRI].r);
color->g = CVar_GetS32("gTunic_Kokiri_Green", sTunicColors[PLAYER_TUNIC_KOKIRI].g); color->g = CVar_GetS32("gTunic_Kokiri_Green", sTunicColors[PLAYER_TUNIC_KOKIRI].g);
color->b = CVar_GetS32("gTunic_Kokiri_Blue", sTunicColors[PLAYER_TUNIC_KOKIRI].b); color->b = CVar_GetS32("gTunic_Kokiri_Blue", sTunicColors[PLAYER_TUNIC_KOKIRI].b);