From 2e6a4a8761bf037283f7eb8dbfd57ab7b9e977a9 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Sat, 12 Mar 2022 15:10:54 +0300 Subject: refactor: rename Cell -> Tile, Item -> Feature --- src/Board/Board.test.ts | 8 +++--- src/Board/Board.ts | 14 ++++----- src/Cell/Cell.test.ts | 56 ------------------------------------ src/Cell/Cell.ts | 76 ------------------------------------------------- src/Tile/Tile.test.ts | 56 ++++++++++++++++++++++++++++++++++++ src/Tile/Tile.ts | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 143 insertions(+), 143 deletions(-) delete mode 100644 src/Cell/Cell.test.ts delete mode 100644 src/Cell/Cell.ts create mode 100644 src/Tile/Tile.test.ts create mode 100644 src/Tile/Tile.ts (limited to 'src') diff --git a/src/Board/Board.test.ts b/src/Board/Board.test.ts index ad5509f..c4e5ed1 100644 --- a/src/Board/Board.test.ts +++ b/src/Board/Board.test.ts @@ -1,15 +1,15 @@ import assert from 'assert'; -import Cell, { Item } from '../Cell/Cell'; +import Tile, { Feature } from '../Tile/Tile'; import Board from "./Board"; -const { Road, Town, Empty } = Item; +const { Road, Town, Empty } = Feature; describe('Board', () => { describe('constructor', () => { it('Should initialize empty board with a starting cell', () => { const board = new Board(); assert.strictEqual(board.cells.length, 1); - assert.deepStrictEqual(board.cells[0], new Cell(Road, [Town, Road, Empty, Road])); + assert.deepStrictEqual(board.cells[0], new Tile(Road, [Town, Road, Empty, Road])); }); }); @@ -17,7 +17,7 @@ describe('Board', () => { it('Should correctly determine legal moves for 1-cell board', () => { const board = new Board(); const attachTo = board.cells[0]; - const cell = new Cell(Town, [Empty, Town, Empty, Town]); + const cell = new Tile(Town, [Empty, Town, Empty, Town]); const legalMoves = board.getAttachments(cell); assert.strictEqual(legalMoves.length, 4); diff --git a/src/Board/Board.ts b/src/Board/Board.ts index c511e89..f1aa45b 100644 --- a/src/Board/Board.ts +++ b/src/Board/Board.ts @@ -1,25 +1,25 @@ import _ from 'lodash'; -import Cell, { Item } from "../Cell/Cell"; +import Tile, { Feature } from "../Tile/Tile"; -const { Road, Town, Empty } = Item; +const { Road, Town, Empty } = Feature; export default class Board { - cells: Cell[]; + cells: Tile[]; - constructor(cells?: Cell[]) { + constructor(cells?: Tile[]) { if (cells) this.cells = cells; - else this.cells = [new Cell(Road, [Town, Road, Empty, Road])] + else this.cells = [new Tile(Road, [Town, Road, Empty, Road])] } print() { this.cells.forEach(cell => cell.print()); } - getAttachments(cell: Cell) { + getAttachments(cell: Tile) { return _.flatten(this.cells.map(attachTo => attachTo.getAttachments(cell))); } - getLegalMoves(cell: Cell) { + getLegalMoves(cell: Tile) { const attachments = this.getAttachments(cell); console.log(attachments); } diff --git a/src/Cell/Cell.test.ts b/src/Cell/Cell.test.ts deleted file mode 100644 index be6f475..0000000 --- a/src/Cell/Cell.test.ts +++ /dev/null @@ -1,56 +0,0 @@ -import assert from 'assert'; -import Cell, { Direction, Item } from './Cell'; - -const { North, East, South, West } = Direction; -const { Road, Town, Empty, River } = Item; - -describe('Cell', () => { - describe('getSide', () => { - it('Should get North, East, South and West sides correctly', () => { - const cell = new Cell(Empty, [Road, Town, Empty, River]); - - assert.strictEqual(cell.getSide(North), Road); - assert.strictEqual(cell.getSide(East), Town); - assert.strictEqual(cell.getSide(South), Empty); - assert.strictEqual(cell.getSide(West), River); - }); - - it('Should respect cell orientation', () => { - const cell = new Cell(Empty, [Road, Town, Empty, River]); - cell.rotate(5); - - assert.strictEqual(cell.getSide(North), River); - assert.strictEqual(cell.getSide(East), Road); - assert.strictEqual(cell.getSide(South), Town); - assert.strictEqual(cell.getSide(West), Empty); - }); - - it('Should work with negative orientation', () => { - const cell = new Cell(Empty, [Road, Town, Empty, River]); - cell.rotate(-7); - - assert.strictEqual(cell.getSide(North), River); - assert.strictEqual(cell.getSide(East), Road); - assert.strictEqual(cell.getSide(South), Town); - assert.strictEqual(cell.getSide(West), Empty); - }); - }); - - describe('getAttachments', () => { - it('Should correclty list legal attachments', () => { - const attachTo = new Cell(Town, [Road, Town, Town, Road]) - const cell = new Cell(Road, [Empty, Road, Road, Empty]) - - cell.print(); - attachTo.print(); - - const attachments = attachTo.getAttachments(cell); - assert.strictEqual(attachments.length, 4); - assert.deepStrictEqual(attachments[0], { side: 0, rotation: 0, cell, attachTo }); - assert.deepStrictEqual(attachments[1], { side: 0, rotation: 1, cell, attachTo }); - assert.deepStrictEqual(attachments[2], { side: 3, rotation: 0, cell, attachTo }); - assert.deepStrictEqual(attachments[3], { side: 3, rotation: 3, cell, attachTo }); - }); - }); -}); - diff --git a/src/Cell/Cell.ts b/src/Cell/Cell.ts deleted file mode 100644 index 70bb792..0000000 --- a/src/Cell/Cell.ts +++ /dev/null @@ -1,76 +0,0 @@ -import _ from 'lodash'; -import Debug, { Debugger } from 'debug'; - -const debug = Debug('cell'); - -export enum Direction { - North, - East, - South, - West -} - -export enum Item { - Empty = " ", - Road = "R", - Town = "T", - River = "I", - Church = "C", -} - -export interface Attachment { - attachTo: Cell; - side: Direction; - cell: Cell; - rotation: number; // Clockwise rotation of a cell -} - - -export default class Cell { - center: Item; - private sides: [Item, Item, Item, Item]; - neighbors: [Cell, Cell, Cell, Cell]; - private orientation: number // amount of 90-degree counter-clockwise rotations from original orientation - shield?: boolean; - - debug: Debugger; - - public constructor(center: Item, sides: [Item, Item, Item, Item], orientation = 0, shield = false) { - this.center = center; - this.sides = sides; - this.shield = shield; - this.orientation = orientation; - } - - print() { - console.log( ` ${this.getSide(Direction.North)} \n${this.getSide(Direction.West)}${this.center}${this.getSide(Direction.East)}\n ${this.getSide(Direction.South)} `); - } - - getSide(direction: Direction) { - return this.sides[(((this.orientation + direction) % 4) + 4) % 4]; - } - - rotate(rotation = 1) { - debug(`Rotating ${rotation} clockwise`) - this.orientation = this.orientation - rotation; - } - - getAttachments(cell: Cell) { - return _.flatten([0, 1, 2, 3].map(side => { - const item = this.getSide(side); - return [0, 1, 2, 3] - .filter(rotation => cell.getSide(side - rotation + 2) === item) - .map(rotation => ({ - cell, - rotation, - side, - attachTo: this as Cell - })) - })); - } - - attach(cell: Cell, side: Direction) { - if (this.neighbors[side]) throw new Error('There is something already attached to this side!'); - this.neighbors[side] = cell; - } -} diff --git a/src/Tile/Tile.test.ts b/src/Tile/Tile.test.ts new file mode 100644 index 0000000..62ac51e --- /dev/null +++ b/src/Tile/Tile.test.ts @@ -0,0 +1,56 @@ +import assert from 'assert'; +import Tile, { Direction, Feature } from './Tile'; + +const { North, East, South, West } = Direction; +const { Road, Town, Empty, River } = Feature; + +describe('Tile', () => { + describe('getSide', () => { + it('Should get North, East, South and West sides correctly', () => { + const cell = new Tile(Empty, [Road, Town, Empty, River]); + + assert.strictEqual(cell.getSide(North), Road); + assert.strictEqual(cell.getSide(East), Town); + assert.strictEqual(cell.getSide(South), Empty); + assert.strictEqual(cell.getSide(West), River); + }); + + it('Should respect cell orientation', () => { + const cell = new Tile(Empty, [Road, Town, Empty, River]); + cell.rotate(5); + + assert.strictEqual(cell.getSide(North), River); + assert.strictEqual(cell.getSide(East), Road); + assert.strictEqual(cell.getSide(South), Town); + assert.strictEqual(cell.getSide(West), Empty); + }); + + it('Should work with negative orientation', () => { + const cell = new Tile(Empty, [Road, Town, Empty, River]); + cell.rotate(-7); + + assert.strictEqual(cell.getSide(North), River); + assert.strictEqual(cell.getSide(East), Road); + assert.strictEqual(cell.getSide(South), Town); + assert.strictEqual(cell.getSide(West), Empty); + }); + }); + + describe('getAttachments', () => { + it('Should correclty list legal attachments', () => { + const attachTo = new Tile(Town, [Road, Town, Town, Road]) + const cell = new Tile(Road, [Empty, Road, Road, Empty]) + + cell.print(); + attachTo.print(); + + const attachments = attachTo.getAttachments(cell); + assert.strictEqual(attachments.length, 4); + assert.deepStrictEqual(attachments[0], { side: 0, rotation: 0, cell, attachTo }); + assert.deepStrictEqual(attachments[1], { side: 0, rotation: 1, cell, attachTo }); + assert.deepStrictEqual(attachments[2], { side: 3, rotation: 0, cell, attachTo }); + assert.deepStrictEqual(attachments[3], { side: 3, rotation: 3, cell, attachTo }); + }); + }); +}); + diff --git a/src/Tile/Tile.ts b/src/Tile/Tile.ts new file mode 100644 index 0000000..4eee263 --- /dev/null +++ b/src/Tile/Tile.ts @@ -0,0 +1,76 @@ +import _ from 'lodash'; +import Debug, { Debugger } from 'debug'; + +const debug = Debug('cell'); + +export enum Direction { + North, + East, + South, + West +} + +export enum Feature { + Empty = " ", + Road = "R", + Town = "T", + River = "I", + Church = "C", +} + +export interface Attachment { + attachTo: Tile; + side: Direction; + cell: Tile; + rotation: number; // Clockwise rotation of a cell +} + + +export default class Tile { + center: Feature; + private sides: [Feature, Feature, Feature, Feature]; + neighbors: [Tile, Tile, Tile, Tile]; + private orientation: number // amount of 90-degree counter-clockwise rotations from original orientation + shield?: boolean; + + debug: Debugger; + + public constructor(center: Feature, sides: [Feature, Feature, Feature, Feature], orientation = 0, shield = false) { + this.center = center; + this.sides = sides; + this.shield = shield; + this.orientation = orientation; + } + + print() { + console.log( ` ${this.getSide(Direction.North)} \n${this.getSide(Direction.West)}${this.center}${this.getSide(Direction.East)}\n ${this.getSide(Direction.South)} `); + } + + getSide(direction: Direction) { + return this.sides[(((this.orientation + direction) % 4) + 4) % 4]; + } + + rotate(rotation = 1) { + debug(`Rotating ${rotation} clockwise`) + this.orientation = this.orientation - rotation; + } + + getAttachments(cell: Tile) { + return _.flatten([0, 1, 2, 3].map(side => { + const item = this.getSide(side); + return [0, 1, 2, 3] + .filter(rotation => cell.getSide(side - rotation + 2) === item) + .map(rotation => ({ + cell, + rotation, + side, + attachTo: this as Tile + })) + })); + } + + attach(cell: Tile, side: Direction) { + if (this.neighbors[side]) throw new Error('There is something already attached to this side!'); + this.neighbors[side] = cell; + } +} -- cgit v1.2.3