Skip to content

feat(murdermystery): add hero kills #714

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

Merged
jacobk999 merged 1 commit into from
Nov 19, 2024
Merged

feat(murdermystery): add hero kills #714

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: 2 additions & 1 deletion apps/discord-bot/src/commands/murdermystery/murdermystery.profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export const MurderMysteryProfile = ({
value={t(stats.trapKills)}
color="§c"
/>
<Table.td title={t("stats.heroKills")} value={t(stats.heroKills)} color="§e" />
<Table.td title={t("stats.bowKills")} value={t(stats.bowKills)} color="§6" />
<Table.td title={t("stats.suicides")} value={t(stats.suicides)} color="§4" />
</Table.tr>
Expand All @@ -103,7 +104,6 @@ export const MurderMysteryProfile = ({
value={t(stats.detectiveWins)}
color="§b"
/>
<Table.td title={t("stats.heroWins")} value={t(stats.heroWins)} color="§e" />
</Table.tr>
<Table.tr>
<Table.td title={t("stats.kills")} value={t(stats.kills)} color="§a" />
Expand All @@ -126,6 +126,7 @@ export const MurderMysteryProfile = ({
value={t(stats.trapKills)}
color="§c"
/>
<Table.td title={t("stats.heroKills")} value={t(stats.heroKills)} color="§e" />
<Table.td title={t("stats.bowKills")} value={t(stats.bowKills)} color="§6" />
<Table.td title={t("stats.suicides")} value={t(stats.suicides)} color="§4" />
</Table.tr>
Expand Down
1 change: 1 addition & 0 deletions locales/en-US/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,7 @@
"headshots": "Headshots",
"headstart": "Headstart",
"healing": "Healing",
"heroKills": "Hero Kills",
"heroWins": "Hero Wins",
"hidden": "Hidden",
"hiderWins": "Hider Wins",
Expand Down
8 changes: 4 additions & 4 deletions packages/schemas/src/player/gamemodes/murdermystery/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
ClassicMurderMysteryMode,
InfectionMurderMysteryMode,
MurderMysteryKnife,
StandardMurderMysteryMode,
OverallMurderMysteryMode,
} from "./mode.js";
import { Color } from "#color";
import { type ExtractGameModes, GameModes } from "#game";
Expand Down Expand Up @@ -44,7 +44,7 @@ export class MurderMystery {
public knife: MurderMysteryKnife;

@Field()
public overall: StandardMurderMysteryMode;
public overall: OverallMurderMysteryMode;

@Field()
public classic: ClassicMurderMysteryMode;
Expand All @@ -67,13 +67,13 @@ export class MurderMystery {
this.emblemFormatted = EMBLEM_MAP[emblemSelection] ? `${emblemColor.code}${EMBLEM_MAP[emblemSelection]}` : "";
this.knife = new MurderMysteryKnife(data);

this.overall = new StandardMurderMysteryMode(data, "");
this.overall = new OverallMurderMysteryMode(data);
this.classic = new ClassicMurderMysteryMode(data, "MURDER_CLASSIC");
this.doubleUp = new ClassicMurderMysteryMode(data, "MURDER_DOUBLE_UP");
this.assassins = new AssassinsMurderMysteryMode(data, "MURDER_ASSASSINS");
this.infection = new InfectionMurderMysteryMode(data, "MURDER_INFECTION");

this.overall.heroWins = ap.murdermystery_countermeasures;
this.overall.heroKills = ap.murdermystery_countermeasures;
}
}

Expand Down
14 changes: 12 additions & 2 deletions packages/schemas/src/player/gamemodes/murdermystery/mode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class StandardMurderMysteryMode extends BaseMurderMysteryMode {
public thrownKnifeKills: number;

@Field()
public heroWins: number;
public heroKills: number;

@Field()
public detectiveWins: number;
Expand All @@ -77,15 +77,25 @@ export class StandardMurderMysteryMode extends BaseMurderMysteryMode {

this.trapKills = data[`trap_kills${mode}`];
this.thrownKnifeKills = data[`thrown_knife_kills${mode}`];
this.heroKills = data[`was_hero${mode}`];

this.heroWins = data[`was_hero${mode}`];
this.detectiveWins = data[`detective_wins${mode}`];
this.murdererWins = data[`murderer_wins${mode}`];
this.killsAsMurderer = data[`kills_as_murderer${mode}`];
this.suicides = data[`suicides${mode}`];
}
}

export class OverallMurderMysteryMode extends StandardMurderMysteryMode {
@Field()
public heroWins: number;

public constructor(data: APIData) {
super(data, "");
this.heroWins = data.murdermystery_countermeasures;
}
}

export class ClassicMurderMysteryMode extends StandardMurderMysteryMode {
@Field({
leaderboard: { sort: "ASC", formatter: formatTime },
Expand Down