enefel 1.0.94 → 1.0.98

package/index.js

@@ -314,18 +314,22 @@ const getBlockAssistance = (
   isFoul = false,
   isAttacker = false
 ) => {
-  players = players.filter((player) => {
+  const OtherPlayersThanInvolved = players.filter((player) => {
     return player.id !== attackerPlayer.id && player.id !== defenderPlayer.id;
   });
 
-  // 1. Must be adjacent to the enemy player involved in the block,
-  // 3. Must be standing, and …
-  const adjacentEnemyPlayers = players.filter((player) => {
+  const isValidAdjacentEnemy = (player, target) => {
     return (
       hasStatusTacleZone(player) &&
-      player.teamId !== defenderPlayer.teamId &&
-      isAdjacent(player, defenderPlayer)
+      isAdjacent(player, target) &&
+      player.teamId !== target.teamId
     );
+  };
+
+  // 1. Must be adjacent to the enemy player involved in the block,
+  // 3. Must be standing, and …
+  const adjacentEnemyPlayers = OtherPlayersThanInvolved.filter((player) => {
+    return isValidAdjacentEnemy(player, defenderPlayer);
   });
   // 2. Must not be in the tackle zone of any other player from the
   // opposing team, and ...
@@ -335,12 +339,10 @@ const getBlockAssistance = (
       if (hasSkill(adjacentEnemyPlayer, SKILL_NAMES.GUARD)) {
         hasGard = true;
         if (
-          isAttacker &&
-          players.some((player) => {
+          isAttacker && // player is the attacker player.
+          [...OtherPlayersThanInvolved, defenderPlayer].some((player) => {
             return (
-              hasStatusTacleZone(player) &&
-              player.teamId !== adjacentEnemyPlayer.teamId &&
-              isAdjacent(player, adjacentEnemyPlayer) &&
+              isValidAdjacentEnemy(player, adjacentEnemyPlayer) &&
               hasSkill(player, SKILL_NAMES.DEFENSIVE)
             );
           })
@@ -350,13 +352,10 @@ const getBlockAssistance = (
       }
       return (
         (!isFoul && hasGard) ||
-        !players.some((player) => {
+        !OtherPlayersThanInvolved.some((player) => {
           return (
-            player.id !== attackerPlayer.id &&
-            player.id !== defenderPlayer.id &&
-            hasStatusTacleZone(player) && // 4. Must have his tackle zones.
-            player.teamId !== adjacentEnemyPlayer.teamId &&
-            isAdjacent(player, adjacentEnemyPlayer)
+            // 4. Must have his tackle zones.
+            isValidAdjacentEnemy(player, adjacentEnemyPlayer)
           );
         })
       );

package/package.json

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

package/race.js

@@ -18,6 +18,76 @@ const { SKILL_NAMES } = require("./skill");
 // const ranges = [6, 16, 31, 51, 76, 176];
 // https://web.archive.org/web/20090403112513/http://enefel.org/carriere.php
 module.exports = {
+  // LIZARDMEN
+  "lizardmen-skink": {
+    MA: 8,
+    ST: 2,
+    AG: 3,
+    AV: 7,
+    normal: "A",
+    double: "GPS",
+    normalCoach: "G",
+    icons: ["lizardmen-skink1"],
+    skills: [SKILL_NAMES.DODGE, SKILL_NAMES.STUNTY],
+    badge: "lizardmen-career",
+    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-saurus": {
+    MA: 6,
+    ST: 4,
+    AG: 1,
+    AV: 9,
+    normal: "GS",
+    double: "A",
+    normalCoach: "G",
+    icons: ["lizardmen-saurus1"],
+    skills: [SKILL_NAMES.STAR],
+    badge: "lizardmen-career",
+    range: 4,
+    cost: 85,
+  },
+  "lizardmen-kroxigor": {
+    MA: 6,
+    ST: 5,
+    AG: 1,
+    AV: 9,
+    normal: "S",
+    double: "AG",
+    normalCoach: "G",
+    icons: ["lizardmen-kroxigor1"],
+    skills: [
+      SKILL_NAMES.BONE_HEAD,
+      [SKILL_NAMES.LONER, 4],
+      SKILL_NAMES.MIGHTY_BLOW,
+      SKILL_NAMES.PREHENSILE_TAIL,
+      SKILL_NAMES.THICK_SKULL,
+      SKILL_NAMES.BIG_GUY,
+    ],
+    badge: "lizardmen-career",
+    range: 5,
+    cost: 140,
+  },
+
   // NORSE
   "norse-lineman": {
     MA: 6,
@@ -89,7 +159,7 @@ module.exports = {
     double: "A",
     normalCoach: "G",
     icons: ["norse-ulfwereners1"],
-    skills: [SKILL_NAMES.FRENZY, SKILL_NAMES.SPECIALIST],
+    skills: [SKILL_NAMES.FRENZY, SKILL_NAMES.STAR],
     badge: "norse-career",
     range: 4,
     cost: 105,
@@ -109,7 +179,7 @@ module.exports = {
       SKILL_NAMES.FRENZY,
       [SKILL_NAMES.LONER, 4],
       SKILL_NAMES.UNCHANNELLED_FURY,
-      SKILL_NAMES.STAR,
+      SKILL_NAMES.BIG_GUY,
     ],
     badge: "norse-career",
     range: 6,

package/skillCoach.js

@@ -13,7 +13,7 @@ const SKILL_COACH_TYPE = {
 // TODO: add text translation when add a skill
 const COACH_SKILLS = {
   [SKILL_COACH_NAMES.SPONSOR]: SKILL_COACH_TYPE.GENERAL,
-  [SKILL_COACH_NAMES.SPY]: SKILL_COACH_TYPE.GENERAL,
+  // [SKILL_COACH_NAMES.SPY]: SKILL_COACH_TYPE.GENERAL, // If reactivate, check getCoachSkill hotfix
   [SKILL_COACH_NAMES.THREATENING]: SKILL_COACH_TYPE.GENERAL,
 };
 
@@ -23,6 +23,10 @@ function shouldDisplayInfoInName(skillId) {
 }
 
 function getCoachSkill(player, skillId) {
+  if (skillId === SKILL_COACH_NAMES.SPY) {
+    // Hotfix
+    return false;
+  }
   if (!COACH_SKILLS.hasOwnProperty(skillId)) {
     throw `Skill '${skillId}' does not exist`;
   }