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

Switch tunics and kokiri colors to be red by default

Browse source
This commit is contained in:
aMannus 2023-11-27 21:52:43 +01:00
commit acac97ed16
4 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
View file

@ -190,9 +190,9 @@ typedef struct {
colors were darker than the gDPSetPrimColor. You will see many more examples of this below in the `ApplyOrResetCustomGfxPatches` method colors were darker than the gDPSetPrimColor. You will see many more examples of this below in the `ApplyOrResetCustomGfxPatches` method
*/ */
static std::map<std::string, CosmeticOption> cosmeticOptions = { static std::map<std::string, CosmeticOption> cosmeticOptions = {
COSMETIC_OPTION("Link_KokiriTunic", "Kokiri Tunic", GROUP_LINK, ImVec4( 30, 105, 27, 255), false, true, false), COSMETIC_OPTION("Link_KokiriTunic", "Kokiri Tunic", GROUP_LINK, ImVec4(255, 0, 0, 255), false, true, false),
COSMETIC_OPTION("Link_GoronTunic", "Goron Tunic", GROUP_LINK, ImVec4(100, 20, 0, 255), false, true, false), COSMETIC_OPTION("Link_GoronTunic", "Goron Tunic", GROUP_LINK, ImVec4(255, 0, 0, 255), false, true, false),
COSMETIC_OPTION("Link_ZoraTunic", "Zora Tunic", GROUP_LINK, ImVec4( 0, 60, 100, 255), false, true, false), COSMETIC_OPTION("Link_ZoraTunic", "Zora Tunic", GROUP_LINK, ImVec4(255, 0, 0, 255), false, true, false),
COSMETIC_OPTION("Link_Hair", "Hair", GROUP_LINK, ImVec4(255, 173, 27, 255), false, true, true), COSMETIC_OPTION("Link_Hair", "Hair", GROUP_LINK, ImVec4(255, 173, 27, 255), false, true, true),
COSMETIC_OPTION("Link_Linen", "Linen", GROUP_LINK, ImVec4(255, 255, 255, 255), false, true, true), COSMETIC_OPTION("Link_Linen", "Linen", GROUP_LINK, ImVec4(255, 255, 255, 255), false, true, true),
COSMETIC_OPTION("Link_Boots", "Boots", GROUP_LINK, ImVec4( 93, 44, 18, 255), false, true, true), COSMETIC_OPTION("Link_Boots", "Boots", GROUP_LINK, ImVec4( 93, 44, 18, 255), false, true, true),
@ -325,7 +325,7 @@ static std::map<std::string, CosmeticOption> cosmeticOptions = {
COSMETIC_OPTION("NPC_Dog1", "Dog 1", GROUP_NPC, ImVec4(255, 255, 200, 255), false, true, true), COSMETIC_OPTION("NPC_Dog1", "Dog 1", GROUP_NPC, ImVec4(255, 255, 200, 255), false, true, true),
COSMETIC_OPTION("NPC_Dog2", "Dog 2", GROUP_NPC, ImVec4(150, 100, 50, 255), false, true, true), COSMETIC_OPTION("NPC_Dog2", "Dog 2", GROUP_NPC, ImVec4(150, 100, 50, 255), false, true, true),
COSMETIC_OPTION("NPC_GoldenSkulltula", "Golden Skulltula", GROUP_NPC, ImVec4(255, 255, 255, 255), false, true, false), COSMETIC_OPTION("NPC_GoldenSkulltula", "Golden Skulltula", GROUP_NPC, ImVec4(255, 255, 255, 255), false, true, false),
COSMETIC_OPTION("NPC_Kokiri", "Kokiri", GROUP_NPC, ImVec4( 0, 130, 70, 255), false, true, false), COSMETIC_OPTION("NPC_Kokiri", "Kokiri", GROUP_NPC, ImVec4(255, 0, 0, 255), false, true, false),
COSMETIC_OPTION("NPC_Gerudo", "Gerudo", GROUP_NPC, ImVec4( 90, 0, 140, 255), false, true, false), COSMETIC_OPTION("NPC_Gerudo", "Gerudo", GROUP_NPC, ImVec4( 90, 0, 140, 255), false, true, false),
COSMETIC_OPTION("NPC_MetalTrap", "Metal Trap", GROUP_NPC, ImVec4(255, 255, 255, 255), false, true, true), COSMETIC_OPTION("NPC_MetalTrap", "Metal Trap", GROUP_NPC, ImVec4(255, 255, 255, 255), false, true, true),
COSMETIC_OPTION("NPC_IronKnuckles", "Iron Knuckles", GROUP_NPC, ImVec4(245, 255, 205, 255), false, true, false), COSMETIC_OPTION("NPC_IronKnuckles", "Iron Knuckles", GROUP_NPC, ImVec4(245, 255, 205, 255), false, true, false),

4
soh/soh/OTRGlobals.cpp
View file

@ -1048,10 +1048,6 @@ extern "C" void InitOTR() {
tm *tm_now = localtime(&now); tm *tm_now = localtime(&now);
CVarRegisterInteger("gLetItSnow", 1); CVarRegisterInteger("gLetItSnow", 1);
CVarRegisterInteger("gCosmetics.Link_KokiriTunic.Changed", 1);
CVarRegisterColor("gCosmetics.Link_KokiriTunic.Value", Color_RGBA8{ 255, 0, 0, 255 });
CVarRegisterInteger("gCosmetics.NPC_Kokiri.Changed", 1);
CVarRegisterColor("gCosmetics.NPC_Kokiri.Value", Color_RGBA8{ 255, 0, 0, 255 });
srand(now); srand(now);
#ifdef ENABLE_CROWD_CONTROL #ifdef ENABLE_CROWD_CONTROL

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

@ -967,10 +967,18 @@ void* sMouthTextures[] = {
}; };
#endif #endif
// Original colors
//Color_RGB8 sTunicColors[] = {
// { 30, 105, 27 },
// { 100, 20, 0 },
// { 0, 60, 100 },
//};
// Overwrite to red tunic as default for Holidays in Hyrule build
Color_RGB8 sTunicColors[] = { Color_RGB8 sTunicColors[] = {
{ 30, 105, 27 }, { 255, 0, 0 },
{ 100, 20, 0 }, { 255, 0, 0 },
{ 0, 60, 100 }, { 255, 0, 0 },
}; };
Color_RGB8 sGauntletColors[] = { Color_RGB8 sGauntletColors[] = {

6
soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
View file

@ -1377,6 +1377,12 @@ Gfx* EnKo_SetEnvColor(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b, u8 a) {
void EnKo_Draw(Actor* thisx, PlayState* play) { void EnKo_Draw(Actor* thisx, PlayState* play) {
EnKo* this = (EnKo*)thisx; EnKo* this = (EnKo*)thisx;
Color_RGBA8 tunicColor = sModelInfo[ENKO_TYPE].tunicColor; Color_RGBA8 tunicColor = sModelInfo[ENKO_TYPE].tunicColor;
// Overwrite to red tunic as default for Holidays in Hyrule build
tunicColor.r = 255;
tunicColor.g = 0;
tunicColor.b = 0;
Color_RGBA8 bootsColor = sModelInfo[ENKO_TYPE].bootsColor; Color_RGBA8 bootsColor = sModelInfo[ENKO_TYPE].bootsColor;
if (CVarGetInteger("gCosmetics.NPC_Kokiri.Changed", 0)) { if (CVarGetInteger("gCosmetics.NPC_Kokiri.Changed", 0)) {