enefel 1.0.104 → 1.0.107

package/improvement.js

@@ -7,6 +7,26 @@ const SPP = {
   EXP_SOR: 2,
   EXP_TD: 3,
 };
+const ranges = [6, 16, 31, 51, 76, 176];
+const coachRanges = [3, 8, 15, 25, 36, 80];
+
+const getNextRange = (currentRange) => {
+  for (let i = 0; i < ranges.length; i++) {
+    if (currentRange < ranges[i]) {
+      return ranges[i];
+    }
+  }
+  return "∞";
+};
+
+const getNextRangeCoach = (currentRange) => {
+  for (let i = 0; i < coachRanges.length; i++) {
+    if (currentRange < coachRanges[i]) {
+      return coachRanges[i];
+    }
+  }
+  return "∞";
+};
 
 /* 
 SPPs Title Star Player Rolls
@@ -19,10 +39,10 @@ SPPs Title Star Player Rolls
  176+ Legend Six 
  */
 
-const ranges = [6, 16, 31, 51, 76, 176];
-const coachRanges = [3, 8, 15, 25, 36, 80];
 module.exports = {
   coachRanges,
+  getNextRange,
+  getNextRangeCoach,
   ranges,
   SPP,
 };

package/index.js

@@ -19,9 +19,9 @@ const {
   METEO,
 } = require("./meteo");
 const { distance } = require("./calcul");
-const { getCareerFromPlayer, getCareers } = require("./race");
+const { getCareerFromPlayer } = require("./race");
 const { getMaxMA } = require("./player");
-const INITIAL_REROLL = 2;
+
 const POSTULATION_HOURS = 24;
 const INACTIVE_DAYS = 10;
 const MAX_PLAYER_USER = 2;
@@ -922,7 +922,6 @@ module.exports = {
   getTeamColor,
   getThrowingBonus,
   haveSameTeam,
-  INITIAL_REROLL,
   isAdjacent,
   isCoach,
   isGameRunning,

package/package.json

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

package/race.js

@@ -1,4 +1,5 @@
 const { SKILL_NAMES } = require("./skill");
+const { canBeSelectedByUser } = require("./state");
 
 const ANIMOSITY_NUMBER = 2;
 
@@ -983,8 +984,18 @@ function getCareerRanges() {
   return [0, ...ranges];
 }
 
+const NB_MAX_PLAYERS = 2;
+
+function getPlayersAvailableForPromo(players = []) {
+  const playersByState = getPlayersByState(players);
+
+  return [...playersByState.actives, ...playersByState.lastRetired].slice(
+    0,
+    NB_MAX_PLAYERS
+  );
+}
+
 function getPromoCareer(careerId, userPlayers) {
-  const NB_MAX_PLAYERS = 2;
   const race = getRaceFromCareer(careerId);
   let promo = userPlayers
     .filter((p, i) => p && i < NB_MAX_PLAYERS && getRaceFromPlayer(p) === race)
@@ -1012,6 +1023,12 @@ function getTeamGroups(team) {
   return groups;
 }
 
+function isPlayerNeutralGroup(player) {
+  const group = getPlayerGroup(player);
+  const neutrals = [GROUP_NAME.NEUTRAL];
+  return neutrals.includes(group);
+}
+
 function isNeutralGroup(group) {
   const neutrals = [GROUP_NAME.NEUTRAL];
   return neutrals.includes(group);
@@ -1023,6 +1040,27 @@ function getTeamIncompatibleGroups(team) {
   return Object.entries(groups).filter((group) => !isNeutralGroup(group[0]));
 }
 
+const getPlayersByState = (players) => {
+  const playerActives = [];
+  const playerInactives = [];
+
+  for (const p of players) {
+    if (canBeSelectedByUser(p.state)) {
+      playerActives.push(p);
+    } else {
+      playerInactives.push(p);
+    }
+  }
+
+  return {
+    actives: playerActives,
+    inactives: playerInactives,
+    lastRetired: playerInactives.sort(
+      (a, b) => Date.parse(b.connectedAt) - Date.parse(a.connectedAt)
+    ),
+  };
+};
+
 module.exports = {
   ANIMOSITY_NUMBER,
   COMPATIBILITY,
@@ -1036,6 +1074,8 @@ module.exports = {
   getCareersByRace,
   getPlayerCompatibility,
   getPlayerGroup,
+  getPlayersAvailableForPromo,
+  getPlayersByState,
   getPriceCareer,
   getPromoCareer,
   getRaceFromCareer,
@@ -1045,5 +1085,6 @@ module.exports = {
   getTeamIncompatibleGroups,
   GROUP_NAME,
   isNeutralGroup,
+  isPlayerNeutralGroup,
   RACE,
 };

package/skill.js

@@ -171,7 +171,7 @@ function useSkill(player, skillId, date = -1, info = null) {
   skill.info = info;
 }
 
-function getSkill(player, skillId) {
+function getSkill(player, skillId, info = null) {
   if (!SKILLS.hasOwnProperty(skillId)) {
     throw `Skill '${skillId}' does not exist`;
   }
@@ -179,12 +179,20 @@ function getSkill(player, skillId) {
   if (!playerSkills) {
     return false;
   }
-  const skill = playerSkills.find((s) => s.skill_id === skillId);
+  const skill = playerSkills.find(
+    (s) => s.skill_id === skillId && (info ? s.info === info : true)
+  );
   return skill;
 }
 
-function hasSkill(player, skillId, withDate = false, checkActivated = true) {
-  const skill = getSkill(player, skillId);
+function hasSkill(
+  player,
+  skillId,
+  withDate = false,
+  checkActivated = true,
+  info = null
+) {
+  const skill = getSkill(player, skillId, info);
 
   const isActivated = (skill) =>
     checkActivated && isActivableSkills(skillId)

package/stadium.js

@@ -1,6 +1,6 @@
-const { INITIAL_REROLL } = require(".");
 const { d6 } = require("./random");
 
+const INITIAL_REROLL = 2;
 const MIN_SCRIMMAGE = 3; // TODO: in league param
 const MAX_LATERAL = 2;
 

package/state.js

@@ -85,42 +85,12 @@ function shouldBeRemovedFromTeam(state) {
   return state === PLAYER_STATE.BLOCKED || state === PLAYER_STATE.DEAD;
 }
 
-const getPlayersByState = (players) => {
-  const playerActives = [];
-  const playerInactives = [];
-  let lastRetired = null;
-
-  for (const p of players) {
-    if (canBeSelectedByUser(p.state)) {
-      playerActives.push(p);
-    } else {
-      playerInactives.push(p);
-    }
-  }
-
-  for (player of playerInactives) {
-    if (!lastRetired) {
-      lastRetired = player;
-    }
-    if (player.connectedAt > lastRetired.connectedAt) {
-      lastRetired = player;
-    }
-  }
-
-  return {
-    actives: playerActives,
-    inactives: playerInactives,
-    lastRetired,
-  };
-};
-
 module.exports = {
   canBeSelectedByUser,
   canJoinTeamWithState,
   canPlayLeague,
   canTeamPlayLeague,
   getPlayableStates,
-  getPlayersByState,
   isActive,
   isBlocked,
   isDead,