Skip to content
This repository has been archived by the owner on Dec 11, 2024. It is now read-only.

Commit

Permalink
Ratio removeal
Browse files Browse the repository at this point in the history
  • Loading branch information
Kathund committed Sep 1, 2024
1 parent 0220e12 commit bfe2c5a
Show file tree
Hide file tree
Showing 22 changed files with 171 additions and 171 deletions.
6 changes: 3 additions & 3 deletions src/API/getPlayer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ test('getPlayer', async () => {
expect(data.stats.pit.deaths).toBeDefined();
expectTypeOf(data.stats.pit.deaths).toEqualTypeOf<number>();
expect(data.stats.pit.deaths).toBeGreaterThanOrEqual(0);
expect(data.stats.pit.KDRatio).toBeDefined();
expectTypeOf(data.stats.pit.KDRatio).toEqualTypeOf<number>();
expect(data.stats.pit.KDRatio).toBeGreaterThanOrEqual(0);
expect(data.stats.pit.KDR).toBeDefined();
expectTypeOf(data.stats.pit.KDR).toEqualTypeOf<number>();
expect(data.stats.pit.KDR).toBeGreaterThanOrEqual(0);
expect(data.stats.pit.assists).toBeDefined();
expectTypeOf(data.stats.pit.assists).toEqualTypeOf<number>();
expect(data.stats.pit.assists).toBeGreaterThanOrEqual(0);
Expand Down
28 changes: 14 additions & 14 deletions src/structures/MiniGames/Arcade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ export class BountyHunters {
wins: number;
kills: number;
deaths: number;
KDRatio: number;
KDR: number;
bountyKills: number;
bowKills: number;
swordKills: number;
constructor(data: Record<string, any>) {
this.wins = data.wins_oneinthequiver || 0;
this.kills = data.kills_oneinthequiver || 0;
this.deaths = data.deaths_oneinthequiver || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.bountyKills = data.bounty_kills_oneinthequiver || 0;
this.bowKills = data.bow_kills_oneinthequiver || 0;
this.swordKills = data.sword_kills_oneinthequiver || 0;
Expand All @@ -109,11 +109,11 @@ export class BountyHunters {
export class CaptureTheWool {
wins: number;
losses: number;
WLRatio: number;
WLR: number;
draws: number;
kills: number;
deaths: number;
KDRatio: number;
KDR: number;
assists: number;
woolPickedUp: number;
woolCaptured: number;
Expand All @@ -122,11 +122,11 @@ export class CaptureTheWool {
constructor(data: Record<string, any>) {
this.wins = data.woolhunt_participated_wins || 0;
this.losses = data.woolhunt_participated_losses || 0;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.draws = data.woolhunt_participated_draws || 0;
this.kills = data.woolhunt_kills || 0;
this.deaths = data.woolhunt_deaths || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.assists = data.woolhunt_assists || 0;
this.woolPickedUp = data.woolhunt_wools_stolen || 0;
this.woolCaptured = data.woolhunt_wools_captured || 0;
Expand Down Expand Up @@ -318,7 +318,7 @@ export class MiniWalls {
wins: number;
kills: number;
deaths: number;
KDRatio: number;
KDR: number;
finalKills: number;
witherKills: number;
witherDamage: number;
Expand All @@ -330,7 +330,7 @@ export class MiniWalls {
this.wins = data.wins_mini_walls || 0;
this.kills = data.kills_mini_walls || 0;
this.deaths = data.deaths_mini_walls || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.finalKills = data.final_kills_mini_walls || 0;
this.witherKills = data.wither_kills_mini_walls || 0;
this.witherDamage = data.wither_damage_mini_walls || 0;
Expand All @@ -355,14 +355,14 @@ export class PixelPartyGameMode {
wins: number;
gamesPlayed: number;
losses: number;
WLRatio: number;
WLR: number;
roundsPlayed: number;
powerUpsCollected: number;
constructor(data: Record<string, any>, modeName: string) {
this.wins = data?.[`wins_${modeName}`] || 0;
this.gamesPlayed = data?.[`games_played_${modeName}`] || 0;
this.losses = this.gamesPlayed - this.wins;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.roundsPlayed = data?.[`rounds_completed_${modeName}`] || 0;
this.powerUpsCollected = data?.[`power_ups_collected_${modeName}`] || 0;
}
Expand All @@ -372,7 +372,7 @@ export class PixelParty {
wins: number;
gamesPlayed: number;
losses: number;
WLRatio: number;
WLR: number;
roundsPlayed: number;
powerUpsCollected: number;
normal: PixelPartyGameMode;
Expand All @@ -384,7 +384,7 @@ export class PixelParty {
this.wins = data?.pixel_party?.wins || 0;
this.gamesPlayed = data?.pixel_party?.games_played || 0;
this.losses = this.gamesPlayed - this.wins;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.roundsPlayed = data?.pixel_party?.rounds_completed || 0;
this.powerUpsCollected = data?.pixel_party?.power_ups_collected || 0;
this.normal = new PixelPartyGameMode(data.pixel_party, 'normal');
Expand All @@ -399,12 +399,12 @@ export class ThrowOut {
wins: number;
kills: number;
deaths: number;
KDRatio: number;
KDR: number;
constructor(data: Record<string, any>) {
this.wins = data.wins_throw_out || 0;
this.kills = data.kills_throw_out || 0;
this.deaths = data.deaths_throw_out || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/structures/MiniGames/ArenaBrawl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ class ArenaBrawlMode {
damage: number;
kills: number;
deaths: number;
KDRatio: number;
KDR: number;
healed: number;
wins: number;
losses: number;
WLRatio: number;
WLR: number;
games: number;
winstreak: number;
constructor(data: Record<string, any>, mode: string) {
this.damage = data[`damage_${mode}`];
this.kills = data[`kills_${mode}`];
this.deaths = data[`deaths_${mode}`];
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.healed = data[`healed_${mode}`];
this.wins = data[`wins_${mode}`];
this.losses = data[`losses_${mode}`];
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.games = data[`games_${mode}`];
this.winstreak = data[`win_streaks_${mode}`];
}
Expand Down
24 changes: 12 additions & 12 deletions src/structures/MiniGames/BedWars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ export interface BedWarsModeStats {
finalDeaths: number;
beds: BedWarsBeds;
avg: BedWarsAvg;
KDRatio: number;
WLRatio: number;
finalKDRatio: number;
KDR: number;
WLR: number;
FKDR: number;
}

export interface BedwarsDreamModeStats {
Expand Down Expand Up @@ -171,9 +171,9 @@ function generateStatsForMode(data: Record<string, any>, mode: string): BedWarsM
finalKills: divide(data[`${mode}_final_kills_bedwars`], data[`${mode}_games_played_bedwars`]),
bedsBroken: divide(data[`${mode}_beds_broken_bedwars`], data[`${mode}_games_played_bedwars`])
},
KDRatio: divide(data[`${mode}_kills_bedwars`], data[`${mode}_deaths_bedwars`]),
WLRatio: divide(data[`${mode}_wins_bedwars`], data[`${mode}_losses_bedwars`]),
finalKDRatio: divide(data[`${mode}_final_kills_bedwars`], data[`${mode}_final_deaths_bedwars`])
KDR: divide(data[`${mode}_kills_bedwars`], data[`${mode}_deaths_bedwars`]),
WLR: divide(data[`${mode}_wins_bedwars`], data[`${mode}_losses_bedwars`]),
FKDR: divide(data[`${mode}_final_kills_bedwars`], data[`${mode}_final_deaths_bedwars`])
};
}

Expand Down Expand Up @@ -384,9 +384,9 @@ class BedWars {
collectedItemsTotal: BedWarsCollectedItems;
beds: BedWarsBeds;
avg: BedWarsAvg;
KDRatio: number;
finalKDRatio: number;
WLRatio: number;
KDR: number;
FKDR: number;
WLR: number;
solo: BedWarsModeStats;
doubles: BedWarsModeStats;
threes: BedWarsModeStats;
Expand Down Expand Up @@ -426,9 +426,9 @@ class BedWars {
finalKills: divide(this.finalKills, this.playedGames),
bedsBroken: divide(this.beds.broken, this.playedGames)
};
this.KDRatio = divide(this.kills, this.deaths);
this.finalKDRatio = divide(this.finalKills, this.finalDeaths);
this.WLRatio = divide(this.wins, this.losses);
this.KDR = divide(this.kills, this.deaths);
this.FKDR = divide(this.finalKills, this.finalDeaths);
this.WLR = divide(this.wins, this.losses);
this.solo = generateStatsForMode(data, 'eight_one');
this.doubles = generateStatsForMode(data, 'eight_two');
this.threes = generateStatsForMode(data, 'four_three');
Expand Down
16 changes: 8 additions & 8 deletions src/structures/MiniGames/BlitzSurvivalGames.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ class BlitzSGKit {
exp: number;
kills: number;
deaths: number;
KDRatio: number;
KDR: number;
wins: number;
gamesPlayed: number;
losses: number;
WLRatio: number;
WLR: number;
arrowsShot: number;
arrowsHit: number;
bowAccuracy: number;
Expand All @@ -25,11 +25,11 @@ class BlitzSGKit {
this.exp = data[`exp_${kitName}`] || 0;
this.kills = data[`kills_${kitName}`] || 0;
this.deaths = data[`deaths_${kitName}`] || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.wins = data[`wins_${kitName}`] || 0;
this.gamesPlayed = data[`games_played_${kitName}`] || 0;
this.losses = this.gamesPlayed - this.wins;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.arrowsShot = data[`arrows_fired_${kitName}`] || 0;
this.arrowsHit = data[`arrows_hit_${kitName}`] || 0;
this.bowAccuracy = divide(this.arrowsHit, this.arrowsShot);
Expand All @@ -50,13 +50,13 @@ class BlitzSurvivalGames {
killsSolo: number;
killsTeams: number;
deaths: number;
KDRatio: number;
KDR: number;
wins: number;
winsSolo: number;
winsTeam: number;
gamesPlayed: number;
losses: number;
WLRatio: number;
WLR: number;
arrowsShot: number;
arrowsHit: number;
bowAccuracy: number;
Expand Down Expand Up @@ -112,13 +112,13 @@ class BlitzSurvivalGames {
this.killsSolo = data.kills_solo_normal || 0;
this.killsTeams = data.kills_teams_normal || 0;
this.deaths = data.deaths || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.wins = data.wins || 0;
this.winsSolo = data.wins_solo_normal || 0;
this.winsTeam = data.wins_teams || 0;
this.gamesPlayed = data.games_played || 0;
this.losses = this.gamesPlayed - this.wins;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.arrowsShot = data.arrows_fired || 0;
this.arrowsHit = data.arrows_hit || 0;
this.bowAccuracy = divide(this.arrowsHit, this.arrowsShot);
Expand Down
4 changes: 2 additions & 2 deletions src/structures/MiniGames/BuildBattle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class BuildBattle {
score: number;
totalWins: number;
games: number;
WLRatio: number;
WLR: number;
superVotes: number;
coins: number;
totalVotes: number;
Expand All @@ -20,7 +20,7 @@ class BuildBattle {
this.score = data.score || 0;
this.totalWins = data.wins || 0;
this.games = data.games_played || 0;
this.WLRatio = divide(this.totalWins, this.games);
this.WLR = divide(this.totalWins, this.games);
this.superVotes = data.super_votes || 0;
this.coins = data.coins || 0;
this.totalVotes = data.total_votes || 0;
Expand Down
32 changes: 16 additions & 16 deletions src/structures/MiniGames/CopsAndCrims.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ class CopsAndCrimsDefusal {
headshotKills: number;
assists: number;
deaths: number;
KDRatio: number;
KDR: number;
wins: number;
gamesPlayed: number;
losses: number;
WLRatio: number;
WLR: number;
roundWins: number;
shotsFired: number;
bombsDefused: number;
Expand All @@ -21,11 +21,11 @@ class CopsAndCrimsDefusal {
this.headshotKills = data.headshot_kills || 0;
this.assists = data.assists || 0;
this.deaths = data.deaths || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.wins = data.game_wins || 0;
this.gamesPlayed = data.game_plays || 0;
this.losses = this.gamesPlayed - this.wins;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.roundWins = data.round_wins || 0;
this.shotsFired = data.shots_fired || 0;
this.bombsDefused = data.bombs_defused || 0;
Expand All @@ -39,22 +39,22 @@ class CopsAndCrimsDeathmatch {
kills: number;
assists: number;
deaths: number;
KDRatio: number;
KDR: number;
wins: number;
gamesPlayed: number;
losses: number;
WLRatio: number;
WLR: number;
killsAsCrim: number;
killsAsCop: number;
constructor(data: Record<string, any>) {
this.kills = data.kills_deathmatch || 0;
this.assists = data.assists_deathmatch || 0;
this.deaths = data.deaths_deathmatch || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.wins = data.game_wins_deathmatch || 0;
this.gamesPlayed = data.game_plays_deathmatch || 0;
this.losses = this.gamesPlayed - this.wins;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.killsAsCrim = data.criminal_kills_deathmatch || 0;
this.killsAsCop = data.cop_kills_deathmatch || 0;
}
Expand All @@ -64,23 +64,23 @@ class CopsAndCrimsGunGame {
kills: number;
assists: number;
deaths: number;
KDRatio: number;
KDR: number;
wins: number;
gamesPlayed: number;
losses: number;
WLRatio: number;
WLR: number;
killsAsCrim: number;
killsAsCop: number;
fastestWin: number;
constructor(data: Record<string, any>) {
this.kills = data.kills_gungame || 0;
this.assists = data.assists_gungame || 0;
this.deaths = data.deaths_gungame || 0;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.wins = data.game_wins_gungame || 0;
this.gamesPlayed = data.game_plays_gungame || 0;
this.losses = this.gamesPlayed - this.wins;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.killsAsCrim = data.criminal_kills_gungame || 0;
this.killsAsCop = data.cop_kills_gungame || 0;
this.fastestWin = data.fastest_win_gungame || 0;
Expand All @@ -95,11 +95,11 @@ class CopsAndCrims {
kills: number;
assists: number;
deaths: number;
KDRatio: number;
KDR: number;
wins: number;
gamesPlayed: number;
losses: number;
WLRatio: number;
WLR: number;
killsAsCrim: number;
killsAsCop: number;
prefixColor: string;
Expand All @@ -114,11 +114,11 @@ class CopsAndCrims {
this.kills = this.defusal.kills + this.deathmath.kills + this.gunGame.kills;
this.assists = this.defusal.assists + this.deathmath.assists + this.gunGame.assists;
this.deaths = this.defusal.deaths + this.deathmath.deaths + this.gunGame.deaths;
this.KDRatio = divide(this.kills, this.deaths);
this.KDR = divide(this.kills, this.deaths);
this.wins = this.defusal.wins + this.deathmath.wins + this.gunGame.wins;
this.gamesPlayed = this.defusal.gamesPlayed + this.deathmath.gamesPlayed + this.gunGame.gamesPlayed;
this.losses = this.gamesPlayed - this.wins;
this.WLRatio = divide(this.wins, this.losses);
this.WLR = divide(this.wins, this.losses);
this.killsAsCrim = this.defusal.killsAsCrim + this.deathmath.killsAsCrim + this.gunGame.killsAsCrim;
this.killsAsCop = this.defusal.killsAsCop + this.deathmath.killsAsCop + this.gunGame.killsAsCop;
this.prefixColor = data.lobbyPrefixColor || '';
Expand Down
Loading

0 comments on commit bfe2c5a

Please sign in to comment.