enefel 1.0.105 → 1.0.108

package/.yarnrc

@@ -0,0 +1 @@
+registry "https://registry.yarnpkg.com"

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/league.js

@@ -1,8 +1,11 @@
 const { GAME_TYPE } = require(".");
 const { canPlayLeague } = require("./state");
 
-const GROUP_SIZE = 4;
-const HAS_NEXT_SEASON_PLAYOFF = true;
+const MIN_OPEN_SIZE = 4;
+const GROUP_SIZE = 8;
+const HAS_NEXT_SEASON_PLAYOFF = false;
+const CAN_CHOOSE_TO_PARTICIPATE = false;
+const HOME_AND_AWAY = false;
 
 const calculateTeamsStandingForPlayoff = (flatTeams, division) => {
   const standings = [{ teams: [] }];
@@ -75,10 +78,17 @@ const calculateTeamsStandingForPlayoff = (flatTeams, division) => {
   return flatedTeams;
 };
 
-const calculateTeamsStandingForLeagues = (newStandings, division) => {
+const calculateTeamsStandingForLeagues = (
+  newStandings,
+  division,
+  currentSeason
+) => {
+  const openDivision = newStandings[division.length - 1];
   for (let i = 0; i < division.length - 1; ++i) {
     const currentDivision = newStandings[i];
-    const nextDivision = newStandings[i + 1];
+    const nextDivision = currentSeason.playoff
+      ? openDivision
+      : newStandings[i + 1];
 
     const currentDivisionLastTeam =
       currentDivision.teams[currentDivision.teams.length - 1];
@@ -87,13 +97,20 @@ const calculateTeamsStandingForLeagues = (newStandings, division) => {
 
     if (nextDivision.name === GAME_TYPE.OPEN) {
       // To avoid some teams block the open, we take the first team with canChampionship
-      indexNextDivisionFirstTeam = nextDivision.teams.findIndex(
-        (t) => t.canChampionship
-      );
+
+      let alreadyFind = i;
+      indexNextDivisionFirstTeam = nextDivision.teams.findIndex((t, i) => {
+        if (currentSeason.playoff && i < alreadyFind) {
+          // Fix Si CAN_CHOOSE_TO_PARTICIPATE ?
+          return false;
+        }
+        return t.canChampionship || !CAN_CHOOSE_TO_PARTICIPATE;
+      });
       if (indexNextDivisionFirstTeam === -1) {
-        indexNextDivisionFirstTeam = 0;
+        indexNextDivisionFirstTeam = currentSeason.playoff ? i : 0;
       }
     }
+
     const nextDivisionFirstTeam =
       nextDivision.teams[indexNextDivisionFirstTeam];
 
@@ -109,7 +126,7 @@ const calculateTeamsStandingForLeagues = (newStandings, division) => {
   return flatTeams;
 };
 
-const calculateTeamsStandingForNextSeason = (division) => {
+const calculateTeamsStandingForNextSeason = (division, currentSeason) => {
   division = division.filter(
     (d) => d.name !== GAME_TYPE.FRIENDLY && d.name !== GAME_TYPE.PLAYOFF
   );
@@ -123,7 +140,11 @@ const calculateTeamsStandingForNextSeason = (division) => {
   if (HAS_NEXT_SEASON_PLAYOFF && GROUP_SIZE * 3 < flatTeams.length) {
     return calculateTeamsStandingForPlayoff(flatTeams, division);
   }
-  return calculateTeamsStandingForLeagues(newStandings, division);
+  return calculateTeamsStandingForLeagues(
+    newStandings,
+    division,
+    currentSeason
+  );
 };
 
 const forcastNextSeason = (flatTeams) => {
@@ -137,7 +158,10 @@ const forcastNextSeason = (flatTeams) => {
       return;
     }
     // En playoff on n'a que les ligues A et B + open
-    if (!team.canChampionship || i >= 2) {
+    if (
+      (CAN_CHOOSE_TO_PARTICIPATE && !team.canChampionship) ||
+      (i >= 2 && HAS_NEXT_SEASON_PLAYOFF)
+    ) {
       open.push(team);
       return;
     }
@@ -150,8 +174,7 @@ const forcastNextSeason = (flatTeams) => {
     }
   });
   open = [...currentGroup, ...open];
-
-  if (open.length < GROUP_SIZE) {
+  if (open.length < MIN_OPEN_SIZE) {
     const lastDivision = groups.pop();
     if (lastDivision) {
       open = [...lastDivision, ...open];
@@ -182,7 +205,7 @@ const playoffNextSeason = (flatTeams) => {
   // Le reste est mis en open
   open = [...currentGroup, ...open];
 
-  if (open.length < GROUP_SIZE) {
+  if (open.length < MIN_OPEN_SIZE) {
     const lastDivision = groups.pop();
     if (lastDivision) {
       open = [...lastDivision, ...open];
@@ -240,7 +263,12 @@ function sortLeagues(a, b) {
 
 module.exports = {
   calculateTeamsStandingForNextSeason,
+  CAN_CHOOSE_TO_PARTICIPATE,
+  GROUP_SIZE,
+  HAS_NEXT_SEASON_PLAYOFF,
   hasCalendar,
+  HOME_AND_AWAY,
+  MIN_OPEN_SIZE,
   playoffNextSeason,
   sortLeagues,
   tournament,

package/package.json

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

package/race.js

@@ -1023,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);
@@ -1079,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/yarn-error.log

@@ -0,0 +1,46 @@
+Arguments: 
+  C:\Program Files\nodejs\node.exe C:\Program Files (x86)\Yarn\bin\yarn.js
+
+PATH: 
+  C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files (x86)\Yarn\bin\;C:\Program Files\nodejs\;C:\Users\yoann\.windows-build-tools\python27\;C:\Users\yoann\AppData\Local\Microsoft\WindowsApps;C:\Users\yoann\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\yoann\AppData\Local\Yarn\bin;C:\Program Files\Docker Toolbox;C:\Program Files\Java\jdk1.8.0_221;C:\Users\yoann\AppData\Roaming\npm;C:\Program Files\heroku\bin
+
+Yarn version: 
+  1.10.1
+
+Node version: 
+  12.13.1
+
+Platform: 
+  win32 x64
+
+Trace: 
+  SyntaxError: Unknown token: { line: 1, col: 39, type: 'INVALID', value: undefined } 1:39 in C:\dev\e2\enefel\.yarnrc
+      at Parser.unexpected (C:\Program Files (x86)\Yarn\lib\cli.js:57347:11)
+      at Parser.parse (C:\Program Files (x86)\Yarn\lib\cli.js:57478:14)
+      at parse (C:\Program Files (x86)\Yarn\lib\cli.js:57549:17)
+      at module.exports.exports.default (C:\Program Files (x86)\Yarn\lib\cli.js:57113:96)
+      at YarnRegistry.<anonymous> (C:\Program Files (x86)\Yarn\lib\cli.js:82396:64)
+      at Generator.next (<anonymous>)
+      at step (C:\Program Files (x86)\Yarn\lib\cli.js:98:30)
+      at C:\Program Files (x86)\Yarn\lib\cli.js:109:13
+
+npm manifest: 
+  {
+    "name": "enefel",
+    "version": "1.0.1",
+    "main": "index.js",
+    "author": "Manest",
+    "license": "MIT",
+    "devDependencies": {
+      "jest": "^24.9.0"
+    },
+    "scripts": {
+      "test": "jest"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile