@gamepark/odin 0.0.5 → 0.0.7

package/dist/OdinRules.d.ts

@@ -1,8 +1,8 @@
 import { CompetitiveScore, CustomMove, FillGapStrategy, MaterialGame, MaterialMove, PlayMoveContext, PositiveSequenceStrategy, SecretMaterialRules, TimeLimit } from '@gamepark/rules-api';
-import { ChangePlayerRule } from './ChangePlayerRule';
 import { LocationType } from './material/LocationType';
 import { MaterialType } from './material/MaterialType';
 import { PlayerId } from './PlayerId';
+import { ChangePlayerRule } from './rules/ChangePlayerRule';
 import { DealCardsRule } from './rules/DealCardsRule';
 import { EndOfRoundRule } from './rules/EndOfRoundRule';
 import { PickCardRule } from './rules/PickCardRule';

package/dist/OdinRules.js

@@ -17,9 +17,9 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OdinRules = void 0;
 var rules_api_1 = require("@gamepark/rules-api");
-var ChangePlayerRule_1 = require("./ChangePlayerRule");
 var LocationType_1 = require("./material/LocationType");
 var MaterialType_1 = require("./material/MaterialType");
+var ChangePlayerRule_1 = require("./rules/ChangePlayerRule");
 var CustomMoveType_1 = require("./rules/CustomMoveType");
 var DealCardsRule_1 = require("./rules/DealCardsRule");
 var EndOfRoundRule_1 = require("./rules/EndOfRoundRule");
