@gamepark/odin 0.0.3 → 0.0.5

package/dist/ChangePlayerRule.d.ts

@@ -0,0 +1,6 @@
+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

@@ -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 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;

package/dist/OdinRules.d.ts

@@ -1,4 +1,5 @@
 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';
@@ -11,6 +12,7 @@ export declare class OdinRules extends SecretMaterialRules<PlayerId, MaterialTyp
         1: typeof PlayCardsRule;
         4: typeof DealCardsRule;
         2: typeof PickCardRule;
+        5: typeof ChangePlayerRule;
         3: typeof EndOfRoundRule;
     };
     hidingStrategies: {

package/dist/OdinRules.js

@@ -17,6 +17,7 @@ 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 CustomMoveType_1 = require("./rules/CustomMoveType");
@@ -36,6 +37,7 @@ var OdinRules = (function (_super) {
             _a[RuleId_1.RuleId.PlayCards] = PlayCardsRule_1.PlayCardsRule,
             _a[RuleId_1.RuleId.DealCards] = DealCardsRule_1.DealCardsRule,
             _a[RuleId_1.RuleId.PickCard] = PickCardRule_1.PickCardRule,
+            _a[RuleId_1.RuleId.ChangePlayer] = ChangePlayerRule_1.ChangePlayerRule,
             _a[RuleId_1.RuleId.EndOfRound] = EndOfRoundRule_1.EndOfRoundRule,
             _a);
         _this.hidingStrategies = (_b = {},

package/dist/rules/CustomMoveType.d.ts

@@ -1,5 +1,6 @@
 export declare enum CustomMoveType {
     Pass = 1,
     TurnTempo = 2,
-    SortHand = 3
+    SortHand = 3,
+    PlaceAllCards = 4
 }

package/dist/rules/CustomMoveType.js

@@ -6,4 +6,5 @@ var CustomMoveType;
     CustomMoveType[CustomMoveType["Pass"] = 1] = "Pass";
     CustomMoveType[CustomMoveType["TurnTempo"] = 2] = "TurnTempo";
     CustomMoveType[CustomMoveType["SortHand"] = 3] = "SortHand";
+    CustomMoveType[CustomMoveType["PlaceAllCards"] = 4] = "PlaceAllCards";
 })(CustomMoveType = exports.CustomMoveType || (exports.CustomMoveType = {}));

package/dist/rules/EndOfRoundRule.js

@@ -59,6 +59,7 @@ 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 Memory_1 = require("./Memory");
 var RuleId_1 = require("./RuleId");
 var EndOfRoundRule = (function (_super) {
@@ -67,8 +68,9 @@ var EndOfRoundRule = (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     EndOfRoundRule.prototype.onRuleStart = function () {
-        var moves = this.onRoundEnd();
-        if (!moves.length) {
+        var moves = [this.customMove(CustomMoveType_1.CustomMoveType.TurnTempo, true)];
+        moves.push.apply(moves, __spreadArray([], __read(this.onRoundEnd()), false));
+        if (moves.length === 1) {
             moves.push.apply(moves, __spreadArray([], __read(this.groupToDeckMove), false));
         }
         return moves;

package/dist/rules/PickCardRule.d.ts

@@ -1,11 +1,11 @@
 import { MaterialMove, MoveItem } from '@gamepark/rules-api';
 import { BasePlayerTurn } from './BasePlayerTurn';
+import { RuleId } from './RuleId';
 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>[];
+    afterItemMove(move: MoveItem): import("@gamepark/rules-api").StartRule<RuleId.ChangePlayer>[];
+    goToNextRule(): import("@gamepark/rules-api").StartRule<RuleId.ChangePlayer>[];
     get currentTable(): import("@gamepark/rules-api").Material<number, number, number>;
-    get nextTable(): import("@gamepark/rules-api").Material<number, number, number>;
 }

package/dist/rules/PickCardRule.js

@@ -54,7 +54,7 @@ var PickCardRule = (function (_super) {
     }
     PickCardRule.prototype.onRuleStart = function () {
         if (this.isEndOfRound) {
-            return [this.customMove(CustomMoveType_1.CustomMoveType.TurnTempo, true), this.startRule(RuleId_1.RuleId.EndOfRound)];
+            return [this.startRule(RuleId_1.RuleId.EndOfRound)];
         }
         var moves = [this.customMove(CustomMoveType_1.CustomMoveType.TurnTempo)];
         if (this.getPlayerMoves().length)
@@ -81,21 +81,7 @@ var PickCardRule = (function (_super) {
         return this.goToNextRule();
     };
     PickCardRule.prototype.goToNextRule = 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(this.nextTable.moveItemsAtOnce({
-                id: LocationType_1.MiddleOfTable.Current
-            }));
-        }
-        moves.push(this.startPlayerTurn(RuleId_1.RuleId.PlayCards, this.nextPlayer));
-        return moves;
+        return [this.startRule(RuleId_1.RuleId.ChangePlayer)];
     };
     Object.defineProperty(PickCardRule.prototype, "currentTable", {
         get: function () {
@@ -104,13 +90,6 @@ var PickCardRule = (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(PickCardRule.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 PickCardRule;
 }(BasePlayerTurn_1.BasePlayerTurn));
 exports.PickCardRule = PickCardRule;

package/dist/rules/PlayCardsRule.d.ts

@@ -1,15 +1,15 @@
-import { CustomMove, ItemMove, MaterialItem, MaterialMove } from '@gamepark/rules-api';
+import { CustomMove, ItemMove, MaterialMove } from '@gamepark/rules-api';
 import { Card } from '../material/Card';
 import { BasePlayerTurn } from './BasePlayerTurn';
 export declare class PlayCardsRule extends BasePlayerTurn {
     getPlayerMoves(): MaterialMove<number, number, number, number>[];
-    get sort(): ((item: MaterialItem) => 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

@@ -65,6 +65,7 @@ var LocationType_1 = require("../material/LocationType");
 var MaterialType_1 = require("../material/MaterialType");
 var BasePlayerTurn_1 = require("./BasePlayerTurn");
 var CustomMoveType_1 = require("./CustomMoveType");
+var SortHelper_1 = require("./helper/SortHelper");
 var Memory_1 = require("./Memory");
 var RuleId_1 = require("./RuleId");
 var PlayCardsRule = (function (_super) {
@@ -73,19 +74,19 @@ var PlayCardsRule = (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     PlayCardsRule.prototype.getPlayerMoves = function () {
-        var _this = this;
         var playableCards = this.playableCards;
         var table = this.table;
         var tableSize = table.length;
         var moves = [];
         var combinations = this.getPlayableCombinations(playableCards.getItems().map(function (item) { return item.id; }), tableSize, this.tableValue);
         var allHandCombination = this.getPlayableCombinations(playableCards.getItems().map(function (item) { return item.id; }), playableCards.length, this.tableValue);
+        var sortHelper = new SortHelper_1.SortHelper(this.game);
         if (allHandCombination.length) {
             moves.push.apply(moves, __spreadArray([], __read(allHandCombination.map(function (c) {
                 var _a;
                 return (_a = playableCards
                     .id(function (id) { return c.includes(id); }))
-                    .sort.apply(_a, __spreadArray([], __read(_this.sort), false)).moveItemsAtOnce({
+                    .sort.apply(_a, __spreadArray([], __read(sortHelper.sortByValue), false)).moveItemsAtOnce({
                     type: LocationType_1.LocationType.MiddleOfTable,
                     id: LocationType_1.MiddleOfTable.Next
                 });
@@ -95,7 +96,7 @@ var PlayCardsRule = (function (_super) {
             var _a;
             return (_a = playableCards
                 .id(function (id) { return c.includes(id); }))
-                .sort.apply(_a, __spreadArray([], __read(_this.sort), false)).moveItemsAtOnce({
+                .sort.apply(_a, __spreadArray([], __read(sortHelper.sortByValue), false)).moveItemsAtOnce({
                 type: LocationType_1.LocationType.MiddleOfTable,
                 id: LocationType_1.MiddleOfTable.Next
             });
@@ -105,13 +106,6 @@ var PlayCardsRule = (function (_super) {
         }
         return moves;
     };
-    Object.defineProperty(PlayCardsRule.prototype, "sort", {
-        get: function () {
-            return [function (item) { return -(0, Card_1.getCardValue)(item.id); }, function (item) { return (0, Card_1.getCardColor)(item.id); }];
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(PlayCardsRule.prototype, "tableValue", {
         get: function () {
             var table = this.table;
@@ -132,6 +126,9 @@ var PlayCardsRule = (function (_super) {
             return [];
         var moves = [];
         this.memorize(Memory_1.Memory.LastPlayerThatPlay, this.player);
+        if (this.hand.length > 0) {
+            moves.push(this.customMove(CustomMoveType_1.CustomMoveType.TurnTempo));
+        }
         moves.push(this.startRule(RuleId_1.RuleId.PickCard));
         return moves;
     };
@@ -169,6 +166,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/RuleId.d.ts

@@ -2,5 +2,6 @@ export declare enum RuleId {
     PlayCards = 1,
     PickCard = 2,
     EndOfRound = 3,
-    DealCards = 4
+    DealCards = 4,
+    ChangePlayer = 5
 }

package/dist/rules/RuleId.js

@@ -7,4 +7,5 @@ var RuleId;
     RuleId[RuleId["PickCard"] = 2] = "PickCard";
     RuleId[RuleId["EndOfRound"] = 3] = "EndOfRound";
     RuleId[RuleId["DealCards"] = 4] = "DealCards";
+    RuleId[RuleId["ChangePlayer"] = 5] = "ChangePlayer";
 })(RuleId = exports.RuleId || (exports.RuleId = {}));

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

@@ -0,0 +1,4 @@
+import { MaterialItem, MaterialRulesPart } from '@gamepark/rules-api';
+export declare class SortHelper extends MaterialRulesPart {
+    get sortByValue(): ((item: MaterialItem) => number)[];
+}

package/dist/rules/helper/SortHelper.js

@@ -0,0 +1,35 @@
+"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.SortHelper = void 0;
+var rules_api_1 = require("@gamepark/rules-api");
+var Card_1 = require("../../material/Card");
+var SortHelper = (function (_super) {
+    __extends(SortHelper, _super);
+    function SortHelper() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(SortHelper.prototype, "sortByValue", {
+        get: function () {
+            return [function (item) { return -(0, Card_1.getCardValue)(item.id); }, function (item) { return (0, Card_1.getCardColor)(item.id); }];
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return SortHelper;
+}(rules_api_1.MaterialRulesPart));
+exports.SortHelper = SortHelper;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/odin",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "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.1",
+    "@gamepark/rules-api": "~6.37.8",
     "@types/lodash": "^4.17.7",
     "i18next": "^22.0.3",
     "lodash": "^4.17.21"
   },
-  "gitHead": "3be3270b6e561e6289b862d21400ea93358b5459"
+  "gitHead": "511bef61747cf286673e33a1b5d89db59b2c9795"
 }