@konoui/mjimage 0.0.26 → 0.0.27

package/dist/mjs/lib/calculator/calc.d.ts

@@ -1,5 +1,5 @@
 import { TYPE, Round, Wind } from "../core/constants";
-import { Tile, BlockPon, BlockChi, BlockShoKan, BlockAnKan, BlockDaiKan, Type, Block } from "../core/parser";
+import { Tile, BlockPon, BlockChi, BlockShoKan, BlockAnKan, BlockDaiKan, Type, Block, SerializedBlock } from "../core/parser";
 export type TupleOfSize<T, N extends number, R extends unknown[] = []> = R["length"] extends N ? R : TupleOfSize<T, N, [T, ...R]>;
 export interface HandData {
     [TYPE.M]: TupleOfSize<number, 10>;
@@ -7,7 +7,7 @@ export interface HandData {
     [TYPE.P]: TupleOfSize<number, 10>;
     [TYPE.Z]: TupleOfSize<number, 8>;
     [TYPE.BACK]: [string, number];
-    called: (BlockChi | BlockPon | BlockAnKan | BlockDaiKan | BlockShoKan)[];
+    called: readonly (BlockChi | BlockPon | BlockAnKan | BlockDaiKan | BlockShoKan)[];
     tsumo: Tile | null;
     reached: boolean;
 }
@@ -17,7 +17,7 @@ export declare class Hand {
     private init;
     get hands(): Tile[];
     toString(): string;
-    get called(): (BlockChi | BlockPon | BlockAnKan | BlockDaiKan | BlockShoKan)[];
+    get called(): readonly (BlockChi | BlockPon | BlockAnKan | BlockDaiKan | BlockShoKan)[];
     get reached(): boolean;
     get drawn(): Tile | null;
     get menzen(): boolean;
@@ -56,7 +56,18 @@ export declare class BlockCalculator {
     private commonAll;
     private commonByType;
 }
-export interface BoardParams {
+export declare const NZ: readonly number[];
+export declare const N19: readonly number[];
+export declare const deserializeWinResult: (ret: SerializedWinResult) => WinResult;
+type SerializedBoardContext = Omit<BoardContext, "doraMarkers" | "blindDoraMarkers"> & {
+    doraMarkers: string[];
+    blindDoraMarkers?: string[];
+};
+export type SerializedWinResult = Omit<WinResult, "hand" | "boardContext"> & {
+    hand: SerializedBlock[];
+    boardContext: SerializedBoardContext;
+};
+export interface BoardContext {
     doraMarkers: Tile[];
     blindDoraMarkers?: Tile[];
     round: Round;
@@ -85,7 +96,7 @@ export interface WinResult {
     }[];
     point: number;
     hand: Block[];
-    params: BoardParams;
+    boardContext: BoardContext;
 }
 export declare class DoubleCalculator {
     hand: Hand;
@@ -104,9 +115,9 @@ export declare class DoubleCalculator {
         finalWallWin: boolean;
         finalDiscardWin: boolean;
         oneShotWin: boolean;
-        orig: BoardParams;
+        orig: BoardContext;
     };
-    constructor(hand: Hand, params: BoardParams);
+    constructor(hand: Hand, params: BoardContext);
     calc(hands: Block[][]): WinResult | false;
     calcPatterns(hands: Block[][]): {
         points: {
@@ -261,3 +272,4 @@ export declare class DoubleCalculator {
     dK13(h: Block[]): never[];
     calcFu(h: Block[]): number;
 }
+export {};

package/dist/mjs/lib/calculator/calc.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -9,8 +20,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DoubleCalculator = exports.BlockCalculator = exports.ShantenCalculator = exports.Hand = void 0;
+exports.DoubleCalculator = exports.deserializeWinResult = exports.N19 = exports.NZ = exports.BlockCalculator = exports.ShantenCalculator = exports.Hand = void 0;
 var constants_1 = require("../core/constants");
+var helper_1 = require("./helper");
 var parser_1 = require("../core/parser");
 var Hand = (function () {
     function Hand(input, allowBackBlock) {
@@ -33,7 +45,7 @@ var Hand = (function () {
         for (var _i = 0, blocks_1 = blocks; _i < blocks_1.length; _i++) {
             var b = blocks_1[_i];
             if (b.isCalled()) {
-                this.data.called.push(b);
+                this.data.called = __spreadArray(__spreadArray([], this.called, true), [b], false);
                 continue;
             }
             else if (b.is(constants_1.BLOCK.TSUMO)) {
@@ -89,18 +101,21 @@ var Hand = (function () {
         configurable: true
     });
     Hand.prototype.toString = function () {
-        var c = "";
+        var called = "";
         for (var _i = 0, _a = this.called; _i < _a.length; _i++) {
             var b_1 = _a[_i];
-            c = "".concat(c, ",").concat(b_1.toString());
+            called = "".concat(called, ",").concat(b_1.toString());
         }
-        var tiles = this.hands;
+        var tsumo = "";
+        if (this.drawn)
+            tsumo = ",".concat(this.drawn.toString());
+        var tiles = this.hands.filter(function (v) { return !v.has(constants_1.OPERATOR.TSUMO); });
         var b = new parser_1.BlockHand(tiles).toString();
-        return "".concat(b).concat(c);
+        return "".concat(b).concat(tsumo).concat(called);
     };
     Object.defineProperty(Hand.prototype, "called", {
         get: function () {
-            return this.data.called.concat();
+            return this.data.called;
         },
         enumerable: false,
         configurable: true
@@ -215,15 +230,17 @@ var Hand = (function () {
         if (toRemove.length != b.tiles.length - 1)
             throw new Error("removal: ".concat(toRemove, " block: ").concat(b));
         this.dec(toRemove);
-        this.data.called.push(b);
+        this.data.called = __spreadArray(__spreadArray([], this.called, true), [b], false);
         this.data.tsumo = null;
         return;
     };
     Hand.prototype.kan = function (b) {
         if (b instanceof parser_1.BlockAnKan) {
             var t = b.tiles[0];
+            if ((0, parser_1.isNum0)(t))
+                t = new parser_1.Tile(t.t, 5);
             this.dec([t, t, t, t]);
-            this.data.called.push(b);
+            this.data.called = __spreadArray(__spreadArray([], this.called, true), [b], false);
             this.data.tsumo = null;
             return;
         }
@@ -232,12 +249,12 @@ var Hand = (function () {
             if (idx == -1)
                 throw new Error("unable to find ".concat(b.tiles[0]));
             var t = b.tiles[0];
-            if ((0, parser_1.isNum0)(t)) {
+            if ((0, parser_1.isNum0)(t))
                 t = new parser_1.Tile(t.t, 5);
-            }
-            this.data.called.splice(idx, 1);
             this.dec([t]);
-            this.data.called.push(b);
+            this.data.called = __spreadArray(__spreadArray(__spreadArray([], this.called.slice(0, idx), true), this.called.slice(idx + 1), true), [
+                b,
+            ], false);
             this.data.tsumo = null;
             return;
         }
@@ -245,9 +262,7 @@ var Hand = (function () {
     };
     Hand.prototype.clone = function () {
         var c = new Hand(this.toString());
-        c.data.called = this.called.map(function (b) { return b.clone(); });
         c.data.reached = this.data.reached;
-        c.data.tsumo = this.data.tsumo == null ? null : this.data.tsumo;
         return c;
     };
     return Hand;
@@ -291,7 +306,7 @@ var ShantenCalculator = (function () {
             var t = _a[_i];
             if (t == constants_1.TYPE.BACK)
                 continue;
-            var nn = t == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
+            var nn = t == constants_1.TYPE.Z ? exports.NZ : exports.N19;
             for (var _b = 0, nn_1 = nn; _b < nn_1.length; _b++) {
                 var n = nn_1[_b];
                 if (this.hand.get(t, n) >= 1)
@@ -529,7 +544,7 @@ var BlockCalculator = (function () {
             var t = _a[_i];
             if (t == constants_1.TYPE.BACK)
                 continue;
-            var nn = t == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
+            var nn = t == constants_1.TYPE.Z ? exports.NZ : exports.N19;
             for (var _b = 0, nn_2 = nn; _b < nn_2.length; _b++) {
                 var n = nn_2[_b];
                 if (this.hand.get(t, n) == 1)
@@ -626,7 +641,7 @@ var BlockCalculator = (function () {
             this.commonByType(constants_1.TYPE.S),
             handleZ(),
             handleBack(),
-            [this.hand.called],
+            [this.hand.called.concat()],
         ].sort(function (a, b) { return b.length - a.length; });
         var ret = vvv[0].concat();
         for (var i = 0; i < ret.length; i++) {
@@ -686,6 +701,14 @@ var BlockCalculator = (function () {
     return BlockCalculator;
 }());
 exports.BlockCalculator = BlockCalculator;
+exports.NZ = [1, 2, 3, 4, 5, 6, 7];
+exports.N19 = [1, 9];
+var deserializeWinResult = function (ret) {
+    var _a;
+    var bc = ret.boardContext;
+    return __assign(__assign({}, ret), { hand: ret.hand.map(parser_1.Block.from), boardContext: __assign(__assign({}, bc), { doraMarkers: bc.doraMarkers.map(parser_1.Tile.from), blindDoraMarkers: (_a = bc.blindDoraMarkers) === null || _a === void 0 ? void 0 : _a.map(parser_1.Tile.from) }) });
+};
+exports.deserializeWinResult = deserializeWinResult;
 var DoubleCalculator = (function () {
     function DoubleCalculator(hand, params) {
         var _a, _b, _c, _d, _e, _f, _g;
@@ -766,13 +789,8 @@ var DoubleCalculator = (function () {
             return b.tiles.some(function (t) { return t.has(constants_1.OPERATOR.TSUMO); });
         });
         var myWind = this.cfg.orig.myWind;
-        var isParent = myWind == "1w";
-        var deltas = {
-            "1w": 0,
-            "2w": 0,
-            "3w": 0,
-            "4w": 0,
-        };
+        var isParent = myWind == constants_1.WIND.EAST;
+        var deltas = (0, helper_1.createWindMap)(0);
         if (!isTsumo) {
             var deadPoint = this.cfg.sticks.dead * 300;
             if (this.cfg.orig.ronWind == null)
@@ -796,7 +814,7 @@ var DoubleCalculator = (function () {
                     var key = _a[_i];
                     if (key == myWind)
                         continue;
-                    var coefficient = key == "1w" ? 2 : 1;
+                    var coefficient = key == constants_1.WIND.EAST ? 2 : 1;
                     var point = ceil(base * coefficient) + deadPoint;
                     deltas[key] -= point;
                     deltas[myWind] += point;
@@ -811,7 +829,7 @@ var DoubleCalculator = (function () {
             points: patterns[idx].points,
             point: deltas[myWind],
             hand: patterns[idx].hand,
-            params: this.cfg.orig,
+            boardContext: this.cfg.orig,
         };
         return v;
     };
@@ -867,18 +885,19 @@ var DoubleCalculator = (function () {
     DoubleCalculator.prototype.dC1 = function (h) {
         if (this.minus() != 0)
             return [];
+        var yaku = "平和";
         var fu = this.calcFu(h);
         if (fu == 20)
-            return [{ name: "平和", double: 1 }];
+            return [{ name: yaku, double: 1 }];
         if (!h.some(function (b) { return b.tiles.some(function (t) { return t.has(constants_1.OPERATOR.TSUMO); }); })) {
             if (fu == 30)
-                return [{ name: "平和", double: 1 }];
+                return [{ name: yaku, double: 1 }];
         }
         return [];
     };
     DoubleCalculator.prototype.dD1 = function (h) {
         var cond = h.some(function (block) {
-            return block.tiles.some(function (t) { return t.t == constants_1.TYPE.Z || [1, 9].includes(t.n); });
+            return block.tiles.some(function (t) { return t.t == constants_1.TYPE.Z || exports.N19.includes(t.n); });
         });
         return cond ? [] : [{ name: "断么九", double: 1 }];
     };
@@ -1063,7 +1082,7 @@ var DoubleCalculator = (function () {
     };
     DoubleCalculator.prototype.dH2 = function (h) {
         var cond = h.every(function (b) {
-            var values = b.tiles[0].t == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
+            var values = b.tiles[0].t == constants_1.TYPE.Z ? exports.NZ : exports.N19;
             return b.tiles.every(function (t) { return values.includes(t.n); });
         });
         return cond ? [{ name: "混老頭", double: 2 }] : [];
@@ -1076,7 +1095,7 @@ var DoubleCalculator = (function () {
         if (!h.some(function (b) { return b.tiles[0].t == constants_1.TYPE.Z; }))
             return [];
         var cond = h.every(function (block) {
-            var values = block.tiles[0].t == constants_1.TYPE.Z ? [1, 2, 3, 4, 5, 6, 7] : [1, 9];
+            var values = block.tiles[0].t == constants_1.TYPE.Z ? exports.NZ : exports.N19;
             return block.tiles.some(function (t) { return values.includes(t.n); });
         });
         return cond ? [{ name: "混全帯么九", double: 2 - this.minus() }] : [];
@@ -1139,7 +1158,7 @@ var DoubleCalculator = (function () {
         if (h.some(function (b) { return b.tiles[0].t == constants_1.TYPE.Z; }))
             return [];
         var cond = h.every(function (b) {
-            return b.tiles.some(function (t) { return [1, 9].includes(t.n); });
+            return b.tiles.some(function (t) { return exports.N19.includes(t.n); });
         });
         return cond ? [{ name: "純全帯么九色", double: 3 - this.minus() }] : [];
     };
@@ -1212,12 +1231,12 @@ var DoubleCalculator = (function () {
         return cond ? [{ name: "大三元", double: 13 }] : [];
     };
     DoubleCalculator.prototype.dE13 = function (h) {
-        var cond = h.every(function (b) { return b.tiles.every(function (t) { return t.t == constants_1.TYPE.Z; }); });
+        var cond = h.every(function (b) { return b.tiles[0].t == constants_1.TYPE.Z; });
         return cond ? [{ name: "字一色", double: 13 }] : [];
     };
     DoubleCalculator.prototype.dF13 = function (h) {
         var cond = h.every(function (b) {
-            return b.tiles.every(function (t) { return t.t != constants_1.TYPE.Z && [1, 9].includes(t.n); });
+            return b.tiles.every(function (t) { return t.t != constants_1.TYPE.Z && exports.N19.includes(t.n); });
         });
         return cond ? [{ name: "清老頭", double: 13 }] : [];
     };
@@ -1282,7 +1301,7 @@ var DoubleCalculator = (function () {
                 return base * 2;
             else if (tile.t == constants_1.TYPE.Z && [myWind, round].includes(tile.n))
                 return base * 2;
-            else if ([1, 9].includes(tile.n))
+            else if (exports.N19.includes(tile.n))
                 return base * 2;
             else
                 return base;
@@ -1374,7 +1393,7 @@ var minTile = function (b) {
     return __spreadArray([], b.tiles, true).sort(parser_1.tileSortFunc)[0];
 };
 var toDora = function (doraMarker) {
-    var n = doraMarker.isNum() && doraMarker.n == 0 ? 5 : doraMarker.n;
+    var n = (0, parser_1.isNum0)(doraMarker) ? 5 : doraMarker.n;
     var t = doraMarker.t;
     return new parser_1.Tile(t, (n % 9) + 1);
 };

package/dist/mjs/lib/calculator/efficiency.d.ts

@@ -1,5 +1,10 @@
 import { Tile } from "../core";
 import { Hand } from "./calc";
+export interface SerializedCandidate {
+    tile: string;
+    candidates: string[];
+    shanten: number;
+}
 export interface Candidate {
     tile: Tile;
     candidates: Tile[];

package/dist/mjs/lib/calculator/helper.d.ts

@@ -0,0 +1,6 @@
+export declare function createWindMap<T>(initial: T, clone?: boolean): {
+    "1w": T;
+    "2w": T;
+    "3w": T;
+    "4w": T;
+};

package/dist/mjs/lib/calculator/helper.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createWindMap = createWindMap;
+var constants_1 = require("../core/constants");
+function createWindMap(initial, clone) {
+    var _a;
+    if (clone === void 0) { clone = false; }
+    var m = (_a = {},
+        _a[constants_1.WIND.EAST] = initial,
+        _a[constants_1.WIND.SOUTH] = initial,
+        _a[constants_1.WIND.WEST] = initial,
+        _a[constants_1.WIND.NORTH] = initial,
+        _a);
+    if (clone) {
+        for (var _i = 0, _b = Object.values(constants_1.WIND); _i < _b.length; _i++) {
+            var w = _b[_i];
+            m[w] = structuredClone(initial);
+        }
+    }
+    return m;
+}

package/dist/mjs/lib/calculator/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./calc";
 export * from "./efficiency";
+export * from "./helper";

package/dist/mjs/lib/calculator/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./calc"), exports);
 __exportStar(require("./efficiency"), exports);
+__exportStar(require("./helper"), exports);

package/dist/mjs/lib/controller/controller.d.ts

@@ -1,5 +1,5 @@
 import { Wind, Round } from "../core/";
-import { BoardParams, Hand, WinResult, Candidate } from "../calculator";
+import { BoardContext, Hand, WinResult, Candidate } from "../calculator";
 import { BlockAnKan, BlockChi, BlockDaiKan, BlockPon, BlockShoKan, Tile } from "../core/parser";
 import { PlayerEvent, EventHandler, DistributeEvent } from "./events";
 import { Wall, WallProps, River, PlaceManager, ScoreManager, Counter } from ".";
@@ -96,7 +96,7 @@ export declare class Controller {
     constructor(players: PlayerProps[], params?: {
         debug?: boolean;
     });
-    boardParams(w: Wind): BoardParams;
+    boardParams(w: Wind): BoardContext;
     hand(w: Wind): ActorHand;
     get placeManager(): PlaceManager;
     get scoreManager(): ScoreManager;

package/dist/mjs/lib/controller/controller.js

@@ -163,8 +163,11 @@ var Controller = (function () {
                     this.actor.send({
                         type: selected.type,
                         iam: e.wind,
-                        ret: e.choices.RON,
-                        targetInfo: e.tileInfo,
+                        ret: (0, calculator_1.deserializeWinResult)(e.choices.RON),
+                        targetInfo: {
+                            wind: e.discarterInfo.wind,
+                            tile: parser_1.Tile.from(e.discarterInfo.tile),
+                        },
                     });
                     break;
                 case "DAI_KAN":
@@ -172,7 +175,7 @@ var Controller = (function () {
                     this.actor.send({
                         type: selected.type,
                         iam: e.wind,
-                        block: e.choices.DAI_KAN,
+                        block: parser_1.Block.from(e.choices.DAI_KAN),
                     });
                     break;
                 case "CHI":
@@ -183,7 +186,7 @@ var Controller = (function () {
                     this.actor.send({
                         type: selected.type,
                         iam: e.wind,
-                        block: c[0],
+                        block: parser_1.Block.from(c[0]),
                     });
             }
         }
@@ -197,8 +200,8 @@ var Controller = (function () {
                     (0, assert_1.default)(e.choices.TSUMO, "tsumo choice is none");
                     this.actor.send({
                         type: selected.type,
-                        ret: e.choices.TSUMO,
-                        lastTile: e.tileInfo.tile,
+                        ret: (0, calculator_1.deserializeWinResult)(e.choices.TSUMO),
+                        lastTile: parser_1.Tile.from(e.drawerInfo.tile),
                         iam: w,
                     });
                     break;
@@ -207,7 +210,7 @@ var Controller = (function () {
                     (0, assert_1.default)(candidates, "".concat(selected.type, " candidates is none"));
                     this.actor.send({
                         type: selected.type,
-                        tile: candidates[0].tile,
+                        tile: parser_1.Tile.from(candidates[0].tile),
                         iam: w,
                     });
                     break;
@@ -216,7 +219,7 @@ var Controller = (function () {
                     (0, assert_1.default)(tiles, "".concat(selected.type, " choice is none"));
                     this.actor.send({
                         type: selected.type,
-                        tile: tiles[0].clone({ remove: core_1.OPERATOR.TSUMO }),
+                        tile: parser_1.Tile.from(tiles[0]).clone({ remove: core_1.OPERATOR.TSUMO }),
                         iam: w,
                     });
                     break;
@@ -225,7 +228,7 @@ var Controller = (function () {
                     (0, assert_1.default)(choices, "".concat(selected.type, " choice is none"));
                     this.actor.send({
                         type: selected.type,
-                        block: choices[0],
+                        block: parser_1.BlockAnKan.from(choices[0]),
                         iam: w,
                     });
                     break;
@@ -235,7 +238,7 @@ var Controller = (function () {
                     (0, assert_1.default)(choices, "".concat(selected.type, " choice is none"));
                     this.actor.send({
                         type: selected.type,
-                        block: choices[0],
+                        block: parser_1.Block.from(choices[0]),
                         iam: w,
                     });
                     break;
@@ -248,7 +251,7 @@ var Controller = (function () {
         else if (sample.type == "CHOICE_AFTER_CALLED") {
             (0, assert_1.default)(sample.choices.DISCARD, "discard candidate tile is none: ".concat(JSON.stringify(sample, null, 2), " ").concat(this.hand(sample.wind).toString()));
             var w = sample.wind;
-            var t = sample.choices.DISCARD[0];
+            var t = parser_1.Tile.from(sample.choices.DISCARD[0]);
             (0, assert_1.default)(t != null, "undefined tile ".concat(this.hand(w).toString()));
             this.actor.send({ type: "DISCARD", tile: t, iam: w });
         }
@@ -266,9 +269,12 @@ var Controller = (function () {
             this.actor.send({
                 type: "RON",
                 iam: e.wind,
-                ret: e.choices.RON,
+                ret: (0, calculator_1.deserializeWinResult)(e.choices.RON),
                 quadWin: true,
-                targetInfo: e.tileInfo,
+                targetInfo: {
+                    wind: e.callerInfo.wind,
+                    tile: parser_1.Tile.from(e.callerInfo.tile),
+                },
             });
         }
     };
@@ -329,7 +335,7 @@ var Controller = (function () {
         var blindDoraMarkers = hand.reached
             ? this.wall.blindDoraMarkers
             : undefined;
-        var final = new calculator_1.DoubleCalculator(hand, __assign(__assign({}, ret.params), { sticks: this.placeManager.sticks, blindDoraMarkers: blindDoraMarkers })).calc([ret.hand]);
+        var final = new calculator_1.DoubleCalculator(hand, __assign(__assign({}, ret.boardContext), { sticks: this.placeManager.sticks, blindDoraMarkers: blindDoraMarkers })).calc([ret.hand]);
         (0, assert_1.default)(final);
         return final;
     };
@@ -637,7 +643,7 @@ var Controller = (function () {
         return num >= 9;
     };
     Controller.prototype.initialHands = function () {
-        var m = (0, _1.createWindMap)("");
+        var m = (0, calculator_1.createWindMap)("");
         for (var i = 0; i < 3; i++) {
             for (var _i = 0, _a = Object.values(core_1.WIND); _i < _a.length; _i++) {
                 var w = _a[_i];
@@ -672,9 +678,7 @@ var ActorHand = (function (_super) {
     };
     ActorHand.prototype.clone = function () {
         var c = new ActorHand(this.toString());
-        c.data.called = this.called.map(function (b) { return b.clone(); });
         c.data.reached = this.data.reached;
-        c.data.tsumo = this.data.tsumo == null ? null : this.data.tsumo;
         return c;
     };
     ActorHand.prototype.dec = function (tiles) {
@@ -691,7 +695,7 @@ var BaseActor = (function () {
         this.river = new _1.River();
         this.placeManager = new _1.PlaceManager({});
         this.scoreManager = new _1.ScoreManager({});
-        this.hands = (0, _1.createWindMap)(new ActorHand(""));
+        this.hands = (0, calculator_1.createWindMap)(new ActorHand(""));
         this.counter = new _1.Counter();
         this.doraMarkers = [];
         this.id = id;
@@ -711,14 +715,15 @@ var BaseActor = (function () {
                     break;
                 case "DISTRIBUTE":
                     this.counter.reset();
+                    var doraMarker = parser_1.Tile.from(e.doraMarker);
                     this.setHands(e);
                     this.placeManager = new _1.PlaceManager(structuredClone(e.places), {
                         round: structuredClone(e.round),
                         sticks: structuredClone(e.sticks),
                     });
                     this.scoreManager = new _1.ScoreManager(structuredClone(e.scores));
-                    this.doraMarkers = [e.doraMarker];
-                    this.counter.dec(e.doraMarker);
+                    this.doraMarkers = [doraMarker];
+                    this.counter.dec(doraMarker);
                     for (var _i = 0, _d = Object.values(core_1.WIND); _i < _d.length; _i++) {
                         var w = _d[_i];
                         if (w != e.wind)
@@ -726,56 +731,68 @@ var BaseActor = (function () {
                         (_a = this.counter).dec.apply(_a, this.hand(w).hands);
                     }
                     break;
-                case "DRAW":
-                    this.hands[e.iam].draw(e.tile);
-                    this.counter.dec(e.tile);
+                case "DRAW": {
+                    var t = parser_1.Tile.from(e.tile);
+                    this.hands[e.iam].draw(t);
+                    this.counter.dec(t);
                     break;
-                case "DISCARD":
-                    this.river.discard(e.tile, e.iam);
-                    this.hands[e.iam].discard(e.tile);
+                }
+                case "DISCARD": {
+                    var t = parser_1.Tile.from(e.tile);
+                    this.river.discard(t, e.iam);
+                    this.hands[e.iam].discard(t);
                     if (e.iam != e.wind) {
-                        this.counter.dec(e.tile);
-                        this.counter.addTileToSafeMap(e.tile, e.iam);
+                        this.counter.dec(t);
+                        this.counter.addTileToSafeMap(t, e.iam);
                         for (var _e = 0, _f = Object.values(core_1.WIND); _e < _f.length; _e++) {
                             var w = _f[_e];
                             if (this.hand(w).reached)
-                                this.counter.addTileToSafeMap(e.tile, w);
+                                this.counter.addTileToSafeMap(t, w);
                         }
                     }
                     break;
+                }
                 case "PON":
                 case "CHI":
-                case "DAI_KAN":
-                    this.hands[e.iam].call(e.block);
+                case "DAI_KAN": {
+                    var block = parser_1.Block.from(e.block);
+                    this.hands[e.iam].call(block);
                     this.river.markCalled();
                     if (e.iam != e.wind)
-                        (_b = this.counter).dec.apply(_b, e.block.tiles.filter(function (t) { return !t.has(core_1.OPERATOR.HORIZONTAL); }));
+                        (_b = this.counter).dec.apply(_b, block.tiles.filter(function (t) { return !t.has(core_1.OPERATOR.HORIZONTAL); }));
                     break;
-                case "SHO_KAN":
-                    this.hands[e.iam].kan(e.block);
+                }
+                case "SHO_KAN": {
+                    var block = parser_1.Block.from(e.block);
+                    this.hands[e.iam].kan(block);
                     if (e.iam != e.wind)
-                        this.counter.dec(e.block.tiles.filter(function (t) { return t.has(core_1.OPERATOR.HORIZONTAL); })[0]);
+                        this.counter.dec(block.tiles.filter(function (t) { return t.has(core_1.OPERATOR.HORIZONTAL); })[0]);
                     break;
-                case "AN_KAN":
-                    this.hands[e.iam].kan(e.block);
+                }
+                case "AN_KAN": {
+                    var block = parser_1.Block.from(e.block);
+                    this.hands[e.iam].kan(block);
                     if (e.iam != e.wind)
-                        (_c = this.counter).dec.apply(_c, e.block.tiles.filter(function (t) { return !t.has(core_1.OPERATOR.HORIZONTAL); }));
+                        (_c = this.counter).dec.apply(_c, block.tiles.filter(function (t) { return !t.has(core_1.OPERATOR.HORIZONTAL); }));
                     break;
+                }
                 case "REACH":
                     var pid = this.placeManager.playerID(e.iam);
                     this.hands[e.iam].reach();
                     this.scoreManager.reach(pid);
                     this.placeManager.incrementReachStick();
                     break;
-                case "NEW_DORA":
-                    this.doraMarkers.push(e.doraMarker);
-                    this.counter.dec(e.doraMarker);
+                case "NEW_DORA": {
+                    var doraMarker_1 = parser_1.Tile.from(e.doraMarker);
+                    this.doraMarkers.push(doraMarker_1);
+                    this.counter.dec(doraMarker_1);
                     break;
+                }
                 case "TSUMO":
                     break;
                 case "RON":
                     if (e.pushBackReachStick) {
-                        var w = e.targetInfo.wind;
+                        var w = e.victimInfo.wind;
                         var id = this.placeManager.playerID(w);
                         this.scoreManager.restoreReachStick(id);
                         this.placeManager.decrementReachStick();
@@ -827,7 +844,7 @@ var Observer = (function (_super) {
         var _this = _super.call(this, "observer", eventHandler) || this;
         _this.applied = {};
         _this.counter.disable = true;
-        _this.hands = (0, _1.createWindMap)(new ActorHand("_____________"));
+        _this.hands = (0, calculator_1.createWindMap)(new ActorHand("_____________"));
         return _this;
     }
     Observer.prototype.setHands = function (e) {