@@ -62,7 +62,7 @@ var OdinRules = (function (_super) {
         this.memorize(Memory_1.Memory.HandSort, previousState.memory[Memory_1.Memory.HandSort]);
     };
     OdinRules.prototype.giveTime = function () {
-        return 60;
+        return 30;
     };
     OdinRules.prototype.getScore = function (playerId) {
         return new ScoreHelper_1.ScoreHelper(this.game, playerId).score;

package/dist/rules/ChangePlayerRule.d.ts

@@ -0,0 +1,7 @@
+import { MaterialMove } from '@gamepark/rules-api';
+import { BasePlayerTurn } from './BasePlayerTurn';
+export declare class ChangePlayerRule extends BasePlayerTurn {
+    onRuleStart(): MaterialMove<number, number, number, number>[];
+    get currentTable(): import("@gamepark/rules-api").Material<number, number, number>;
+    get nextTable(): import("@gamepark/rules-api").Material<number, number, number>;
+}

package/dist/rules/ChangePlayerRule.js

@@ -0,0 +1,62 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChangePlayerRule = void 0;
+var LocationType_1 = require("../material/LocationType");
+var MaterialType_1 = require("../material/MaterialType");
+var BasePlayerTurn_1 = require("./BasePlayerTurn");
+var RuleId_1 = require("./RuleId");
+var ChangePlayerRule = (function (_super) {
+    __extends(ChangePlayerRule, _super);
+    function ChangePlayerRule() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ChangePlayerRule.prototype.onRuleStart = function () {
+        var moves = [];
+        var currentTable = this.currentTable;
+        if (currentTable.length) {
+            moves.push(this.currentTable.moveItemsAtOnce({
+                type: LocationType_1.LocationType.Discard
+            }));
+        }
+        var nextTable = this.nextTable;
+        if (nextTable.length) {
+            moves.push(nextTable.moveItemsAtOnce({
+                type: LocationType_1.LocationType.MiddleOfTable,
+                id: LocationType_1.MiddleOfTable.Current
+            }));
+        }
+        moves.push(this.startPlayerTurn(RuleId_1.RuleId.PlayCards, this.nextPlayer));
+        return moves;
+    };
+    Object.defineProperty(ChangePlayerRule.prototype, "currentTable", {
+        get: function () {
+            return this.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.MiddleOfTable).locationId(LocationType_1.MiddleOfTable.Current);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(ChangePlayerRule.prototype, "nextTable", {
+        get: function () {
+            return this.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.MiddleOfTable).locationId(LocationType_1.MiddleOfTable.Next);
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return ChangePlayerRule;
+}(BasePlayerTurn_1.BasePlayerTurn));
+exports.ChangePlayerRule = ChangePlayerRule;

package/dist/rules/EndOfRoundRule.js

@@ -39,27 +39,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EndOfRoundRule = void 0;
 var rules_api_1 = require("@gamepark/rules-api");
-var sum_1 = __importDefault(require("lodash/sum"));
 var LocationType_1 = require("../material/LocationType");
 var MaterialType_1 = require("../material/MaterialType");
 var CustomMoveType_1 = require("./CustomMoveType");
+var EndHelper_1 = require("./helper/EndHelper");
 var Memory_1 = require("./Memory");
 var RuleId_1 = require("./RuleId");
 var EndOfRoundRule = (function (_super) {
@@ -76,33 +62,7 @@ var EndOfRoundRule = (function (_super) {
         return moves;
     };
     EndOfRoundRule.prototype.onRoundEnd = function () {
-        var e_1, _a;
-        var ended = false;
-        var _loop_1 = function (player) {
-            var hand = this_1.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.Hand).player(player);
-            this_1.memorize(Memory_1.Memory.PlayerScore, function (s) {
-                if (s === void 0) { s = []; }
-                return __spreadArray(__spreadArray([], __read(s), false), [hand.length], false);
-            }, player);
-            var score = (0, sum_1.default)(this_1.remind(Memory_1.Memory.PlayerScore, player));
-            if (!ended && score >= 15)
-                ended = true;
-        };
-        var this_1 = this;
-        try {
-            for (var _b = __values(this.game.players), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var player = _c.value;
-                _loop_1(player);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        if (!ended) {
+        if (!new EndHelper_1.EndHelper(this.game).isEnded) {
             this.memorize(Memory_1.Memory.Round, function (r) {
                 return r + 1;
             });

package/dist/rules/PickCardRule.js

@@ -57,6 +57,11 @@ var PickCardRule = (function (_super) {
             return [this.startRule(RuleId_1.RuleId.EndOfRound)];
         }
         var moves = [this.customMove(CustomMoveType_1.CustomMoveType.TurnTempo)];
+        var playerMoves = this.getPlayerMoves();
+        if (playerMoves.length === 1 && (0, rules_api_1.isMoveItemType)(MaterialType_1.MaterialType.Card)(playerMoves[0]) && playerMoves[0].location.type === LocationType_1.LocationType.Hand) {
+            moves.push(playerMoves[0]);
+            return moves;
+        }
         if (this.getPlayerMoves().length)
             return moves;
         moves.push.apply(moves, __spreadArray([], __read(this.goToNextRule()), false));

package/dist/rules/PlayCardsRule.d.ts

@@ -2,14 +2,15 @@ import { CustomMove, ItemMove, MaterialMove } from '@gamepark/rules-api';
 import { Card } from '../material/Card';
 import { BasePlayerTurn } from './BasePlayerTurn';
 export declare class PlayCardsRule extends BasePlayerTurn {
+    onRuleStart(): CustomMove<number>[];
     getPlayerMoves(): MaterialMove<number, number, number, number>[];
+    getAvailableMoves(): MaterialMove<number, number, number, number>[];
     get tableValue(): number;
     onCustomMove(move: CustomMove): MaterialMove<number, number, number, number>[];
     afterItemMove(move: ItemMove): MaterialMove<number, number, number, number>[];
     goToNextPlayer(): MaterialMove<number, number, number, number>[];
     get firstPlayer(): number;
     get table(): import("@gamepark/rules-api").Material<number, number, number>;
-    get nextTable(): import("@gamepark/rules-api").Material<number, number, number>;
     get playableCards(): import("@gamepark/rules-api").Material<number, number, number>;
     get hand(): import("@gamepark/rules-api").Material<number, number, number>;
     kCombinations<T>(arr: T[], k: number): T[][];

package/dist/rules/PlayCardsRule.js

@@ -73,7 +73,19 @@ var PlayCardsRule = (function (_super) {
     function PlayCardsRule() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    PlayCardsRule.prototype.onRuleStart = function () {
+        var table = this.table;
+        var tableSize = table.length;
+        var hand = this.playableCards;
+        if (hand.length < tableSize) {
+            return [this.customMove(CustomMoveType_1.CustomMoveType.Pass)];
+        }
+        return [];
+    };
     PlayCardsRule.prototype.getPlayerMoves = function () {
+        return this.getAvailableMoves();
+    };
+    PlayCardsRule.prototype.getAvailableMoves = function () {
         var playableCards = this.playableCards;
         var table = this.table;
         var tableSize = table.length;
@@ -144,8 +156,7 @@ var PlayCardsRule = (function (_super) {
                     type: LocationType_1.LocationType.Discard
                 }));
             }
-            moves.push(this.startPlayerTurn(RuleId_1.RuleId.PlayCards, next));
-            return moves;
+            moves.push(this.startRule(RuleId_1.RuleId.ChangePlayer));
         }
         else {
             moves.push(this.startPlayerTurn(RuleId_1.RuleId.PlayCards, this.nextPlayer));
@@ -166,13 +177,6 @@ var PlayCardsRule = (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(PlayCardsRule.prototype, "nextTable", {
-        get: function () {
-            return this.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.MiddleOfTable).locationId(LocationType_1.MiddleOfTable.Next);
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(PlayCardsRule.prototype, "playableCards", {
         get: function () {
             var _this = this;

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

@@ -0,0 +1,4 @@
+import { MaterialRulesPart } from '@gamepark/rules-api';
+export declare class EndHelper extends MaterialRulesPart {
+    get isEnded(): boolean;
+}

package/dist/rules/helper/EndHelper.js

@@ -0,0 +1,103 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        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));
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EndHelper = void 0;
+var rules_api_1 = require("@gamepark/rules-api");
+var sum_1 = __importDefault(require("lodash/sum"));
+var LocationType_1 = require("../../material/LocationType");
+var MaterialType_1 = require("../../material/MaterialType");
+var Memory_1 = require("../Memory");
+var EndHelper = (function (_super) {
+    __extends(EndHelper, _super);
+    function EndHelper() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(EndHelper.prototype, "isEnded", {
+        get: function () {
+            var e_1, _a;
+            var ended = false;
+            var _loop_1 = function (player) {
+                var hand = this_1.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.Hand).player(player);
+                this_1.memorize(Memory_1.Memory.PlayerScore, function (s) {
+                    if (s === void 0) { s = []; }
+                    return __spreadArray(__spreadArray([], __read(s), false), [hand.length], false);
+                }, player);
+                var score = (0, sum_1.default)(this_1.remind(Memory_1.Memory.PlayerScore, player));
+                if (!ended && score >= 15)
+                    ended = true;
+            };
+            var this_1 = this;
+            try {
+                for (var _b = __values(this.game.players), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var player = _c.value;
+                    _loop_1(player);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return ended;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return EndHelper;
+}(rules_api_1.MaterialRulesPart));
+exports.EndHelper = EndHelper;

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

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

package/dist/rules/helper/ScoreHelper.js

@@ -21,8 +21,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScoreHelper = void 0;
 var rules_api_1 = require("@gamepark/rules-api");
 var sum_1 = __importDefault(require("lodash/sum"));
-var LocationType_1 = require("../../material/LocationType");
-var MaterialType_1 = require("../../material/MaterialType");
 var Memory_1 = require("../Memory");
 var ScoreHelper = (function (_super) {
     __extends(ScoreHelper, _super);
@@ -45,13 +43,6 @@ var ScoreHelper = (function (_super) {
         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 () {
-            return this.material(MaterialType_1.MaterialType.Card).location(LocationType_1.LocationType.Hand).player(this.player).length === 0;
-        },
-        enumerable: false,
-        configurable: true
-    });
     return ScoreHelper;
 }(rules_api_1.MaterialRulesPart));
 exports.ScoreHelper = ScoreHelper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/odin",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "The rules of Odin adapted for Game Park",
   "sideEffects": false,
   "main": "dist/index.js",
@@ -24,10 +24,10 @@
     "lodash": ">=4.17"
   },
   "devDependencies": {
-    "@gamepark/rules-api": "~6.37.8",
+    "@gamepark/rules-api": "~6.38.5",
     "@types/lodash": "^4.17.7",
     "i18next": "^22.0.3",
     "lodash": "^4.17.21"
   },
-  "gitHead": "511bef61747cf286673e33a1b5d89db59b2c9795"
+  "gitHead": "8633d0fca555c2e0b391a4c64476d32e062b9763"
 }