enefel 1.0.83 → 1.0.87

package/index.js

@@ -9,7 +9,11 @@ const {
   hasStatusCanFaceup,
   hasStatusCanStandup,
 } = require("./status");
-
+const {
+  meteoAttackerStrengthBlitz,
+  meteoMaxPassDistance,
+  METEO,
+} = require("./meteo");
 const INITIAL_REROLL = 2;
 const POSTULATION_HOURS = 24;
 const INACTIVE_DAYS = 10;
@@ -590,7 +594,7 @@ const isOnLine = (A, B, C) => {
   return AC + BC >= AB - 0.1 && AC + BC <= AB + 0.7 && AC < AB;
 };
 
-const getThrowingBonus = (p1, p2) => {
+const getThrowingBonus = (p1, p2, game) => {
   if (
     !(
       Number.isInteger(p1.x) &&
@@ -614,7 +618,7 @@ const getThrowingBonus = (p1, p2) => {
   //empireoublie.free.fr/docs/table_intercept.pdf
   //https://play.google.com/store/apps/details?id=com.cyberedelf.interception
 
-  if (dist < 1 || dist >= 14) {
+  if (dist < 1 || dist >= meteoMaxPassDistance(game.meteo)) {
     return null;
   }
   if (dist >= 1 && dist < 3.5) {
@@ -846,16 +850,38 @@ const getMoralModifier = (player) => {
   return race.cost / 10 + range;
 };
 
+const getAttackerStrength = (
+  player,
+  isBlitz = false,
+  meteoValue = METEO.PERFECT_CONDITION
+) => {
+  try {
+    let bonus = isBlitz ? meteoAttackerStrengthBlitz(meteoValue) : 0;
+    const hasHorn = hasSkill(player, SKILL_NAMES.HORNS);
+    bonus += isBlitz && hasHorn ? 1 : 0;
+    return player.current_ST + bonus;
+  } catch (e) {
+    throw new Error(`Error in getAttackerStrength: ${e}`);
+  }
+};
+
+const getDefenderStrength = (player) => {
+  return player.current_ST;
+};
+
 module.exports = {
+  getDefenderStrength,
   addSeconds,
   availableSquaresToPushBack,
   canBlock,
+  canEndTurn,
   canFaceUp,
   canFoul,
   canMove,
   canPass,
   canPlayerIntercepts,
   canStandup,
+  canThrowTeamMate,
   canTransmit,
   distance,
   FORMATION_DEFAULT_NAME,
@@ -863,6 +889,7 @@ module.exports = {
   GAME_HISTORY_TYPE,
   GAME_STATUS,
   GAME_TYPE,
+  getAttackerStrength,
   getBestInterceptor,
   getBlockAssistance,
   getCareers,
@@ -892,7 +919,5 @@ module.exports = {
   PLAYER_STAT,
   POSTULATION_HOURS,
   shuffleArray,
-  canThrowTeamMate,
-  canEndTurn,
   TAKE_BALL_TYPE,
 };

package/meteo.js

@@ -3,7 +3,11 @@ const METEO = {
   AUTUMNAL_CHILL: 2,
   POURING_RAIN: 3,
   STRONG_WINDS: 4,
+  COLD_WINDS: 5,
+  FREEZING: 6,
   PERFECT_CONDITION: 7,
+  HEAVY_SNOW: 8,
+  BLIZZARD: 9,
 };
 
 const SEASON = {
@@ -14,11 +18,26 @@ const SEASON = {
 };
 
 const getSeason = () => {
-  return SEASON.AUTUMN;
+  return SEASON.WINTER;
+  // return SEASON.AUTUMN;
 };
 
 const getMeteo = (value) => {
   const season = getSeason();
+  if (season === SEASON.WINTER) {
+    switch (value) {
+      case 2:
+        return METEO.COLD_WINDS;
+      case 3:
+        return METEO.FREEZING;
+      case 11:
+        return METEO.HEAVY_SNOW;
+      case 12:
+        return METEO.BLIZZARD;
+      default:
+        return METEO.PERFECT_CONDITION;
+    }
+  }
   if (season === SEASON.AUTUMN) {
     switch (value) {
       case 2:
@@ -36,62 +55,89 @@ const getMeteo = (value) => {
   return METEO.PERFECT_CONDITION;
 };
 
+const meteoAttackerStrengthBlitz = (meteoValue) => {
+  let modif = 0;
+  if (meteoValue === METEO.HEAVY_SNOW) {
+    modif = -1;
+  }
+  return modif;
+};
+
 const meteoPlayerFall = (meteoValue) => {
   let modif = 0;
-  if (meteoValue) {
-    if (meteoValue === METEO.AUTUMN_LEAF_STREWN_PITCH) {
-      modif = -1;
-    }
+  if (meteoValue === METEO.AUTUMN_LEAF_STREWN_PITCH) {
+    modif = -1;
+  }
+  if (meteoValue === METEO.FREEZING) {
+    modif = 1;
   }
   return modif;
 };
 
 const meteoKO = (meteoValue) => {
   let modif = 0;
-  if (meteoValue) {
-    if (meteoValue === METEO.AUTUMNAL_CHILL) {
-      modif = -1;
-    }
+  if (meteoValue === METEO.AUTUMNAL_CHILL) {
+    modif = -1;
+  }
+  if (meteoValue === METEO.COLD_WINDS) {
+    modif = -1;
   }
   return modif;
 };
 
 const meteoTakeBall = (meteoValue) => {
   let modif = 0;
-  if (meteoValue) {
-    if (meteoValue === METEO.POURING_RAIN) {
-      modif = -1;
-    }
+  if (meteoValue === METEO.POURING_RAIN) {
+    modif = -1;
   }
   return modif;
 };
 
 const meteoPassRebound = (meteoValue) => {
   let modif = 0;
-  if (meteoValue) {
-    if (meteoValue === METEO.STRONG_WINDS) {
-      modif = 3;
-    }
+  if (meteoValue === METEO.STRONG_WINDS) {
+    modif = 3;
   }
   return modif;
 };
 
 const meteoPassBonus = (meteoValue) => {
   let modif = 0;
-  if (meteoValue) {
-    if (meteoValue === METEO.STRONG_WINDS) {
-      modif = -1;
-    }
+  if (meteoValue === METEO.STRONG_WINDS) {
+    modif = -1;
+  }
+  if (meteoValue === METEO.COLD_WINDS) {
+    modif = -1;
   }
   return modif;
 };
 
+const meteoGfi = (meteoValue) => {
+  let modif = 0;
+  if (meteoValue === METEO.BLIZZARD) {
+    modif = -1;
+  }
+  return modif;
+};
+
+const meteoMaxPassDistance = (meteoValue) => {
+  // 3.5, 7, 10.2, 13.1
+  let max = 14;
+  if (meteoValue === METEO.BLIZZARD) {
+    max = 7;
+  }
+  return max;
+};
+
 const tools = {
-  meteoPassBonus,
-  meteoPassRebound,
   getMeteo,
   METEO,
+  meteoAttackerStrengthBlitz,
+  meteoGfi,
   meteoKO,
+  meteoMaxPassDistance,
+  meteoPassBonus,
+  meteoPassRebound,
   meteoPlayerFall,
   meteoTakeBall,
 };

package/package.json

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

package/skill.js

@@ -28,8 +28,10 @@ const SKILL_NAMES = {
   DUMP_OFF: "dump-off",
   FEND: "fend",
   FRENZY: "frenzy",
+  FUMBLEROOSKIE: "fumblerooskie",
   GUARD: "guard",
   HORNS: "horns",
+  IRON_HARD_SKIN: "iron-hard-skin",
   JUGGERNAUT: "juggernaut",
   JUMP_UP: "jump-up",
   LEAP: "leap",
@@ -56,6 +58,7 @@ const SKILL_NAMES = {
   SURE_FEET: "sure-feet",
   SURE_HANDS: "sure-hands",
   TACKLE: "tackle",
+  TENTACLES: "tentacles",
   THICK_SKULL: "thick-skull",
   THROW_TEAM_MATE: "throw-team-mate",
   TWO_HEADS: "two-heads",
@@ -99,8 +102,10 @@ const SKILLS = {
   [SKILL_NAMES.DUMP_OFF]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.FEND]: SKILL_TYPE.GENERAL,
   [SKILL_NAMES.FRENZY]: SKILL_TYPE.GENERAL,
+  [SKILL_NAMES.FUMBLEROOSKIE]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.GUARD]: SKILL_TYPE.STRENGTH,
   [SKILL_NAMES.HORNS]: SKILL_TYPE.MUTATION,
+  [SKILL_NAMES.IRON_HARD_SKIN]: SKILL_TYPE.MUTATION,
   [SKILL_NAMES.JUGGERNAUT]: SKILL_TYPE.STRENGTH,
   [SKILL_NAMES.JUMP_UP]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.LEAP]: SKILL_TYPE.AGILITY,
@@ -127,6 +132,7 @@ const SKILLS = {
   [SKILL_NAMES.SURE_FEET]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.SURE_HANDS]: SKILL_TYPE.GENERAL,
   [SKILL_NAMES.TACKLE]: SKILL_TYPE.GENERAL,
+  [SKILL_NAMES.TENTACLES]: SKILL_TYPE.MUTATION,
   [SKILL_NAMES.THICK_SKULL]: SKILL_TYPE.STRENGTH,
   [SKILL_NAMES.THROW_TEAM_MATE]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.TWO_HEADS]: SKILL_TYPE.MUTATION,
@@ -146,7 +152,9 @@ function useSkill(player, skillId, date = -1, info = null) {
   }
   const skill = playerSkills.find((s) => s.skill_id === skillId);
   skill.date_next =
-    date === -1 ? new Date(Date.now() + getTime(TYPE_TIMER.ACTION) * 1000) : date;
+    date === -1
+      ? new Date(Date.now() + getTime(TYPE_TIMER.ACTION) * 1000)
+      : date;
   skill.info = info;
 }
 
@@ -197,11 +205,12 @@ const getPlayersWithSkill = (players, skillId) => {
 
 const isActivableSkills = (skill) => {
   const activables = [
-    SKILL_NAMES.WRESTLE,
+    SKILL_NAMES.BRAWLER,
     SKILL_NAMES.DUMP_OFF,
     SKILL_NAMES.JUGGERNAUT,
-    SKILL_NAMES.BRAWLER,
     SKILL_NAMES.PILE_DRIVER,
+    SKILL_NAMES.TENTACLES,
+    SKILL_NAMES.WRESTLE,
   ];
   return activables.includes(skill);
 };