enefel 1.0.135 → 1.0.136

package/badge.js

@@ -2,9 +2,10 @@ const { getCareers } = require("./career");
 const { ranges } = require("./improvement");
 
 const BADGE_NAMES = {
-  KILL: "kill",
-  DEAD: "dead",
   BLOODTHIRSTY: "bloodthirsty",
+  DEAD: "dead",
+  KILL: "kill",
+  NURGLE: "nurgle",
 };
 const badges = {};
 
@@ -19,6 +20,7 @@ Object.values(getCareers()).forEach((r) => {
 badges[BADGE_NAMES.KILL] = [0, 1, 2, 3, 5, 7, 9]; // 10 max
 badges[BADGE_NAMES.DEAD] = [0, 1, 2, 3, 5, 7, 9]; // 10 max
 badges[BADGE_NAMES.BLOODTHIRSTY] = [0]; // 1 max
+badges[BADGE_NAMES.NURGLE] = [0]; // 1 max
 
 function getBadgeMaxLevel(badge) {
   return badges[badge.badge_id].length;

package/career.js

@@ -148,10 +148,7 @@ const CAREER = {
     double: "AS",
     normalCoach: "G",
     icons: ["nurgle-rotter1"],
-    skills: [
-      SKILL_NAMES.DECAY,
-      //SKILL_NAMES.PLAGUE_RIDDEN
-    ],
+    skills: [SKILL_NAMES.DECAY, SKILL_NAMES.PLAGUE_RIDDEN],
     badge: RACE.NURGLE,
     range: 0,
     cost: 35,
@@ -169,7 +166,7 @@ const CAREER = {
       SKILL_NAMES.HORNS,
       SKILL_NAMES.REGENERATION,
       SKILL_NAMES.SPECIALIST,
-      // SKILL_NAMES.PLAGUE_RIDDEN
+      SKILL_NAMES.PLAGUE_RIDDEN,
     ],
     badge: RACE.NURGLE,
     range: 1,
@@ -189,7 +186,7 @@ const CAREER = {
       SKILL_NAMES.FOUL_APPEARANCE,
       SKILL_NAMES.REGENERATION,
       SKILL_NAMES.STAR,
-      // SKILL_NAMES.PLAGUE_RIDDEN
+      SKILL_NAMES.PLAGUE_RIDDEN,
     ],
     badge: RACE.NURGLE,
     range: 5,
@@ -210,7 +207,7 @@ const CAREER = {
       [SKILL_NAMES.LONER, 4],
       SKILL_NAMES.MIGHTY_BLOW,
       SKILL_NAMES.REGENERATION,
-      // SKILL_NAMES.PLAGUE_RIDDEN
+      SKILL_NAMES.PLAGUE_RIDDEN,
       SKILL_NAMES.REALLY_STUPID,
       SKILL_NAMES.TENTACLES,
       SKILL_NAMES.BIG_GUY,

package/index.js

@@ -20,7 +20,7 @@ const {
 } = require("./meteo");
 const { distance } = require("./calcul");
 const { getCareerFromPlayer } = require("./race");
-const { getMaxMA } = require("./player");
+const { getMaxCarac, PLAYER_CARAC } = require("./player");
 const { GAME_STATUS } = require("./game");
 
 const POSTULATION_HOURS = 24;
@@ -141,6 +141,7 @@ const GAME_HISTORY_INFO = {
   ARMOR: "ar",
   BALL: "ball",
   BLOCK: "b",
+  CARAC_CHANGE: "cc",
   CASUALTY: "ca",
   DODGE: "d",
   END_PO: "endpo",
@@ -164,13 +165,14 @@ const GAME_HISTORY_INFO = {
   PASS: "p",
   REJECTION: "r",
   REROLL_COACH: "rc",
+  REROLL_INITIAL: "rei",
   REROLL_METEO: "rm",
   REROLL_RACE_MALUS: "rrm",
-  REROLL_INITIAL: "rei",
   REROLL: "re",
   SCATTER: "sc",
-  SKILL: "sk",
+  SKILL_GAIN: "skg",
   SKILL_LOSS: "skl",
+  SKILL: "sk",
   SPY: "spy",
   STANDUP: "st",
   START_FAN: "fan",
@@ -691,7 +693,7 @@ function getEnemyTackleZones(location, teamId, players) {
   });
 }
 
-function canBlock(attacker, defender, attackerTeam, game) {
+function canBlock(attacker, defender, attackerTeam, game, withModif = true) {
   if (
     !attacker ||
     !defender ||
@@ -715,7 +717,9 @@ function canBlock(attacker, defender, attackerTeam, game) {
 
   // No blitz available
   if (attackerTeam.date_next_blitz !== null) {
-    return attacker.current_MA === getMaxMA(attacker, game);
+    return attacker.current_MA === withModif
+      ? getMaxCarac(attacker, PLAYER_CARAC.MA, game)
+      : attacker.MA;
   } else {
     // Blitz available
 
@@ -753,7 +757,8 @@ function canPass(player, playerTeam, playerIdWithBall) {
 function canEndTurn(player, game) {
   return (
     player.date_next_action === null &&
-    (player.has_action === false || player.current_MA < getMaxMA(player, game))
+    (player.has_action === false ||
+      player.current_MA < getMaxCarac(player, PLAYER_CARAC.MA, game))
   );
 }
 

package/item.js

@@ -0,0 +1,38 @@
+const RARITY = {
+  COMMUN: "c",
+  UNCOMMUN: "u",
+  RARE: "r",
+  EPIC: "e",
+  LEGENDARY: "l",
+};
+
+const ITEM_ID = {
+  BEER: "beer",
+  DRUG: "drug",
+  GREEN_PILL: "green-pill",
+  NEWSPAPER: "newspaper",
+};
+
+const getQteFromRarity = (rarity) => {
+  if (rarity === RARITY.COMMUN) {
+    return 10000;
+  }
+  if (rarity === RARITY.UNCOMMUN) {
+    return 1000;
+  }
+  if (rarity === RARITY.RARE) {
+    return 100;
+  }
+  if (rarity === RARITY.EPIC) {
+    return 10;
+  }
+  if (rarity === RARITY.LEGENDARY) {
+    return 1;
+  }
+};
+
+module.exports = {
+  RARITY,
+  ITEM_ID,
+  getQteFromRarity,
+};

package/package.json

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

package/player.js

@@ -1,5 +1,7 @@
+const { getCareers } = require("./career");
 const { ranges, getAgingMinExperience } = require("./improvement");
 const { meteoMaxMA } = require("./meteo");
+const { getCareerFromPlayer } = require("./race");
 const { hasSkill, SKILL_NAMES } = require("./skill");
 
 const PLAYER_CARAC = {
@@ -9,19 +11,97 @@ const PLAYER_CARAC = {
   ST: "ST",
 };
 
-function getMaxMA(player, game) {
+function getCareerBaseCarac(player, carac) {
+  const career = getCareerFromPlayer(player);
+  if (!career) {
+    throw new Error("No career for player " + player.id);
+  }
+  return career[carac];
+}
+
+function getCareerBaseCaracLimit(player, value, carac) {
+  const base = getCareerBaseCarac(player, carac);
+  if (value > base + 2) {
+    value = base + 2;
+  }
+  if (value < base - 2) {
+    value = base - 2;
+  }
+  return value;
+}
+
+function getMaxCarac(player, carac, game) {
   if (!player) {
     return null;
   }
+  if (carac === PLAYER_CARAC.AG) {
+    return getMaxAG(player, game);
+  } else if (carac === PLAYER_CARAC.MA) {
+    return getMaxMA(player, game);
+  } else if (carac === PLAYER_CARAC.AV) {
+    return getMaxAV(player, game);
+  } else if (carac === PLAYER_CARAC.ST) {
+    return getMaxST(player, game);
+  }
+}
+
+function getMaxCommun(player, carac, game) {
+  let c = player[carac];
+  if (!player.tempCarac) {
+    return c;
+  }
+  const obj = JSON.parse(player.tempCarac);
+  for (const value of Object.values(obj)) {
+    if (value.gainCarac === PLAYER_CARAC[carac]) {
+      c += 1;
+    }
+    if (value.loseCarac === PLAYER_CARAC[carac]) {
+      c -= 1;
+    }
+  }
+
+  c = getCareerBaseCaracLimit(player, c, PLAYER_CARAC[carac]);
+
+  return c;
+}
+
+function getLimitedValue(c) {
+  if (c > 10) {
+    c = 10;
+  }
+  if (c < 0) {
+    c = 0;
+  }
+  return c;
+}
+
+function getMaxAV(player, game) {
+  let c = getMaxCommun(player, PLAYER_CARAC.AV, game);
+  return getLimitedValue(c);
+}
+
+function getMaxST(player, game) {
+  let c = getMaxCommun(player, PLAYER_CARAC.ST, game);
+  return getLimitedValue(c);
+}
+
+function getMaxAG(player, game) {
+  let c = getMaxCommun(player, PLAYER_CARAC.AG, game);
+  return getLimitedValue(c);
+}
+
+function getMaxMA(player, game) {
+  let c = getMaxCommun(player, PLAYER_CARAC.MA, game);
 
   if (game) {
     const maxMA = meteoMaxMA(game.meteo);
-    if (player.MA > maxMA) {
-      return maxMA;
+
+    if (c > maxMA) {
+      c = maxMA;
     }
   }
 
-  return player.MA;
+  return getLimitedValue(c);
 }
 
 function getMaxGfi(player) {
@@ -76,6 +156,6 @@ module.exports = {
   gamesforAgingRoll,
   getAgingBonus,
   getMaxGfi,
-  getMaxMA,
+  getMaxCarac,
   PLAYER_CARAC,
 };

package/skill.js

@@ -24,7 +24,6 @@ const SKILL_DURATION = {
 
 // Missing for races
 const SKILL_NAMES = {
-  TAKE_ROOT: "take-root",
   ACCURATE: "accurate",
   ALWAYS_HUNGRY: "always-hungry",
   ANIMAL_SAVAGERY: "animal-salvagery",
@@ -66,6 +65,7 @@ const SKILL_NAMES = {
   ON_THE_BALL: "on-the-ball",
   PASS: "pass",
   PILE_DRIVER: "pile-driver",
+  PLAGUE_RIDDEN: "plague-ridden",
   PREHENSILE_TAIL: "prehensile-tail",
   PROJECTILE_VOMIT: "projectile-vomit",
   REALLY_STUPID: "really-stupid",
@@ -87,6 +87,7 @@ const SKILL_NAMES = {
   SURE_FEET: "sure-feet",
   SURE_HANDS: "sure-hands",
   TACKLE: "tackle",
+  TAKE_ROOT: "take-root",
   TENTACLES: "tentacles",
   THICK_SKULL: "thick-skull",
   THROW_TEAM_MATE: "throw-team-mate",
@@ -109,7 +110,6 @@ const SKILL_TYPE = {
 
 // TODO: add text translation when add a skill
 const SKILLS = {
-  [SKILL_NAMES.TAKE_ROOT]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.ACCURATE]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.ALWAYS_HUNGRY]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.ANIMAL_SAVAGERY]: SKILL_TYPE.EXTRAORDINARY,
@@ -125,6 +125,7 @@ const SKILLS = {
   [SKILL_NAMES.CLAW]: SKILL_TYPE.MUTATION,
   [SKILL_NAMES.CLOUD_BURSTER]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.DAUNTLESS]: SKILL_TYPE.GENERAL,
+  [SKILL_NAMES.DECAY]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.DEFENSIVE]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.DIRTY_PLAYER]: SKILL_TYPE.GENERAL,
   [SKILL_NAMES.DISTURBING_PRESENCE]: SKILL_TYPE.MUTATION,
@@ -150,6 +151,7 @@ const SKILLS = {
   [SKILL_NAMES.ON_THE_BALL]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.PASS]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.PILE_DRIVER]: SKILL_TYPE.STRENGTH,
+  [SKILL_NAMES.PLAGUE_RIDDEN]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.PREHENSILE_TAIL]: SKILL_TYPE.MUTATION,
   [SKILL_NAMES.PROJECTILE_VOMIT]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.REALLY_STUPID]: SKILL_TYPE.EXTRAORDINARY,
@@ -171,6 +173,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.TAKE_ROOT]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.TENTACLES]: SKILL_TYPE.MUTATION,
   [SKILL_NAMES.THICK_SKULL]: SKILL_TYPE.STRENGTH,
   [SKILL_NAMES.THROW_TEAM_MATE]: SKILL_TYPE.EXTRAORDINARY,