State logger

Petah · Sep 4, 2020 · 7dcf8f6 · 7dcf8f6
1 parent bc00cca
commit 7dcf8f6
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 36 deletions.
diff --git a/src/lib/randomMove.ts b/src/lib/randomMove.ts
@@ -1,36 +1,36 @@
 import { isFree } from './isFree';
 import { log } from './log';
-import { BTData } from '../types/BTData';
+import { BTData, BTRequest } from '../types/BTData';
 import { MoveDirection } from '../types/MoveDirection';
 import { shuffle } from './shuffle';
 
-export function randomMove(data: BTData) {
+export function randomMove(request: BTRequest) {
     let direction, x, y;
     const directions = [MoveDirection.LEFT, MoveDirection.RIGHT, MoveDirection.UP, MoveDirection.DOWN];
     shuffle(directions);
     while (direction = directions.pop()) {
         switch (direction) {
             case MoveDirection.UP:
-                x = data.you.body[0].x;
-                y = data.you.body[0].y - 1;
+                x = request.body.you.body[0].x;
+                y = request.body.you.body[0].y - 1;
                 break;
 
             case MoveDirection.DOWN:
-                x = data.you.body[0].x;
-                y = data.you.body[0].y + 1;
+                x = request.body.you.body[0].x;
+                y = request.body.you.body[0].y + 1;
                 break;
 
             case MoveDirection.LEFT:
-                x = data.you.body[0].x - 1;
-                y = data.you.body[0].y;
+                x = request.body.you.body[0].x - 1;
+                y = request.body.you.body[0].y;
                 break;
 
             case MoveDirection.RIGHT:
-                x = data.you.body[0].x + 1;
-                y = data.you.body[0].y;
+                x = request.body.you.body[0].x + 1;
+                y = request.body.you.body[0].y;
                 break;
         }
-        if (isFree(data, x, y)) {
+        if (isFree(request.body, x, y)) {
             log('randomMove', direction);
             return direction;
         }

diff --git a/src/server/snakes/base-snake.ts b/src/server/snakes/base-snake.ts
@@ -1,5 +1,10 @@
 import { Server } from '../Server';
 import { BTRequest } from '../../types/BTData';
+import { MoveDirection } from '../../types/MoveDirection';
+
+export interface StateFunction {
+    (request: BTRequest): MoveDirection
+}
 
 export abstract class BaseSnake {
     public info: any = {};
@@ -8,11 +13,26 @@ export abstract class BaseSnake {
     public enabled: boolean = false;
     public port: number;
 
+    protected states: StateFunction[];
+
     constructor() {
         this.info.name = this.name;
     }
 
-    start(request: BTRequest): void {
+    public start(request: BTRequest): void {
+    }
+
+    public move(request: BTRequest) {
+        let direction;
+        for (const state of this.states) {
+            if (direction = state(request)) {
+                request.log(state.name);
+                return {
+                    move: direction,
+                    shout: state.name,
+                };
+            }
+        }
     }
 
     public get name() {

diff --git a/src/server/snakes/dunno.ts b/src/server/snakes/dunno.ts
@@ -31,7 +31,7 @@ export class Dunno extends BaseSnake implements ISnake {
             direction = smartRandomMove(request);
         }
         if (!direction) {
-            direction = randomMove(request.body);
+            direction = randomMove(request);
         }
         return {
             move: direction,

diff --git a/src/server/snakes/keep-away.ts b/src/server/snakes/keep-away.ts
@@ -29,7 +29,7 @@ export class KeepAway extends BaseSnake implements ISnake {
             direction = smartRandomMove(request);
         }
         if (!direction) {
-            direction = randomMove(request.body);
+            direction = randomMove(request);
         }
         return {
             move: direction,

diff --git a/src/server/snakes/project-z-2.ts b/src/server/snakes/project-z-2.ts
@@ -29,7 +29,7 @@ export class ProjectZ2 extends BaseSnake implements ISnake {
             direction = smartRandomMove(request);
         }
         if (!direction) {
-            direction = randomMove(request.body);
+            direction = randomMove(request);
         }
         return {
             move: direction,

diff --git a/src/server/snakes/project-z.ts b/src/server/snakes/project-z.ts
@@ -27,7 +27,7 @@ export class ProjectZ extends BaseSnake implements ISnake {
             direction = smartRandomMove(request);
         }
         if (!direction) {
-            direction = randomMove(request.body);
+            direction = randomMove(request);
         }
         return {
             move: direction,

diff --git a/src/server/snakes/rando.ts b/src/server/snakes/rando.ts
@@ -25,7 +25,7 @@ export class Rando extends BaseSnake implements ISnake {
             direction = smartRandomMove(request);
         }
         if (!direction) {
-            direction = randomMove(request.body);
+            direction = randomMove(request);
         }
         return {
             move: direction,

diff --git a/src/server/snakes/tail-chase.ts b/src/server/snakes/tail-chase.ts
@@ -8,9 +8,10 @@ import { randomMove } from '../../lib/randomMove';
 import { smartRandomMove } from '../../lib/smartRandomMove';
 import { moveTowardsTail } from '../../lib/moveTowardsTail';
 import { moveAway } from '../../lib/moveAway';
-import { BaseSnake } from './base-snake';
+import { BaseSnake, StateFunction } from './base-snake';
 import { ISnake } from './snake-interface';
 import { closestEnemyHead } from '../../lib/closestEnemyHead';
+import { MoveDirection } from '../../types/MoveDirection';
 
 export class TailChase extends BaseSnake implements ISnake {
     public port: number = 9005;
@@ -19,27 +20,24 @@ export class TailChase extends BaseSnake implements ISnake {
     public headType = HeadType.PIXEL;
     public tailType = TailType.HOOK;
 
-    move(request: BTRequest) {
-        let direction;
+    protected states: StateFunction[] = [
+        this.getFood,
+        this.runAway,
+        moveTowardsTail,
+        smartRandomMove,
+        randomMove,
+    ];
+
+    private getFood(request: BTRequest): MoveDirection {
         if (request.body.you.health < request.body.board.width || request.body.you.health < request.body.board.height) {
-            direction = moveTowardsFoodPf(request);
+            return moveTowardsFoodPf(request);
         }
+    }
 
+    private runAway(request: BTRequest): MoveDirection {
         const closest = closestEnemyHead(request);
         if (closest && closest.path.length <= 4) {
-            direction = moveAway(request);
-        }
-        if (!direction) {
-            direction = moveTowardsTail(request);
-        }
-        if (!direction) {
-            direction = smartRandomMove(request);
-        }
-        if (!direction) {
-            direction = randomMove(request.body);
+            return moveAway(request);
         }
-        return {
-            move: direction,
-        };
     }
 }
diff --git a/src/server/snakes/tak.ts b/src/server/snakes/tak.ts
@@ -43,7 +43,7 @@ export class Tak extends BaseSnake implements ISnake {
             direction = smartRandomMove(request);
         }
         if (!direction) {
-            direction = randomMove(request.body);
+            direction = randomMove(request);
         }
         return {
             move: direction,

diff --git a/src/web/grid.ts b/src/web/grid.ts
@@ -26,7 +26,7 @@ export function loadGrid(request: BTRequest) {
     $('.log').html('');
     if (request.logs) {
         for (const log of request.logs) {
-            $('<div>').text(log).appendTo('.log');
+            $('<div>').text(log.map(l => typeof l === 'string' ? l : JSON.stringify(l, null, 4)).join(' ')).appendTo('.log');
         }
     }