enefel 1.0.155 → 1.0.156

package/block.js

@@ -65,6 +65,15 @@ const getOrderDice = (attacker, defender) => {
 
 const getOrderDiceAgainst = (attacker, defender) => {
   if (hasSkill(defender, SKILL_NAMES.BLOCK)) {
+    if (hasSkill(defender, SKILL_NAMES.WRESTLE)) {
+      return [
+        { value: 1, isReroll: true },
+        { value: 3, isReroll: false },
+        { value: 2, isReroll: !hasSkill(attacker, SKILL_NAMES.BLOCK) },
+        { value: 4, isReroll: false },
+        { value: 5, isReroll: false },
+      ];
+    }
     return [
       { value: 1, isReroll: true },
       { value: 2, isReroll: !hasSkill(attacker, SKILL_NAMES.BLOCK) },

package/card.js

@@ -0,0 +1,24 @@
+const CARD_TYPE = {
+  PLAYER: "player",
+  TEAM: "team",
+};
+
+const CARD_RARITY = {
+  COMMUN: "c",
+  UNCOMMUN: "u",
+  RARE: "r",
+};
+
+const CARD_DISPLAY = {
+  N1: "1",
+  N2: "2",
+  N3: "3",
+  N4: "4",
+};
+
+const card = {
+  CARD_TYPE,
+  CARD_RARITY,
+  CARD_DISPLAY,
+};
+module.exports = card;

package/index.js

@@ -20,7 +20,7 @@ const {
 } = require("./meteo");
 const { distance } = require("./calcul");
 const { getCareerFromPlayer } = require("./race");
-const { getMaxCarac, PLAYER_CARAC } = require("./player");
+const { getMaxCarac, PLAYER_CARAC, hasMove } = require("./player");
 const { GAME_STATUS } = require("./game");
 
 const POSTULATION_HOURS = 24;
@@ -758,8 +758,7 @@ function canPass(player, playerTeam, playerIdWithBall) {
 function canEndTurn(player, game) {
   return (
     player.date_next_action === null &&
-    (player.has_action === false ||
-      player.current_MA < getMaxCarac(player, PLAYER_CARAC.MA, game))
+    (player.has_action === false || hasMove(player, game))
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enefel",
-  "version": "1.0.155",
+  "version": "1.0.156",
   "main": "index.js",
   "author": "Manest",
   "license": "MIT",

package/player.js

@@ -1,7 +1,7 @@
 const { getAgingMinExperience } = require("./improvement");
 const { meteoMaxMA } = require("./meteo");
 const { getCareerFromPlayer } = require("./race");
-const { hasSkill, SKILL_NAMES } = require("./skill");
+const { hasSkill, SKILL_NAMES, hasUsedSkill } = require("./skill");
 
 const PLAYER_CARAC = {
   AG: "AG",
@@ -10,6 +10,17 @@ const PLAYER_CARAC = {
   ST: "ST",
 };
 
+function hasMove(player, game) {
+  if (
+    player.current_MA >= getMaxCarac(player, PLAYER_CARAC.MA, game) &&
+    player.current_gfi >= getMaxGfi(player) &&
+    !hasUsedSkill(player, SKILL_NAMES.JUMP_UP)
+  ) {
+    return false;
+  }
+  return true;
+}
+
 function arePlayingSameGame(p1, p2) {
   return p1.gameId == p2.gameId;
 }
@@ -210,4 +221,5 @@ module.exports = {
   isTeamPlaying,
   areFromSameTeam,
   hasTeam,
+  hasMove,
 };

package/skill.js

@@ -214,7 +214,15 @@ function getSkill(player, skillId, info = null) {
   const skill = playerSkills.find(
     (s) => s.skill_id === skillId && (info ? s.info === info : true)
   );
-  return skill;
+  return !!skill ? skill : false;
+}
+
+function hasUsedSkill(player, skill) {
+  const hasSkill = getSkill(player, skill);
+  if (hasSkill === false) {
+    return false;
+  }
+  return hasSkill.date_next !== null ? true : false;
 }
 
 function hasSkill(
@@ -415,4 +423,5 @@ module.exports = {
   useSkill,
   isNoTurnoverSkill,
   getNoTurnoverSkill,
+  hasUsedSkill,
 };

package/state.js

@@ -14,6 +14,7 @@ const PLAYER_STATE = {
   BLOCKED: 4,
 };
 
+// WARNING, check the state, no the player
 function isActive(state) {
   return state === PLAYER_STATE.ACTIVE;
 }