@konoui/mjimage 0.0.22 → 0.0.24

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

@@ -43,15 +43,15 @@ var Hand = (function () {
                 continue;
             }
             else if (b.is(constants_1.BLOCK.HAND)) {
-                this.inc(b.tiles);
+                this.inc(__spreadArray([], b.tiles, true));
                 continue;
             }
             else if (input.split("").every(function (v) { return v === constants_1.TYPE.BACK; })) {
-                this.inc(b.tiles);
+                this.inc(__spreadArray([], b.tiles, true));
                 continue;
             }
             else if (allowBackBlock) {
-                this.inc(b.tiles);
+                this.inc(__spreadArray([], b.tiles, true));
                 continue;
             }
             throw new Error("unexpected block ".concat(b.type, " ").concat(b.toString()));
@@ -74,10 +74,11 @@ var Hand = (function () {
                 }
             }
             if (this.drawn != null) {
-                var idx = tiles.findIndex(function (t) { return t.equals(t); });
+                var drawn_1 = this.drawn;
+                var idx = tiles.findIndex(function (t) { return t.equals(drawn_1); });
                 if (idx < 0)
                     throw new Error("[debug] hand has drawn: ".concat(this.drawn, " but no tile in hands"));
-                tiles[idx].add(constants_1.OPERATOR.TSUMO);
+                tiles[idx] = tiles[idx].clone({ add: constants_1.OPERATOR.TSUMO });
             }
             if (tiles.length < 1)
                 throw new Error("[debug] no tiles in hand ".concat(tiles.length, ", called: ").concat(this.called, ", data: ").concat(JSON.stringify(this.data, null, 2)));
@@ -93,7 +94,7 @@ var Hand = (function () {
             c = "".concat(c, ",").concat(b_1.toString());
         }
         var tiles = this.hands;
-        var b = new parser_1.Block(tiles, constants_1.BLOCK.HAND).toString();
+        var b = new parser_1.BlockHand(tiles).toString();
         return "".concat(b).concat(c);
     };
     Object.defineProperty(Hand.prototype, "called", {
@@ -147,20 +148,16 @@ var Hand = (function () {
                 throw new Error("unable to increase ".concat(t, " in ").concat(this.toString()));
             }
             backup.push(t);
-            if (!(t.t == constants_1.TYPE.Z || t.t == constants_1.TYPE.BACK) && t.n == 0) {
+            if ((0, parser_1.isNum0)(t)) {
                 this.data[t.t][5] += 1;
             }
             if (t.t == constants_1.TYPE.BACK)
                 this.data[t.t][1] += 1;
             else
                 this.data[t.t][t.n] += 1;
-            if (t.t != constants_1.TYPE.Z &&
-                t.n == 5 &&
-                this.get(t.t, 5) == 4 &&
-                this.get(t.t, 0) == 0) {
+            if ((0, parser_1.isNum5)(t) && this.get(t.t, 5) == 4 && this.get(t.t, 0) == 0) {
                 this.data[t.t][0] = 1;
-                var c = backup.pop().clone();
-                c.n = 0;
+                var c = backup.pop().clone({ n: 0 });
                 backup.push(c);
             }
         }
@@ -180,29 +177,25 @@ var Hand = (function () {
                 throw new Error("unable to decrease ".concat(t.toString(), " in ").concat(this.toString()));
             }
             backup.push(t);
-            if (!(t.t == constants_1.TYPE.Z || t.t == constants_1.TYPE.BACK) && t.n == 0) {
+            if ((0, parser_1.isNum0)(t)) {
                 this.data[t.t][5] -= 1;
             }
             if (t.t == constants_1.TYPE.BACK)
                 this.data[t.t][1] -= 1;
             else
                 this.data[t.t][t.n] -= 1;
-            if (t.t != constants_1.TYPE.Z &&
-                t.n == 5 &&
-                this.get(t.t, 5) == 0 &&
-                this.get(t.t, 0) > 0) {
+            if ((0, parser_1.isNum5)(t) && this.get(t.t, 5) == 0 && this.get(t.t, 0) > 0) {
                 this.data[t.t][0] = 0;
-                var c = backup.pop().clone();
-                c.n = 0;
+                var c = backup.pop().clone({ n: 0 });
                 backup.push(c);
             }
         }
         return backup;
     };
     Hand.prototype.draw = function (t) {
-        t.add(constants_1.OPERATOR.TSUMO);
-        this.inc([t]);
-        this.data.tsumo = t;
+        var ts = t.clone({ add: constants_1.OPERATOR.TSUMO });
+        this.inc([ts]);
+        this.data.tsumo = ts;
         return;
     };
     Hand.prototype.discard = function (t) {
@@ -242,8 +235,8 @@ var Hand = (function () {
             var idx = this.data.called.findIndex(function (v) { return v.is(constants_1.BLOCK.PON) && v.tiles[0].equals(b.tiles[0], true); });
             if (idx == -1)
                 throw new Error("unable to find ".concat(b.tiles[0]));
-            var t = b.tiles[0].clone();
-            if (t.isNum() && t.n == 0) {
+            var t = b.tiles[0];
+            if ((0, parser_1.isNum0)(t)) {
                 t = new parser_1.Tile(t.t, 5);
             }
             this.data.called.splice(idx, 1);
@@ -258,7 +251,7 @@ var Hand = (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.clone();
+        c.data.tsumo = this.data.tsumo == null ? null : this.data.tsumo;
         return c;
     };
     return Hand;
@@ -504,7 +497,11 @@ var BlockCalculator = (function () {
             var _a = indexes_1[_i], hidx = _a[0], bidx = _a[1], tidx = _a[2];
             var hand = hands[hidx];
             var newHand = hand.map(function (block) { return block.clone(); });
-            newHand[bidx].tiles[tidx].add(op);
+            var block = newHand[bidx];
+            var newTile = block.tiles[tidx].clone({ add: op });
+            newHand[bidx] = block.clone({
+                replace: { idx: tidx, tile: newTile },
+            });
             newHands.push(newHand);
         }
         return newHands;
@@ -571,7 +568,7 @@ var BlockCalculator = (function () {
                 cond(t, 8, [1, 2]);
             var cond2 = this.hand.sum(t) == 14;
             if (cond1 && cond2) {
-                return [[new parser_1.Block(this.hand.hands, constants_1.BLOCK.HAND)]];
+                return [[new parser_1.BlockHand(this.hand.hands)]];
             }
         }
         return [];
@@ -702,8 +699,8 @@ var DoubleCalculator = (function () {
             blindDoras: params.blindDoraMarkers == null
                 ? []
                 : params.blindDoraMarkers.map(function (v) { return toDora(v); }),
-            roundWind: new parser_1.Parser(params.round.substring(0, 2)).parse()[0].tiles[0],
-            myWind: new parser_1.Parser(params.myWind).parse()[0].tiles[0],
+            roundWind: parser_1.Tile.from(params.round.substring(0, 2)),
+            myWind: parser_1.Tile.from(params.myWind),
             reached: (_a = params.reached) !== null && _a !== void 0 ? _a : 0,
             sticks: (_b = params.sticks) !== null && _b !== void 0 ? _b : { dead: 0, reach: 0 },
             replacementWin: (_c = params.replacementWin) !== null && _c !== void 0 ? _c : false,
@@ -950,7 +947,7 @@ var DoubleCalculator = (function () {
                     if (t.equals(d, true))
                         bcount++;
                 }
-                if (t.n == 0)
+                if ((0, parser_1.isNum0)(t))
                     rcount++;
             }
         }
@@ -973,17 +970,17 @@ var DoubleCalculator = (function () {
         var _loop_2 = function (block) {
             if (!check(block))
                 return "continue";
-            var tile = block.minTile();
+            var tile = minTile(block);
             if (tile.t == constants_1.TYPE.Z)
                 return "continue";
             var filteredTypes = [constants_1.TYPE.M, constants_1.TYPE.P, constants_1.TYPE.S].filter(function (v) { return v != tile.t; });
             var cond1 = h.some(function (b) {
                 var newTile = new parser_1.Tile(filteredTypes[0], tile.n);
-                return check(b) && newTile.equals(b.minTile(), true);
+                return check(b) && newTile.equals(minTile(b), true);
             });
             var cond2 = h.some(function (b) {
                 var newTile = new parser_1.Tile(filteredTypes[1], tile.n);
-                return check(b) && newTile.equals(b.minTile(), true);
+                return check(b) && newTile.equals(minTile(b), true);
             });
             if (cond1 && cond2)
                 return { value: [{ name: "三色同順", double: 2 - this_2.minus() }] };
@@ -1038,17 +1035,17 @@ var DoubleCalculator = (function () {
         var _loop_3 = function (block) {
             if (!check(block))
                 return "continue";
-            var tile = block.minTile();
+            var tile = minTile(block);
             if (tile.t == constants_1.TYPE.Z)
                 return "continue";
             var filteredTypes = [constants_1.TYPE.M, constants_1.TYPE.P, constants_1.TYPE.S].filter(function (v) { return v != tile.t; });
             var cond1 = h.some(function (b) {
                 var newTile = new parser_1.Tile(filteredTypes[0], tile.n);
-                return check(b) && newTile.equals(b.minTile(), true);
+                return check(b) && newTile.equals(minTile(b), true);
             });
             var cond2 = h.some(function (b) {
                 var newTile = new parser_1.Tile(filteredTypes[1], tile.n);
-                return check(b) && newTile.equals(b.minTile(), true);
+                return check(b) && newTile.equals(minTile(b), true);
             });
             if (cond1 && cond2)
                 return { value: [{ name: "三色同刻", double: 2 }] };
@@ -1099,12 +1096,12 @@ var DoubleCalculator = (function () {
             _a);
         for (var _i = 0, h_4 = h; _i < h_4.length; _i++) {
             var block = h_4[_i];
-            var tile = block.minTile();
+            var tile = minTile(block);
             if (tile.t == constants_1.TYPE.BACK)
                 continue;
             if (tile.t == constants_1.TYPE.Z)
                 continue;
-            if (!(block instanceof parser_1.BlockRun))
+            if (!(block instanceof parser_1.BlockRun || block instanceof parser_1.BlockChi))
                 continue;
             if (tile.n == 1)
                 m[tile.t][0]++;
@@ -1377,6 +1374,9 @@ var countSameBlocks = function (h) {
     }
     return count;
 };
+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 t = doraMarker.t;

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

@@ -25,6 +25,15 @@ var __assign = (this && this.__assign) || function () {
     };
     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)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -208,12 +217,11 @@ var Controller = (function () {
                     (0, assert_1.default)(tiles, "".concat(selected.type, " choice is none"));
                     this.actor.send({
                         type: selected.type,
-                        tile: tiles[0].remove(core_1.OPERATOR.TSUMO),
+                        tile: tiles[0].clone({ remove: core_1.OPERATOR.TSUMO }),
                         iam: w,
                     });
                     break;
-                case "AN_KAN":
-                case "SHO_KAN":
+                case "AN_KAN": {
                     var choices = e.choices[selected.type];
                     (0, assert_1.default)(choices, "".concat(selected.type, " choice is none"));
                     this.actor.send({
@@ -222,6 +230,17 @@ var Controller = (function () {
                         iam: w,
                     });
                     break;
+                }
+                case "SHO_KAN": {
+                    var choices = e.choices[selected.type];
+                    (0, assert_1.default)(choices, "".concat(selected.type, " choice is none"));
+                    this.actor.send({
+                        type: selected.type,
+                        block: choices[0],
+                        iam: w,
+                    });
+                    break;
+                }
                 case "DRAWN_GAME_BY_NINE_TILES":
                     this.actor.send({ type: "DRAWN_GAME_BY_NINE_TILES", iam: w });
                     break;
@@ -294,8 +313,6 @@ var Controller = (function () {
         this.actor.start();
         this.histories.push(ent);
         var v = this.actor.getSnapshot().status;
-        if (v != "done")
-            throw new Error("unexpected state ".concat(this.actor.getSnapshot().value, "(").concat(v, ")"));
     };
     Controller.prototype.startGame = function () {
         for (;;) {
@@ -367,9 +384,9 @@ var Controller = (function () {
             return false;
         if (hand.hands.length < 3)
             return false;
-        var fake = t.clone().remove(core_1.OPERATOR.HORIZONTAL);
-        if (t.isNum() && t.n == 0)
-            fake.n = 5;
+        var fake = t.clone({ remove: core_1.OPERATOR.HORIZONTAL });
+        if ((0, parser_1.isNum0)(t))
+            fake = fake.clone({ n: 5 });
         if (hand.get(t.t, fake.n) < 2)
             return false;
         var blocks = [];
@@ -380,14 +397,17 @@ var Controller = (function () {
             idx = 1;
         if (idx == 1)
             idx = 2;
-        var b = new parser_1.BlockPon([fake.clone(), fake.clone(), fake.clone()]);
-        b.tiles[idx] = t.clone().add(core_1.OPERATOR.HORIZONTAL);
-        if (t.isNum() && fake.n == 5 && hand.get(t.t, 0) > 0)
-            b.tiles[(idx % 2) + 1].n = 0;
+        var b = new parser_1.BlockPon([fake, fake, fake]);
+        b = b.clone({
+            replace: { idx: idx, tile: t.clone({ add: core_1.OPERATOR.HORIZONTAL }) },
+        });
+        var ridx = (idx % 2) + 1;
+        var rt = b.tiles[ridx];
+        if ((0, parser_1.isNum5)(t) && hand.get(t.t, 0) > 0)
+            b = b.clone({ replace: { idx: ridx, tile: rt.clone({ n: 0 }) } });
         blocks.push(b);
-        if (t.isNum() && t.n == 5 && hand.get(t.t, fake.n) == 3) {
-            var red = b.clone();
-            red.tiles[(idx % 2) + 1].n = 5;
+        if ((0, parser_1.isNum5)(t) && hand.get(t.t, fake.n) == 3) {
+            var red = b.clone({ replace: { idx: ridx, tile: rt.clone({ n: 5 }) } });
             blocks.push(red);
         }
         return blocks;
@@ -404,14 +424,17 @@ var Controller = (function () {
             return false;
         if (hand.hands.length < 3)
             return false;
-        var fake = t.clone();
-        if (fake.n == 0)
-            fake.n = 5;
+        var fake = t;
+        if ((0, parser_1.isNum0)(fake))
+            fake = t.clone({ n: 5 });
         var blocks = [];
         var left = fake.n - 2 >= 1 &&
             hand.get(t.t, fake.n - 2) > 0 &&
             hand.get(t.t, fake.n - 1) > 0;
-        var cloned = t.clone().add(core_1.OPERATOR.HORIZONTAL).remove(core_1.OPERATOR.TSUMO);
+        var cloned = t.clone({
+            add: core_1.OPERATOR.HORIZONTAL,
+            remove: core_1.OPERATOR.TSUMO,
+        });
         if (left)
             blocks.push(new parser_1.BlockChi([
                 cloned,
@@ -460,17 +483,17 @@ var Controller = (function () {
             return [];
         if (!hasRed)
             return [];
-        var filtered = blocks.filter(function (b) { return b.tiles[1].n == 5 || b.tiles[2].n == 5; });
+        var filtered = blocks.filter(function (b) { return (0, parser_1.isNum5)(b.tiles[1]) || (0, parser_1.isNum5)(b.tiles[2]); });
         return filtered
             .map(function (b) {
-            if (b.tiles[1].n == 5) {
-                var n = b.clone();
-                n.tiles[1].n = 0;
+            if ((0, parser_1.isNum5)(b.tiles[1])) {
+                var rt = b.tiles[1].clone({ n: 0 });
+                var n = b.clone({ replace: { idx: 1, tile: rt } });
                 return n;
             }
-            else if (b.tiles[2].n == 5) {
-                var n = b.clone();
-                n.tiles[2].n = 0;
+            else if ((0, parser_1.isNum5)(b.tiles[2])) {
+                var rt = b.tiles[2].clone({ n: 0 });
+                var n = b.clone({ replace: { idx: 2, tile: rt } });
                 return n;
             }
         })
@@ -532,7 +555,7 @@ var Controller = (function () {
                         new parser_1.Tile(t, n),
                     ];
                     if (t != core_1.TYPE.Z && n == 5)
-                        tiles[0].n = 0;
+                        tiles[0] = tiles[0].clone({ n: 0 });
                     blocks.push(new parser_1.BlockAnKan(tiles));
                 }
             }
@@ -554,14 +577,15 @@ var Controller = (function () {
             return false;
         var blocks = [];
         for (var _i = 0, called_1 = called; _i < called_1.length; _i++) {
-            var c = called_1[_i];
-            var pick = c.tiles[0];
+            var cb = called_1[_i];
+            var pick = cb.tiles[0];
             if (hand.get(pick.t, pick.n) == 1) {
-                var cb = c.clone();
-                cb.tiles.push(new parser_1.Tile(pick.t, pick.n, [core_1.OPERATOR.HORIZONTAL]));
-                if (pick.n == 5 && hand.get(pick.t, 0) == 1)
-                    cb.tiles[3].n == 0;
-                blocks.push(new parser_1.BlockShoKan(cb.tiles));
+                var tiles = __spreadArray(__spreadArray([], cb.tiles, true), [
+                    new parser_1.Tile(pick.t, pick.n, [core_1.OPERATOR.HORIZONTAL]),
+                ], false);
+                if ((0, parser_1.isNum5)(pick) && hand.get(pick.t, 0) == 1)
+                    tiles[3].n == 0;
+                blocks.push(new parser_1.BlockShoKan(tiles));
             }
         }
         if (blocks.length == 0)
@@ -578,25 +602,25 @@ var Controller = (function () {
             return false;
         if (w == whoDiscarded)
             return false;
-        var fake = t.clone().remove(core_1.OPERATOR.HORIZONTAL);
-        if (fake.isNum() && fake.n == 0)
-            fake.n = 5;
+        var fake = t.clone({ remove: core_1.OPERATOR.HORIZONTAL });
+        if ((0, parser_1.isNum0)(fake))
+            fake = fake.clone({ n: 5 });
         if (hand.get(fake.t, fake.n) != 3)
             return false;
-        var b = new parser_1.BlockDaiKan([
-            fake.clone(),
-            fake.clone(),
-            fake.clone(),
-            fake.clone(),
-        ]);
+        var base = new parser_1.BlockDaiKan([fake, fake, fake, fake]);
         var idx = Math.abs(Number(w[0]) - Number(whoDiscarded[0]));
         if (idx == 3)
             idx = 0;
         if (idx == 1)
             idx = 3;
-        b.tiles[idx] = t.clone().add(core_1.OPERATOR.HORIZONTAL);
-        if (fake.isNum() && fake.n == 5 && t.n == 5)
-            b.tiles[(idx % 3) + 1].n = 0;
+        var b = base.clone({
+            replace: { idx: idx, tile: t.clone({ add: core_1.OPERATOR.HORIZONTAL }) },
+        });
+        if ((0, parser_1.isNum5)(fake) && (0, parser_1.isNum5)(t)) {
+            var ridx = (idx % 3) + 1;
+            var rt = b.tiles[ridx].clone({ n: 0 });
+            b = b.clone({ replace: { idx: ridx, tile: rt } });
+        }
         (0, assert_1.default)(b.tiles.filter(function (t) { return t.has(core_1.OPERATOR.HORIZONTAL); }).length == 1, "h op ".concat(b.toString()));
         return b;
     };
@@ -649,111 +673,120 @@ var BaseActor = (function () {
     };
     BaseActor.prototype.handleEvent = function (e) {
         var _a, _b, _c;
-        switch (e.type) {
-            case "CHOICE_AFTER_CALLED":
-            case "CHOICE_AFTER_DISCARDED":
-            case "CHOICE_AFTER_DRAWN":
-            case "CHOICE_FOR_CHAN_KAN":
-                break;
-            case "DISTRIBUTE":
-                this.counter.reset();
-                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);
-                for (var _i = 0, _d = Object.values(core_1.WIND); _i < _d.length; _i++) {
-                    var w = _d[_i];
-                    if (w != e.wind)
-                        continue;
-                    (_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);
-                break;
-            case "DISCARD":
-                this.river.discard(e.tile, e.iam);
-                this.hands[e.iam].discard(e.tile);
-                if (e.iam != e.wind) {
+        try {
+            switch (e.type) {
+                case "CHOICE_AFTER_CALLED":
+                case "CHOICE_AFTER_DISCARDED":
+                case "CHOICE_AFTER_DRAWN":
+                case "CHOICE_FOR_CHAN_KAN":
+                    break;
+                case "DISTRIBUTE":
+                    this.counter.reset();
+                    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);
+                    for (var _i = 0, _d = Object.values(core_1.WIND); _i < _d.length; _i++) {
+                        var w = _d[_i];
+                        if (w != e.wind)
+                            continue;
+                        (_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);
-                    this.counter.addTileToSafeMap(e.tile, 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);
+                    break;
+                case "DISCARD":
+                    this.river.discard(e.tile, e.iam);
+                    this.hands[e.iam].discard(e.tile);
+                    if (e.iam != e.wind) {
+                        this.counter.dec(e.tile);
+                        this.counter.addTileToSafeMap(e.tile, 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);
+                        }
                     }
-                }
-                break;
-            case "PON":
-            case "CHI":
-            case "DAI_KAN":
-                this.hands[e.iam].call(e.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); }));
-                break;
-            case "SHO_KAN":
-            case "AN_KAN":
-                this.hands[e.iam].kan(e.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); }));
-                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);
-                break;
-            case "TSUMO":
-                break;
-            case "RON":
-                if (e.pushBackReachStick) {
-                    var w = e.targetInfo.wind;
-                    var id = this.placeManager.playerID(w);
-                    this.scoreManager.restoreReachStick(id);
-                    this.placeManager.decrementReachStick();
-                }
-                break;
-            case "END_GAME":
-                switch (e.subType) {
-                    case "NINE_TILES":
-                    case "FOUR_KAN":
-                    case "FOUR_WIND":
-                        this.placeManager.incrementDeadStick();
-                        break;
-                    case "DRAWN_GAME": {
-                        var pm = this.placeManager.playerMap;
-                        this.scoreManager.update(e.deltas, pm);
-                        this.placeManager.incrementDeadStick();
-                        if (!e.shouldContinue)
-                            this.placeManager.nextRound();
-                        break;
+                    break;
+                case "PON":
+                case "CHI":
+                case "DAI_KAN":
+                    this.hands[e.iam].call(e.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); }));
+                    break;
+                case "SHO_KAN":
+                    this.hands[e.iam].kan(e.block);
+                    if (e.iam != e.wind)
+                        this.counter.dec(e.block.tiles.filter(function (t) { return t.has(core_1.OPERATOR.HORIZONTAL); })[0]);
+                    break;
+                case "AN_KAN":
+                    this.hands[e.iam].kan(e.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); }));
+                    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);
+                    break;
+                case "TSUMO":
+                    break;
+                case "RON":
+                    if (e.pushBackReachStick) {
+                        var w = e.targetInfo.wind;
+                        var id = this.placeManager.playerID(w);
+                        this.scoreManager.restoreReachStick(id);
+                        this.placeManager.decrementReachStick();
                     }
-                    case "WIN_GAME": {
-                        var pm = this.placeManager.playerMap;
-                        this.scoreManager.update(e.deltas, pm);
-                        if (e.shouldContinue)
+                    break;
+                case "END_GAME":
+                    switch (e.subType) {
+                        case "NINE_TILES":
+                        case "FOUR_KAN":
+                        case "FOUR_WIND":
+                            this.placeManager.incrementDeadStick();
+                            break;
+                        case "DRAWN_GAME": {
+                            var pm = this.placeManager.playerMap;
+                            this.scoreManager.update(e.deltas, pm);
                             this.placeManager.incrementDeadStick();
-                        else {
-                            this.placeManager.nextRound();
-                            this.placeManager.resetDeadStick();
+                            if (!e.shouldContinue)
+                                this.placeManager.nextRound();
+                            break;
+                        }
+                        case "WIN_GAME": {
+                            var pm = this.placeManager.playerMap;
+                            this.scoreManager.update(e.deltas, pm);
+                            if (e.shouldContinue)
+                                this.placeManager.incrementDeadStick();
+                            else {
+                                this.placeManager.nextRound();
+                                this.placeManager.resetDeadStick();
+                            }
+                            this.placeManager.resetReachStick();
+                            break;
                         }
-                        this.placeManager.resetReachStick();
-                        break;
                     }
-                }
-                break;
-            default:
-                throw new Error("unexpected event ".concat(JSON.stringify(e, null, 2)));
+                    break;
+                default:
+                    throw new Error("unexpected event ".concat(JSON.stringify(e, null, 2)));
+            }
+        }
+        catch (error) {
+            throw new Error("".concat(this.id, " ").concat(e.type, " ").concat(error));
         }
     };
     return BaseActor;