enefel 1.0.102 → 1.0.105

package/badge.js

@@ -1,5 +1,5 @@
 const { ranges } = require("./improvement");
-const race = require("./race");
+const { getCareers } = require("./race");
 
 const BADGE_NAMES = {
   KILL: "kill",
@@ -10,7 +10,7 @@ const badges = {};
 // "human-career": ranges,
 // "orc-career": ranges,
 // ...
-Object.values(race).forEach((r) => {
+Object.values(getCareers()).forEach((r) => {
   if (!badges[r.badge]) {
     badges[r.badge] = ranges;
   }

package/index.js

@@ -4,7 +4,7 @@ const {
   getDisturbingPresenceMalus,
 } = require("./skill");
 const { ranges } = require("./improvement");
-const races = require("./race");
+
 const {
   hasStatusStanding,
   hasStatusTacleZone,
@@ -19,7 +19,9 @@ const {
   METEO,
 } = require("./meteo");
 const { distance } = require("./calcul");
-const INITIAL_REROLL = 2;
+const { getCareerFromPlayer } = require("./race");
+const { getMaxMA } = require("./player");
+
 const POSTULATION_HOURS = 24;
 const INACTIVE_DAYS = 10;
 const MAX_PLAYER_USER = 2;
@@ -158,6 +160,8 @@ const GAME_HISTORY_INFO = {
   PASS: "p",
   REJECTION: "r",
   REROLL_COACH: "rc",
+  REROLL_RACE_MALUS: "rrm",
+  REROLL_METEO: "rm",
   REROLL: "re",
   SCATTER: "sc",
   SKILL: "sk",
@@ -222,21 +226,6 @@ const TAKE_BALL_TYPE = {
   CATCH_BOUNCE: "bounce",
 };
 
-const getCareers = () => {
-  const carrers = {};
-  for (const [name, values] of Object.entries(races)) {
-    const badge = values.badge;
-    if (!carrers[badge]) {
-      carrers[badge] = [];
-    }
-    if (!carrers[badge][values.range]) {
-      carrers[badge][values.range] = {};
-    }
-    carrers[badge][values.range][name] = values;
-  }
-  return carrers;
-};
-
 const p = (x, y) => {
   return { x: +x, y: +y };
 };
@@ -245,10 +234,6 @@ function shuffleArray(array) {
   return [...array].sort(() => 0.5 - Math.random());
 }
 
-function getMaxGfi(player) {
-  return hasSkill(player, SKILL_NAMES.SPRINT) ? 3 : 2;
-}
-
 function addSeconds(date, days) {
   const result = new Date(date);
   result.setSeconds(result.getSeconds() + days);
@@ -709,7 +694,7 @@ function getEnemyTackleZones(location, teamId, players) {
   });
 }
 
-function canBlock(attacker, defender, attackerTeam) {
+function canBlock(attacker, defender, attackerTeam, game) {
   if (
     !attacker ||
     !defender ||
@@ -733,7 +718,7 @@ function canBlock(attacker, defender, attackerTeam) {
 
   // No blitz available
   if (attackerTeam.date_next_blitz !== null) {
-    return attacker.current_MA === attacker.MA;
+    return attacker.current_MA === getMaxMA(attacker, game);
   } else {
     // Blitz available
 
@@ -768,10 +753,10 @@ function canPass(player, playerTeam, playerIdWithBall) {
   );
 }
 
-function canEndTurn(player) {
+function canEndTurn(player, game) {
   return (
     player.date_next_action === null &&
-    (player.has_action === false || player.current_MA < player.MA)
+    (player.has_action === false || player.current_MA < getMaxMA(player, game))
   );
 }
 
@@ -851,12 +836,12 @@ const isCoach = (player, team = null) => {
 };
 
 const getMoralModifier = (player) => {
-  const race = races[player.race_id];
+  const career = getCareerFromPlayer(player);
   let range = ranges.findIndex((range) => player.experience < range);
   if (range === -1) {
     range = ranges.length;
   }
-  return race.cost / 10 + range;
+  return career.cost / 10 + range;
 };
 
 const getAttackerStrength = (
@@ -898,7 +883,17 @@ const swapArrayLocs = (arr, index1, index2) => {
   return arr;
 };
 
+const getInactiveDays = (isDev = false) => {
+  return isDev ? 10000 : INACTIVE_DAYS;
+};
+
+const getMaxPlayers = (isDev = false) => {
+  return isDev ? 10000 : MAX_PLAYER_USER;
+};
+
 module.exports = {
+  getInactiveDays,
+  getMaxPlayers,
   addSeconds,
   availableSquaresToPushBack,
   canBlock,
@@ -919,18 +914,14 @@ module.exports = {
   getAttackerStrength,
   getBestInterceptor,
   getBlockAssistance,
-  getCareers,
   getDefenderStrength,
   getDicesBlock,
   getEnemyTackleZones,
-  getMaxGfi,
   getMoralModifier,
   getPlayerOnCell,
   getTeamColor,
   getThrowingBonus,
   haveSameTeam,
-  INACTIVE_DAYS,
-  INITIAL_REROLL,
   isAdjacent,
   isCoach,
   isGameRunning,
@@ -941,7 +932,6 @@ module.exports = {
   isSquareValidToPushBack,
   LAST_SEASON_ALPHA,
   MAX_PLAYER_TEAM,
-  MAX_PLAYER_USER,
   swapArrayLocs,
   p,
   PLAYER_HISTORY_INFO,

package/league.js

@@ -238,16 +238,7 @@ function sortLeagues(a, b) {
   return 0;
 }
 
-function getWinner(game) {
-  // TODO
-  if (game.score1 > game.score2) {
-    return game.team1_id;
-  } else {
-    return game.team2_id;
-  }
-}
 module.exports = {
-  getWinner,
   calculateTeamsStandingForNextSeason,
   hasCalendar,
   playoffNextSeason,

package/meteo.js

@@ -8,22 +8,40 @@ const METEO = {
   PERFECT_CONDITION: 7,
   HEAVY_SNOW: 8,
   BLIZZARD: 9,
+  MORNING_DEW: 10,
+  BLOSSOMING_FLOWERS: 11,
+  MISTY_MORNING: 12,
+  HIGH_WINDS: 13,
 };
 
 const SEASON = {
-  AUTUMN: 4,
+  WINTER: 1,
   SPRING: 2,
   SUMMER: 3,
-  WINTER: 1,
+  AUTUMN: 4,
 };
 
 const getSeason = () => {
-  return SEASON.WINTER;
+  return SEASON.SPRING;
   // return SEASON.AUTUMN;
 };
 
 const getMeteo = (value) => {
   const season = getSeason();
+  if (season === SEASON.SPRING) {
+    switch (value) {
+      case 2:
+        return METEO.MORNING_DEW;
+      case 3:
+        return METEO.BLOSSOMING_FLOWERS;
+      case 11:
+        return METEO.MISTY_MORNING;
+      case 12:
+        return METEO.HIGH_WINDS;
+      default:
+        return METEO.PERFECT_CONDITION;
+    }
+  }
   if (season === SEASON.WINTER) {
     switch (value) {
       case 2:
@@ -85,6 +103,17 @@ const meteoKO = (meteoValue) => {
   return modif;
 };
 
+// only pickup ball interaction
+const meteoPickUpBall = (meteoValue) => {
+  let modif = 0;
+
+  if (meteoValue === METEO.MORNING_DEW) {
+    modif = -1;
+  }
+  return modif;
+};
+
+// All ball interaction
 const meteoTakeBall = (meteoValue) => {
   let modif = 0;
   if (meteoValue === METEO.POURING_RAIN) {
@@ -117,28 +146,55 @@ const meteoGfi = (meteoValue) => {
   if (meteoValue === METEO.BLIZZARD) {
     modif = -1;
   }
+  if (meteoValue === METEO.MORNING_DEW) {
+    modif = -1;
+  }
   return modif;
 };
 
 const meteoMaxPassDistance = (meteoValue) => {
   // 3.5, 7, 10.2, 13.1
   let max = 14;
-  if (meteoValue === METEO.BLIZZARD) {
+  if (meteoValue === METEO.BLIZZARD || meteoValue === METEO.MISTY_MORNING) {
     max = 7;
   }
   return max;
 };
 
+const meteoHasExpulsion = (meteoValue) => {
+  if (meteoValue === METEO.BLOSSOMING_FLOWERS) {
+    return false;
+  }
+  return true;
+};
+
+const meteoMaxMA = (meteoValue) => {
+  if (meteoValue === METEO.MISTY_MORNING) {
+    return 6;
+  }
+  return Infinity;
+};
+
+const meteoRerollRoll = (meteoValue) => {
+  if (meteoValue === METEO.HIGH_WINDS) {
+    return 2;
+  }
+  return 1;
+};
 const tools = {
   getMeteo,
   METEO,
   meteoAttackerStrengthBlitz,
   meteoGfi,
+  meteoHasExpulsion,
   meteoKO,
+  meteoMaxMA,
   meteoMaxPassDistance,
   meteoPassBonus,
   meteoPassRebound,
+  meteoPickUpBall,
   meteoPlayerFall,
+  meteoRerollRoll,
   meteoTakeBall,
 };
 module.exports = tools;