add: scoreboard colors

Author: StormAxs

src/engine/shared/config_pulse.h

@@ -37,7 +37,7 @@ MACRO_CONFIG_INT(ClHoverMessagesHistory, p_hover_messages_history, 0, 0, 1, CFGF
 MACRO_CONFIG_INT(ClHoverMessagesMaxHistory, p_hover_message_max_history, 15, 1, 40, CFGFLAG_CLIENT | CFGFLAG_SAVE, "")
 MACRO_CONFIG_INT(ClHoverMessagesMaxNotifications, p_hover_message_max_notifications, 10, 1, 40, CFGFLAG_CLIENT | CFGFLAG_SAVE, "")
 
-MACRO_CONFIG_INT(ClTrailStyle, p_toggle_trails, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "")
+MACRO_CONFIG_INT(ClTrailStyle, p_toggle_trails, 0, 0, 3, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Player trail style (0 = off, 1 = sparkle, 2 = ring, 3 = rainbow)")
 MACRO_CONFIG_INT(ClPlayerIdleAura, p_idle_aura, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "")
 
 
@@ -64,4 +64,6 @@ MACRO_CONFIG_INT(ClHammerHitEffectSound, p_effect_sound_hammerhit, 1, 0, 1, CFGF
 MACRO_CONFIG_INT(ClJumpEffect, p_effect_jump, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "toggles hammer hit effect")
 MACRO_CONFIG_INT(ClJumpEffectSound, p_effect_sound_jump, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "toggles jump effect sound")
 
-
+//Scoreboard
+MACRO_CONFIG_COL(ClFoeColor, p_blacklist_p_color, 65457, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Blacklist players color")
+MACRO_CONFIG_COL(ClFriendColor, p_friend_color, 7995321, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Friends color")

src/game/client/components/comp_pulse/menus_macro.h

@@ -43,3 +43,7 @@
         } \
     }
 
+#define COLORPICKER(rect, section, title, config_var, default_color) \
+    DoLine_ColorPicker(&rect, ColorPickerLineSize, ColorPickerLabelSize, ColorPickerLineSpacing, &section, Localize(title), config_var, default_color, false)
+
+

src/game/client/components/comp_pulse/menus_pulse.cpp

@@ -378,6 +378,10 @@ void CMenus::RenderSettingsPulse(CUIRect MainView)
 			DRAW_BOX(RightSection, ScoreboardRect, 140.0f, defaultCol, 10.0f);
 			s_ScrollRegion.AddRect(ScoreboardRect);
 			BOX_LABEL(ScoreboardRect, Section, "Scoreboard Settings", 40.0f, 10.0f);
+			static CButtonContainer s_FoeColor, s_FriendColor;
+			ColorRGBA DefaultCol = ColorRGBA(1.0f, 1.0f, 1.0f, 1.f);
+			COLORPICKER(s_FoeColor, ScoreboardRect, "Foe Color In Scoreboard", &g_Config.m_ClFoeColor, DefaultCol);
+			COLORPICKER(s_FriendColor, ScoreboardRect, "Friend Color In Scoreboard", &g_Config.m_ClFriendColor, DefaultCol);
 
 			CKeyInfo Key;
 			FIND_KEY_BINDING(Key, "toggle_scoreboard_menu");

src/game/client/components/scoreboard.cpp

@@ -691,6 +691,26 @@ bool CScoreboard::RenderScoreboard(CUIRect Scoreboard, int Team, int CountStart,
 				{
 					TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClAuthedPlayerColor)));
 				}
+				//PulseStuff===========
+				if(ClientData.m_AuthLevel)
+				{
+					ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClAuthedPlayerColor));
+					TextRender()->TextColor(Color);
+				}
+				else if(ClientData.m_Friend)
+				{
+					ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClFriendColor));
+					TextRender()->TextColor(Color);
+				}
+
+				TextRender()->SetCursor(&Cursor, NameOffset, Row.y + (Row.h - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
+				if(ClientData.m_Foe)
+				{
+					ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClFoeColor));
+					TextRender()->TextColor(Color);
+				}
+
+
 				if(g_Config.m_ClShowIds)
 				{
 					char aClientId[16];
@@ -709,14 +729,31 @@ bool CScoreboard::RenderScoreboard(CUIRect Scoreboard, int Team, int CountStart,
 
 			// clan
 			{
-				if(GameClient()->m_aLocalIds[g_Config.m_ClDummy] >= 0 && str_comp(ClientData.m_aClan, GameClient()->m_aClients[GameClient()->m_aLocalIds[g_Config.m_ClDummy]].m_aClan) == 0)
+				// clan
+
+				if(str_comp(ClientData.m_aClan, GameClient()->m_aClients[GameClient()->m_aLocalIds[g_Config.m_ClDummy]].m_aClan) == 0)
 				{
-					TextRender()->TextColor(color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClSameClanColor)));
+					ColorRGBA Color = color_cast<ColorRGBA>(ColorHSLA(g_Config.m_ClSameClanColor));
+					TextRender()->TextColor(Color);
+
+					std::string SpecialClan = "Inner peace";
+					if(ClientData.m_aClan == SpecialClan)
+					{
+						float Time = LocalTime();
+						float PulseSpeed = 0.2f;
+						float PulseIntensity = 0.5f;
+						
+						float Hue = fmod(Time * PulseSpeed, 1.0f);
+						float Saturation = 0.8f + 0.2f * sinf(Time * PulseSpeed * 2.0f);
+						float Value = 0.8f + 0.2f * sinf(Time * PulseSpeed * 1.5f);
+						
+						ColorRGBA Special = color_cast<ColorRGBA>(ColorHSVA(Hue, Saturation, Value));
+						TextRender()->TextColor(Special);
+					}
 				}
 				else
-				{
-					TextRender()->TextColor(TextColor);
-				}
+					TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
+
 				CTextCursor Cursor;
 				TextRender()->SetCursor(&Cursor, ClanOffset + (ClanLength - minimum(TextRender()->TextWidth(FontSize, ClientData.m_aClan), ClanLength)) / 2.0f, Row.y + (Row.h - FontSize) / 2.0f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_ELLIPSIS_AT_END);
 				Cursor.m_LineWidth = ClanLength;