feat: Operators

Experiment to try to find a good guiding approach with KE.

Also contains various other fixes for the current development stream.

Author: oliversalzburg

packages/kitten-analysts/examples/a708b0ad-5f94-4466-8a2e-1d381117d0e0.json

@@ -3,7 +3,7 @@ FROM docker.io/library/node:22.8.0-bookworm@sha256:8ec02324cb37718197de92e516777
 LABEL "org.opencontainers.image.description"="Kittens Game with Kitten Science DNA"
 
 ARG REPO=https://github.com/kitten-science/kittensgame.git
-ARG BRANCH=feat/kgnet-iteration
+ARG BRANCH=feat/caching
 
 EXPOSE 8080
 

packages/kitten-analysts/examples/ka-internal-savestate.json

@@ -16,6 +16,8 @@ declare global {
 export type KittenAnalystsMessageId =
   | "connected"
   | "getBuildings"
+  | "getCalendar"
+  | "getRaces"
   | "getResourcePool"
   | "getStatistics"
   | "getTechnologies"
@@ -24,17 +26,40 @@ export type KittenAnalystsMessageId =
   | "reportSavegame";
 
 export type PayloadBuildings = Array<{
+  group: string;
   label: string;
   name: string;
   on: number;
   tab: TabId;
   value: number;
 }>;
+export type PayloadCalendar = Array<{
+  cryptoPrice: number;
+  cycle: number;
+  cycleYear: number;
+  day: number;
+  eventChance: number;
+  festivalDays: number;
+  futureSeasonTemporalParadox: number;
+  season: number;
+  seasonsPerYear: number;
+  year: number;
+  yearsPerCycle: number;
+}>;
+export type PayloadRaces = Array<{
+  embassyLevel: number;
+  energy: number;
+  name: string;
+  standing: number;
+  title: string;
+  unlocked: boolean;
+}>;
 export type PayloadResources = Array<{
   craftable: boolean;
   label: string;
   maxValue: number;
   name: string;
+  rate: number;
   value: number;
 }>;
 export type PayloadStatistics = Array<{
@@ -55,19 +80,23 @@ export interface KittenAnalystsMessage<
   TMessage extends KittenAnalystsMessageId,
   TData = TMessage extends "getBuildings"
     ? PayloadBuildings
-    : TMessage extends "getResourcePool"
-      ? PayloadResources
-      : TMessage extends "getStatistics"
-        ? PayloadStatistics
-        : TMessage extends "getTechnologies"
-          ? PayloadTechnologies
-          : TMessage extends "reportFrame"
-            ? unknown
-            : TMessage extends "reportSavegame"
-              ? unknown
-              : TMessage extends "injectSavegame"
-                ? KGNetSavePersisted
-                : never,
+    : TMessage extends "getCalendar"
+      ? PayloadCalendar
+      : TMessage extends "getRaces"
+        ? PayloadRaces
+        : TMessage extends "getResourcePool"
+          ? PayloadResources
+          : TMessage extends "getStatistics"
+            ? PayloadStatistics
+            : TMessage extends "getTechnologies"
+              ? PayloadTechnologies
+              : TMessage extends "reportFrame"
+                ? unknown
+                : TMessage extends "reportSavegame"
+                  ? unknown
+                  : TMessage extends "injectSavegame"
+                    ? KGNetSavePersisted
+                    : never,
 > {
   /**
    * The payload of the message.
@@ -225,80 +254,180 @@ export class KittenAnalysts {
         const bonfire: PayloadBuildings = game.bld.meta[0].meta.flatMap(building => {
           if (building.stages) {
             return building.stages.map((stage, index) => ({
+              group: "upgrade",
+              label: stage.label,
               name: building.name,
-              value: index === building.stage ? building.val : 0,
               on: index === building.stage ? building.on : 0,
-              label: stage.label,
               tab: "Bonfire",
+              value: index === building.stage ? building.val : 0,
             }));
           }
           return {
+            group: "base",
+            label: building.label ?? building.name,
             name: building.name,
-            value: building.val,
             on: building.on,
-            label: building.label ?? building.name,
             tab: "Bonfire",
+            value: building.val,
           };
         });
+
+        const religionGroups = ["ziggurats", "orderOfTheSun", "cryptotheology", "pacts"];
+        const religion: PayloadBuildings = game.religion.meta.flatMap((meta, index) =>
+          meta.meta.map(building => ({
+            group: religionGroups[index],
+            label: building.label,
+            name: building.name,
+            on: 0,
+            tab: "Religion",
+            value: building.val,
+          })),
+        );
+
+        const spaceGroups = [
+          "groundControl",
+          "cath",
+          "moon",
+          "dune",
+          "piscine",
+          "helios",
+          "terminus",
+          "kairo",
+          "yarn",
+          "umbra",
+          "charon",
+          "centaurusSystem",
+          "furthestRing",
+        ];
         const space: PayloadBuildings = game.space.meta.flatMap((meta, index) =>
           // index 0 is moon missions
           index === 0
             ? []
             : meta.meta.map(building => ({
+                group: spaceGroups[index],
+                label: building.label,
                 name: building.name,
-                value: building.val,
                 on: building.on,
-                label: building.label,
                 tab: "Space",
+                value: building.val,
               })),
         );
-        const religion: PayloadBuildings = game.religion.meta.flatMap(meta =>
-          meta.meta.map(building => ({
-            name: building.name,
-            value: building.val,
-            on: 0,
-            label: building.label,
-            tab: "Religion",
+
+        const timeGroups = ["chronoForge", "voidSpace"];
+        const time: PayloadBuildings = game.time.meta.flatMap((meta, index) =>
+          meta.meta.map(item => ({
+            group: timeGroups[index],
+            label: item.label,
+            name: item.name,
+            on: "on" in item ? (item.on ?? 0) : 0,
+            tab: "Time",
+            value: item.val,
           })),
         );
 
         return {
           client_type: this.location.includes("headless.html") ? "headless" : "browser",
-          data: [...bonfire, ...space, ...religion],
+          data: [...bonfire, ...religion, ...space, ...time],
           guid: game.telemetry.guid,
           location: this.location,
           responseId: message.responseId,
           type: message.type,
         };
       }
-      case "getResourcePool": {
-        const resources: PayloadResources = game.resPool.resources.map(resource => ({
-          name: resource.name,
-          value: resource.value,
-          maxValue: resource.maxValue,
-          label: resource.title,
-          craftable: resource.craftable ?? false,
+
+      case "getCalendar": {
+        const data: PayloadCalendar = [
+          {
+            cryptoPrice: game.calendar.cryptoPrice,
+            cycle: game.calendar.cycle,
+            cycleYear: game.calendar.cycleYear,
+            day: game.calendar.day,
+            eventChance: game.calendar.eventChance,
+            festivalDays: game.calendar.festivalDays,
+            futureSeasonTemporalParadox: game.calendar.futureSeasonTemporalParadox,
+            season: game.calendar.season,
+            seasonsPerYear: game.calendar.seasonsPerYear,
+            year: game.calendar.year,
+            yearsPerCycle: game.calendar.yearsPerCycle,
+          },
+        ];
+        return {
+          client_type: this.location.includes("headless.html") ? "headless" : "browser",
+          data,
+          guid: game.telemetry.guid,
+          location: this.location,
+          responseId: message.responseId,
+          type: message.type,
+        };
+      }
+
+      case "getRaces": {
+        const data: PayloadRaces = game.diplomacy.races.map(race => ({
+          embassyLevel: race.embassyLevel,
+          energy: race.energy,
+          name: race.name,
+          standing: race.standing,
+          title: race.title,
+          unlocked: race.unlocked,
         }));
+
+        return {
+          client_type: this.location.includes("headless.html") ? "headless" : "browser",
+          data,
+          guid: game.telemetry.guid,
+          location: this.location,
+          responseId: message.responseId,
+          type: message.type,
+        };
+      }
+      case "getResourcePool": {
+        const isTimeParadox = this.game.calendar.day < 0;
+
+        const resources: PayloadResources = this.game.resPool.resources.map(resource => {
+          let rate =
+            (isTimeParadox ? 0 : this.game.getResourcePerTick(resource.name, true)) *
+            this.game.getTicksPerSecondUI();
+          if (resource.calculatePerDay === true) {
+            rate =
+              this.game.getResourcePerDay(resource.name) *
+              (resource.name === "necrocorn" ? 1 + this.game.timeAccelerationRatio() : 1);
+          } else if (resource.calculatePerYear) {
+            rate = this.game.getResourceOnYearProduction(resource.name);
+          }
+
+          return {
+            name: resource.name,
+            value: resource.value,
+            maxValue: resource.maxValue,
+            label: resource.title,
+            craftable: resource.craftable ?? false,
+            rate: rate,
+          };
+        });
+
         const pseudoResources: PayloadResources = [
           {
             craftable: false,
             label: "Worship",
             maxValue: Infinity,
             name: "worship",
+            rate: 0,
             value: game.religion.faith,
           },
           {
             craftable: false,
             label: "Epiphany",
             maxValue: Infinity,
             name: "epiphany",
+            rate: 0,
             value: game.religion.faithRatio,
           },
           {
             craftable: false,
             label: "Necrocorn deficit",
             maxValue: Infinity,
             name: "necrocornDeficit",
+            rate: 0,
             value: game.religion.pactsManager.necrocornDeficit,
           },
         ];

packages/kitten-analysts/game.Containerfile

@@ -18,6 +18,8 @@ import {
   KittenAnalystsMessage,
   KittenAnalystsMessageId,
   PayloadBuildings,
+  PayloadCalendar,
+  PayloadRaces,
   PayloadResources,
   PayloadStatistics,
   PayloadTechnologies,
@@ -28,13 +30,19 @@ import { kg_buildings_constructed } from "./metrics/kg_buildings_constructed.js"
 import { kg_challenges_completed_total } from "./metrics/kg_challenges_completed_total.js";
 import { kg_clicks_total } from "./metrics/kg_clicks_total.js";
 import { kg_crafts_total } from "./metrics/kg_crafts_total.js";
+import { kg_crypto_price } from "./metrics/kg_crypto_price.js";
+import { kg_embassy_level } from "./metrics/kg_embassy_level.js";
 import { kg_events_observed } from "./metrics/kg_events_observed.js";
+import { kg_festival_days } from "./metrics/kg_festival_days.js";
 import { kg_kittens_average } from "./metrics/kg_kittens_average.js";
 import { kg_kittens_dead } from "./metrics/kg_kittens_dead.js";
 import { kg_kittens_total } from "./metrics/kg_kittens_total.js";
 import { kg_paragon_total } from "./metrics/kg_paragon_total.js";
+import { kg_race_energy } from "./metrics/kg_race_energy.js";
+import { kg_race_standing } from "./metrics/kg_race_standing.js";
 import { kg_resets_total } from "./metrics/kg_resets_total.js";
 import { kg_resource_max_value } from "./metrics/kg_resource_max_value.js";
+import { kg_resource_rate } from "./metrics/kg_resource_rate.js";
 import { kg_resource_value } from "./metrics/kg_resource_value.js";
 import { kg_tech_researched } from "./metrics/kg_tech_researched.js";
 import { kg_tech_unlocked } from "./metrics/kg_tech_unlocked.js";
@@ -77,7 +85,12 @@ const cache = new Map<
   Promise<
     Array<KittenAnalystsMessage<
       KittenAnalystsMessageId,
-      PayloadBuildings | PayloadResources | PayloadStatistics | PayloadTechnologies
+      | PayloadBuildings
+      | PayloadCalendar
+      | PayloadRaces
+      | PayloadResources
+      | PayloadStatistics
+      | PayloadTechnologies
     > | null>
   >
 >();
@@ -92,6 +105,14 @@ register.registerMetric(kg_building_on(cache, remote));
 
 register.registerMetric(kg_resource_value(cache, remote));
 register.registerMetric(kg_resource_max_value(cache, remote));
+register.registerMetric(kg_resource_rate(cache, remote));
+
+register.registerMetric(kg_embassy_level(cache, remote));
+register.registerMetric(kg_race_energy(cache, remote));
+register.registerMetric(kg_race_standing(cache, remote));
+
+register.registerMetric(kg_crypto_price(cache, remote));
+register.registerMetric(kg_festival_days(cache, remote));
 
 // Metrics from in-game Stats
 
@@ -216,7 +237,7 @@ routerNetwork.post("/kgnet/save/upload", context => {
     remote
       .toHeadless({
         type: "injectSavegame",
-        data: savegame,
+        data: savegameEphemeral,
       })
       .catch(redirectErrorsToConsole(console));