@slugbugblue/trax 0.17.0 → 0.19.0

package/src/puzzles.js

@@ -1,5 +1,5 @@
 /** This is a collection of puzzles.
- * @copyright 2022
+ * @copyright 2022-2023
  * @author Chad Transtrum <chad@transtrum.net>
  * @license Apache-2.0
  */
@@ -23,6 +23,10 @@ export const sources = {
     name: 'Donald G. Bailey',
     url: 'http://www.traxgame.com/games_puzzles.php',
   },
+  book1: {
+    name: 'Martin M. S. Pedersen',
+    url: 'https://gnutrax.com/book',
+  },
 }
 
 /** @type {Puzzle[]} */
@@ -396,7 +400,7 @@ export const puzzles = [
     level: 2,
     player: 2,
     max: 10,
-    hint: 'A0\\',
+    hints: ['A0\\', 'D0/'],
   },
   {
     id: 'eb8.trx',
@@ -440,7 +444,7 @@ export const puzzles = [
     level: 2,
     player: 1,
     max: 11,
-    hints: ['A0/', 'C4\\', 'D5/'],
+    hints: ['A0/', 'C4\\', 'D4/'],
   },
   {
     id: 'iw3.trx',
@@ -598,14 +602,15 @@ export const puzzles = [
   },
   {
     id: 'ib10.trx',
+    title: "Sucker's Opening",
     src: 'traxgame',
     game: 'traxloop',
-    notation: '@0/ A0\\ @2/',
+    notation: '@0/ @1/ B0\\',
     icon: '0a:cd',
     level: 3,
     player: 2,
-    max: 12,
-    hint: 'C1/',
+    max: 14,
+    hint: '@2\\',
   },
   {
     id: 'ib11.trx',
@@ -745,7 +750,7 @@ export const puzzles = [
     game: 'traxloop',
     notation: '@0/ A2+ A3+ A4\\ B3\\ B4+ B5\\ C5/ C4+ D4/ D5+ E5/ E4/',
     icon: 'd:b:ba:aeecd:0fdec',
-    level: 1,
+    level: 2,
     player: 2,
     max: 18,
     hints: ['B1+', 'B2/', 'D3+'],
@@ -758,8 +763,8 @@ export const puzzles = [
     icon: 'ecd',
     level: 3,
     player: 2,
-    max: 14,
-    hint: 'C2\\',
+    max: 16,
+    hints: ['A0+', 'C2\\'],
   },
   {
     id: 'hb4.trx',
@@ -805,6 +810,127 @@ export const puzzles = [
     max: 16,
     hint: 'B1+',
   },
+  {
+    id: 'book_01.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0/ @1+ B0/ C1+ D2/ C3/',
+    icon: 'dcba:bdcd:1dc',
+    level: 2,
+    player: 1,
+    max: 13,
+    hint: '@2/',
+  },
+  {
+    id: 'book_02.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0+ B1+ C1/ B0/ B0/ B0/ B0/ D5/ E5/ E6+ C4/ C3+ B6+',
+    icon: '0df:0ca:0df:cd:eecdc:0efae',
+    level: 2,
+    player: 2,
+    max: 18,
+    hints: ['D2\\', 'D3/'],
+  },
+  {
+    id: 'book_03.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0/ @1/ @1+ @1/ @1+ C0/ D1/ E1+ D0+ E1+ F1\\ E0+',
+    icon: '3e:1deef:1cdec:bdecd',
+    level: 3,
+    player: 1,
+    max: 19,
+    hint: 'C1\\',
+  },
+  {
+    id: 'book_04.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0+ B1/ @1/ A0/ C3/ A4+ @4+ @3/ a5\\',
+    icon: '1caf:1dec:dcafd:aeec:fd',
+    level: 3,
+    player: 2,
+    max: 16,
+    hint: 'C0/',
+  },
+  {
+    id: 'book_05.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0/ @1/ B0+ @2+ A0/ @2+',
+    icon: 'cd:ecde:0ecd',
+    level: 2,
+    player: 1,
+    max: 15,
+    hints: ['B4\\', 'C4/'],
+  },
+  {
+    id: 'book_07.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0/ A2+ A0+ @2\\ B0+ C1+ B0/ B0/ A2+',
+    icon: 'cdf:eca:0ee:0e:fd:0b',
+    level: 2,
+    player: 2,
+    max: 14,
+    hint: 'C6+',
+  },
+  {
+    id: 'book_08.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0/ @1/ A2/ A0/ B1/ @1+ @1/ A0/ @1/',
+    icon: 'cdfaf:0cbdc:0facd:0afdc',
+    level: 3,
+    player: 2,
+    max: 18,
+    hint: 'A0\\',
+  },
+  {
+    id: 'book_09.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0/ @1/ B0/ B0/ A0/ A5/ @3\\ @4/',
+    icon: '1d:1cd:dfdc:cacd:0fdc',
+    level: 3,
+    player: 1,
+    max: 15,
+    hint: 'A2\\',
+  },
+  {
+    id: 'book_10.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0/ A0+ A0/ A4+ A0/ A0/ B4+ C4/ @4+ @4/ @4/',
+    icon: '2caf:2dfa:2caf:cdeeec:fafd:2b',
+    level: 2,
+    player: 2,
+    max: 18,
+    hint: 'E6+',
+  },
+  {
+    id: 'book_11.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0+ B1+ C1/ C0/ B0/ @3+',
+    icon: '1d:1cd:eeec',
+    level: 1,
+    player: 1,
+    max: 9,
+    hint: 'B1\\',
+  },
+  {
+    id: 'book_12.trx',
+    src: 'book1',
+    game: 'traxloop',
+    notation: '@0+ B1+ C1/ C0/ B0/ D2+',
+    icon: '0d:0cde:eecd',
+    level: 3,
+    player: 1,
+    max: 15,
+    hint: 'B4\\',
+  },
 ]
 
 puzzles.sort(

package/src/threats.js

@@ -1,5 +1,5 @@
 /** Threats database: hand-coded threats
- * @copyright 2022
+ * @copyright 2022-2023
  * @author Chad Transtrum <chad@transtrum.net>
  * @license Apache-2.0
  */
@@ -21,7 +21,7 @@ const REGEX = {
   '?': 'b?', // Zero or one black piece
 }
 
-export const Threat = class {
+export class Threat {
   #depth = 0
   #pattern = ''
   #rx
@@ -72,7 +72,7 @@ export const Threat = class {
   }
 }
 
-export const ThreatsDB = class {
+export class ThreatsDB {
   #db = {}
   #depth = 0
 
@@ -89,7 +89,7 @@ export const ThreatsDB = class {
 
   add(depth, pattern, reforms = false) {
     this.#depth = Math.max(depth, this.#depth)
-    if (pattern in this.#db) throw new Error('Duplicate pattern:' + pattern)
+    if (pattern in this.#db) throw new Error('Duplicate pattern: ' + pattern)
     this.#db[pattern] = new Threat(depth, pattern, reforms)
     return this.#db[pattern]
   }
@@ -175,6 +175,8 @@ for (const one of Object.keys(corners)) {
   threats.compose(3, one + '!bbrmW') // Same, but slightly different layout
   threats.compose(3, 'ab*lrb¡' + one) // Reverse
   threats.compose(3, 'alrbb¡' + one) // Reverse of different layout
+  threats.compose(4, one + '!b*b¡ra?lr') // Partial edge with attack into hollow
+  threats.compose(4, 'rm?wr!b*b¡' + one) // Reverse
 
   for (const two of Object.keys(corners)) {
     end = two.replace(/[aA]/, 'm').replace('C', 'p')
@@ -188,9 +190,14 @@ for (const one of Object.keys(corners)) {
     if (post) {
       threats.compose(2, one + post + '!' + end) // L
       threats.compose(3, one + post + '!br' + end) // Three-stage
+      threats.compose(3, one + post + 'r' + end) // Defense forms an L
       threats.compose(3, one + '!br¡?' + end) // Attack to form an L threat
     }
 
+    if (pre && post) {
+      threats.compose(3, start + 'r' + end) // Defense forms an L
+    }
+
     threats.compose(3, one + '!b*b¡' + two) // Edge threat
   }
 }
@@ -200,3 +207,17 @@ threats.add(3, 'Arlbmwr') // Reversed
 
 threats.add(4, 'rb¡c?w!br') // Connectable pair on an edge
 threats.add(4, 'ArlbmrW') // Wide cave ready for an attack
+
+// Threats to solve puzzle iw1.trx
+threats.add(5, 'A?rwarlrar?W') // Back to back white corners next to a corner
+threats.add(4, 'A?rlr!bralrar?W') // ... activated ... becomes:
+threats.add(4, 'A?rlrbrmrwar?W') // Corner surrounded by corners
+threats.add(4, 'A?rlr!bramrar?W') // ... activated ...
+threats.add(3, 'A?rlr!brm?wr!brmrW') // ... defended ...
+
+// Threats to solve puzzle ib10.trx
+threats.add(6, 'Arw!b?rarlr') // Sucker's Opening
+threats.add(5, 'Arw!b?brbralr') // ... activated ... becomes:
+threats.add(4, 'Arw!b?brb¡arbW') // Wide corner opposite nearly formed edge
+threats.add(5, 'Arw!b?brb¡rmrW') // ... or hollow corner opposite same edge
+threats.add(4, 'Arw!b?brb¡rmwr') // ... activated ...

package/src/types.d.ts

@@ -1,4 +1,5 @@
 /** Type information.
+ * @copyright 2022-2023
  * @author Chad Transtrum <chad@transtrum.net>
  * @license Apache-2.0
  */
@@ -44,6 +45,7 @@ type EdgeLocation = {
   pw?: boolean
   zb?: string
   zw?: string
+  idx?: number
 }
 
 type EdgeObject = {
@@ -53,7 +55,19 @@ type EdgeObject = {
 }
 
 /** Object representing a concrete threat found in a position. */
-type FoundThreat = { threat: string; match: string; at: number; value: number }
+type FoundThreat = {
+  threat: string
+  match: string
+  at: number
+  value: number
+  level: number
+}
+
+/** Threats found for each color that cannot actually be activated. */
+type FaultyThreats = {
+  b: FoundThreat[]
+  w: FoundThreat[]
+}
 
 /** An object with keys representing each level, with arrays for each threat of
  * that level. */

package/src/version.js

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