enefel 1.0.91 → 1.0.95

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.91",
+  "version": "1.0.95",
   "main": "index.js",
   "author": "Manest",
   "license": "MIT",
@@ -9,7 +9,6 @@
   },
   "scripts": {
     "test": "jest"
-
   },
   "dependencies": {
     "yup": "^0.28.5"

package/race.js

@@ -18,6 +18,162 @@ 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 = {
+  // NORSE
+  "norse-lineman": {
+    MA: 6,
+    ST: 3,
+    AG: 3,
+    AV: 7,
+    normal: "G",
+    double: "AS",
+    normalCoach: "G",
+    icons: ["norse-lineman1"],
+    skills: [SKILL_NAMES.BLOCK],
+    badge: "norse-career",
+    range: 0,
+    cost: 50,
+  },
+  "norse-thrower": {
+    MA: 6,
+    ST: 3,
+    AG: 3,
+    AV: 7,
+    normal: "GP",
+    double: "AS",
+    normalCoach: "G",
+    icons: ["norse-thrower1"],
+    skills: [SKILL_NAMES.BLOCK, SKILL_NAMES.PASS, SKILL_NAMES.SPECIALIST],
+    badge: "norse-career",
+    range: 1,
+    cost: 70,
+  },
+  "norse-catcher": {
+    MA: 7,
+    ST: 3,
+    AG: 3,
+    AV: 7,
+    normal: "AG",
+    double: "S",
+    normalCoach: "G",
+    icons: ["norse-catcher1"],
+    skills: [SKILL_NAMES.BLOCK, SKILL_NAMES.DAUNTLESS, SKILL_NAMES.SPECIALIST],
+    badge: "norse-career",
+    range: 2,
+    cost: 90,
+  },
+  "norse-berserker": {
+    MA: 6,
+    ST: 3,
+    AG: 3,
+    AV: 7,
+    normal: "GS",
+    double: "A",
+    normalCoach: "G",
+    icons: ["norse-berserker1"],
+    skills: [
+      SKILL_NAMES.BLOCK,
+      SKILL_NAMES.JUMP_UP,
+      SKILL_NAMES.FRENZY,
+      SKILL_NAMES.SPECIALIST,
+    ],
+    badge: "norse-career",
+    range: 3,
+    cost: 90,
+  },
+  "norse-ulfwereners": {
+    MA: 6,
+    ST: 4,
+    AG: 2,
+    AV: 8,
+    normal: "GS",
+    double: "A",
+    normalCoach: "G",
+    icons: ["norse-ulfwereners1"],
+    skills: [SKILL_NAMES.FRENZY, SKILL_NAMES.SPECIALIST],
+    badge: "norse-career",
+    range: 4,
+    cost: 105,
+  },
+  "norse-yhetee": {
+    MA: 5,
+    ST: 5,
+    AG: 1,
+    AV: 8,
+    normal: "S",
+    double: "AG",
+    normalCoach: "G",
+    icons: ["norse-yhetee1"],
+    skills: [
+      SKILL_NAMES.CLAW,
+      // SKILL_NAMES.DISTURBING_PRESENCE,
+      SKILL_NAMES.FRENZY,
+      [SKILL_NAMES.LONER, 4],
+      SKILL_NAMES.UNCHANNELLED_FURY,
+      SKILL_NAMES.STAR,
+    ],
+    badge: "norse-career",
+    range: 6,
+    cost: 140,
+  },
+
+  // AMAZON
+  "amazon-linewomen": {
+    MA: 6,
+    ST: 3,
+    AG: 3,
+    AV: 7,
+    normal: "G",
+    double: "AS",
+    normalCoach: "G",
+    icons: ["amazon-linewomen1"],
+    skills: [SKILL_NAMES.DODGE],
+    badge: "amazon-career",
+    range: 0,
+    cost: 75,
+  },
+  "amazon-thrower": {
+    MA: 6,
+    ST: 3,
+    AG: 3,
+    AV: 7,
+    normal: "GP",
+    double: "AS",
+    normalCoach: "G",
+    icons: ["amazon-thrower1"],
+    skills: [SKILL_NAMES.PASS, SKILL_NAMES.DODGE, SKILL_NAMES.SPECIALIST],
+    badge: "amazon-career",
+    range: 1,
+    cost: 75,
+  },
+  "amazon-catcher": {
+    MA: 6,
+    ST: 3,
+    AG: 3,
+    AV: 7,
+    normal: "AG",
+    double: "S",
+    normalCoach: "G",
+    icons: ["amazon-catcher1"],
+    skills: [SKILL_NAMES.CATCH, SKILL_NAMES.DODGE, SKILL_NAMES.SPECIALIST],
+    badge: "amazon-career",
+    range: 2,
+    cost: 75,
+  },
+  "amazon-blitzer": {
+    MA: 6,
+    ST: 3,
+    AG: 3,
+    AV: 7,
+    normal: "GS",
+    double: "A",
+    normalCoach: "G",
+    icons: ["amazon-blitzer1"],
+    skills: [SKILL_NAMES.BLOCK, SKILL_NAMES.DODGE, SKILL_NAMES.SPECIALIST],
+    badge: "amazon-career",
+    range: 4,
+    cost: 90,
+  },
+
   // HUMAN
 
   "human-lineman": {