@gamepark/odin 0.0.7 → 1.0.0

package/dist/rules/EndOfRoundRule.js

@@ -39,13 +39,27 @@ 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) {
@@ -62,7 +76,33 @@ var EndOfRoundRule = (function (_super) {
         return moves;
     };
     EndOfRoundRule.prototype.onRoundEnd = function () {
-        if (!new EndHelper_1.EndHelper(this.game).isEnded) {
+        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) {
             this.memorize(Memory_1.Memory.Round, function (r) {
                 return r + 1;
             });

package/dist/rules/PlayCardsRule.d.ts

@@ -11,6 +11,7 @@ export declare class PlayCardsRule extends BasePlayerTurn {
     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

@@ -130,6 +130,13 @@ var PlayCardsRule = (function (_super) {
         if (!(0, rules_api_1.isCustomMoveType)(CustomMoveType_1.CustomMoveType.Pass)(move))
             return [];
         var moves = [];
+        var nextTable = this.nextTable;
+        if (nextTable.length) {
+            moves.push(nextTable.moveItemsAtOnce({
+                type: LocationType_1.LocationType.Hand,
+                player: this.player
+            }));
+        }
         moves.push.apply(moves, __spreadArray([], __read(this.goToNextPlayer()), false));
         return moves;
     };
@@ -177,6 +184,13 @@ 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.js

@@ -14,52 +14,10 @@ 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));
-};
-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 ScoreHelper_1 = require("./ScoreHelper");
 var EndHelper = (function (_super) {
     __extends(EndHelper, _super);
     function EndHelper() {
@@ -67,33 +25,8 @@ var EndHelper = (function (_super) {
     }
     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;
+            var _this = this;
+            return this.game.players.some(function (p) { return new ScoreHelper_1.ScoreHelper(_this.game, p).score >= 15; });
         },
         enumerable: false,
         configurable: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/odin",
-  "version": "0.0.7",
+  "version": "1.0.0",
   "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": "8633d0fca555c2e0b391a4c64476d32e062b9763"
+  "gitHead": "d2d8272afb68c2035b154c54a38265bdabf4ad50"
 }

package/dist/ChangePlayerRule.d.ts

@@ -1,6 +0,0 @@
-import { MaterialMove, PlayerTurnRule } from '@gamepark/rules-api';
-export declare class ChangePlayerRule extends PlayerTurnRule {
-    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/ChangePlayerRule.js

@@ -1,62 +0,0 @@
-"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 rules_api_1 = require("@gamepark/rules-api");
-var LocationType_1 = require("./material/LocationType");
-var MaterialType_1 = require("./material/MaterialType");
-var RuleId_1 = require("./rules/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;
-}(rules_api_1.PlayerTurnRule));
-exports.ChangePlayerRule = ChangePlayerRule;