Skip to content

Assisted suicides also by world and indicate assists in kill feed. #2009

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
Agiel wants to merge 1 commit into
base: master
Choose a base branch
from
+69 −54
Open

Assisted suicides also by world and indicate assists in kill feed. #2009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
110 changes: 61 additions & 49 deletions src/game/client/neo/ui/neo_hud_deathnotice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,35 +384,35 @@ void CNEOHud_DeathNotice::SetDeathNoticeItemDimensions(DeathNoticeItem* deathNot
}
else
{ // Player killed message
if (deathNoticeItem->Killer.iEntIndex != 0 && !deathNoticeItem->bSuicide)
if (!deathNoticeItem->bSuicide && deathNoticeItem->Killer.iEntIndex != 0)
{
surface()->GetTextSize(g_hFontKillfeed, deathNoticeItem->Killer.szName, width, height);
totalWidth += width;
}
if (deathNoticeItem->Assist.iEntIndex != 0 && !deathNoticeItem->bSuicide)
if (deathNoticeItem->Assist.iEntIndex != 0)
{
surface()->GetTextSize(g_hFontKillfeed, deathNoticeItem->Assist.szName, width, height);
totalWidth += width;
if (deathNoticeItem->bSuicide && deathNoticeItem->Victim.iEntIndex != 0)
{
surface()->GetTextSize(g_hFontKillfeed, deathNoticeItem->Victim.szName, width, height);
totalWidth += width;
}
surface()->GetTextSize(g_hFontKillfeed, ASSIST_SEPARATOR, width, height);
totalWidth += width;
surface()->GetTextSize(g_hFontKillfeed, deathNoticeItem->Assist.szName, width, height);
totalWidth += width;
}
if (deathNoticeItem->Victim.iEntIndex != 0)
if (deathNoticeItem->bSuicide)
{
surface()->GetTextSize(g_hFontKillfeed, deathNoticeItem->Victim.szName, width, height);
totalWidth += width;
if (!deathNoticeItem->bSuicide)
if (deathNoticeItem->Assist.iEntIndex != 0)
{
totalWidth += spaceLength;
}
}
if (deathNoticeItem->bSuicide)
{
totalWidth += surface()->GetCharacterWidth(g_hFontKillfeedIcons, NEO_HUD_DEATHNOTICEICON_SHORTBUS) + spaceLength;
}
else
{
surface()->GetTextSize(g_hFontKillfeedIcons, deathNoticeItem->szDeathIcon, width, height);
totalWidth += width + spaceLength;
totalWidth += width + spaceLength + spaceLength;
if (deathNoticeItem->bExplosive)
{
totalWidth += surface()->GetCharacterWidth(g_hFontKillfeedIcons, NEO_HUD_DEATHNOTICEICON_EXPLODE) + spaceLength;
Expand All @@ -422,9 +422,14 @@ void CNEOHud_DeathNotice::SetDeathNoticeItemDimensions(DeathNoticeItem* deathNot
totalWidth += surface()->GetCharacterWidth(g_hFontKillfeedIcons, NEO_HUD_DEATHNOTICEICON_HEADSHOT) + spaceLength;
}
}
if (deathNoticeItem->Victim.iEntIndex != 0)
{
surface()->GetTextSize(g_hFontKillfeed, deathNoticeItem->Victim.szName, width, height);
totalWidth += width;
}
if (deathNoticeItem->bWasCarryingGhost)
{
totalWidth += surface()->GetCharacterWidth(g_hFontKillfeedIcons, NEO_HUD_DEATHNOTICEICON_GHOST) + spaceLength + spaceLength;
totalWidth += surface()->GetCharacterWidth(g_hFontKillfeedIcons, NEO_HUD_DEATHNOTICEICON_GHOST) + spaceLength;
}
}
deathNoticeItem->iLength = totalWidth;
Expand Down Expand Up @@ -459,27 +464,35 @@ void CNEOHud_DeathNotice::DrawPlayerDeath(int i)
{
DrawCommon(i);

if (!m_DeathNotices[i].bSuicide)
// Killer
if (!m_DeathNotices[i].bSuicide && m_DeathNotices[i].Killer.iEntIndex != 0)
{
// Killer
if (m_DeathNotices[i].Killer.iEntIndex != 0)
SetColorForNoticePlayer(m_DeathNotices[i].Killer.iTeam);
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(m_DeathNotices[i].Killer.szName, m_DeathNotices[i].Killer.iNameLength);
}

// Assister
if (m_DeathNotices[i].Assist.iEntIndex != 0)
{
if (m_DeathNotices[i].bSuicide && m_DeathNotices[i].Victim.iEntIndex != 0)
{
SetColorForNoticePlayer(m_DeathNotices[i].Killer.iTeam);
// Victim in killer position if suicide and there's an assister
SetColorForNoticePlayer(m_DeathNotices[i].Victim.iTeam);
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(m_DeathNotices[i].Killer.szName, m_DeathNotices[i].Killer.iNameLength);
surface()->DrawPrintText(m_DeathNotices[i].Victim.szName, m_DeathNotices[i].Victim.iNameLength);
}

// Assister
if (m_DeathNotices[i].Assist.iEntIndex != 0)
{
surface()->DrawSetTextColor(COLOR_NEO_WHITE);
surface()->DrawPrintText(ASSIST_SEPARATOR, ASSIST_SEPARATOR_LENGTH - 1);
surface()->DrawSetTextColor(COLOR_NEO_WHITE);
surface()->DrawPrintText(ASSIST_SEPARATOR, ASSIST_SEPARATOR_LENGTH - 1);

SetColorForNoticePlayer(m_DeathNotices[i].Assist.iTeam);
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(m_DeathNotices[i].Assist.szName, m_DeathNotices[i].Assist.iNameLength);
}
SetColorForNoticePlayer(m_DeathNotices[i].Assist.iTeam);
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(m_DeathNotices[i].Assist.szName, m_DeathNotices[i].Assist.iNameLength);
}

if (!m_DeathNotices[i].bSuicide)
{
// Icons
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(L" ", 1);
Expand All @@ -503,39 +516,38 @@ void CNEOHud_DeathNotice::DrawPlayerDeath(int i)
surface()->DrawPrintText(&icon, 1);
}
}

// Victim
if (m_DeathNotices[i].Victim.iEntIndex != 0)
else
{
surface()->DrawSetTextFont(g_hFontKillfeed);
if (!m_DeathNotices[i].bSuicide)
// Suicide Icon
if (m_DeathNotices[i].Assist.iEntIndex != 0)
{
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(L" ", 1);
}
SetColorForNoticePlayer(m_DeathNotices[i].Victim.iTeam);
surface()->DrawPrintText(m_DeathNotices[i].Victim.szName, m_DeathNotices[i].Victim.iNameLength);
}

// Victim Ghoster Icon
if (m_DeathNotices[i].bWasCarryingGhost)
{
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(L" ", 1);
surface()->DrawSetTextFont(g_hFontKillfeedIcons);
surface()->DrawSetTextColor(COLOR_NEO_WHITE);
wchar_t icon = NEO_HUD_DEATHNOTICEICON_GHOST;
surface()->DrawSetTextColor(COLOR_NEO_ORANGE);
wchar_t icon = NEO_HUD_DEATHNOTICEICON_SHORTBUS;
surface()->DrawPrintText(&icon, 1);
}

// Suicide Icon
if (m_DeathNotices[i].bSuicide)
// Victim
if (m_DeathNotices[i].Victim.iEntIndex != 0)
{
SetColorForNoticePlayer(m_DeathNotices[i].Victim.iTeam);
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(L" ", 1);
surface()->DrawSetTextFont(g_hFontKillfeedIcons);
surface()->DrawSetTextColor(COLOR_NEO_ORANGE);
wchar_t icon = NEO_HUD_DEATHNOTICEICON_SHORTBUS;
surface()->DrawPrintText(&icon, 1);
surface()->DrawPrintText(m_DeathNotices[i].Victim.szName, m_DeathNotices[i].Victim.iNameLength);

// Victim Ghoster Icon
if (m_DeathNotices[i].bWasCarryingGhost)
{
surface()->DrawSetTextFont(g_hFontKillfeed);
surface()->DrawPrintText(L" ", 1);
surface()->DrawSetTextFont(g_hFontKillfeedIcons);
surface()->DrawSetTextColor(COLOR_NEO_WHITE);
wchar_t icon = NEO_HUD_DEATHNOTICEICON_GHOST;
surface()->DrawPrintText(&icon, 1);
}
}
}

