Androrc the Orc
Emperor
Yes, why not.
This is the changed function (changes in red):
Code:
void CvGameTextMgr::parseLeaderTraits(CvWStringBuffer &szHelpString, LeaderHeadTypes eLeader, CivilizationTypes eCivilization, bool bDawnOfMan, bool bCivilopediaText)
{
PROFILE_FUNC();
CvWString szTempBuffer; // Formatting
int iI;
// Build help string
if (eLeader != NO_LEADER)
{
if (!bDawnOfMan && !bCivilopediaText)
{
szTempBuffer.Format( SETCOLR L"%s" ENDCOLR , TEXT_COLOR("COLOR_HIGHLIGHT_TEXT"), GC.getLeaderHeadInfo(eLeader).getDescription());
szHelpString.append(szTempBuffer);
}
FAssert((GC.getNumTraitInfos() > 0) &&
"GC.getNumTraitInfos() is less than or equal to zero but is expected to be larger than zero in CvSimpleCivPicker::setLeaderText");
[COLOR="Red"] //R&R
//Androrc Trait Description
/*
bool bFirst = true;
for (iI = 0; iI < GC.getNumTraitInfos(); ++iI)
{
if (GC.getLeaderHeadInfo(eLeader).hasTrait(iI) || (eCivilization != NO_CIVILIZATION && GC.getCivilizationInfo(eCivilization).hasTrait(iI)))
{
if (!bFirst)
{
if (bDawnOfMan)
{
szHelpString.append(L", ");
}
}
else
{
bFirst = false;
}
parseTraits(szHelpString, ((TraitTypes)iI), eCivilization, bDawnOfMan);
}
}
*/
bool bFirst = true;
bool bFirstCivilizationTrait = true;
bool bFirstLeaderTrait = true;
for (iI = 0; iI < GC.getNumTraitInfos(); ++iI)
{
if (eCivilization != NO_CIVILIZATION && GC.getCivilizationInfo(eCivilization).hasTrait(iI))
{
if (bFirstCivilizationTrait)
{
szHelpString.append(NEWLINE);
szTempBuffer.Format( SETCOLR L"%s" ENDCOLR , TEXT_COLOR("COLOR_HIGHLIGHT_TEXT"), gDLL->getText("TXT_KEY_CIVILIZATION_TRAITS").c_str());
szHelpString.append(szTempBuffer);
bFirstCivilizationTrait = false;
}
if (!bFirst)
{
if (bDawnOfMan)
{
szHelpString.append(L", ");
}
}
else
{
bFirst = false;
}
parseTraits(szHelpString, ((TraitTypes)iI), eCivilization, bDawnOfMan);
}
}
for (iI = 0; iI < GC.getNumTraitInfos(); ++iI)
{
if (GC.getLeaderHeadInfo(eLeader).hasTrait(iI))
{
if (bFirstLeaderTrait)
{
if (!bFirstCivilizationTrait)
{
szHelpString.append(NEWLINE);
}
szHelpString.append(NEWLINE);
szTempBuffer.Format( SETCOLR L"%s" ENDCOLR , TEXT_COLOR("COLOR_HIGHLIGHT_TEXT"), gDLL->getText("TXT_KEY_LEADER_TRAITS").c_str());
szHelpString.append(szTempBuffer);
bFirstLeaderTrait = false;
}
if (!bFirst)
{
if (bDawnOfMan)
{
szHelpString.append(L", ");
}
}
else
{
bFirst = false;
}
parseTraits(szHelpString, ((TraitTypes)iI), eCivilization, bDawnOfMan);
}
}
//Androrc End
//R&R End
[/COLOR] }
else
{
// Random leader
szTempBuffer.Format( SETCOLR L"%s" ENDCOLR , TEXT_COLOR("COLOR_HIGHLIGHT_TEXT"), gDLL->getText("TXT_KEY_TRAIT_PLAYER_UNKNOWN").c_str());
szHelpString.append(szTempBuffer);
}
}And these are the XML text lines:
Code:
<TEXT>
<Tag>TXT_KEY_CIVILIZATION_TRAITS</Tag>
<English>Civilization Traits</English>
</TEXT>
<TEXT>
<Tag>TXT_KEY_LEADER_TRAITS</Tag>
<English>Leader Traits</English>
</TEXT>I would upload the changed files myself, but as you know, I'm having trouble with committing files.
