Skip to content

Award assists to players for damage inflicted before bot takeover #1901

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
sunzenshen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Award assists to players for damage inflicted before bot takeover #1901

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
3 changes: 3 additions & 0 deletions src/game/client/neo/c_neo_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ class C_NEO_Player : public C_HL2MP_Player
bool m_bCopyOverTakeoverPlayerDetails{ false };
CNetworkHandle(C_NEO_Player, m_hSpectatorTakeoverPlayerTarget);
CNetworkHandle(C_NEO_Player, m_hSpectatorTakeoverPlayerImpersonatingMe);
C_NEO_Player* GetSpectatorTakeoverPlayerTarget() const { return m_hSpectatorTakeoverPlayerTarget.Get(); }
C_NEO_Player* GetSpectatorTakeoverPlayerImpersonatingMe() const { return m_hSpectatorTakeoverPlayerImpersonatingMe.Get(); }

void CSpectatorTakeoverPlayerUpdateOnDataChanged();
void CSpectatorTakeoverPlayerUpdate(C_NEO_Player* pPlayerTakeoverTarget);
const char* GetPlayerNameWithTakeoverContext(int player_index);
Expand Down
30 changes: 26 additions & 4 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 @@ -785,12 +785,34 @@ void CNEOHud_DeathNotice::AddPlayerDeath(IGameEvent* event)
C_NEO_Player* pVictim = ToNEOPlayer(UTIL_PlayerByIndex(victim));
C_NEO_Player* pAssist = ToNEOPlayer(UTIL_PlayerByIndex(assist));

if (pKiller)
killer_name = pKiller->GetPlayerNameWithTakeoverContext(killer);
// Special case: Spectator assisted their own bot-takeover kill
// Simplify to "Bot Name + Player Name"
if (pKiller && pAssist && killer == assist && killer > 0)
{
C_NEO_Player* pTakeoverTarget = pKiller->GetSpectatorTakeoverPlayerTarget();
if (pTakeoverTarget)
{
killer_name = pTakeoverTarget->GetNeoPlayerName();
assists_name = pAssist->GetNeoPlayerName();
}
}
else
{
if (pKiller)
{
killer_name = pKiller->GetPlayerNameWithTakeoverContext(killer);
}

if (pAssist)
{
assists_name = pAssist->GetPlayerNameWithTakeoverContext(assist);
}
}

if (pVictim)
{
victim_name = pVictim->GetPlayerNameWithTakeoverContext(victim);
if (pAssist)
assists_name = pAssist->GetPlayerNameWithTakeoverContext(assist);
}

// Make a new death notice
DeathNoticeItem deathMsg;
Expand Down
3 changes: 2 additions & 1 deletion src/game/server/neo/neo_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3236,7 +3236,8 @@ int CNEO_Player::OnTakeDamage_Alive(const CTakeDamageInfo& info)
// Checking because attacker might be prop or world
if (auto *attacker = ToNEOPlayer(info.GetAttacker()))
{
const int attackerIdx = attacker->entindex();
CNEO_Player* pImpersonated = attacker->GetSpectatorTakeoverPlayerTarget();
const int attackerIdx = pImpersonated ? pImpersonated->entindex() : attacker->entindex();
NEORules()->SetLastAttacker(entindex()); // NEO TODO (Adam) Once we can spectate non-players, let last attacker be non-neoplayer (Jeff)

// Separate the fractional amount of damage from the whole
Expand Down
3 changes: 3 additions & 0 deletions src/game/server/neo/neo_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ class CNEO_Player : public CHL2MP_Player
bool GetBotCloakStateDisrupted() const { return !m_botThermOpticCamoDisruptedTimer.IsElapsed(); }
bool GetSpectatorTakeoverPlayerPending() const { return m_bSpectatorTakeoverPlayerPending; }

CNEO_Player* GetSpectatorTakeoverPlayerTarget() const { return m_hSpectatorTakeoverPlayerTarget.Get(); }
CNEO_Player* GetSpectatorTakeoverPlayerImpersonatingMe() const { return m_hSpectatorTakeoverPlayerImpersonatingMe.Get(); }

virtual void StartAutoSprint(void) OVERRIDE;
virtual void StartSprinting(void) OVERRIDE;
virtual void StopSprinting(void) OVERRIDE;
Expand Down
13 changes: 10 additions & 3 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 @@ -3940,7 +3940,9 @@ static CNEO_Player* FetchAssists(CNEO_Player* attacker, CNEO_Player* victim)
}

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

for (int assistIdx = 1; assistIdx <= gpGlobals->maxClients; ++assistIdx)
{
if (assistIdx == attackerIdx)
Expand Down Expand Up @@ -4116,13 +4118,18 @@ void CNEORules::PlayerKilled(CBasePlayer *pVictim, const CTakeDamageInfo &info)
{
if (sv_neo_teamdamage_assists.GetBool())
{
assister->AddPoints(-1, true);
// If a bot is being taken over, penalize the impersonator.
CNEO_Player* pImpersonator = assister->GetSpectatorTakeoverPlayerImpersonatingMe();
CNEO_Player* pPenalized = pImpersonator ? pImpersonator : assister;
// bIgnorePlayerTakeover = true to penalize the impersonator
pPenalized->AddPoints(-1, true, true);
}
}
// Enemy kill assist
else
{
assister->AddPoints(1, false);
// bIgnorePlayerTakeover = true: FetchAssists handled spec-takeover
assister->AddPoints(1, false, true);
}
}
}
Expand Down
Loading