@gamepark/odin 0.0.2 → 0.0.3

package/dist/OdinRules.d.ts

@@ -1,5 +1,4 @@
-import { CustomMove, MaterialGame, MaterialMove, PlayMoveContext, PositiveSequenceStrategy, SecretMaterialRules, TimeLimit } from '@gamepark/rules-api';
-import { CompetitiveScore } from '../../../rules-api';
+import { CompetitiveScore, CustomMove, FillGapStrategy, MaterialGame, MaterialMove, PlayMoveContext, PositiveSequenceStrategy, SecretMaterialRules, TimeLimit } from '@gamepark/rules-api';
 import { LocationType } from './material/LocationType';
 import { MaterialType } from './material/MaterialType';
 import { PlayerId } from './PlayerId';
@@ -24,7 +23,7 @@ export declare class OdinRules extends SecretMaterialRules<PlayerId, MaterialTyp
         1: {
             2: PositiveSequenceStrategy<number, number, number>;
             1: PositiveSequenceStrategy<number, number, number>;
-            3: PositiveSequenceStrategy<number, number, number>;
+            3: FillGapStrategy<number, number, number>;
             4: PositiveSequenceStrategy<number, number, number>;
         };
     };

package/dist/OdinRules.js

@@ -48,7 +48,7 @@ var OdinRules = (function (_super) {
             _d[MaterialType_1.MaterialType.Card] = (_e = {},
                 _e[LocationType_1.LocationType.Hand] = new rules_api_1.PositiveSequenceStrategy(),
                 _e[LocationType_1.LocationType.Deck] = new rules_api_1.PositiveSequenceStrategy(),
-                _e[LocationType_1.LocationType.MiddleOfTable] = new rules_api_1.PositiveSequenceStrategy(),
+                _e[LocationType_1.LocationType.MiddleOfTable] = new rules_api_1.FillGapStrategy(),
                 _e[LocationType_1.LocationType.Discard] = new rules_api_1.PositiveSequenceStrategy(),
                 _e),
             _d);

package/dist/rules/DealCardsRule.d.ts

@@ -1,8 +1,10 @@
 import { ItemMove, MaterialMove, MaterialRulesPart } from '@gamepark/rules-api';
+import { PlayerId } from '../PlayerId';
 export declare class DealCardsRule extends MaterialRulesPart {
     onRuleStart(): MaterialMove<number, number, number, number>[];
     afterItemMove(move: ItemMove): MaterialMove[];
     dealToPlayersAndGo(): MaterialMove[];
+    getPlayerHand(player: PlayerId): import("@gamepark/rules-api").Material<number, number, number>;
     get deck(): import("@gamepark/rules-api").MaterialDeck<number, number, number>;
     get discard(): import("@gamepark/rules-api").Material<number, number, number>;
 }

package/dist/rules/DealCardsRule.js

@@ -88,6 +88,9 @@ var DealCardsRule = (function (_super) {
             try {
                 for (var _b = (e_1 = void 0, __values(this.game.players)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var player = _c.value;
+                    var hand = this.getPlayerHand(player);
+                    if (hand.length + i >= 9)
+                        continue;
                     moves.push.apply(moves, __spreadArray([], __read(deck.deal({
                         type: LocationType_1.LocationType.Hand,
                         player: player
@@ -105,6 +108,9 @@ var DealCardsRule = (function (_super) {
         moves.push(this.startPlayerTurn(RuleId_1.RuleId.PlayCards, this.remind(Memory_1.Memory.FirstPlayer)));
         return moves;
     };
+    DealCardsRule.prototype.getPlayerHand = function (player) {
+        return this.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.Hand).player(player);
+    };
     Object.defineProperty(DealCardsRule.prototype, "deck", {
         get: function () {
             return this.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.Deck).deck();

package/dist/rules/PickCardRule.d.ts

@@ -2,6 +2,7 @@ import { MaterialMove, MoveItem } from '@gamepark/rules-api';
 import { BasePlayerTurn } from './BasePlayerTurn';
 export declare class PickCardRule extends BasePlayerTurn {
     onRuleStart(): MaterialMove<number, number, number, number>[];
+    get isEndOfRound(): boolean;
     getPlayerMoves(): MaterialMove[];
     afterItemMove(move: MoveItem): MaterialMove<number, number, number, number>[];
     goToNextRule(): MaterialMove<number, number, number, number>[];

package/dist/rules/PickCardRule.js

@@ -14,12 +14,38 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+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));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PickCardRule = void 0;
 var rules_api_1 = require("@gamepark/rules-api");
 var LocationType_1 = require("../material/LocationType");
 var MaterialType_1 = require("../material/MaterialType");
 var BasePlayerTurn_1 = require("./BasePlayerTurn");
+var CustomMoveType_1 = require("./CustomMoveType");
 var RuleId_1 = require("./RuleId");
 var PickCardRule = (function (_super) {
     __extends(PickCardRule, _super);
@@ -27,10 +53,22 @@ var PickCardRule = (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     PickCardRule.prototype.onRuleStart = function () {
+        if (this.isEndOfRound) {
+            return [this.customMove(CustomMoveType_1.CustomMoveType.TurnTempo, true), this.startRule(RuleId_1.RuleId.EndOfRound)];
+        }
+        var moves = [this.customMove(CustomMoveType_1.CustomMoveType.TurnTempo)];
         if (this.getPlayerMoves().length)
-            return [];
-        return this.goToNextRule();
+            return moves;
+        moves.push.apply(moves, __spreadArray([], __read(this.goToNextRule()), false));
+        return moves;
     };
+    Object.defineProperty(PickCardRule.prototype, "isEndOfRound", {
+        get: function () {
+            return this.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.Hand).player(this.player).length === 0;
+        },
+        enumerable: false,
+        configurable: true
+    });
     PickCardRule.prototype.getPlayerMoves = function () {
         return this.currentTable.moveItems({
             type: LocationType_1.LocationType.Hand,

package/dist/rules/PlayCardsRule.d.ts

@@ -8,7 +8,6 @@ export declare class PlayCardsRule extends BasePlayerTurn {
     onCustomMove(move: CustomMove): MaterialMove<number, number, number, number>[];
     afterItemMove(move: ItemMove): MaterialMove<number, number, number, number>[];
     goToNextPlayer(): MaterialMove<number, number, number, number>[];
-    afterPlaceCards(): MaterialMove<number, number, number, number>[];
     get firstPlayer(): number;
     get table(): import("@gamepark/rules-api").Material<number, number, number>;
     get playableCards(): import("@gamepark/rules-api").Material<number, number, number>;

package/dist/rules/PlayCardsRule.js

@@ -83,7 +83,7 @@ var PlayCardsRule = (function (_super) {
         if (allHandCombination.length) {
             moves.push.apply(moves, __spreadArray([], __read(allHandCombination.map(function (c) {
                 var _a;
-                return (_a = _this.hand
+                return (_a = playableCards
                     .id(function (id) { return c.includes(id); }))
                     .sort.apply(_a, __spreadArray([], __read(_this.sort), false)).moveItemsAtOnce({
                     type: LocationType_1.LocationType.MiddleOfTable,
@@ -93,7 +93,7 @@ var PlayCardsRule = (function (_super) {
         }
         moves.push.apply(moves, __spreadArray([], __read(combinations.map(function (c) {
             var _a;
-            return (_a = _this.hand
+            return (_a = playableCards
                 .id(function (id) { return c.includes(id); }))
                 .sort.apply(_a, __spreadArray([], __read(_this.sort), false)).moveItemsAtOnce({
                 type: LocationType_1.LocationType.MiddleOfTable,
@@ -123,23 +123,16 @@ var PlayCardsRule = (function (_super) {
     PlayCardsRule.prototype.onCustomMove = function (move) {
         if (!(0, rules_api_1.isCustomMoveType)(CustomMoveType_1.CustomMoveType.Pass)(move))
             return [];
-        var moves = this.afterPlaceCards();
+        var moves = [];
         moves.push.apply(moves, __spreadArray([], __read(this.goToNextPlayer()), false));
         return moves;
     };
     PlayCardsRule.prototype.afterItemMove = function (move) {
         if (!(0, rules_api_1.isMoveItemTypeAtOnce)(MaterialType_1.MaterialType.Card)(move) || move.location.type !== LocationType_1.LocationType.MiddleOfTable)
             return [];
-        var moves = this.afterPlaceCards();
+        var moves = [];
         this.memorize(Memory_1.Memory.LastPlayerThatPlay, this.player);
-        var isEndOfRound = this.hand.length === 0;
-        moves.push(this.customMove(CustomMoveType_1.CustomMoveType.TurnTempo, isEndOfRound));
-        if (this.hand.length === 0) {
-            moves.push(this.startRule(RuleId_1.RuleId.EndOfRound));
-        }
-        else {
-            moves.push(this.startRule(RuleId_1.RuleId.PickCard));
-        }
+        moves.push(this.startRule(RuleId_1.RuleId.PickCard));
         return moves;
     };
     PlayCardsRule.prototype.goToNextPlayer = function () {
@@ -162,25 +155,6 @@ var PlayCardsRule = (function (_super) {
         }
         return moves;
     };
-    PlayCardsRule.prototype.afterPlaceCards = function () {
-        var e_1, _a;
-        var moves = [];
-        var selected = this.material(MaterialType_1.MaterialType.Card).selected().getItems();
-        try {
-            for (var selected_1 = __values(selected), selected_1_1 = selected_1.next(); !selected_1_1.done; selected_1_1 = selected_1.next()) {
-                var item = selected_1_1.value;
-                delete item.selected;
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (selected_1_1 && !selected_1_1.done && (_a = selected_1.return)) _a.call(selected_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return moves;
-    };
     Object.defineProperty(PlayCardsRule.prototype, "firstPlayer", {
         get: function () {
             return this.remind(Memory_1.Memory.FirstPlayer);
@@ -197,7 +171,8 @@ var PlayCardsRule = (function (_super) {
     });
     Object.defineProperty(PlayCardsRule.prototype, "playableCards", {
         get: function () {
-            return this.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.Hand).player(this.player);
+            var _this = this;
+            return this.material(MaterialType_1.MaterialType.Card).location(function (l) { return (l.type === LocationType_1.LocationType.Hand && l.player === _this.player) || (l.type === LocationType_1.LocationType.MiddleOfTable && l.id === LocationType_1.MiddleOfTable.Next); });
         },
         enumerable: false,
         configurable: true
@@ -224,7 +199,7 @@ var PlayCardsRule = (function (_super) {
         return parseInt(values.join(''), 10);
     };
     PlayCardsRule.prototype.getPlayableCombinations = function (hand, tableCount, tableValue) {
-        var e_2, _a, e_3, _b, e_4, _c, e_5, _d;
+        var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
         var results = [];
         var byColor = (0, groupBy_1.default)(hand, function (card) { return card % 10; });
         var byValue = (0, groupBy_1.default)(hand, function (card) { return Math.floor(card / 10); });
@@ -232,54 +207,54 @@ var PlayCardsRule = (function (_super) {
             for (var _e = __values([byColor, byValue]), _f = _e.next(); !_f.done; _f = _e.next()) {
                 var group = _f.value;
                 try {
-                    for (var _g = (e_3 = void 0, __values(Object.values(group))), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    for (var _g = (e_2 = void 0, __values(Object.values(group))), _h = _g.next(); !_h.done; _h = _g.next()) {
                         var cards = _h.value;
                         try {
-                            for (var _j = (e_4 = void 0, __values([tableCount, tableCount + 1])), _k = _j.next(); !_k.done; _k = _j.next()) {
+                            for (var _j = (e_3 = void 0, __values([tableCount, tableCount + 1])), _k = _j.next(); !_k.done; _k = _j.next()) {
                                 var count = _k.value;
                                 if (cards.length >= count) {
                                     try {
-                                        for (var _l = (e_5 = void 0, __values(this.kCombinations(cards, count))), _m = _l.next(); !_m.done; _m = _l.next()) {
+                                        for (var _l = (e_4 = void 0, __values(this.kCombinations(cards, count))), _m = _l.next(); !_m.done; _m = _l.next()) {
                                             var comb = _m.value;
                                             if (this.concatCardValue(comb) > tableValue) {
                                                 results.push(comb);
                                             }
                                         }
                                     }
-                                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
                                     finally {
                                         try {
                                             if (_m && !_m.done && (_d = _l.return)) _d.call(_l);
                                         }
-                                        finally { if (e_5) throw e_5.error; }
+                                        finally { if (e_4) throw e_4.error; }
                                     }
                                 }
                             }
                         }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
                         finally {
                             try {
                                 if (_k && !_k.done && (_c = _j.return)) _c.call(_j);
                             }
-                            finally { if (e_4) throw e_4.error; }
+                            finally { if (e_3) throw e_3.error; }
                         }
                     }
                 }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
                         if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
                     }
-                    finally { if (e_3) throw e_3.error; }
+                    finally { if (e_2) throw e_2.error; }
                 }
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
                 if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_1) throw e_1.error; }
         }
         var unique = (0, uniqWith_1.default)(results, function (a, b) { return (0, isEqual_1.default)((0, orderBy_1.default)(a), (0, orderBy_1.default)(b)); });
         return unique;

package/dist/rules/helper/ScoreHelper.d.ts

@@ -5,6 +5,6 @@ export declare class ScoreHelper extends MaterialRulesPart {
     constructor(game: MaterialGame, player: PlayerId);
     isWinningRound(round: number): boolean;
     get score(): number;
-    getRoundScore(round: number): number;
+    getRoundScore(round: number): number | undefined;
     get isWinning(): boolean;
 }

package/dist/rules/helper/ScoreHelper.js

@@ -42,7 +42,8 @@ var ScoreHelper = (function (_super) {
         configurable: true
     });
     ScoreHelper.prototype.getRoundScore = function (round) {
-        return this.remind(Memory_1.Memory.PlayerScore, this.player)[round];
+        var _a;
+        return (_a = this.remind(Memory_1.Memory.PlayerScore, this.player)) === null || _a === void 0 ? void 0 : _a[round - 1];
     };
     Object.defineProperty(ScoreHelper.prototype, "isWinning", {
         get: function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/odin",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "The rules of Odin adapted for Game Park",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -29,5 +29,5 @@
     "i18next": "^22.0.3",
     "lodash": "^4.17.21"
   },
-  "gitHead": "c5272c1052e76fc49097aa007043479a237ac668"
+  "gitHead": "3be3270b6e561e6289b862d21400ea93358b5459"
 }