enefel 1.0.190 → 1.0.192

package/improvement.js

@@ -61,9 +61,18 @@ const getSPP = (game, type) => {
   return SPP[game.type][`EXP_${type}`];
 };
 
-const getNextRange = (currentRange) => {
+const getCurrentRange = (currentExp) => {
   for (let i = 0; i < ranges.length; i++) {
-    if (currentRange < ranges[i]) {
+    if (currentExp < ranges[i]) {
+      return i + 1;
+    }
+  }
+  return ranges.length + 1;
+};
+
+const getNextRange = (currentExp) => {
+  for (let i = 0; i < ranges.length; i++) {
+    if (currentExp < ranges[i]) {
       return ranges[i];
     }
   }
@@ -102,4 +111,5 @@ module.exports = {
   getSPP,
   ranges,
   SPP_TYPE,
+  getCurrentRange,
 };

package/index.js

@@ -226,10 +226,10 @@ const PLAYER_HISTORY_INFO = {
 };
 
 const TAKE_BALL_TYPE = {
-  CATCH_PASS: "pass",
-  CATCH_HANDOFF: "hand-off",
-  PICKUP: "pick-up",
-  CATCH_BOUNCE: "bounce",
+  CATCH_PASS: "pass", // Reception passe
+  CATCH_HANDOFF: "hand-off", // Reception d'une Transmission
+  PICKUP: "pick-up", // Ramasse la balle au sol
+  CATCH_BOUNCE: "bounce", // Reception d'un rebond
 };
 
 const p = (x, y) => {

package/move.js

@@ -1,4 +1,5 @@
 const { getEnemyTackleZones } = require("./position");
+const { shuffleArray } = require("./random");
 const { hasSkill, SKILL_NAMES } = require("./skill");
 
 function bonusDodge(player, adjEnemies, adjDestinationEnemies) {
@@ -12,6 +13,7 @@ function bonusDodge(player, adjEnemies, adjDestinationEnemies) {
   if (adjEnemies.find((p) => hasSkill(p, SKILL_NAMES.PREHENSILE_TAIL))) {
     bonus -= 1;
   }
+
   // STUNTY should not be valid if it has a special weapon
   if (!hasSkill(player, SKILL_NAMES.STUNTY)) {
     bonus -= adjDestinationEnemies.filter(
@@ -22,18 +24,26 @@ function bonusDodge(player, adjEnemies, adjDestinationEnemies) {
   return bonus;
 }
 
-function malusJumpingLocation(destination, playerTeamId, players) {
+function malusJumpingLocation(
+  destination,
+  playerTeamId,
+  players,
+  isCurrentLocation = false
+) {
   const enemies = getEnemyTackleZones(destination, playerTeamId, players);
   let malus = 0;
   malus += enemies.length;
-  if (enemies.find((p) => hasSkill(p, SKILL_NAMES.PREHENSILE_TAIL))) {
-    malus += 1;
+  if (isCurrentLocation) {
+    // Prehensile Tail : When an active opposition player attempts to Dodge, Jump or Leap in order to vacate a square in which they are being Marked by this player
+    if (enemies.find((p) => hasSkill(p, SKILL_NAMES.PREHENSILE_TAIL))) {
+      malus += 1;
+    }
   }
   return malus;
 }
 
 function modifJumping(player, destination, playerTeamId, players) {
-  let malusCurrent = malusJumpingLocation(player, playerTeamId, players);
+  let malusCurrent = malusJumpingLocation(player, playerTeamId, players, true);
   let malusDestination = malusJumpingLocation(
     destination,
     playerTeamId,

package/package.json

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

package/skill.js

@@ -44,6 +44,7 @@ const SKILL_NAMES = {
   DEFENSIVE: "defensive",
   DIRTY_PLAYER: "dirty-player",
   DISTURBING_PRESENCE: "distrubing-presence",
+  DIVING_TACKLE: "diving-tackle",
   DODGE: "dodge",
   DRUNKARD: "drunkard",
   DUMP_OFF: "dump-off",
@@ -98,6 +99,7 @@ const SKILL_NAMES = {
   UNCHANNELLED_FURY: "unchannelled-fury",
   VERY_LONG_LEGS: "very-long-legs",
   WRESTLE: "wrestle",
+  DIVING_CATCH: "diving-catch",
 };
 
 const SKILL_TYPE = {
@@ -132,6 +134,7 @@ const SKILLS = {
   [SKILL_NAMES.DEFENSIVE]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.DIRTY_PLAYER]: SKILL_TYPE.GENERAL,
   [SKILL_NAMES.DISTURBING_PRESENCE]: SKILL_TYPE.MUTATION,
+  [SKILL_NAMES.DIVING_TACKLE]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.DODGE]: SKILL_TYPE.AGILITY,
   [SKILL_NAMES.DRUNKARD]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.DUMP_OFF]: SKILL_TYPE.PASSING,
@@ -186,6 +189,8 @@ const SKILLS = {
   [SKILL_NAMES.UNCHANNELLED_FURY]: SKILL_TYPE.EXTRAORDINARY,
   [SKILL_NAMES.VERY_LONG_LEGS]: SKILL_TYPE.MUTATION,
   [SKILL_NAMES.WRESTLE]: SKILL_TYPE.GENERAL,
+  [SKILL_NAMES.DIVING_CATCH]: SKILL_TYPE.AGILITY,
+
   // [SKILL_NAMES.SIDE_STEP]: SKILL_TYPE.AGILITY,
 };
 
@@ -293,10 +298,21 @@ const isActivableSkills = (skill) => {
 };
 
 const isSelectPlayersSkills = (skill) => {
-  const activables = [];
+  const activables = [SKILL_NAMES.DIVING_TACKLE];
   return activables.includes(skill);
 };
 
+const hasSkillForPlayer = (playerWithSkill, playerTarget, skillId) => {
+  if (hasSkill(playerWithSkill, skillId)) {
+    const skill = getSkill(playerWithSkill, skillId);
+    const data = skill?.data || [];
+    if (skill && data.includes(playerTarget.id)) {
+      return true;
+    }
+  }
+  return false;
+};
+
 function getStarLimit(teamPlayers) {
   const specialists = getPlayersWithSkill(
     teamPlayers,
@@ -413,6 +429,7 @@ const hasToAgilityJumpUp = (player) => {
 };
 
 module.exports = {
+  hasSkillForPlayer,
   BIG_GUY_LIMIT,
   getDisturbingPresenceMalus,
   getNoTurnoverSkill,