Label zones

src/checkmodal.ts

@@ -107,7 +107,7 @@ export class CheckModal {
         let skill = option.skill();
         let skillName = getSkills().get(skill).profile.name;
         let hasSkill = getPlayerProgress().hasLearned(skill);
-        hasSkill ||= true;
+        // hasSkill ||= true;
         if (hasSkill) {
           optionLabel = `[${skillName}] ${option.unlockable}`;
         } else {

src/hotbar.ts

@@ -5,7 +5,6 @@ import { getSkillsModal } from "./skillsmodal.ts";
 import { addButton } from "./button.ts";
 import { getSleepModal } from "./sleepmodal.ts";
 import {getPlayerProgress} from "./playerprogress.ts";
-import {getSkills} from "./skills.ts";
 
 type Button = {
   label: string;

src/hud.ts

@@ -27,7 +27,13 @@ export class Hud {
   #draw() {
     D.fillRect(new Point(-4, -4), this.size.add(new Size(8, 8)), BG_OUTER);
     D.drawText(getPlayerProgress().name, new Point(0, 0), FG_BOLD);
-    D.drawText(`Level ${getHuntMode().getDepth()}`, new Point(0, 16), FG_TEXT);
+
+    let levelText = `Level ${getHuntMode().getDepth()}`;
+    let zoneLabel = getHuntMode().getZoneLabel();
+    if (zoneLabel != null) {
+      levelText += ": " + zoneLabel;
+    }
+    D.drawText(levelText, new Point(0, 16), FG_TEXT);
     D.drawText(
       `Turn ${getStateManager().getTurn()}/${getStateManager().getMaxTurns()}`,
       new Point(0, 32),

src/huntmode.ts

@@ -1,19 +1,13 @@
-import { Point } from "./engine/datatypes.ts";
+import {Point} from "./engine/datatypes.ts";
-import { DrawPile } from "./drawpile.ts";
+import {DrawPile} from "./drawpile.ts";
-import { D } from "./engine/public.ts";
+import {D} from "./engine/public.ts";
-import { sprThrallLore } from "./sprites.ts";
+import {sprThrallLore} from "./sprites.ts";
-import {
+import {BG_INSET, BG_WALL_OR_UNREVEALED, FG_BOLD, FG_MOULDING, FG_TEXT, FG_TOO_EXPENSIVE,} from "./colors.ts";
-  BG_INSET,
+import {getPlayerProgress} from "./playerprogress.ts";
-  BG_WALL_OR_UNREVEALED,
+import {Architecture, LoadedNewMap} from "./newmap.ts";
-  FG_BOLD,
+import {FLOOR_CELL_SIZE, GridArt} from "./gridart.ts";
-  FG_MOULDING,
+import {shadowcast} from "./shadowcast.ts";
-  FG_TEXT, FG_TOO_EXPENSIVE,
+import {getCheckModal} from "./checkmodal.ts";
-} from "./colors.ts";
-import { getPlayerProgress } from "./playerprogress.ts";
-import { Architecture, LoadedNewMap } from "./newmap.ts";
-import { FLOOR_CELL_SIZE, GridArt } from "./gridart.ts";
-import { shadowcast } from "./shadowcast.ts";
-import { getCheckModal } from "./checkmodal.ts";
 import {withCamera} from "./layout.ts";
 
 export class HuntMode {
@@ -87,6 +81,10 @@ export class HuntMode {
     this.#collectResources();
   }
 
+  getZoneLabel(): string | null {
+    return this.map.get(this.player).zoneLabel;
+  }
+
   // draw
   update() {
     withCamera("Gameplay", () => { this.#update() });

src/manormap.ts

@@ -51,6 +51,7 @@ export function generateManor(): LoadedNewMap {
         }
       };
 
+      cell.zoneLabel = "Manor";
       switch (BASIC_PLAN.get(xy)) {
         case "#":
           break;

src/mapgen.ts

@@ -67,15 +67,16 @@ class Knife {
     this.#region += 1;
   }
 
-  carve(point: Point) {
+  carve(point: Point, label?: string) {
     this.#regions.set(point, this.#region);
     this.map.get(point).architecture = Architecture.Floor;
+    this.map.get(point).zoneLabel = label ?? null;
   }
 
-  carveRoom(room: Rect, protect?: boolean) {
+  carveRoom(room: Rect, protect?: boolean, label?: string) {
     for (let y = room.top.y; y < room.top.y + room.size.h; y++) {
       for (let x = room.top.x; x < room.top.x + room.size.w; x++) {
-        this.carve(new Point(x, y));
+        this.carve(new Point(x, y), label);
       }
     }
 
@@ -262,9 +263,9 @@ function carveVault(knife: Knife, room: Rect, vaultTemplate: VaultTemplate) {
   let ab = mergeRects(a, b);
 
   knife.startRegion();
-  knife.carveRoom(ab);
+  knife.carveRoom(ab, false, vaultTemplate.roomLabels.hall);
-  knife.carveRoom(c, true);
+  knife.carveRoom(c, true, vaultTemplate.roomLabels.backroom);
-  knife.carveRoom(d, true);
+  knife.carveRoom(d, true, vaultTemplate.roomLabels.closet);
 
   // now place standard pickups
   for (let dy = 0; dy < ab.size.h; dy++) {
@@ -312,7 +313,7 @@ function carveVault(knife: Knife, room: Rect, vaultTemplate: VaultTemplate) {
       if (check != null) {
         knife.map.get(connector).pickup = new LockPickup(check);
       }
-      knife.carve(connector);
+      knife.carve(connector, vaultTemplate.roomLabels.backroom);
     }
     if (mergeRects(c, d).contains(connector)) {
       // TODO: Put check 2 here
@@ -320,7 +321,7 @@ function carveVault(knife: Knife, room: Rect, vaultTemplate: VaultTemplate) {
       if (check != null) {
         knife.map.get(connector).pickup = new LockPickup(check);
       }
-      knife.carve(connector);
+      knife.carve(connector, vaultTemplate.roomLabels.closet);
     }
   }
 
@@ -366,7 +367,7 @@ function carveVault(knife: Knife, room: Rect, vaultTemplate: VaultTemplate) {
 }
 
 function carveStaircase(knife: Knife, room: Rect, ix: number) {
-  carveRoom(knife, room);
+  carveRoom(knife, room, "Stairwell");
 
   let x = Math.floor(room.top.x + room.size.w / 2);
   let y = Math.floor(room.top.y + room.size.h / 2);
@@ -381,13 +382,9 @@ function carveStaircase(knife: Knife, room: Rect, ix: number) {
   }
 }
 
-function carveRoom(knife: Knife, room: Rect) {
+function carveRoom(knife: Knife, room: Rect, label?: string) {
   knife.startRegion();
-  for (let y = room.top.y; y < room.top.y + room.size.h; y++) {
+  knife.carveRoom(room, false, label);
-    for (let x = room.top.x; x < room.top.x + room.size.w; x++) {
-      knife.carve(new Point(x, y));
-    }
-  }
 
   for (let dy = 0; dy < Math.ceil(room.size.h / 2); dy++) {
     for (let dx = 0; dx < Math.ceil(room.size.w / 2); dx++) {

src/newmap.ts

@@ -32,8 +32,9 @@ export class LoadedNewMap {
   #entrance: Point | null;
   #architecture: Grid<Architecture>;
   #pickups: Grid<Pickup | null>;
-  #provinces: Grid<string | null>;
+  #provinces: Grid<string | null>;  // TODO: Does this just duplicate zoneLabels
   #revealed: Grid<boolean>;
+  #zoneLabels: Grid<string | null>;
 
   constructor(id: string, size: Size) {
     this.#id = id;
@@ -43,6 +44,7 @@ export class LoadedNewMap {
     this.#pickups = new Grid<Pickup | null>(size, () => null);
     this.#provinces = new Grid<string | null>(size, () => null);
     this.#revealed = new Grid<boolean>(size, () => false);
+    this.#zoneLabels = new Grid<string | null>(size, () => null);
   }
 
   set entrance(point: Point) {
@@ -95,6 +97,14 @@ export class LoadedNewMap {
   getRevealed(point: Point): boolean {
     return this.#revealed.get(point);
   }
+
+  setZoneLabel(point: Point, value: string | null) {
+    this.#zoneLabels.set(point, value);
+  }
+
+  getZoneLabel(point: Point): string | null {
+    return this.#zoneLabels.get(point);
+  }
 }
 
 export class CellView {
@@ -134,6 +144,13 @@ export class CellView {
     return this.#map.getRevealed(this.#point);
   }
 
+  set zoneLabel(value: string | null) {
+    this.#map.setZoneLabel(this.#point, value);
+  }
+  get zoneLabel(): string | null {
+    return this.#map.getZoneLabel(this.#point);
+  }
+
   copyFrom(cell: CellView) {
     this.architecture = cell.architecture;
     this.pickup = cell.pickup;

src/pickups.ts

@@ -363,7 +363,7 @@ export class ThrallCollectionPlatePickup {
     }
   }
 
-  onClick(cell: CellView): boolean {
+  onClick(_cell: CellView): boolean {
     let lifeStage = getPlayerProgress().getThrallLifeStage(this.thrall);
     let itemStage = getPlayerProgress().getThrallItemStage(this.thrall);
     let data = getThralls().get(this.thrall);

src/skillsmodal.ts

@@ -2,7 +2,7 @@ import { getPartLocation, withCamera } from "./layout.ts";
 import { AlignX, Point, Rect, Size } from "./engine/datatypes.ts";
 import { DrawPile } from "./drawpile.ts";
 import { D } from "./engine/public.ts";
-import {BG_INSET, FG_BOLD, FG_TEXT, FG_TEXT_DISABLED, FG_TEXT_ENDORSED} from "./colors.ts";
+import {BG_INSET, FG_BOLD, FG_TEXT_DISABLED, FG_TEXT_ENDORSED} from "./colors.ts";
 import { addButton } from "./button.ts";
 import { getSkills } from "./skills.ts";
 import { getPlayerProgress } from "./playerprogress.ts";

src/vaulttemplate.ts

@@ -32,6 +32,11 @@ import {
 
 export type VaultTemplate = {
   stats: { primary: Stat; secondary: Stat };
+  roomLabels: {
+    hall: string,
+    backroom: string,
+    closet: string,
+  }
   thrall: () => Thrall;
   thrallItem: () => Thrall;
   checks: [CheckData, CheckData];
@@ -41,6 +46,11 @@ export const standardVaultTemplates: VaultTemplate[] = [
   {
     // zoo
     stats: { primary: "AGI", secondary: "PSI" },
+    roomLabels: {
+      hall: "Zoo",
+      backroom: "Gator Pen",
+      closet: "Pantry",
+    },
     thrall: () => thrallParty,
     thrallItem: () => thrallBat,
     checks: [
@@ -88,6 +98,11 @@ export const standardVaultTemplates: VaultTemplate[] = [
   {
     // blood bank
     stats: { primary: "AGI", secondary: "INT" },
+    roomLabels: {
+      hall: "Blood Bank",
+      backroom: "Backroom",
+      closet: "Blood Storage [?]",
+    },
     thrall: () => thrallLore,
     thrallItem: () => thrallStealth,
     checks: [
@@ -134,6 +149,11 @@ export const standardVaultTemplates: VaultTemplate[] = [
   {
     // coffee shop
     stats: { primary: "PSI", secondary: "CHA" },
+    roomLabels: {
+      hall: "Coffee Shop",
+      backroom: "Private Studio",
+      closet: "Darkroom",
+    },
     thrall: () => thrallBat,
     thrallItem: () => thrallCharm,
     checks: [
@@ -181,6 +201,11 @@ export const standardVaultTemplates: VaultTemplate[] = [
   {
     // optometrist
     stats: { primary: "PSI", secondary: "PSI" },
+    roomLabels: {
+      hall: "Optometrist",
+      backroom: "Eyeball Room",
+      closet: "Guts of the Machine",
+    },
     thrall: () => thrallCharm,
     thrallItem: () => thrallStare,
     checks: [
@@ -228,6 +253,11 @@ export const standardVaultTemplates: VaultTemplate[] = [
   {
     // club,
     stats: { primary: "CHA", secondary: "PSI" },
+    roomLabels: {
+      hall: "Nightclub",
+      backroom: "Secret Poker Game",
+      closet: "Trophy Room",
+    },
     thrall: () => thrallStealth,
     thrallItem: () => thrallParty,
     checks: [
@@ -275,6 +305,11 @@ export const standardVaultTemplates: VaultTemplate[] = [
   {
     // library
     stats: { primary: "INT", secondary: "CHA" },
+    roomLabels: {
+      hall: "Library",
+      backroom: "Special Collections",
+      closet: "Hall of Desire",
+    },
     thrall: () => thrallStare,
     thrallItem: () => thrallLore,
     checks: [