Skip to content

More distinct attribute colors, more detailed epitaph #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
INeedAUniqueUsername wants to merge 2 commits into
base: master
Choose a base branch
from
Open

More distinct attribute colors, more detailed epitaph #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0aeeaf
Update disadvantage/degradation tag colors
INeedAUniqueUsername Aug 29, 2017
363306b
Mention extra conditions (radiation, blinding, paralysis, disarming) …
INeedAUniqueUsername Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Transcendence/CGSelectorArea.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,10 +870,10 @@ void CGSelectorArea::PaintInstalledItem (CG32bitImage &Dest, const RECT &rcRect,
if (Entry.pItemCtx->GetEnhancementDisplayAttributes(&Attribs))
{
const CString &sMods = Attribs[0].sText;
bool bIsDisadvantage = (Attribs[0].iType == attribWeakness);
bool bIsDisadvantage = (Attribs[0].iType == attribDegradation);

CG32bitPixel rgbBackColor = (bIsDisadvantage ? m_VI.GetColor(colorAreaDisadvantage) : m_VI.GetColor(colorAreaAdvantage));
CG32bitPixel rgbTextColor = (bIsDisadvantage ? m_VI.GetColor(colorTextDisadvantage) : m_VI.GetColor(colorTextAdvantage));
CG32bitPixel rgbBackColor = (bIsDisadvantage ? m_VI.GetColor(colorAreaDegradation) : m_VI.GetColor(colorAreaEnhancement));
CG32bitPixel rgbTextColor = (bIsDisadvantage ? m_VI.GetColor(colorAreaDegradation) : m_VI.GetColor(colorAreaEnhancement));

PaintModifier(Dest, x, y, sMods, rgbTextColor, rgbBackColor, &y);
}
Expand Down Expand Up @@ -937,10 +937,10 @@ void CGSelectorArea::PaintInstalledItem (CG32bitImage &Dest, const RECT &rcRect,
// Damaged

if (pDevice->IsDamaged())
PaintModifier(Dest, x, y, CONSTLIT("damaged"), m_VI.GetColor(colorTextDisadvantage), m_VI.GetColor(colorAreaDisadvantage), &y);
PaintModifier(Dest, x, y, CONSTLIT("damaged"), m_VI.GetColor(colorTextDisadvantage), m_VI.GetColor(colorAreaDegradation), &y);

if (pDevice->IsDisrupted())
PaintModifier(Dest, x, y, CONSTLIT("ionized"), m_VI.GetColor(colorTextDisadvantage), m_VI.GetColor(colorAreaDisadvantage), &y);
PaintModifier(Dest, x, y, CONSTLIT("ionized"), m_VI.GetColor(colorTextDisadvantage), m_VI.GetColor(colorAreaDegradation), &y);

// Modifiers

Expand All @@ -950,8 +950,8 @@ void CGSelectorArea::PaintInstalledItem (CG32bitImage &Dest, const RECT &rcRect,
if (!sMods.IsBlank())
{
bool bIsDisadvantage = *sMods.GetASCIIZPointer() == '-';
CG32bitPixel rgbBackColor = (bIsDisadvantage ? m_VI.GetColor(colorAreaDisadvantage) : m_VI.GetColor(colorAreaAdvantage));
CG32bitPixel rgbTextColor = (bIsDisadvantage ? m_VI.GetColor(colorTextDisadvantage) : m_VI.GetColor(colorTextAdvantage));
CG32bitPixel rgbBackColor = (bIsDisadvantage ? m_VI.GetColor(colorAreaDegradation) : m_VI.GetColor(colorAreaEnhancement));
CG32bitPixel rgbTextColor = (bIsDisadvantage ? m_VI.GetColor(colorAreaDegradation) : m_VI.GetColor(colorAreaEnhancement));

PaintModifier(Dest, x, y, sMods, rgbTextColor, rgbBackColor, &y);
}
Expand Down
31 changes: 27 additions & 4 deletions Transcendence/CTranscendenceModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,7 @@ CString CTranscendenceModel::CalcEpitaph (SDestroyCtx &Ctx)
ASSERT(Ctx.pObj == (CSpaceObject *)pShip);
ASSERT(pShip->GetSystem());
CString sSystemName = pShip->GetSystem()->GetName();

// Figure out who killed us

CString sCause;
CSpaceObject *pAttacker = Ctx.Attacker.GetObj();
if (pAttacker)
Expand All @@ -214,8 +212,34 @@ CString CTranscendenceModel::CalcEpitaph (SDestroyCtx &Ctx)
else
sCause = CONSTLIT("by unknown forces");

// Generat based on cause
//Let's mention any extra conditions that the player had before dying
CString sEffects;
TArray<CString> Effects;

if (pShip->IsRadioactive())
Effects.Insert("radioactive"); //Doesn't seem to work for some reason
if (pShip->IsBlind())
Effects.Insert("blind");
if (pShip->IsParalyzed())
Effects.Insert("paralyzed");
if (pShip->IsDisarmed())
Effects.Insert("disarmed");

if (Effects.GetCount() == 1)
sEffects = Effects.GetAt(0);
else if (Effects.GetCount() == 2)
sEffects = strPatternSubst(CONSTLIT("%s and %s"), Effects.GetAt(0), Effects.GetAt(1));
else {
sEffects = Effects.GetAt(0);
for (int i = 1; i < Effects.GetCount() - 1; i++) {
sEffects = strPatternSubst(CONSTLIT("%s, %s"), sEffects, Effects.GetAt(i));
}
sEffects = strPatternSubst(CONSTLIT("%s, and %s"), sEffects, Effects.GetAt(Effects.GetCount() - 1));
}
sCause = strPatternSubst(CONSTLIT("%s while %s"), sCause, sEffects);

// Generate based on cause

CString sText;
switch (Ctx.iCause)
{
Expand Down Expand Up @@ -1591,7 +1615,6 @@ void CTranscendenceModel::OnPlayerDestroyed (SDestroyCtx &Ctx, CString *retsEpit
Ctx.bResurrectPending = (m_pResurrectType != NULL);

// Generate epitaph

CString sText = CalcEpitaph(Ctx);
if (retsEpitaph)
*retsEpitaph = sText;
Expand Down