Skip to content

Commit 36723fb

Browse files
Merge branch 'schema' into client-release
2 parents 3ab7e19 + 1412c18 commit 36723fb

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

client/src/components/sidebar/game/team-table.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
7272
ratKingPercent = teamStat.ratKingPercent
7373
}
7474

75+
const formatPercent = (val: number) => (val * 100).toFixed(1)
76+
7577
const teamName = TEAM_COLOR_NAMES[teamIdx].toLowerCase()
7678
return (
7779
<div className="flex flex-col items-center">
@@ -88,7 +90,7 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
8890
<div className="flex items-center w-[145px]">
8991
<div>Percent:</div>
9092
<div className="ml-1">
91-
<b>{cheesePercent}</b>
93+
<b>{formatPercent(cheesePercent)}</b>
9294
</div>
9395
</div>
9496
</div>
@@ -97,15 +99,15 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
9799
<div className="w-[30px] h-[30px] mr-5">
98100
<img style={{ transform: 'scale(1.5)' }} src={imageSource(`robots/cat/cat_0.png`)} />
99101
</div>
100-
<div>Count:</div>
102+
<div>Damage:</div>
101103
<div className="ml-1">
102104
<b>{catDamageAmount}</b>
103105
</div>
104106
</div>
105107
<div className="flex items-center w-[145px]">
106108
<div>Percent:</div>
107109
<div className="ml-1">
108-
<b>{catDamagePercent}</b>
110+
<b>{formatPercent(catDamagePercent)}</b>
109111
</div>
110112
</div>
111113
</div>
@@ -125,7 +127,7 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
125127
<div className="flex items-center w-[145px]">
126128
<div>Percent:</div>
127129
<div className="ml-1">
128-
<b>{ratKingPercent}</b>
130+
<b>{formatPercent(ratKingPercent)}</b>
129131
</div>
130132
</div>
131133
</div>

client/src/playback/RoundStat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export default class RoundStat {
8787
const teamStat = this.teams.get(team) ?? assert.fail(`team ${i} not found in team stats in round`)
8888

8989
teamStat.cheeseAmount = delta.teamCheeseTransferred(i) ?? assert.fail('missing cheese amount')
90-
teamStat.cheesePercent = teamStat.cheeseAmount / totalCheese
90+
teamStat.cheesePercent = totalCheese ? teamStat.cheeseAmount / totalCheese : 0
9191
teamStat.catDamageAmount = delta.teamCatDamage(i) ?? assert.fail('missing cat damage amount')
9292
teamStat.catDamagePercent = totalCatDamage ? teamStat.catDamageAmount / totalCatDamage : 0
9393
teamStat.ratKingCount = delta.teamAliveRatKings(i) ?? assert.fail('missing rat king count')

0 commit comments

Comments
 (0)