Skip to content

Commit 1234773

Browse files
jacobk999jacobk999
authored
feat(murdermystery): add prefixes (#819)
* feat(murdermystery): add prefixes * chore: undo folder move * fix: format
1 parent 2596951 commit 1234773

14 files changed

Lines changed: 319 additions & 114 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@ apps/support-bot/commands.json
2323
.pnpm-store/
2424
Cargo.lock
2525
/target
26+
/data
27+
compose.dev.yml
2628
*.node
27-
.env
29+
.env

‎apps/discord-bot/src/commands/murdermystery/murdermystery.profile.tsx‎

Lines changed: 118 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,19 @@
66
* https://github.com/Statsify/statsify/blob/main/LICENSE
77
*/
88

9-
import { Container, Footer, Header, Historical, SidebarItem, Table } from "#components";
10-
import { FormattedGame, type GameMode, MurderMysteryModes } from "@statsify/schemas";
9+
import {
10+
Container,
11+
Footer,
12+
Header,
13+
Historical,
14+
SidebarItem,
15+
Table,
16+
} from "#components";
17+
import {
18+
FormattedGame,
19+
type GameMode,
20+
MurderMysteryModes,
21+
} from "@statsify/schemas";
1122
import { formatTime } from "@statsify/util";
1223
import type { BaseProfileProps } from "#commands/base.hypixel-command";
1324

@@ -43,7 +54,11 @@ export const MurderMysteryProfile = ({
4354
table = (
4455
<Table.table>
4556
<Table.tr>
46-
<Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
57+
<Table.td
58+
title={t("stats.wins")}
59+
value={t(stats.wins)}
60+
color="§a"
61+
/>
4762
<Table.td
4863
title={t("stats.murdererWins")}
4964
value={t(stats.murdererWins)}
@@ -54,11 +69,23 @@ export const MurderMysteryProfile = ({
5469
value={t(stats.detectiveWins)}
5570
color="§b"
5671
/>
57-
<Table.td title={t("stats.heroWins")} value={t(stats.heroWins)} color="§e" />
72+
<Table.td
73+
title={t("stats.heroWins")}
74+
value={t(stats.heroWins)}
75+
color="§e"
76+
/>
5877
</Table.tr>
5978
<Table.tr>
60-
<Table.td title={t("stats.kills")} value={t(stats.kills)} color="§a" />
61-
<Table.td title={t("stats.deaths")} value={t(stats.deaths)} color="§c" />
79+
<Table.td
80+
title={t("stats.kills")}
81+
value={t(stats.kills)}
82+
color="§a"
83+
/>
84+
<Table.td
85+
title={t("stats.deaths")}
86+
value={t(stats.deaths)}
87+
color="§c"
88+
/>
6289
<Table.td title={t("stats.kdr")} value={t(stats.kdr)} color="§6" />
6390
<Table.td
6491
title={t("stats.killsAsMurderer")}
@@ -77,9 +104,21 @@ export const MurderMysteryProfile = ({
77104
value={t(stats.trapKills)}
78105
color="§c"
79106
/>
80-
<Table.td title={t("stats.heroKills")} value={t(stats.heroKills)} color="§e" />
81-
<Table.td title={t("stats.bowKills")} value={t(stats.bowKills)} color="§6" />
82-
<Table.td title={t("stats.suicides")} value={t(stats.suicides)} color="§4" />
107+
<Table.td
108+
title={t("stats.heroKills")}
109+
value={t(stats.heroKills)}
110+
color="§e"
111+
/>
112+
<Table.td
113+
title={t("stats.bowKills")}
114+
value={t(stats.bowKills)}
115+
color="§6"
116+
/>
117+
<Table.td
118+
title={t("stats.suicides")}
119+
value={t(stats.suicides)}
120+
color="§4"
121+
/>
83122
</Table.tr>
84123
</Table.table>
85124
);
@@ -93,7 +132,11 @@ export const MurderMysteryProfile = ({
93132
table = (
94133
<Table.table>
95134
<Table.tr>
96-
<Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
135+
<Table.td
136+
title={t("stats.wins")}
137+
value={t(stats.wins)}
138+
color="§a"
139+
/>
97140
<Table.td
98141
title={t("stats.murdererWins")}
99142
value={t(stats.murdererWins)}
@@ -106,8 +149,16 @@ export const MurderMysteryProfile = ({
106149
/>
107150
</Table.tr>
108151
<Table.tr>
109-
<Table.td title={t("stats.kills")} value={t(stats.kills)} color="§a" />
110-
<Table.td title={t("stats.deaths")} value={t(stats.deaths)} color="§c" />
152+
<Table.td
153+
title={t("stats.kills")}
154+
value={t(stats.kills)}
155+
color="§a"
156+
/>
157+
<Table.td
158+
title={t("stats.deaths")}
159+
value={t(stats.deaths)}
160+
color="§c"
161+
/>
111162
<Table.td title={t("stats.kdr")} value={t(stats.kdr)} color="§6" />
112163
<Table.td
113164
title={t("stats.killsAsMurderer")}
@@ -126,16 +177,30 @@ export const MurderMysteryProfile = ({
126177
value={t(stats.trapKills)}
127178
color="§c"
128179
/>
129-
<Table.td title={t("stats.heroKills")} value={t(stats.heroKills)} color="§e" />
130-
<Table.td title={t("stats.bowKills")} value={t(stats.bowKills)} color="§6" />
131-
<Table.td title={t("stats.suicides")} value={t(stats.suicides)} color="§4" />
180+
<Table.td
181+
title={t("stats.heroKills")}
182+
value={t(stats.heroKills)}
183+
color="§e"
184+
/>
185+
<Table.td
186+
title={t("stats.bowKills")}
187+
value={t(stats.bowKills)}
188+
color="§6"
189+
/>
190+
<Table.td
191+
title={t("stats.suicides")}
192+
value={t(stats.suicides)}
193+
color="§4"
194+
/>
132195
</Table.tr>
133196
<Historical.exclude time={time}>
134197
<Table.tr>
135198
<Table.td
136199
title={t("stats.fastestMurdererWin")}
137200
value={
138-
stats.fastestMurdererWin ? formatTime(stats.fastestMurdererWin) : "N/A"
201+
stats.fastestMurdererWin ?
202+
formatTime(stats.fastestMurdererWin) :
203+
"N/A"
139204
}
140205
color="§c"
141206
/>
@@ -161,9 +226,21 @@ export const MurderMysteryProfile = ({
161226
table = (
162227
<Table.table>
163228
<Table.tr>
164-
<Table.td title={t("stats.wins")} value={t(stats.wins)} color="§e" />
165-
<Table.td title={t("stats.kills")} value={t(stats.kills)} color="§a" />
166-
<Table.td title={t("stats.deaths")} value={t(stats.deaths)} color="§c" />
229+
<Table.td
230+
title={t("stats.wins")}
231+
value={t(stats.wins)}
232+
color="§e"
233+
/>
234+
<Table.td
235+
title={t("stats.kills")}
236+
value={t(stats.kills)}
237+
color="§a"
238+
/>
239+
<Table.td
240+
title={t("stats.deaths")}
241+
value={t(stats.deaths)}
242+
color="§c"
243+
/>
167244
<Table.td title={t("stats.kdr")} value={t(stats.kdr)} color="§6" />
168245
</Table.tr>
169246
<Table.tr>
@@ -177,7 +254,11 @@ export const MurderMysteryProfile = ({
177254
value={t(stats.trapKills)}
178255
color="§c"
179256
/>
180-
<Table.td title={t("stats.bowKills")} value={t(stats.bowKills)} color="§6" />
257+
<Table.td
258+
title={t("stats.bowKills")}
259+
value={t(stats.bowKills)}
260+
color="§6"
261+
/>
181262
</Table.tr>
182263
</Table.table>
183264
);
@@ -190,7 +271,11 @@ export const MurderMysteryProfile = ({
190271
table = (
191272
<Table.table>
192273
<Table.tr>
193-
<Table.td title={t("stats.wins")} value={t(stats.wins)} color="§a" />
274+
<Table.td
275+
title={t("stats.wins")}
276+
value={t(stats.wins)}
277+
color="§a"
278+
/>
194279
<Historical.exclude time={time}>
195280
<Table.td
196281
title={t("stats.lastAliveGames")}
@@ -212,7 +297,11 @@ export const MurderMysteryProfile = ({
212297
/>
213298
</Table.tr>
214299
<Table.tr>
215-
<Table.td title={t("stats.alphaWins")} value={t(stats.alphaWins)} color="§c" />
300+
<Table.td
301+
title={t("stats.alphaWins")}
302+
value={t(stats.alphaWins)}
303+
color="§c"
304+
/>
216305
<Table.td
217306
title={t("stats.killsAsAlpha")}
218307
value={t(stats.killsAsAlpha)}
@@ -226,15 +315,17 @@ export const MurderMysteryProfile = ({
226315
}
227316
}
228317

229-
const description = [];
230-
231-
if (murdermystery.emblemFormatted) description.push(`§7${t("stats.emblem")}: ${murdermystery.emblemFormatted}`);
232-
description.push(`§7${t("stats.knife")}: §a${murdermystery.knife.name}`);
318+
const description = [
319+
`§7${t("stats.prefix")}: ${murdermystery.prefix}`,
320+
`§7${t("stats.knife")}: §a${murdermystery.knife.name}`,
321+
];
233322

234323
if (murdermystery.knife.progression.percent >= 1)
235324
description.push(`§7${t("stats.progression.exp")}: §l§dPRESTIGED`);
236325
else
237-
description.push(`§7${t("stats.progression.exp")}: ${knifePrestigeProgressBar(murdermystery.knife.progression.percent)} §e${murdermystery.knife.progression.current}§7/§d${murdermystery.knife.progression.max}`);
326+
description.push(
327+
`§7${t("stats.progression.exp")}: ${knifePrestigeProgressBar(murdermystery.knife.progression.percent)} §e${murdermystery.knife.progression.current}§7/§d${murdermystery.knife.progression.max}`
328+
);
238329

239330
return (
240331
<Container background={background}>

‎assets/private‎

‎assets/public‎

Submodule public updated 1 file

‎packages/rendering/src/font/tokens.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export interface Token {
2424
effect: (
2525
part: string,
2626
matches: RegExpMatchArray,
27-
defaultState: Omit<TextNode, "text">
27+
defaultState: Omit<TextNode, "text">,
2828
) => Partial<TextNode>;
2929
}
3030

@@ -70,8 +70,6 @@ const color: Token = {
7070
regex: colorRegex,
7171
effect: (part) => ({
7272
color: part.startsWith("#") ? part.slice(0, 7) : textColors[part[0]],
73-
strikethrough: false,
74-
underline: false,
7573
}),
7674
};
7775

0 commit comments

Comments
 (0)