enefel 1.0.98 → 1.0.99

package/calcul.js

@@ -0,0 +1,8 @@
+const distance = (p1, p2) => {
+  return Math.sqrt(Math.pow(p1.x - p2.x, 2) + Math.pow(p1.y - p2.y, 2));
+};
+
+const distanceSquares = (p1, p2, distance) => {
+  return Math.abs(p1.x - p2.x) <= distance && Math.abs(p1.y - p2.y) <= distance;
+};
+module.exports = { distance, distanceSquares };

package/index.js

@@ -1,4 +1,8 @@
-const { hasSkill, SKILL_NAMES } = require("./skill");
+const {
+  hasSkill,
+  SKILL_NAMES,
+  getDisturbingPresenceMalus,
+} = require("./skill");
 const { ranges } = require("./improvement");
 const races = require("./race");
 const {
@@ -14,6 +18,7 @@ const {
   meteoMaxPassDistance,
   METEO,
 } = require("./meteo");
+const { distance } = require("./calcul");
 const INITIAL_REROLL = 2;
 const POSTULATION_HOURS = 24;
 const INACTIVE_DAYS = 10;
@@ -580,10 +585,6 @@ const availableSquaresToPushBack = (p1, p2) => {
   }
 };
 
-const distance = (p1, p2) => {
-  return Math.sqrt(Math.pow(p1.x - p2.x, 2) + Math.pow(p1.y - p2.y, 2));
-};
-
 // playerFrom, pointTo, foe
 const isOnLine = (A, B, C) => {
   //http://www.luccini.it/bloodbowl/downloads/Tabella_Intercetti.pdf
@@ -673,7 +674,8 @@ const getBestInterceptor = (playerFrom, pointTo, players) => {
   let bestAGPlayers = [];
   possiblePlayers.forEach((player) => {
     const zdt = getEnemyTackleZones(player, player.teamId, players).length;
-    if (player.current_AG - zdt > bestAG) {
+    const disturbingPresence = getDisturbingPresenceMalus(player, players);
+    if (player.current_AG - zdt - disturbingPresence > bestAG) {
       bestAG = player.current_AG - zdt;
       bestAGPlayers = [];
       bestAGPlayers.push(player);
@@ -889,7 +891,6 @@ module.exports = {
   canStandup,
   canThrowTeamMate,
   canTransmit,
-  distance,
   FORMATION_DEFAULT_NAME,
   GAME_HISTORY_INFO,
   GAME_HISTORY_TYPE,

package/package.json

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

package/race.js

@@ -33,25 +33,25 @@ module.exports = {
     range: 0,
     cost: 60,
   },
-  // "lizardmen-chameleon": {
-  //   MA: 7,
-  //   ST: 2,
-  //   AG: 3,
-  //   AV: 7,
-  //   normal: "A",
-  //   double: "GPS",
-  //   normalCoach: "G",
-  //   icons: ["lizardmen-chameleon1"],
-  //   skills: [
-  //     SKILL_NAMES.DODGE,
-  //     // SKILL_NAMES.ON_THE_BALL,
-  //     // SKILL_NAMES.SHADOWING,
-  //     SKILL_NAMES.STUNTY,
-  //   ],
-  //   badge: "lizardmen-career",
-  //   range: 1,
-  //   cost: 70,
-  // },
+  "lizardmen-chameleon": {
+    MA: 7,
+    ST: 2,
+    AG: 3,
+    AV: 7,
+    normal: "A",
+    double: "GPS",
+    normalCoach: "G",
+    icons: ["lizardmen-chameleon1"],
+    skills: [
+      SKILL_NAMES.DODGE,
+      SKILL_NAMES.ON_THE_BALL,
+      SKILL_NAMES.SHADOWING,
+      SKILL_NAMES.STUNTY,
+    ],
+    badge: "lizardmen-career",
+    range: 1,
+    cost: 70,
+  },
   "lizardmen-saurus": {
     MA: 6,
     ST: 4,
@@ -175,7 +175,7 @@ module.exports = {
     icons: ["norse-yhetee1"],
     skills: [
       SKILL_NAMES.CLAW,
-      // SKILL_NAMES.DISTURBING_PRESENCE,
+      SKILL_NAMES.DISTURBING_PRESENCE,
       SKILL_NAMES.FRENZY,
       [SKILL_NAMES.LONER, 4],
       SKILL_NAMES.UNCHANNELLED_FURY,

package/skill.js

@@ -1,3 +1,5 @@
+const { distanceSquares } = require("./calcul");
+const { hasStatusOnField } = require("./status");
 const { getTime, TYPE_TIMER } = require("./time");
 
 const BIG_GUY_LIMIT = 1;
@@ -7,6 +9,7 @@ const SPECIALIST_LIMIT = 6;
 const SKILL_INFO_ACTIVE = "active";
 const SKILL_INFO_INACTIVE = "inactive";
 
+// Missing for races
 const SKILL_NAMES = {
   ACCURATE: "accurate",
   ALWAYS_HUNGRY: "always-hungry",
@@ -24,6 +27,7 @@ const SKILL_NAMES = {
   DAUNTLESS: "dauntless",
   DEFENSIVE: "defensive",
   DIRTY_PLAYER: "dirty-player",
+  DISTURBING_PRESENCE: "distrubing-presence",
   DODGE: "dodge",
   DUMP_OFF: "dump-off",
   FEND: "fend",
@@ -38,6 +42,7 @@ const SKILL_NAMES = {
   LONER: "loner",
   MIGHTY_BLOW: "mighty-blow",
   NERVES_OF_STEEL: "nerves-of-steel",
+  ON_THE_BALL: "on-the-ball",
   PASS: "pass",
   PILE_DRIVER: "pile-driver",
   PREHENSILE_TAIL: "prehensile-tail",
@@ -47,6 +52,7 @@ const SKILL_NAMES = {
   RIGHT_STUFF: "right-stuff",
   RUNNING_PASS: "running-pass",
   SAFE_PASS: "safe-pass",
+  SHADOWING: "shadowing",
   SNEAKY_GIT: "sneaky-git",
   SPECIALIST: "specialist",
   SPRINT: "sprint",
@@ -98,6 +104,7 @@ const SKILLS = {
   [SKILL_NAMES.DAUNTLESS]: SKILL_TYPE.GENERAL,
   [SKILL_NAMES.DEFENSIVE]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.DIRTY_PLAYER]: SKILL_TYPE.GENERAL,
+  [SKILL_NAMES.DISTURBING_PRESENCE]: SKILL_TYPE.MUTATION,
   [SKILL_NAMES.DODGE]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.DUMP_OFF]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.FEND]: SKILL_TYPE.GENERAL,
@@ -112,6 +119,7 @@ const SKILLS = {
   [SKILL_NAMES.LONER]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.MIGHTY_BLOW]: SKILL_TYPE.STRENGTH,
   [SKILL_NAMES.NERVES_OF_STEEL]: SKILL_TYPE.PASSING,
+  [SKILL_NAMES.ON_THE_BALL]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.PASS]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.PILE_DRIVER]: SKILL_TYPE.STRENGTH,
   [SKILL_NAMES.PREHENSILE_TAIL]: SKILL_TYPE.MUTATION,
@@ -121,6 +129,7 @@ const SKILLS = {
   [SKILL_NAMES.RIGHT_STUFF]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.RUNNING_PASS]: SKILL_TYPE.PASSING,
   [SKILL_NAMES.SAFE_PASS]: SKILL_TYPE.PASSING,
+  [SKILL_NAMES.SHADOWING]: SKILL_TYPE.GENERAL,
   [SKILL_NAMES.SNEAKY_GIT]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.SPECIALIST]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.SPRINT]: SKILL_TYPE.AGILITY,
@@ -211,6 +220,7 @@ const isActivableSkills = (skill) => {
     SKILL_NAMES.PILE_DRIVER,
     SKILL_NAMES.TENTACLES,
     SKILL_NAMES.WRESTLE,
+    SKILL_NAMES.SHADOWING,
   ];
   return activables.includes(skill);
 };
@@ -254,6 +264,30 @@ function getSkillLimitSizeTeam(player, teamPlayers) {
   return null;
 }
 
+/* 
+DISTURBING PRESENCE
+ When an opposition player performs either a 
+ Pass action,
+ a Throw Team- mate action 
+ or a Throw Bomb Special action,
+ or attempts to either interfere with a pass 
+ or to catch the ball, 
+ they must apply a -1 modifier to the test for each player on your team with this Skill 
+ that is within three squares of them, 
+ even if the player with this Skill is Prone, 
+ Stunned or has lost their Tackle Zone. */
+function getDisturbingPresenceMalus(player, players) {
+  const malus = players.filter((p) => {
+    return (
+      p.teamId !== player.teamId &&
+      hasStatusOnField(p) &&
+      hasSkill(p, SKILL_NAMES.DISTURBING_PRESENCE) &&
+      distanceSquares(player, p, 3)
+    );
+  }).length;
+  return malus;
+}
+
 module.exports = {
   BIG_GUY_LIMIT,
   getPlayersWithSkill,
@@ -268,4 +302,5 @@ module.exports = {
   SKILL_NAMES,
   SKILLS,
   useSkill,
+  getDisturbingPresenceMalus,
 };