Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Changed player colors to be more consitant in terms of brightness and hue

Browse Source 
This was SVN commit r2985.
This commit is contained in:
Wijitmaker 2005-10-22 09:59:47 +00:00
parent a5a9f4b657
commit c0eb742373
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
binaries/data/tools/atlas/lists.xml
View File

@ -44,14 +44,14 @@
<playercolours>
<colour name="Gaia" rgb="255 255 255"/>
<colour name="Player 1" rgb="22 95 204" buttontext="255 255 255"/>
<colour name="Player 2" rgb="216 0 0" buttontext="255 255 255"/>
<colour name="Player 3" rgb="0 87 0" buttontext="255 255 255"/>
<colour name="Player 4" rgb="255 247 37"/>
<colour name="Player 5" rgb="255 173 0"/>
<colour name="Player 6" rgb="0 172 150"/>
<colour name="Player 7" rgb="211 58 201" buttontext="255 255 255"/>
<colour name="Player 8" rgb="60 60 60" buttontext="255 255 255"/>
<colour name="Player 1" rgb="111 111 207" buttontext="255 255 255"/>
<colour name="Player 2" rgb="207 111 111" buttontext="255 255 255"/>
<colour name="Player 3" rgb="111 207 111" buttontext="255 255 255"/>
<colour name="Player 4" rgb="207 207 111" buttontext="255 255 255"/>
<colour name="Player 5" rgb="111 207 207" buttontext="255 255 255"/>
<colour name="Player 6" rgb="207 111 207" buttontext="255 255 255"/>
<colour name="Player 7" rgb="207 159 111" buttontext="255 255 255"/>
<colour name="Player 8" rgb="159 159 159" buttontext="255 255 255"/>
</playercolours>
</lists>

16
source/ps/GameAttributes.cpp
View File

@ -205,28 +205,28 @@ CGameAttributes::CGameAttributes():
m_Players[0]->SetColour(SPlayerColour(1.0f, 1.0f, 1.0f)); //White
m_Players[1]->SetName(L"Player 1");
m_Players[1]->SetColour(SPlayerColour(0.086f, 0.371f, 0.8f)); // Blue
m_Players[1]->SetColour(SPlayerColour(0.4375f, 0.4375f, 0.8125f)); // Blue
m_Players[2]->SetName(L"Acumen");
m_Players[2]->SetColour(SPlayerColour(0.847f, 0.0f, 0.0f)); //Red
m_Players[2]->SetColour(SPlayerColour(0.8125f, 0.4375f, 0.4375f)); //Red
m_Players[3]->SetName(L"Boco the Insignificant");
m_Players[3]->SetColour(SPlayerColour(0.0f, 0.34f, 0.0f)); //Green
m_Players[3]->SetColour(SPlayerColour(0.4375f, 0.8125f, 0.4375f)); //Green
m_Players[4]->SetName(L"NoMonkey the Magnificent");
m_Players[4]->SetColour(SPlayerColour(1.0f, 0.97f, 0.144f)); //Yellow
m_Players[4]->SetColour(SPlayerColour(0.8125f, 0.8125f, 0.4375f)); //Yellow
m_Players[5]->SetName(L"Wijit");
m_Players[5]->SetColour(SPlayerColour(1.0f, 0.678f, 0.0f)); //Orange
m_Players[5]->SetColour(SPlayerColour(0.4375f, 0.8125f, 0.8125f)); //Turquoise
m_Players[6]->SetName(L"Ykkrosh");
m_Players[6]->SetColour(SPlayerColour(0.0f, 0.675f, 0.588f)); //Turquoise
m_Players[6]->SetColour(SPlayerColour(0.8125f, 0.4375f, 0.8125f)); //Purple
m_Players[7]->SetName(L"Code Monkey");
m_Players[7]->SetColour(SPlayerColour(0.827f, 0.227f, 0.788f)); //Purple
m_Players[7]->SetColour(SPlayerColour(0.8125f, 0.625f, 0.4375f)); //Orange
m_Players[8]->SetName(L"Clausewitz");
m_Players[8]->SetColour(SPlayerColour(0.235f, 0.235f, 0.235f)); //Black
m_Players[8]->SetColour(SPlayerColour(0.625f, 0.625f, 0.625f)); //Gray
std::vector<CPlayer *>::iterator it=m_Players.begin();
++it; // Skip Gaia - gaia doesn't account for a slot