Skip to content

Show the actual first blood victim on the Timeline #3374

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

Draft
geracosta wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Show the actual first blood victim on the Timeline #3374

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
79 changes: 47 additions & 32 deletions src/components/Match/Timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ const Timeline = ({
time: number;
team?: number;
player_slot?: number;
victim_player_slot?: number;
key?: number | null;
start?: number;
end?: number;
Expand All @@ -330,11 +331,32 @@ const Timeline = ({
type: "firstblood",
time: match.objectives[fbIndex].time,
player_slot: match.objectives[fbIndex].player_slot,
victim_player_slot: match.objectives[fbIndex].victim_player_slot,
key: killerLog && killerLog[0] ? killerLog[0].key : null,
},
];
}

// The victim from the objective when the API provides it; otherwise fall
// back to guessing from the killer's first kills_log entry, which misses
// first bloods not credited to a hero (e.g. a creep landing the blow)
const findFbVictim = (obj: (typeof fbArr)[number]) => {
if (obj.victim_player_slot !== undefined) {
return match.players.find(
(player) => player.player_slot === obj.victim_player_slot,
);
}
if (obj.key) {
return match.players.find((player) => {
const foundHero = heroesArr("find")(
(hero: any) => hero.name === obj.key,
);
return foundHero && player.hero_id === foundHero.id;
});
}
return undefined;
};

const events = fbArr

// Roshan kills, team 2 = radiant, 3 = dire
Expand Down Expand Up @@ -490,38 +512,31 @@ const Timeline = ({
effect="solid"
place="right"
>
{obj.type === "firstblood" && (
<section>
{match.players
.filter(
(player) =>
player.player_slot === obj.player_slot,
)
.map((player) => (
<PlayerThumb
key={player.player_slot}
{...player}
/>
))}
<span>
{obj.key
? strings.timeline_firstblood_key
: strings.timeline_firstblood}
</span>
{obj.key && (
<PlayerThumb
{...match.players.find((player) => {
const foundHero = heroesArr("find")(
(hero: any) => hero.name === obj.key,
);
return (
foundHero && player.hero_id === foundHero.id
);
})}
/>
)}
</section>
)}
{obj.type === "firstblood" &&
(() => {
const victim = findFbVictim(obj);
return (
<section>
{match.players
.filter(
(player) =>
player.player_slot === obj.player_slot,
)
.map((player) => (
<PlayerThumb
key={player.player_slot}
{...player}
/>
))}
<span>
{victim
? strings.timeline_firstblood_key
: strings.timeline_firstblood}
</span>
{victim && <PlayerThumb {...victim} />}
</section>
);
})()}
{obj.type === "roshan" &&
aegis[obj.key as number] &&
match.players
Expand Down
Loading