Amongus

Author: enchantinggg4

src/gameserver/command/ProcessRankedMatch/process-ranked-match-handler.spec.ts

@@ -182,7 +182,7 @@ describe("MatchController", () => {
 
     for (let change of changes) {
       const pim = pims.find((pim) => pim.playerId === change.playerId);
-      // console.log("Amogus!", change, pim)
+      console.log("Amogus!", change, pim)
       if (pim?.abandoned) {
         expect(change.change).toBeLessThan(0);
       } else if (pim.team === DotaTeam.RADIANT) {

src/rest/dto/player.dto.ts

@@ -2,6 +2,7 @@ import { BanReason } from 'gateway/shared-types/ban';
 import { PlayerId } from 'gateway/shared-types/player-id';
 import { Page } from 'gateway/shared-types/page';
 import { ApiProperty } from '@nestjs/swagger';
+import { MatchAccessLevel } from 'rest/service/player.service';
 
 export class LeaderboardEntryDto {
   rank: number | null;
@@ -26,13 +27,17 @@ export class LeaderboardEntryPageDto extends Page<LeaderboardEntryDto> {
   pages: number;
 }
 
+
+
+
 export class PlayerSummaryDto extends LeaderboardEntryDto {
   newbieUnrankedGamesLeft: number;
   playedAnyGame: boolean;
   calibrationGamesLeft: number;
 
-
   hasUnrankedAccess: boolean;
+
+  accessLevel: MatchAccessLevel
 }
 
 export class BanStatusDto {

src/rest/player.controller.ts

@@ -17,7 +17,7 @@ import { CommandBus, EventBus } from '@nestjs/cqrs';
 import { MakeSureExistsCommand } from 'gameserver/command/MakeSureExists/make-sure-exists.command';
 import { PlayerId } from 'gateway/shared-types/player-id';
 import { GameServerService } from 'gameserver/gameserver.service';
-import { PlayerService, Summary } from 'rest/service/player.service';
+import { MatchAccessLevel, PlayerService, Summary } from 'rest/service/player.service';
 import { HeroStatsDto } from 'rest/dto/hero.dto';
 import { UNRANKED_GAMES_REQUIRED_FOR_RANKED } from 'gateway/shared-types/timings';
 import { BanStatus } from 'gateway/queries/GetPlayerInfo/get-player-info-query.result';
@@ -172,7 +172,6 @@ offset $2 limit $3`,
     };
   }
 
-
   @CacheTTL(120)
   @Get("/summary/:version/:id")
   async playerSummary(
@@ -185,9 +184,9 @@ offset $2 limit $3`,
       where: { steam_id },
     });
 
-
     // Crucial thing for newbie:
-    const hasUnrankedAccess = await this.playerService.hasUnrankedAccess(steam_id)
+    const matchAccessLevel =
+      await this.playerService.getMatchAccessLevel(steam_id);
 
     // if it exists in the view, we happy
     if (lb) {
@@ -207,7 +206,9 @@ offset $2 limit $3`,
         play_time: lb.play_time,
         playedAnyGame: lb.any_games > 0,
 
-        hasUnrankedAccess: hasUnrankedAccess,
+        accessLevel: matchAccessLevel,
+
+        hasUnrankedAccess: matchAccessLevel === MatchAccessLevel.HUMAN_GAMES,
 
         newbieUnrankedGamesLeft:
           lb.ranked_games > 0
@@ -241,7 +242,9 @@ offset $2 limit $3`,
 
       playedAnyGame: summary && summary.any_games > 0,
 
-      hasUnrankedAccess: (summary?.bot_wins || 0) > 0,
+      hasUnrankedAccess: matchAccessLevel === MatchAccessLevel.HUMAN_GAMES,
+
+      accessLevel: matchAccessLevel,
 
       newbieUnrankedGamesLeft:
         (summary?.ranked_games || 0) > 0

src/rest/service/player.service.ts

@@ -9,14 +9,32 @@ import { PlayerSummaryDto } from 'rest/dto/player.dto';
 import PlayerInMatchEntity from 'gameserver/model/player-in-match.entity';
 import { VersionPlayerEntity } from 'gameserver/model/version-player.entity';
 
-export type Summary =
-  | undefined
-  | (Omit<PlayerSummaryDto, "rank" | "newbieUnrankedGamesLeft"> & {
-      ranked_games: number;
-      unranked_games: number;
-      any_games: number;
-      bot_wins: number;
-    });
+/**
+ * EDUCATION = need to finish education, either win or lose
+ * SIMPLE_MODES = 1+ games, 0 wins
+ * HUMAN_GAMES = 1+ wins
+ */
+export enum MatchAccessLevel {
+  EDUCATION,
+  SIMPLE_MODES,
+  HUMAN_GAMES,
+}
+
+export function getMatchAccessLevel(anyGames: number, anyWins: number) {
+  if (anyWins) return MatchAccessLevel.HUMAN_GAMES;
+  if (anyGames) return MatchAccessLevel.SIMPLE_MODES;
+  return MatchAccessLevel.EDUCATION;
+}
+
+export type Summary = Omit<
+  PlayerSummaryDto,
+  "rank" | "newbieUnrankedGamesLeft"
+> & {
+  ranked_games: number;
+  unranked_games: number;
+  any_games: number;
+  any_wins: number;
+};
 
 // TODO: we probably need to orm this shit up
 @Injectable()
@@ -153,11 +171,11 @@ order by score desc`;
     ]);
   }
 
-  async fullSummary(steam_id: string): Promise<Summary> {
+  async fullSummary(steam_id: string): Promise<Summary | undefined> {
     const some = await this.playerInMatchRepository.query(
       `with cte as (select plr."playerId"                                                                   as steam_id,
                     count(*)::int                                                                    as any_games,
-                    sum((m.winner = plr.team )::int)::int                                            as bot_wins,
+                    sum((m.winner = plr.team )::int)::int                                            as any_wins,
                     sum((m.matchmaking_mode in (0, 1))::int)::int                                    as games,
                     sum((m.winner = plr.team and m.matchmaking_mode in (0, 1))::int)::int            as wins,
                     sum((m.matchmaking_mode = 0 and m.timestamp > now() - '14 days'::interval)::int) as recent_ranked_games,
@@ -171,7 +189,7 @@ select p.steam_id,
        p.wins,
        p.games,
        p.any_games,
-       p.bot_wins,
+       p.any_wins,
        p.mmr                                                                        as mmr,
        avg(pim.kills)::float                                                        as kills,
        avg(pim.deaths)::float                                                       as deaths,
@@ -189,12 +207,17 @@ group by p.steam_id, p.recent_ranked_games, p.mmr, p.games, p.wins, p.any_games,
     return some[0];
   }
 
-  public async hasUnrankedAccess(steam_id: string): Promise<boolean> {
-    const result: { count: number }[] =
+  public async getMatchAccessLevel(steamId: string): Promise<MatchAccessLevel> {
+    const result: { any_wins: number; any_games: number }[] =
       await this.playerInMatchRepository.query(
-        `select count(*) from player_activity pa where pa.win and pa.steam_id = $1`,
-        [steam_id],
+        `
+select sum(pa.win::int)::int as any_wins, count(pa)::int as any_games
+from player_activity pa
+where pa.steam_id = $1
+`,
+        [steamId],
       );
-    return result[0].count > 0;
+
+    return getMatchAccessLevel(result[0].any_games, result[0].any_wins);
   }
 }