enefel 1.0.117 → 1.0.120

package/color.js

@@ -1,5 +1,28 @@
 const _ = require("lodash");
 
+const colorShade = (col, amt) => {
+  col = col.replace(/^#/, "");
+  if (col.length === 3)
+    col = col[0] + col[0] + col[1] + col[1] + col[2] + col[2];
+
+  let [r, g, b] = col.match(/.{2}/g);
+  [r, g, b] = [
+    parseInt(r, 16) + amt,
+    parseInt(g, 16) + amt,
+    parseInt(b, 16) + amt,
+  ];
+
+  r = Math.max(Math.min(255, r), 0).toString(16);
+  g = Math.max(Math.min(255, g), 0).toString(16);
+  b = Math.max(Math.min(255, b), 0).toString(16);
+
+  const rr = (r.length < 2 ? "0" : "") + r;
+  const gg = (g.length < 2 ? "0" : "") + g;
+  const bb = (b.length < 2 ? "0" : "") + b;
+
+  return `#${rr}${gg}${bb}`;
+};
+
 function deltaE(rgbA, rgbB) {
   let labA = rgb2lab(rgbA);
   let labB = rgb2lab(rgbB);
@@ -97,8 +120,9 @@ const getGameColors = (game) => {
 };
 
 module.exports = {
+  colorShade,
+  getGameColors,
   invertColor,
   isColor,
   isColorTooClose,
-  getGameColors,
 };

package/game.js

@@ -0,0 +1,41 @@
+const GAME_TYPE = {
+  DIVISION: "division",
+  FRIENDLY: "friendly",
+  OPEN: "open",
+  PLAYOFF: "playoff",
+};
+
+const GAME_STATUS = {
+  WAITING: 0,
+  BEFORE: 1,
+  ONGOING: 2,
+  TD: 3,
+  END: 4,
+  FINISH: 5, // pop and po calculated
+};
+
+const hasGameCasualty = (game) => {
+  return game.type !== GAME_TYPE.FRIENDLY;
+};
+
+const getGameFanBonus = (game) => {
+  if (game.type === GAME_TYPE.FRIENDLY) {
+    return -5;
+  }
+  if (game.type === GAME_TYPE.PLAYOFF) {
+    return 5;
+  }
+  return 0;
+};
+
+const getGameFan = (game) => {
+  return Random.d6(2) + getGameFanBonus(game);
+};
+
+module.exports = {
+  GAME_TYPE,
+  GAME_STATUS,
+  hasGameCasualty,
+  getGameFan,
+  getGameFanBonus,
+};

package/improvement.js

@@ -1,15 +1,56 @@
+const { GAME_TYPE } = require("./game");
+
 // STAR PLAYER POINTS
+const SPP_TYPE = {
+  BONUS: "BONUS",
+  INT: "INT",
+  KO: "KO",
+  REU: "REU",
+  SOR: "SOR",
+  TD: "TD",
+};
+
 const SPP = {
-  EXP_BONUS: 1,
-  EXP_INT: 2,
-  EXP_KO: 1,
-  EXP_REU: 1,
-  EXP_SOR: 2,
-  EXP_TD: 3,
+  [GAME_TYPE.FRIENDLY]: {
+    EXP_BONUS: 0,
+    EXP_INT: 1,
+    EXP_KO: 0,
+    EXP_REU: 0,
+    EXP_SOR: 1,
+    EXP_TD: 1,
+  },
+  [GAME_TYPE.DIVISION]: {
+    EXP_BONUS: 1,
+    EXP_INT: 2,
+    EXP_KO: 1,
+    EXP_REU: 1,
+    EXP_SOR: 2,
+    EXP_TD: 3,
+  },
+  [GAME_TYPE.OPEN]: {
+    EXP_BONUS: 1,
+    EXP_INT: 2,
+    EXP_KO: 1,
+    EXP_REU: 1,
+    EXP_SOR: 2,
+    EXP_TD: 3,
+  },
+  [GAME_TYPE.PLAYOFF]: {
+    EXP_BONUS: 1,
+    EXP_INT: 2,
+    EXP_KO: 1,
+    EXP_REU: 1,
+    EXP_SOR: 2,
+    EXP_TD: 3,
+  },
 };
 const ranges = [6, 16, 31, 51, 76, 176];
 const coachRanges = [3, 8, 15, 25, 36, 80];
 
+const getSPP = (game, type) => {
+  return SPP[game.type][`EXP_${type}`];
+};
+
 const getNextRange = (currentRange) => {
   for (let i = 0; i < ranges.length; i++) {
     if (currentRange < ranges[i]) {
@@ -43,6 +84,7 @@ module.exports = {
   coachRanges,
   getNextRange,
   getNextRangeCoach,
+  getSPP,
   ranges,
-  SPP,
+  SPP_TYPE,
 };

package/index.js

@@ -21,6 +21,7 @@ const {
 const { distance } = require("./calcul");
 const { getCareerFromPlayer } = require("./race");
 const { getMaxMA } = require("./player");
+const { GAME_STATUS } = require("./game");
 
 const POSTULATION_HOURS = 24;
 const INACTIVE_DAYS = 10;
@@ -160,12 +161,13 @@ const GAME_HISTORY_INFO = {
   PASS: "p",
   REJECTION: "r",
   REROLL_COACH: "rc",
-  REROLL_RACE_MALUS: "rrm",
   REROLL_METEO: "rm",
+  REROLL_RACE_MALUS: "rrm",
   REROLL: "re",
   SCATTER: "sc",
   SKILL: "sk",
   SPY: "spy",
+  STANDUP: "st",
   START_FAN: "fan",
   STATUS: "s",
   TAKE_BALL: "t",
@@ -203,22 +205,6 @@ const PLAYER_HISTORY_INFO = {
   EXP_COACH: "ecoach",
 };
 
-const GAME_STATUS = {
-  WAITING: 0,
-  BEFORE: 1,
-  ONGOING: 2,
-  TD: 3,
-  END: 4,
-  FINISH: 5, // pop and po calculated
-};
-
-const GAME_TYPE = {
-  DIVISION: "division",
-  FRIENDLY: "friendly",
-  OPEN: "open",
-  PLAYOFF: "playoff",
-};
-
 const TAKE_BALL_TYPE = {
   CATCH_PASS: "pass",
   CATCH_HANDOFF: "hand-off",
@@ -917,8 +903,6 @@ module.exports = {
   FORMATION_DEFAULT_NAME,
   GAME_HISTORY_INFO,
   GAME_HISTORY_TYPE,
-  GAME_STATUS,
-  GAME_TYPE,
   getAttackerStrength,
   getBestInterceptor,
   getBlockAssistance,

package/league.js

@@ -1,4 +1,4 @@
-const { GAME_TYPE } = require(".");
+const { GAME_TYPE } = require("./game");
 const { canPlayLeague } = require("./state");
 
 const MIN_OPEN_SIZE = 4;
@@ -6,6 +6,7 @@ const GROUP_SIZE = 8;
 const HAS_NEXT_SEASON_PLAYOFF = false;
 const CAN_CHOOSE_TO_PARTICIPATE = false;
 const HOME_AND_AWAY = false;
+const NUMBER_TEAM_CHANGE = 2;
 
 const calculateTeamsStandingForPlayoff = (flatTeams, division) => {
   const standings = [{ teams: [] }];
@@ -78,6 +79,32 @@ const calculateTeamsStandingForPlayoff = (flatTeams, division) => {
   return flatedTeams;
 };
 
+const getIndexNextAvailableTeam = (
+  index,
+  nextDivision,
+  currentSeason,
+  currentDivisionIndex
+) => {
+  if (nextDivision.name === GAME_TYPE.OPEN) {
+    // To avoid some teams block the open, we take the first team with canChampionship
+
+    let alreadyFind = currentDivisionIndex;
+    index = nextDivision.teams.findIndex((t, i) => {
+      if (i < index) {
+        return false;
+      }
+      if (currentSeason.playoff && i < alreadyFind) {
+        // Fix Si CAN_CHOOSE_TO_PARTICIPATE ?
+        return false;
+      }
+      return t.canChampionship || !CAN_CHOOSE_TO_PARTICIPATE;
+    });
+    if (index === -1) {
+      index = currentSeason.playoff ? i : 0;
+    }
+  }
+  return index;
+};
 const calculateTeamsStandingForLeagues = (
   newStandings,
   division,
@@ -92,32 +119,38 @@ const calculateTeamsStandingForLeagues = (
 
     const currentDivisionLastTeam =
       currentDivision.teams[currentDivision.teams.length - 1];
+    const currentDivisionPreLastTeam =
+      currentDivision.teams[currentDivision.teams.length - 2];
 
-    let indexNextDivisionFirstTeam = 0;
-
-    if (nextDivision.name === GAME_TYPE.OPEN) {
-      // To avoid some teams block the open, we take the first team with 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 = currentSeason.playoff ? i : 0;
-      }
-    }
+    let indexNextDivisionFirstTeam = getIndexNextAvailableTeam(
+      0,
+      nextDivision,
+      currentSeason,
+      i
+    );
 
     const nextDivisionFirstTeam =
       nextDivision.teams[indexNextDivisionFirstTeam];
 
+    let indexNextDivisionSecondTeam = getIndexNextAvailableTeam(
+      indexNextDivisionFirstTeam + 1,
+      nextDivision,
+      currentSeason,
+      i
+    );
+    const nextDivisionSecondTeam =
+      nextDivision.teams[indexNextDivisionSecondTeam];
+
     currentDivision.teams[currentDivision.teams.length - 1] =
       nextDivisionFirstTeam;
-
     nextDivision.teams[indexNextDivisionFirstTeam] = currentDivisionLastTeam;
+
+    if (NUMBER_TEAM_CHANGE === 2 && nextDivisionSecondTeam) {
+      currentDivision.teams[currentDivision.teams.length - 2] =
+        nextDivisionSecondTeam;
+      nextDivision.teams[indexNextDivisionSecondTeam] =
+        currentDivisionPreLastTeam;
+    }
   }
   const flatTeams = newStandings
     .reduce((p, c) => [...p, ...c.teams], [])
@@ -148,7 +181,6 @@ const calculateTeamsStandingForNextSeason = (division, currentSeason) => {
 };
 
 const forcastNextSeason = (flatTeams) => {
-  // debugger;
   let groups = [];
   let open = [];
   let currentGroup = [];
@@ -189,7 +221,7 @@ const playoffNextSeason = (flatTeams) => {
   let open = [];
   let currentGroup = [];
 
-  // Creation de groupe de 4
+  // Creation de groupe de GROUP_SIZE
   flatTeams.forEach((team) => {
     if (!team) {
       return;
@@ -269,6 +301,7 @@ module.exports = {
   hasCalendar,
   HOME_AND_AWAY,
   MIN_OPEN_SIZE,
+  NUMBER_TEAM_CHANGE,
   playoffNextSeason,
   sortLeagues,
   tournament,

package/package.json

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

package/right.js

@@ -1,4 +1,5 @@
-const { MAX_PLAYER_TEAM, GAME_STATUS } = require(".");
+const { MAX_PLAYER_TEAM } = require(".");
+const { GAME_STATUS } = require("./game");
 const { getSkillLimitSizeTeam } = require("./skill");
 const { canJoinTeamWithState, isTeamActive, isActive } = require("./state");
 

package/skill.js

@@ -9,6 +9,10 @@ const SPECIALIST_LIMIT = 6;
 const SKILL_INFO_ACTIVE = "active";
 const SKILL_INFO_INACTIVE = "inactive";
 
+// TODO 
+// Take Root
+// Timmm-ber!
+ 
 // Missing for races
 const SKILL_NAMES = {
   ACCURATE: "accurate",