Pick a successor at the end of the game

src/endgamemodal.ts

@@ -5,7 +5,7 @@ import {AlignX, AlignY, Point, Rect, Size} from "./engine/datatypes.ts";
 import {DrawPile} from "./drawpile.ts";
 import {addButton} from "./button.ts";
 import {ALL_STATS, Ending, Wish} from "./datatypes.ts";
-import {getScorer} from "./scorer.ts";
+import {getStateManager} from "./statemanager.ts";
 
 const WIDTH = 384;
 const HEIGHT = 384;
@@ -14,12 +14,16 @@ export class EndgameModal {
   #drawpile: DrawPile;
   #page: number;
 
+  #selectedSuccessor: number | null;
+  #selectedWish: number | null;
   #ending: Ending | null;
 
   constructor() {
     this.#drawpile = new DrawPile();
     this.#page = 0;
 
+    this.#selectedSuccessor = null;
+    this.#selectedWish = null;
     this.#ending = null;
 
     // this.show(getScorer().pickEnding());
@@ -31,6 +35,8 @@ export class EndgameModal {
 
   show(ending: Ending) {
     this.#page = 0;
+    this.#selectedSuccessor = null;
+    this.#selectedWish = null;
     this.#ending = ending;
   }
 
@@ -42,6 +48,19 @@ export class EndgameModal {
     withCamera("FullscreenPopover", () => this.#draw())
   }
 
+  get #canProgenerate(): boolean {
+    return this.#selectedSuccessor != null && this.#selectedWish != null;
+  }
+
+  #progenerate() {
+    let successor =
+      this.#ending!.successorOptions[this.#selectedSuccessor!];
+    let wish =
+      this.#ending!.wishOptions[this.#selectedWish!];
+    this.#ending = null;
+    getStateManager().startGame(successor, wish);
+  }
+
   #update() {
     this.#drawpile.clear();
     if (this.#page == 0) {
@@ -135,9 +154,9 @@ export class EndgameModal {
         new Rect(
           new Point(WIDTH/3, HEIGHT - 32), new Size(WIDTH - WIDTH / 3, 32)
         ),
-        true,
+        this.#canProgenerate,
         () => {
-          this.#page += 1;
+          this.#progenerate()
         }
       )
     }
@@ -160,7 +179,7 @@ export class EndgameModal {
 
     let enabled = true;
     let generalRect = new Rect(at, new Size(w, h));
-    let selected = ix == 1;
+    let selected = this.#selectedSuccessor == ix;
 
     this.#drawpile.addClickable(
       0,
@@ -205,7 +224,7 @@ export class EndgameModal {
       enabled,
 
       () => {
-        alert("beep");
+        this.#selectedSuccessor = ix;
       });
   }
 
@@ -215,7 +234,7 @@ export class EndgameModal {
       return;
     }
     let wishOption = wishOptions[ix];
-    let selected = ix == 1;
+    let selected = this.#selectedWish == ix;
     let w = 128;
     let h = 72;
     let generalRect = new Rect(at, new Size(w, h));
@@ -247,7 +266,7 @@ export class EndgameModal {
       enabled,
 
       () => {
-        alert("beep");
+        this.#selectedWish = ix;
       }
     );
   }

src/hud.ts

@@ -15,7 +15,7 @@ export class Hud {
 
   draw() {
     // D.fillRect(new Point(-4, -4), this.size.add(new Size(8, 8)), BG_INSET)
-    D.drawText("Pyrex", new Point(0, 0), FG_BOLD)
+    D.drawText(getPlayerProgress().name, new Point(0, 0), FG_BOLD)
     D.drawText(`Level ${getHuntMode().getDepth()}`, new Point(0, 16), FG_TEXT)
     D.drawText(`Turn ${getStateManager().getTurn()}/${getStateManager().getMaxTurns()}`, new Point(0, 32), FG_TEXT)
 
@@ -24,6 +24,10 @@ export class Hud {
     for (let s of ALL_STATS.values()) {
       D.drawText(`${s}`, new Point(0, y), FG_BOLD)
       D.drawText(`${prog.getStat(s)}`, new Point(32, y), FG_TEXT)
+      let talent = prog.getTalent(s);
+      if (talent) {
+        D.drawText(`(+${talent})`, new Point(56, y), FG_TEXT)
+      }
       y += 16;
     }
     D.drawText("EXP", new Point(0, 144), FG_BOLD);

src/huntmode.ts

@@ -32,22 +32,13 @@ export class HuntMode {
   frame: number
   depth: number
 
-  constructor() {
+  constructor(depth: number) {
-    this.map = null!; // initialized in replaceMap
+    this.map = generate(); // initialized in replaceMap when the game is started
 
     this.drawpile = new DrawPile();
     this.frame = 0;
-    this.depth = 1;
+    this.depth = depth;
-    this.replaceMap();
-  }
-
-  replaceMap(deeper?: boolean) {
-    this.map = generate();
     this.#updateVisibilityAndPossibleMoves();
-
-    if (deeper) {
-      this.depth += 1;
-    }
   }
 
   getDepth() {
@@ -81,7 +72,7 @@ export class HuntMode {
 
     if (present.content.type == "stairs") {
       getPlayerProgress().addBlood(1000);
-      this.replaceMap(true);
+      initHuntMode(new HuntMode(this.depth + 1));
     }
 
     if (present.content.type == "statPickup") {
@@ -269,7 +260,14 @@ export class HuntMode {
 
 const MAP_CELL_ONSCREEN_SIZE: Size = new Size(96, 48)
 
-let active = new HuntMode();
+let active: HuntMode | null = null;
+export function initHuntMode(huntMode: HuntMode) {
+  active = huntMode;
+}
+
 export function getHuntMode() {
+  if (active == null) {
+    throw `trying to get player progress before it has been initialized`
+  }
   return active;
 }

src/main.ts

@@ -1,4 +1,12 @@
 import {hostGame} from "./engine/internal/host.ts";
 import {game} from "./game.ts";
+import {getStateManager} from "./statemanager.ts";
 
+getStateManager().startGame({
+  name: "Pyrex",
+  title: "",
+  note: null,
+  stats: {AGI: 10, INT: 10, CHA: 10, PSI: 10},
+  talents: {AGI: 0, INT: 0, CHA: 0, PSI: 0},
+}, null);
 hostGame(game);

src/playerprogress.ts

@@ -1,30 +1,41 @@
-import {Skill, Stat} from "./datatypes.ts";
+import {ALL_STATS, Skill, Stat, SuccessorOption, Wish} from "./datatypes.ts";
 import {getSkills} from "./skills.ts";
 
 export class PlayerProgress {
+  #name: string
   #stats: Record<Stat, number>
+  #talents: Record<Stat, number>
+  #wish: Wish | null;
   #exp: number;
   #blood: number
   #itemsPurloined: number
   #skillsLearned: number[]  // use the raw ID representation for indexOf
   #untrimmedSkillsAvailable: Skill[]
 
-  constructor() {
+  constructor(asSuccessor: SuccessorOption, withWish: Wish | null) {
-    this.#stats = {
+    this.#name = asSuccessor.name;
-      AGI: 10,
+    this.#stats = {...asSuccessor.stats};
-      INT: 10,
+    this.#talents = {...asSuccessor.talents};
-      CHA: 10,
+    this.#wish = withWish;
-      PSI: 10,
-    };
     this.#exp = 0;
     this.#blood = 0;
     this.#itemsPurloined = 0;
-    this.#skillsLearned = [];
+    this.#skillsLearned = []
-    this.#untrimmedSkillsAvailable = []
+    this.#untrimmedSkillsAvailable = [];
 
     this.refill();
   }
 
+  applyEndOfTurn() {
+    for (let stat of ALL_STATS.values()) {
+      this.#stats[stat] += this.#talents[stat];
+    }
+  }
+
+  get name(): string {
+    return this.#name;
+  }
+
   refill() {
     this.#blood = 2000;
 
@@ -113,6 +124,10 @@ export class PlayerProgress {
     return this.#stats[stat]
   }
 
+  getTalent(stat: Stat): number {
+    return this.#talents[stat];
+  }
+
   getBlood(): number {
     return Math.floor(Math.max(this.#blood, 0));
   }
@@ -152,8 +167,15 @@ export class PlayerProgress {
   }
 }
 
-let active: PlayerProgress = new PlayerProgress();
+let active: PlayerProgress | null = null;
+
+export function initPlayerProgress(asSuccessor: SuccessorOption, withWish: Wish | null){
+  active = new PlayerProgress(asSuccessor, withWish);
+}
 
 export function getPlayerProgress(): PlayerProgress {
+  if (active == null) {
+    throw `trying to get player progress before it has been initialized`
+  }
   return active
 }

src/statemanager.ts

@@ -1,9 +1,10 @@
-import {getPlayerProgress} from "./playerprogress.ts";
+import {getPlayerProgress, initPlayerProgress} from "./playerprogress.ts";
-import {getHuntMode} from "./huntmode.ts";
+import {getHuntMode, HuntMode, initHuntMode} from "./huntmode.ts";
 import {getSleepModal} from "./sleepmodal.ts";
 import {getVNModal} from "./vnmodal.ts";
 import {getScorer} from "./scorer.ts";
 import {getEndgameModal} from "./endgamemodal.ts";
+import {SuccessorOption, Wish} from "./datatypes.ts";
 
 const N_TURNS: number = 9;
 
@@ -18,13 +19,20 @@ export class StateManager {
     return this.#turn
   }
 
+  startGame(asSuccessor: SuccessorOption, withWish: Wish | null) {
+    this.#turn = 1;
+    initHuntMode(new HuntMode(1));
+    initPlayerProgress(asSuccessor, withWish);
+  }
+
   advance() {
     getSleepModal().setShown(false);
 
     if (this.#turn + 1 <= N_TURNS) {
       this.#turn += 1;
+      getPlayerProgress().applyEndOfTurn();
       getPlayerProgress().refill();
-      getHuntMode().replaceMap();
+      initHuntMode(new HuntMode(getHuntMode().depth));
     } else {
       // TODO: Play a specific scene
       let ending = getScorer().pickEnding();