swg-source/client-tools
1
0
Fork 0
mirror of https://github.com/SWG-Source/client-tools.git synced 2026-10-13 05:12:52 -04:00
Code Issues Projects Releases Wiki Activity

Fix #11 - GU 18.4 - Character - GCW Tab Display #412

Browse Source
This commit is contained in:
AconiteX
2021-08-13 23:39:00 -04:00
parent d1b3c0eaf5
commit 62ded5af58
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/client/library/clientUserInterface/src/shared/core/CuiStringIdsCharacterSheet.h
+4
View File
@@ -23,6 +23,10 @@ namespace CuiStringIdsCharacterSheet
MAKE_STRING_ID(ui_charsheet, unmarried);
MAKE_STRING_ID(ui_charsheet, unknown);
MAKE_STRING_ID(ui_charsheet, faction_neutral);
MAKE_STRING_ID(ui_charsheet, faction_neutral_imperialhelpercovert);
MAKE_STRING_ID(ui_charsheet, faction_neutral_imperialhelperdeclared);
MAKE_STRING_ID(ui_charsheet, faction_neutral_rebelhelpercovert);
MAKE_STRING_ID(ui_charsheet, faction_neutral_rebelhelperdeclared);
MAKE_STRING_ID(ui_charsheet, faction_rebelcovert);
MAKE_STRING_ID(ui_charsheet, faction_rebeldeclared);
MAKE_STRING_ID(ui_charsheet, faction_rebelonleave);
src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiCharacterSheet.cpp
+51 -1
View File
@@ -1514,8 +1514,58 @@ void SwgCuiCharacterSheet::updateGcwPage()
//neutral
else if (PvpData::isNeutralFactionId(pvpFaction))
{
m_pvpStatus->SetText(CuiStringIdsCharacterSheet::faction_neutral.localize());
// GU 18.4 - Display Mercenary Status on Character Sheet for Self Only
if(isExaminingSelf())
{
const PlayerObject* po = Game::getPlayerObject();
if(po)
{
unsigned long slotVal = 0;
const char *slots[4] = {
"covert_imperial_mercenary",
"overt_imperial_mercenary",
"covert_rebel_mercenary",
"overt_rebel_mercenary"
};
for (unsigned i = 0; i < 4; i++)
{
po->getCollectionSlotValue(slots[i], slotVal);
if(slotVal > 0)
{
slotVal = i+1;
break;
}
}
switch(slotVal)
{
case 1:
m_pvpStatus->SetText(CuiStringIdsCharacterSheet::faction_neutral_imperialhelpercovert.localize());
break;
case 2:
m_pvpStatus->SetText(CuiStringIdsCharacterSheet::faction_neutral_imperialhelperdeclared.localize());
break;
case 3:
m_pvpStatus->SetText(CuiStringIdsCharacterSheet::faction_neutral_rebelhelpercovert.localize());
break;
case 4:
m_pvpStatus->SetText(CuiStringIdsCharacterSheet::faction_neutral_rebelhelperdeclared.localize());
break;
default:
m_pvpStatus->SetText(CuiStringIdsCharacterSheet::faction_neutral.localize());
break;
}
}
else
{
m_pvpStatus->SetText(CuiStringIdsCharacterSheet::faction_neutral.localize());
}
}
else
{
m_pvpStatus->SetText(CuiStringIdsCharacterSheet::faction_neutral.localize());
}
// format high rank text: put highest rank at top. if ranks are equal, just put rebel at top
if (highRebelRank >= highImperialRank)
{