@cs2dak/cohort 0.2.1 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cs2dak/cohort",
-  "version": "0.2.1",
+  "version": "1.0.0",
   "type": "module",
   "license": "MIT",
   "exports": {
@@ -8,8 +8,8 @@
   },
   "dependencies": {
     "@rivalhub/rival-rating": "^0.1.0",
-    "@cs2dak/contract": "0.2.1",
-    "@cs2dak/core": "0.2.1"
+    "@cs2dak/contract": "1.0.0",
+    "@cs2dak/core": "1.0.0"
   },
   "files": [
     "src/index.ts"

package/src/index.ts

@@ -1,5 +1,6 @@
 import {
   deriveAccountSignalsV2,
+  derivePlayerWeaponHighlights,
   deriveRRIndicators,
   computeAccountRatingsV2
 } from "@cs2dak/core";
@@ -9,6 +10,7 @@ import {
   type AccountSignalsV2,
   type DemoPackage,
   type RRIndicators,
+  type PlayerWeaponHighlightFacts,
   type SeasonCohortBundle,
   type TeamKey,
   type ValueAccountsWeights
@@ -57,6 +59,7 @@ interface PlayerAccumulator {
   mapCount: number;
   signals: AccountSignalsV2[];
   indicators: RRIndicators[];
+  weaponHighlights: PlayerWeaponHighlightFacts[];
   perMatch: Array<{ matchId: string; steamId64: string; accountRR: number; rrV1: number }>;
 }
 
@@ -73,6 +76,7 @@ export function buildSeasonCohort(
   for (const demo of demos) {
     const signals = deriveAccountSignalsV2(demo.pkg);
     const indicators = deriveRRIndicators(demo.pkg);
+    const weaponHighlights = derivePlayerWeaponHighlights(demo.pkg);
     const matchAccounts = computeAccountRatingsV2(demo.pkg);
     const matchAccountBySteamId = new Map(matchAccounts.map((row) => [row.signals.steamId64, row.rr]));
     const rrBySteamId = new Map(indicators.map((row) => [row.steamId64, computeRR(row, rrWeights)]));
@@ -94,6 +98,7 @@ export function buildSeasonCohort(
         mapCount: 0,
         signals: [],
         indicators: [],
+        weaponHighlights: [],
         perMatch: []
       }));
 
@@ -105,6 +110,8 @@ export function buildSeasonCohort(
       acc.mapCount += 1;
       acc.signals.push(signal);
       acc.indicators.push(indicator);
+      const weaponHighlight = weaponHighlights.find((row) => row.steamId64 === player.steamId64);
+      if (weaponHighlight) acc.weaponHighlights.push(weaponHighlight);
       acc.perMatch.push({
         matchId: demo.matchId,
         steamId64: player.steamId64,
@@ -140,9 +147,17 @@ export function buildSeasonCohort(
   const prismResults = new Map(computePrism(prismInputs, prismWeights).map((row) => [row.steamId64, row]));
 
   return seasonCohortBundleSchema.parse({
-    version: "cs2-demo-analysis-kit/season-0.1",
+    version: "cs2-demo-analysis-kit/cohort-1.0",
     matchCount: demos.length,
     weightsVersion: `${rrWeights.version}+${valueWeights.version}+${prismWeights.version}`,
+    provenance: {
+      cohortVersion: "cs2-demo-analysis-kit/cohort-1.0",
+      sourceSchemaVersion: "cs2-demo-format/2.0",
+      matches: demos.map((demo) => ({
+        matchId: demo.matchId,
+        sourceDemoHash: demo.pkg.manifest.demo?.hash ?? null
+      }))
+    },
     players: seasonRows
       .map((row) => {
         const balanced = balancedByKey.get(row.acc.playerKey)!;
@@ -159,6 +174,7 @@ export function buildSeasonCohort(
           rrV1: round(row.rrV1.rr, 3),
           rrV1Percentile: round(rrToPercentile(rrV1Scores, row.rrV1.rr), 1),
           indicators: row.indicators,
+          weaponHighlights: aggregateWeaponHighlights(row.acc.playerKey, row.acc.weaponHighlights),
           accountRR: round(balanced.rr, 3),
           accountRRRaw: round(balanced.rrRaw, 3),
           accountBreakdown: {
@@ -174,7 +190,6 @@ export function buildSeasonCohort(
           perMatch: row.acc.perMatch.sort((a, b) => a.matchId.localeCompare(b.matchId))
         };
       })
-      .sort((a, b) => b.accountRR - a.accountRR || b.rrV1 - a.rrV1 || a.name.localeCompare(b.name))
   });
 }
 
@@ -189,7 +204,7 @@ function aggregateAccountSignals(steamId64: string, rows: AccountSignalsV2[]): A
   return {
     steamId64,
     rounds: sum(rows, (row) => row.rounds),
-    sourceVersion: "cs2-demo-analysis-kit/season-0.1",
+    sourceVersion: "cs2-demo-analysis-kit/cohort-1.0",
     combat: {
       kills: sum(rows, (row) => row.combat.kills),
       deaths: sum(rows, (row) => row.combat.deaths),
@@ -333,6 +348,47 @@ function aggregateRRIndicators(steamId64: string, rows: RRIndicators[]): RRIndic
   };
 }
 
+function aggregateWeaponHighlights(
+  steamId64: string,
+  rows: PlayerWeaponHighlightFacts[]
+): PlayerWeaponHighlightFacts {
+  const weapons = new Map<string, PlayerWeaponHighlightFacts["weapons"][number]>();
+  for (const row of rows) {
+    for (const weapon of row.weapons) {
+      const current = weapons.get(weapon.weapon) ?? {
+        weapon: weapon.weapon,
+        kills: 0,
+        headshotKills: 0,
+        tradeKills: 0,
+        noScopeKills: 0,
+        throughSmokeKills: 0,
+        wallbangKills: 0,
+        penetratedObjects: 0
+      };
+      current.kills += weapon.kills;
+      current.headshotKills += weapon.headshotKills;
+      current.tradeKills += weapon.tradeKills;
+      current.noScopeKills += weapon.noScopeKills;
+      current.throughSmokeKills += weapon.throughSmokeKills;
+      current.wallbangKills += weapon.wallbangKills;
+      current.penetratedObjects += weapon.penetratedObjects;
+      weapons.set(weapon.weapon, current);
+    }
+  }
+  return {
+    steamId64,
+    totalKills: sum(rows, (row) => row.totalKills),
+    weapons: [...weapons.values()]
+      .sort((a, b) => b.kills - a.kills || a.weapon.localeCompare(b.weapon)),
+    highlights: {
+      wallbangKills: sumNullable(rows.map((row) => row.highlights.wallbangKills)),
+      noScopeKills: sumNullable(rows.map((row) => row.highlights.noScopeKills)),
+      throughSmokeKills: sumNullable(rows.map((row) => row.highlights.throughSmokeKills)),
+      collateralKills: sumNullable(rows.map((row) => row.highlights.collateralKills))
+    }
+  };
+}
+
 // 账户平衡的数学（标准化 + 残差化）已迁入 rival-rating 的 computeCohortAccountsRR（公式归属）。
 // 本层只负责把 std(rrV1) 作为 targetStd 传进去，对齐 v2 与 HLTV 逆向的量纲。
 function stdev(xs: number[]): number {