From 93a94dba623aa1f04107d23c96082ba9e2990469 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 16 Jun 2015 16:21:03 +0300 Subject: Add 3 team colors. --- src/enums/gui/usercolorid.h | 3 +++ src/gui/userpalette.cpp | 24 +++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/enums/gui/usercolorid.h b/src/enums/gui/usercolorid.h index 991e7e86b..5ecd64458 100644 --- a/src/enums/gui/usercolorid.h +++ b/src/enums/gui/usercolorid.h @@ -46,6 +46,9 @@ enumStart(UserColorId) HOMUNCULUS, PARTY, GUILD, + TEAM1, + TEAM2, + TEAM3, LABEL_PARTICLES, PARTICLE, PICKUP_INFO, diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp index 3c11088c3..c79cc0b19 100644 --- a/src/gui/userpalette.cpp +++ b/src/gui/userpalette.cpp @@ -51,6 +51,9 @@ const std::string ColorTypeNames[static_cast( "ColorHomunculus", "ColorParty", "ColorGuild", + "ColorTeam1", + "ColorTeam2", + "ColorTeam3", "", "ColorParticle", "ColorPickupInfo", @@ -149,6 +152,11 @@ UserPalette::UserPalette() : GradientType::STATIC, // TRANSLATORS: palette color _("Erased names")); + addColor(UserColorId::ENEMY, + 0xff4040, + GradientType::STATIC, + // TRANSLATORS: palette color + _("Enemy")); addColor(UserColorId::PC, 0xffffff, GradientType::STATIC, @@ -199,11 +207,21 @@ UserPalette::UserPalette() : // TRANSLATORS: palette color GradientType::STATIC, _("Guild members")); - addColor(UserColorId::ENEMY, - 0xff4040, + addColor(UserColorId::TEAM1, + 0x0000ff, + // TRANSLATORS: palette color GradientType::STATIC, + strprintf(_("Team %d"), 1)); + addColor(UserColorId::TEAM2, + 0x00a020, // TRANSLATORS: palette color - _("Enemy")); + GradientType::STATIC, + strprintf(_("Team %d"), 2)); + addColor(UserColorId::TEAM3, + 0xffff20, + // TRANSLATORS: palette color + GradientType::STATIC, + strprintf(_("Team %d"), 3)); addLabel(UserColorId::LABEL_PARTICLES, // TRANSLATORS: palette label _("Particles")); -- cgit v1.2.3-70-g09d2