Expand Down
13 changes: 8 additions & 5 deletions src/game/shared/neo/neo_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ const NeoGameTypeSettings NEO_GAME_TYPE_SETTINGS[NEO_GAME_TYPE__TOTAL] = {
}

BEGIN_RECV_TABLE( CNEOGameRulesProxy, DT_NEOGameRulesProxy )
RecvPropDataTable( "neo_gamerules_data", 0, 0,
&REFERENCE_RECV_TABLE( DT_NEORules ),
RecvPropDataTable( "neo_gamerules_data", 0, 0,
&REFERENCE_RECV_TABLE( DT_NEORules ),
RecvProxy_NEORules )
END_RECV_TABLE()
#else
Expand Down Expand Up @@ -1379,7 +1379,7 @@ void CNEORules::Think(void)
}
else if (GetGameType() == NEO_GAME_TYPE_JGR)
{
if ((!m_pJuggernautPlayer && m_pJuggernautItem && !m_pJuggernautItem->IsBeingActivatedByLosingTeam()) ||
if ((!m_pJuggernautPlayer && m_pJuggernautItem && !m_pJuggernautItem->IsBeingActivatedByLosingTeam()) ||
(!m_pJuggernautPlayer && !m_pJuggernautItem)) // Juggernaut is absent entirely
{
if (GetGlobalTeam(TEAM_JINRAI)->GetScore() > GetGlobalTeam(TEAM_NSF)->GetScore())
Expand Down Expand Up @@ -1474,7 +1474,7 @@ void CNEORules::Think(void)
{
Assert(false);
continue;
}
}
pGhostCap->SetActive(false);
}

Expand Down Expand Up @@ -3940,11 +3940,14 @@ void CNEORules::SetWinningTeam(int team, int iWinReason, bool bForceMapReset, bo
static CNEO_Player* FetchAssists(CNEO_Player* attacker, CNEO_Player* victim)
{
// Non-CNEO_Player, return NULL
if (!attacker || !victim)
if (!victim)
{
return NULL;
}

// If it's a suicide, use the victim as the attacker
attacker = attacker ? attacker : victim;

// Check for assistance (> 50 dmg, not final attacker)
CNEO_Player* pImpersonated = attacker->GetSpectatorTakeoverPlayerTarget();
const int attackerIdx = pImpersonated ? pImpersonated->entindex() : attacker->entindex();
Expand Down