Replace sleep modal

src/checkmodal.ts

@@ -95,7 +95,8 @@ export class CheckModal {
     ) => {
       let accomplished: boolean;
       let optionLabel: string;
-      let resultMessage: string;
+      let resultMessage: string | null;
+      let endorse = false;
       if ((option as ChoiceOption).isChoice) {
         // TODO: Use OOP here
         option = option as ChoiceOption;
@@ -110,6 +111,7 @@ export class CheckModal {
         // hasSkill ||= true;
         if (hasSkill) {
           optionLabel = `[${skillName}] ${option.unlockable}`;
+          endorse = true;
         } else {
           optionLabel = `[Needs ${skillName}] ${option.locked}`;
         }
@@ -125,7 +127,11 @@ export class CheckModal {
             cb();
           }
         }
-      });
+
+        if (resultMessage == null) {
+          this.show(null, null);
+        }
+      }, {endorse});
     };
 
     if (options.length == 0) {

src/game.ts

@@ -4,7 +4,6 @@ import { IGame, Point, Size } from "./engine/datatypes.ts";
 import { getPageLocation, Page } from "./layout.ts";
 import { getHotbar, Hotbar } from "./hotbar.ts";
 import { getSkillsModal, SkillsModal } from "./skillsmodal.ts";
-import { getSleepModal, SleepModal } from "./sleepmodal.ts";
 import { getVNModal, VNModal } from "./vnmodal.ts";
 import { Gameplay, getGameplay } from "./gameplay.ts";
 import { getEndgameModal } from "./endgamemodal.ts";
@@ -37,7 +36,7 @@ export class Game implements IGame {
   camera: MenuCamera;
   page: Page;
   #mainThing: Gameplay | VNModal | null;
-  #bottomThing: CheckModal | SkillsModal | SleepModal | Hotbar | null;
+  #bottomThing: CheckModal | SkillsModal | Hotbar | null;
 
   constructor() {
     this.camera = new MenuCamera({
@@ -123,15 +122,6 @@ export class Game implements IGame {
       return;
     }
 
-    // between skillsModal and sleepModal, skillsModal wins
-    // this is important because skillsModal can be
-    // activated from sleepModal
-    let sleepModal = getSleepModal();
-    if (sleepModal.isShown) {
-      this.#bottomThing = sleepModal;
-      return;
-    }
-
     // use the hotbar only as a matter of last resort
     this.#bottomThing = getHotbar();
   }

src/hotbar.ts

@@ -3,8 +3,9 @@ import { DrawPile } from "./drawpile.ts";
 import { withCamera } from "./layout.ts";
 import { getSkillsModal } from "./skillsmodal.ts";
 import { addButton } from "./button.ts";
-import { getSleepModal } from "./sleepmodal.ts";
 import {getPlayerProgress} from "./playerprogress.ts";
+import {getStateManager} from "./statemanager.ts";
+import {getCheckModal} from "./checkmodal.ts";
 
 type Button = {
   label: string;
@@ -46,15 +47,46 @@ export class Hotbar {
      */
     buttons.push({
       label: "Sleep",
-      cbClick: () => {
+      cbClick: () => { this.#offerSleep(); },
-        getSleepModal().setShown(true);
-      },
       enabled: true,
       endorse: getPlayerProgress().getBlood() < 100,
     });
     return buttons;
   }
 
+  #offerSleep() {
+    let bloodAmount = getPlayerProgress().getBlood();
+    let sleepText = "You're exhausted.";
+    if (bloodAmount > 100) {
+        sleepText = "You've got some energy left -- are you sure you want to sleep?";
+    } else if (bloodAmount > 2000) {
+        sleepText = "Are you sure you want to sleep? You have so much energy.";
+    }
+
+    getCheckModal().show(
+      {
+        label: sleepText,
+        options: [
+          {
+            isChoice: true,
+            countsAsSuccess: true,
+            unlockable: "Sleep",
+            success: null,
+          },
+          {
+            isChoice: true,
+            countsAsSuccess: false,
+            unlockable: "Refrain",
+            success: null,
+          },
+        ]
+      },
+      () => {
+        getStateManager().advance();
+      }
+    )
+  }
+
   update() {
     withCamera("Hotbar", () => this.#update());
   }

src/newmap.ts

@@ -16,14 +16,14 @@ export type ChoiceOption = {
   isChoice: true;
   countsAsSuccess: boolean;
   unlockable: string;
-  success: string;
+  success: string | null;
 };
 export type CheckDataOption = {
   skill: () => Skill;
   locked: string;
   failure: string;
   unlockable: string;
-  success: string;
+  success: string | null;
 };
 
 export class LoadedNewMap {

src/sleepmodal.ts

@@ -1,77 +0,0 @@
-import { DrawPile } from "./drawpile.ts";
-import { Point, Rect, Size } from "./engine/datatypes.ts";
-import { getPartLocation, withCamera } from "./layout.ts";
-import { addButton } from "./button.ts";
-import { D } from "./engine/public.ts";
-import { BG_INSET } from "./colors.ts";
-import { getSkillsModal } from "./skillsmodal.ts";
-import { getStateManager } from "./statemanager.ts";
-
-export class SleepModal {
-  #drawpile: DrawPile;
-  #shown: boolean;
-
-  constructor() {
-    this.#drawpile = new DrawPile();
-    this.#shown = false;
-  }
-
-  get #size(): Size {
-    // We share this logic with SkillModal:
-    // Instead of calculating this here, compute it from outside
-    // as it has to be the same for every bottom modal
-    return getPartLocation("BottomModal").size;
-  }
-
-  get isShown(): boolean {
-    return this.#shown;
-  }
-
-  setShown(shown: boolean) {
-    this.#shown = shown;
-  }
-
-  update() {
-    withCamera("BottomModal", () => this.#update());
-  }
-
-  draw() {
-    withCamera("BottomModal", () => this.#draw());
-  }
-
-  #update() {
-    this.#drawpile.clear();
-    let size = this.#size;
-    this.#drawpile.add(0, () => {
-      D.fillRect(new Point(-4, -4), size.add(new Size(8, 8)), BG_INSET);
-    });
-
-    // add close button
-    let closeRect = new Rect(new Point(0, 96), new Size(80, 32));
-    addButton(this.#drawpile, "Back", closeRect, true, () => {
-      this.setShown(false);
-    });
-
-    let skillsRect = new Rect(new Point(80, 96), new Size(80, 32));
-    addButton(this.#drawpile, "Skills", skillsRect, true, () => {
-      getSkillsModal().setShown(true);
-    });
-
-    let remainingWidth = size.w - 160;
-    let nextRect = new Rect(new Point(160, 96), new Size(remainingWidth, 32));
-    addButton(this.#drawpile, "Sleep (Next Day)", nextRect, true, () => {
-      getStateManager().advance();
-    });
-
-    this.#drawpile.executeOnClick();
-  }
-
-  #draw() {
-    this.#drawpile.draw();
-  }
-}
-
-let active = new SleepModal();
-export function getSleepModal(): SleepModal {
-  return active;
-}

src/statemanager.ts

@@ -1,6 +1,5 @@
 import { getPlayerProgress, initPlayerProgress } from "./playerprogress.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";
@@ -27,8 +26,6 @@ export class StateManager {
   }
 
   advance() {
-    getSleepModal().setShown(false);
-
     if (this.#turn + 1 <= N_TURNS) {
       this.#turn += 1;
       getPlayerProgress().applyEndOfTurn();