@slugbugblue/trax 0.13.0 → 0.14.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @slugbugblue/trax
 
+## 0.14.0 - 2022-12-05
+
+- Added `puzzles` to the CLI:
+
+  - `trax puzzles ls`: see all the puzzles
+  - `trax puzzle new`: start a new puzzle
+
+- Bot tests now include solving all tutorial and easy puzzles. As the bot
+  improves, we will add more puzzles to the tests.
+
 ## 0.13.0 - 2022-11-25
 
 - Add move suggestions to `analyst.js` for CLI and bot use

package/README.md

@@ -154,7 +154,6 @@ publicly available puzzles at [the traxgame.com puzzles page][traxpuzzles].
 ## Roadmap
 
 - Improve the threats database / analysis engine.
-- Add a puzzle interface to the CLI.
 - Add more puzzles.
 
 ## Support

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slugbugblue/trax",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Trax game engine and friends",
   "keywords": [
     "trax",

package/src/analyst.js

@@ -200,7 +200,8 @@ const threatCount = (from) => {
 const passiveAttack = (from) =>
   attackCount(from) > 1 || (attackCount(from) === 1 && threatCount(from) > 0)
 
-const underAttack = (from) => attackCount(from) + threatCount(from) > 0
+// Maybe we don't need this one
+// const underAttack = (from) => attackCount(from) + threatCount(from) > 0
 
 // Analysis class
 export const Analysis = class {
@@ -295,7 +296,7 @@ export const Analysis = class {
       }
 
       const passive = game.color !== color
-      const calc = !passive || passiveAttack(inactive) || underAttack(active)
+      const calc = !passive || passiveAttack(inactive)
 
       // Calculate the effects of the passive player first
       for (const level of Object.keys(inactive).map((i) => int(i))) {

package/src/cli.js

@@ -39,6 +39,7 @@ import {
 import { listCmd } from './cmds/list.js'
 import { newCmd } from './cmds/new.js'
 import { playCmd, tryCmd } from './cmds/play-try.js'
+import { puzzlesCmd } from './cmds/puzzles.js'
 import { selectCmd } from './cmds/select.js'
 import { suggestCmd } from './cmds/suggest.js'
 import { undoCmd } from './cmds/undo.js'
@@ -87,6 +88,7 @@ const plugins = [
   listCmd,
   newCmd,
   playCmd,
+  puzzlesCmd,
   quitCmd,
   selectCmd,
   suggestCmd,
@@ -190,8 +192,8 @@ const color = (text, def) => {
 }
 
 // Internal representations of files
-const CONFIG = { id: '' }
-const DATA = { games: {} }
+const CONFIG = { id: '', puzzleLevel: 0 }
+const DATA = { games: {}, puzzles: {} }
 
 // CLI context object for plugins
 const CLI = {
@@ -215,6 +217,10 @@ const CLI = {
   get ID() {
     return CONFIG.id
   },
+  // The current puzzle level
+  get puzzleLevel() {
+    return CONFIG.puzzleLevel
+  },
 
   // Provide access to the current Trax object
   TRAX: new Trax(),
@@ -231,6 +237,7 @@ const CLI = {
     variable: 123,
     optional: 110,
     short: 153,
+    success: 35,
     white: 250,
   },
 
@@ -298,11 +305,57 @@ const CLI = {
     return id
   },
 
+  newPuzzle(puzzle) {
+    // Starts a new puzzle
+    const id = newId(DATA)
+    const trax = new Trax(puzzle.game, puzzle.notation, 'cli')
+    const players = ['challenger', 'puzzlebot']
+    DATA.games[id] = {
+      id,
+      puzzle: puzzle.id,
+      rules: trax.rules,
+      name: trax.name,
+      turn: trax.turn,
+      max: puzzle.max,
+      players: trax.turn === 1 ? players : players.reverse(),
+      moves: trax.moves.join(' '),
+    }
+
+    if (DATA.puzzles[puzzle.id]) {
+      DATA.puzzles[puzzle.id].attempts += 1
+    } else {
+      DATA.puzzles[puzzle.id] = { attempts: 1, solved: 0 }
+    }
+
+    CONFIG.id = id
+    CONFIG.puzzleLevel = puzzle.level
+    CLI.TRAX = trax
+
+    saveConfig()
+    saveData()
+
+    return id
+  },
+
   out(text) {
     // Prints to stdout
     console.info(text + tty.color(''))
   },
 
+  plural(n, noun, nouns) {
+    return String(n) + ' ' + (Math.abs(n) === 1 ? noun : nouns || noun + 's')
+  },
+
+  puzzle(id) {
+    return DATA.puzzles?.[id] || { attempts: 0, solved: 0 }
+  },
+
+  puzzleSolved(id) {
+    DATA.puzzles = DATA.puzzles || {}
+    DATA.puzzles[id] = DATA.puzzles[id] || { attempts: 1, solved: 0 }
+    DATA.puzzles[id].solved += 1
+  },
+
   resolveCommand(word) {
     // Determine if an entered word is a valid command.
     // Returns the command if a single match is found, an array if multiple

package/src/cmds/import-export.js

@@ -22,6 +22,7 @@ import envPaths from 'env-paths'
 import makeDir from 'make-dir'
 
 import { Trax } from '@slugbugblue/trax'
+import { puzzles, sources } from '@slugbugblue/trax/puzzles'
 
 const paths = envPaths('trax', { suffix: '' })
 const PATHS = {}
@@ -30,7 +31,12 @@ const PATHS = {}
 let cli = {}
 
 const fsOuch = (fsError) => {
-  cli.out(fsError, cli.COLORS.fatal)
+  if (cli.out) {
+    cli.out(fsError, cli.COLORS.fatal)
+  } else {
+    console.log(fsError)
+  }
+
   throw fsError
 }
 
@@ -72,7 +78,12 @@ export const getFile = async (filetype, filename, variable, decode) => {
       }
     } catch (fsError) {
       if (fsError instanceof TypeError || fsError instanceof SyntaxError) {
-        cli.error(`Unable to read ${filetype} file ${path}/${filename}`)
+        const error = `Unable to read ${filetype} file ${path}/${filename}`
+        if (cli.error) {
+          cli.error(error)
+        } else {
+          console.log(error)
+        }
       } else if (fsError.code !== 'ENOENT') {
         fsOuch(fsError)
       }
@@ -200,6 +211,25 @@ exportCmd.fn = (CLI, id, filename) => {
   content += ' vs '
   content += game.players?.[1] || 'black'
   content += '\n; @slugbugblue/trax cli.js v' + CLI.version + '\n'
+  if (game.puzzle) {
+    const puzzle = puzzles.find((p) => p.id === game.puzzle)
+    if (puzzle) {
+      const source = sources[puzzle.src]
+      content += '; Puzzle ' + game.puzzle
+      if (source) {
+        content += ' provided courtesy of ' + source.name
+        if (source.url) content += ' (' + source.url + ')'
+      }
+
+      if (puzzle.title) content += '\n; ' + puzzle.title
+      if (puzzle.desc) content += '\n; ' + puzzle.desc
+      content += '\n; Starting position ' + puzzle.notation + '\n; '
+      const players = [0, 'white', 'black']
+      content += players[puzzle.player] + ' to win by move '
+      content += String(puzzle.max) + '\n'
+    }
+  }
+
   content += trax.notation + '\n'
   if (filename) filename = filename.replace(/[^ a-z\d.~/]/g, '')
   if (filename) {

package/src/cmds/list.js

@@ -40,9 +40,6 @@ export const listCmd = {
   ],
 }
 
-const plural = (n, noun, nouns) =>
-  n + ' ' + (Math.abs(n) === 1 ? noun : nouns || noun + 's')
-
 const alphaSort = (a, b) => {
   a = String(a).toLowerCase()
   b = String(b).toLowerCase()
@@ -120,7 +117,7 @@ listCmd.fn = (CLI, ...filters) => {
       id: (game.id === CLI.GAME.id ? '* #' : '#') + String(game.id),
       name: game.name?.length || 0,
       rules: game.rules,
-      moves: plural(moves, 'move'),
+      moves: CLI.plural(moves, 'move'),
       smoves: game.over ? '9999' : String(moves).padStart(9, '0'),
       sturn: String(game.turn),
       p1: game.players?.[0] || 'white',

package/src/cmds/new.js

@@ -42,7 +42,7 @@ const pairs = [
   ['Donald', 'Daisy'],
   ['Fred', 'Barney'],
   ['Fred', 'George'],
-  ['Frodo', 'Sam'],
+  ['Frodo', 'Samwise'],
   ['Han', 'Chewie'],
   ['Harry', 'Ron'],
   ['Holmes', 'Watson'],

package/src/cmds/play-try.js

@@ -15,6 +15,8 @@
 
 // CLI play/try commands
 
+import { suggest } from '@slugbugblue/trax/analyst'
+
 const moveRx = /^\d+\.?$/
 const notationRx = /^[@a-z]+\d+[bps/\\+]$/i
 
@@ -46,6 +48,40 @@ export const tryCmd = {
   ],
 }
 
+const bot = (CLI) => {
+  const game = CLI.GAME
+  const trax = CLI.TRAX
+  const players = game.players || ['a', 'b']
+  const name = players[trax.turn - 1]
+  if (trax.over && game.puzzle) {
+    if (trax.move <= game.max && name !== 'puzzlebot') {
+      CLI.puzzleSolved(game.puzzle)
+      return 'win'
+    }
+
+    return 'lose'
+  }
+
+  if (!trax.over && /bot\b/i.test(name)) {
+    if (game.puzzle && trax.move >= game.max) {
+      trax.play('puzzled')
+      return 'lose'
+    }
+
+    CLI.do('view')
+    CLI.out(CLI.bubble(trax.color + 'd', `${name} thinking...`))
+    const move = suggest(trax)?.pick?.move
+    if (move) {
+      CLI.out(CLI.bubble(trax.color + 'd', `${name} chooses ${move}`))
+      trax.play(move)
+    }
+
+    if (game.puzzle) return ' and win by move ' + String(game.max)
+  }
+
+  return ''
+}
+
 playCmd.fn = (CLI, ...moves) => {
   if (moves.length === 0 || !moves[0]) {
     CLI.error('You must provide a move.')
@@ -56,24 +92,27 @@ playCmd.fn = (CLI, ...moves) => {
     CLI.do('new')
   }
 
-  if (CLI.TRAX.over) {
+  const game = CLI.GAME
+  const trax = CLI.TRAX
+
+  if (trax.over) {
     return CLI.error('The game is over.')
   }
 
-  const start = CLI.TRAX.move
+  const start = trax.move
   let checkMove
 
   for (let move of moves) {
     if (notationRx.test(move)) {
-      const moveNumber = CLI.TRAX.move
+      const moveNumber = trax.move
       move = CLI.fixNotation(move)
       if (checkMove) {
-        CLI.TRAX.play(checkMove, move)
+        trax.play(checkMove, move)
       } else {
-        CLI.TRAX.play(move)
+        trax.play(move)
       }
 
-      if (CLI.TRAX.move === moveNumber) {
+      if (trax.move === moveNumber) {
         CLI.error(
           'Move "' +
             (checkMove ? checkMove + '. ' : '') +
@@ -88,9 +127,17 @@ playCmd.fn = (CLI, ...moves) => {
     }
   }
 
-  if (CLI.TRAX.move !== start) {
+  if (trax.move !== start) {
+    const result = bot(CLI)
     CLI.updateGameData()
     CLI.do('view')
+    if (result === 'lose') {
+      CLI.error('Failed to complete puzzle ' + game.puzzle)
+    } else if (result === 'win') {
+      CLI.out(CLI.color.success('You completed puzzle ' + game.puzzle))
+    } else if (result) {
+      CLI.out(result)
+    }
   }
 }
 

package/src/cmds/puzzles.js

@@ -0,0 +1,152 @@
+/** @file Puzzles CLI
+ * @copyright 2022
+ * @author Chad Transtrum <chad@transtrum.net>
+ * @license Apache-2.0
+ */
+
+import { Trax } from '@slugbugblue/trax'
+import { levels, puzzles, sources } from '@slugbugblue/trax/puzzles'
+
+let maxLevel = 0
+const puzzleIds = []
+for (const puzzle of puzzles) {
+  maxLevel = Math.max(maxLevel, puzzle.level)
+  puzzleIds.push(puzzle.id)
+}
+
+const validLevels = levels.slice(0, maxLevel + 1)
+const completions = [...validLevels, ...puzzleIds].join('|')
+
+export const puzzlesCmd = {
+  name: 'puzzles',
+  args: '["list"|"start" [<difficulty>|<puzzleID>]]',
+  comp: 'list|ls|new|show|start|view ' + completions,
+  desc: 'play puzzles',
+  help: [
+    'Practice your skills with puzzles. Use "list" to see the puzzle',
+    'categories, or "start" to play a puzzle.',
+  ],
+}
+
+const showPuzzle = (CLI, id) => {
+  const puzzle = puzzles.find((p) => p.id === id)
+  if (!puzzle) return CLI.error(`Puzzle ${id} not found`)
+  const trax = new Trax(puzzle.game, puzzle.notation, 'cli')
+  const players = ['white', 'black']
+  CLI.display(trax, players)
+  let out = CLI.color.short(puzzle.id)
+  out += CLI.color(' is a ' + levels[puzzle.level] + ' puzzle') + '\n'
+  if (puzzle.title) out += CLI.color(puzzle.title) + '\n'
+  if (puzzle.desc) out += CLI.color.help(puzzle.desc) + '\n'
+  out += CLI.color(players[puzzle.player - 1] + ' to win by move ' + puzzle.max)
+  const src = sources[puzzle.src]
+  if (src) {
+    let source = '\nPuzzle '
+    source += src.copyright
+      ? 'copyright ' + src.copyright + ' by'
+      : 'courtesy of'
+    source += ' ' + src.name
+    const url = src.url ? ' ' + CLI.color.white(src.url) : ''
+    out += CLI.color.black(source) + url
+  }
+
+  CLI.out(out)
+}
+
+const listPuzzles = (CLI) => {
+  let size = 1
+  const data = []
+  for (const name of validLevels) {
+    size = Math.max(size, name.length)
+    data.push({ name, count: 0, solved: 0, selected: false })
+  }
+
+  if (data[CLI.puzzleLevel]) data[CLI.puzzleLevel].selected = true
+
+  for (const puzzle of puzzles) {
+    data[puzzle.level].count += 1
+    if (CLI.puzzle(puzzle.id).solved > 0) data[puzzle.level].solved += 1
+  }
+
+  for (const category of data) {
+    let out = category.selected ? CLI.color('* ') : '  '
+    out += CLI.color.short(category.name.padEnd(size + 1))
+    if (category.solved === 0) {
+      out += CLI.color(CLI.plural(category.count, 'puzzle'))
+    } else if (category.solved === category.count) {
+      if (category.count > 3) out += CLI.color.success('all ')
+      out += CLI.color.success(CLI.plural(category.count, 'puzzle') + ' solved')
+    } else {
+      out += CLI.color.success(`${category.solved} solved`)
+      out += CLI.color(` of ${category.count} puzzles`)
+    }
+
+    CLI.out(out)
+  }
+}
+
+const listLevel = (CLI, levelName) => {
+  let size = 1
+  const level = levels.indexOf(levelName)
+  const data = []
+  for (const puzzle of puzzles) {
+    if (puzzle.level !== level) continue
+    size = Math.max(size, puzzle.id.length)
+    data.push({
+      id: puzzle.id,
+      title: puzzle.title,
+      solved: CLI.puzzle(puzzle.id).solved > 0,
+    })
+  }
+
+  for (const puzzle of data) {
+    let out = CLI.color.success(puzzle.solved ? '✓' : ' ')
+    out += CLI.color.short(' ' + puzzle.id)
+    if (puzzle.title) out += CLI.color(' ' + puzzle.title)
+    CLI.out(out)
+  }
+}
+
+const startPuzzle = (CLI, puzzle) => {
+  const id = CLI.newPuzzle(puzzle)
+  CLI.out(CLI.color(`Started puzzle ${puzzle.id} as game #${id}`))
+  showPuzzle(CLI, puzzle.id)
+}
+
+const startNextPuzzle = (CLI, level) => {
+  if (level === undefined) level = CLI.puzzleLevel
+  const unsolved = puzzles.filter((p) => !CLI.puzzle(p.id).solved)
+  if (unsolved.length === 0) {
+    CLI.out(CLI.success('You have already completed all the puzzles.'))
+    return CLI.error('Specify a specific puzzle to try one again.')
+  }
+
+  const next = unsolved.find((p) => p.level >= level) || unsolved[0]
+  startPuzzle(CLI, next)
+}
+
+puzzlesCmd.fn = (CLI, action, id) => {
+  action = action?.toLowerCase() ?? 'list'
+  if ('start'.startsWith(action) || 'new'.startsWith(action)) {
+    if (!id) return startNextPuzzle(CLI)
+
+    const puzzle = puzzles.find((p) => p.id === id)
+    if (puzzle) {
+      return startPuzzle(CLI, puzzle)
+    }
+
+    if (validLevels.includes(id)) {
+      return startNextPuzzle(CLI, levels.indexOf(id))
+    }
+
+    return CLI.error('Could not start puzzle ' + id)
+  }
+
+  if (action) {
+    if (validLevels.includes(id)) return listLevel(CLI, id)
+    if (puzzleIds.includes(id)) return showPuzzle(CLI, id)
+    if (id) return CLI.error('Could not find puzzle ' + id)
+  }
+
+  listPuzzles(CLI)
+}

package/src/cmds/suggest.js

@@ -36,7 +36,7 @@ suggestCmd.fn = (CLI, debug) => {
 
   CLI.out(
     CLI.bubble(
-      game.turn === '1' ? 'wh' : 'bh',
+      game.turn === 1 ? 'w' : 'b',
       String(game.move + 1) + '. ' + suggestion.pick.move,
     ),
   )

package/src/cmds/view.js

@@ -49,5 +49,5 @@ viewCmd.fn = (CLI, move) => {
       CLI.color(' vs ') +
       CLI.bubble('b' + (trax.turn === 2 ? 'h' : ''), players[1]),
   )
-  CLI.display(trax, players, false, show)
+  CLI.display(trax, players, undefined, show)
 }

package/src/puzzles.js

@@ -4,10 +4,20 @@
  * @license Apache-2.0
  */
 
+/** @type string[] */
+export const levels = [
+  'tutorial',
+  'beginner',
+  'tough',
+  'advanced',
+  'expert',
+  'master',
+]
+
 /** @type {{[key: string]: PuzzleSource}} */
 export const sources = {
   sbb: {
-    name: 'puzzlebot',
+    name: "slugbugblue's puzzlebot",
   },
   traxgame: {
     name: 'Donald G. Bailey',
@@ -25,8 +35,8 @@ export const puzzles = [
     icon: 'fd',
     player: 1,
     max: 3,
-    level: 1,
-    title: 'Tutorial: Loop attack',
+    level: 0,
+    title: 'Loop attack',
     desc: "You're playing white, so when you form a white loop, you win the game.",
     hints: ['A0/', 'B0\\'],
   },
@@ -38,8 +48,8 @@ export const puzzles = [
     icon: 'def',
     player: 2,
     max: 4,
-    level: 1,
-    title: 'Tutorial: Wide loop attack',
+    level: 0,
+    title: 'Wide loop attack',
     desc: "Your loop doesn't have to be a perfect circle, and it can be oriented in any direction.",
     hint: 'B2+',
   },
@@ -51,10 +61,10 @@ export const puzzles = [
     icon: 'ca:0e:0d',
     player: 1,
     max: 5,
-    level: 1,
+    level: 0,
     title: 'Partially formed wide loop',
     desc: "It doesn't matter which direction the loops are facing.",
-    hint: 'A2+',
+    hints: ['A2+', 'A3\\'],
   },
   {
     id: 'tutorial.04',
@@ -64,7 +74,7 @@ export const puzzles = [
     icon: 'd:aeec',
     player: 2,
     max: 6,
-    level: 1,
+    level: 0,
     title: 'Using a hollow',
     desc: 'You can use forced tiles with an inside corner to stretch your attack.',
     hint: 'C1+',
@@ -77,7 +87,7 @@ export const puzzles = [
     icon: 'ca:0ef:0ec:0d',
     player: 1,
     max: 7,
-    level: 1,
+    level: 0,
     title: 'Diverted attack',
     desc: "Even though black is attacking into this area, it doesn't stop you from completing your loop.",
     hint: 'A3+',
@@ -90,7 +100,7 @@ export const puzzles = [
     icon: 'd2f:aeeec',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Long cave',
     desc: 'Stretch the line with forced tiles.',
     hint: 'C1+',
@@ -103,7 +113,7 @@ export const puzzles = [
     icon: 'ae:0f:0a',
     player: 1,
     max: 7,
-    level: 1,
+    level: 0,
     title: 'Introduction to the L',
     desc: 'Use an L to form two attacks at once.',
     hint: 'A3/',
@@ -116,7 +126,7 @@ export const puzzles = [
     icon: 'f:bae:1f',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Mirrored Ls',
     desc: "This mirrored position gives an L to both players, but since it's your turn, you have the initiative.",
     hint: 'A3/',
@@ -129,7 +139,7 @@ export const puzzles = [
     icon: 'a:efae',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Sideways L',
     desc: 'An L can be in any orientation.',
     hint: 'D1+',
@@ -142,7 +152,7 @@ export const puzzles = [
     icon: 'fae:1ef',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Ls come in many shapes',
     hint: 'A2/',
   },
@@ -150,13 +160,13 @@ export const puzzles = [
     id: 'tutorial.11',
     src: 'sbb',
     game: 'trax',
-    notation: '@0+ @1\\ @1\\ D1+ D2\\',
+    notation: '@0+ B1/ C1/ @1+ A2/',
     icon: 'faee:2f',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Another L',
-    hint: 'A2/',
+    hint: 'D2\\',
   },
   {
     id: 'tutorial.12',
@@ -166,7 +176,7 @@ export const puzzles = [
     icon: 'ae:fd:0ae',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Fat L',
     desc: "Even though this looks a bit odd, it's just another L.",
     hint: 'C1/',
@@ -179,7 +189,7 @@ export const puzzles = [
     icon: 'bbae:2f',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Connectable pair L',
     desc: 'This L uses a connectable pair instead of two corners, but it works the same as the other Ls.',
     hints: ['A2\\', 'B2/'],
@@ -188,14 +198,14 @@ export const puzzles = [
     id: 'tutorial.14',
     src: 'sbb',
     game: 'trax',
-    notation: '@0+ @1\\ @1\\ C2+ C3+',
+    notation: '@0+ @1/ @1/ C0+ C0+',
     icon: 'fae:1e:1e',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Another connectable pair L',
     desc: 'There is a lot of variation in how Ls look, but being able to recognize them and activate them is key.',
-    hint: 'A2/',
+    hint: 'A2\\',
   },
   {
     id: 'tutorial.15',
@@ -205,7 +215,7 @@ export const puzzles = [
     icon: 'e:e:d:ae',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Simple connectable pair L',
     desc: 'Starting to get the hang of this?',
     hints: ['B1\\', 'B2/'],
@@ -218,7 +228,7 @@ export const puzzles = [
     icon: 'a:e:eec',
     player: 2,
     max: 8,
-    level: 1,
+    level: 0,
     title: 'Strange L',
     desc: 'Just another connectable pair L.',
     hint: 'B1/',

package/src/threats.js

@@ -5,8 +5,8 @@
  */
 
 const REGEX = {
-  a: '[am]', // White that pairs with the next white
-  c: '[cp]', // White that forms a connectable pair with next white
+  a: '[am]', // White that pairs with the next white (m=hollow)
+  c: '[cp]', // White that forms a connectable pair with next white (p=hollow)
   l: '[lmp]', // White in a hollow
   w: '[aclmpw]', // Any white
   '!': '(?:b[acw])*?', // Ripple black/white
@@ -15,7 +15,7 @@ const REGEX = {
   '?': 'b?', // Zero or one black piece
 }
 
-class CustomInspectableThreat {
+class Threat {
   #depth = 0
   #pattern = ''
   #rx = null
@@ -65,7 +65,7 @@ class CustomInspectableThreat {
   }
 }
 
-class CustomInspectableThreatsDB {
+class ThreatsDB {
   #db = {}
   #depth = 0
 
@@ -77,7 +77,8 @@ class CustomInspectableThreatsDB {
 
   add(depth, pattern, reforms = false) {
     this.#depth = Math.max(depth, this.#depth)
-    this.#db[pattern] = new CustomInspectableThreat(depth, pattern, reforms)
+    if (pattern in this.#db) throw new Error('Duplicate pattern:' + pattern)
+    this.#db[pattern] = new Threat(depth, pattern, reforms)
     return this.#db[pattern]
   }
 
@@ -110,8 +111,8 @@ class CustomInspectableThreatsDB {
   }
 }
 
-const pre = true
-const post = true
+const pre = true // This pattern can appear first in an L threat
+const post = true // This pattern can come second in an L threat
 const corners = {
   arw: { pre, post }, // Simple corner
   abrw: { post }, // Wide-first corner
@@ -122,7 +123,13 @@ const corners = {
   cbw: {}, // Wide connectable pair
 }
 
-export const threats = new CustomInspectableThreatsDB(Object.keys(corners))
+export const threats = new ThreatsDB(Object.keys(corners))
+
+// Attacks
+const attacks = [
+  'a?w', // Simple attack and wide attack
+]
+attacks.map((a) => threats.add(1, a))
 
 // Re-forming attacks
 const reformAttacks = [
@@ -139,12 +146,6 @@ const reformThreats = [
 ]
 reformThreats.map((rt) => threats.add(2, rt))
 
-// Attacks
-const attacks = [
-  'a?w', // Simple attack and wide attack
-]
-attacks.map((a) => threats.add(1, a))
-
 // Create multi-stage threats
 for (const one of Object.keys(corners)) {
   for (const two of Object.keys(corners)) {
@@ -152,9 +153,13 @@ for (const one of Object.keys(corners)) {
     const [before, after] = [corners[one].post, corners[two].pre]
     if (before || after) {
       const start = one.replace('w', 'l')
-      threats.add(2, start + (before ? '?¡' : '¡') + two)
+      const pre = before ? '?' : ''
+      const post = after ? '?' : ''
+      threats.add(2, start + pre + '¡' + two) // Make an L
+      threats.add(3, start + pre + 'rb¡' + two) // Make a three-stage threat
       const end = two.replace('a', 'm').replace('c', 'p')
-      threats.add(2, one + (after ? '?!' : '!') + end)
+      threats.add(2, one + post + '!' + end) // L
+      threats.add(3, one + post + '!br' + end) // Three-stage
     }
 
     // Edge threats

package/src/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.13.0'
+export const version = '0.14.0'