enefel 2.2.4 → 2.4.0

package/dist/index.js

@@ -721,7 +721,8 @@ function canPass(player, playerTeam, playerIdWithBall) {
         player.id === playerIdWithBall);
 }
 function canEndTurn(player, game) {
-    return (player.date_next_action === null &&
+    return ((0, status_1.hasStatusOnField)(player) &&
+        player.date_next_action === null &&
         (player.has_action === false || (0, player_1.hasMove)(player, game)));
 }
 function canThrowTeamMate(player, target, playerTeam) {

package/dist/item.d.ts

@@ -12,7 +12,9 @@ declare enum ITEM_ID {
     DRUG = "drug",
     GREEN_PILL = "green-pill",
     NEWSPAPER = "newspaper",
-    BOOSTER = "booster"
+    BOOSTER = "booster",
+    ENERGY_GEL = "energy-gel",
+    SMELLING_SALTS = "smelling-salts"
 }
 declare enum ITEM_TYPE {
     CONSUMABLE = "consumable",
@@ -20,4 +22,4 @@ declare enum ITEM_TYPE {
     FILE = "file"
 }
 declare const getQteFromRarity: (rarity: RARITY) => 1 | 10 | 100 | 1000 | 10000 | undefined;
-export { getQteFromRarity, ITEM_ID, ITEM_TYPE, RARITY };
+export { ITEM_ID, ITEM_TYPE, RARITY, getQteFromRarity };

package/dist/item.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RARITY = exports.ITEM_TYPE = exports.ITEM_ID = exports.getQteFromRarity = void 0;
+exports.getQteFromRarity = exports.RARITY = exports.ITEM_TYPE = exports.ITEM_ID = void 0;
 var RARITY;
 (function (RARITY) {
     RARITY["COMMUN"] = "c";
@@ -18,6 +18,8 @@ var ITEM_ID;
     ITEM_ID["GREEN_PILL"] = "green-pill";
     ITEM_ID["NEWSPAPER"] = "newspaper";
     ITEM_ID["BOOSTER"] = "booster";
+    ITEM_ID["ENERGY_GEL"] = "energy-gel";
+    ITEM_ID["SMELLING_SALTS"] = "smelling-salts";
 })(ITEM_ID || (exports.ITEM_ID = ITEM_ID = {}));
 var ITEM_TYPE;
 (function (ITEM_TYPE) {

package/dist/itemUsage.d.ts

@@ -0,0 +1,11 @@
+import { Player } from "./types/models";
+export interface TempCaracEffect {
+    t: number;
+    gainCarac?: string;
+    loseCarac?: string;
+    moralePenalty?: number;
+    itemId?: string;
+}
+export declare const countItemUsagesInKickoff: (player: Player, itemId: string) => number;
+export declare const canUseItem: (player: Player, itemId: string, maxUsesPerKickoff?: number) => boolean;
+export declare const getRemainingUsages: (player: Player, itemId: string, maxUsesPerKickoff?: number) => number;

package/dist/itemUsage.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRemainingUsages = exports.canUseItem = exports.countItemUsagesInKickoff = void 0;
+const item_1 = require("item");
+const status_1 = require("status");
+const countItemUsagesInKickoff = (player, itemId) => {
+    if (!player.tempCarac) {
+        return 0;
+    }
+    let tempCarac;
+    try {
+        tempCarac = JSON.parse(player.tempCarac);
+    }
+    catch (e) {
+        return 0;
+    }
+    let count = 0;
+    for (const effect of Object.values(tempCarac)) {
+        // Compter tous les effets liés à cet item
+        if (effect.itemId === itemId) {
+            count++;
+        }
+    }
+    return count;
+};
+exports.countItemUsagesInKickoff = countItemUsagesInKickoff;
+const canUseItem = (player, itemId, maxUsesPerKickoff) => {
+    if (maxUsesPerKickoff && maxUsesPerKickoff > 0) {
+        const currentUsages = (0, exports.countItemUsagesInKickoff)(player, itemId);
+        if (currentUsages >= maxUsesPerKickoff) {
+            return false;
+        }
+    }
+    if (itemId === item_1.ITEM_ID.SMELLING_SALTS) {
+        return player.status === status_1.PLAYER_STATUS.KO;
+    }
+    return true;
+};
+exports.canUseItem = canUseItem;
+const getRemainingUsages = (player, itemId, maxUsesPerKickoff) => {
+    if (!maxUsesPerKickoff || maxUsesPerKickoff <= 0) {
+        return -1; // Pas de limite
+    }
+    const currentUsages = (0, exports.countItemUsagesInKickoff)(player, itemId);
+    return Math.max(0, maxUsesPerKickoff - currentUsages);
+};
+exports.getRemainingUsages = getRemainingUsages;

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "enefel",
-    "version": "2.2.4",
+    "version": "2.4.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "enefel",
-            "version": "2.2.4",
+            "version": "2.4.0",
             "license": "MIT",
             "dependencies": {
                 "seedrandom": "3.0.5",

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "enefel",
-    "version": "2.2.4",
+    "version": "2.4.0",
     "description": "Blood Bowl 3 game engine",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/dist/race.js

@@ -174,7 +174,7 @@ const getPlayerAvatarPath = (player) => {
 exports.getPlayerAvatarPath = getPlayerAvatarPath;
 const getRaceFromCareer = (careerId) => {
     const career = getCareerFromKey(careerId);
-    return career.badge;
+    return career?.badge;
 };
 exports.getRaceFromCareer = getRaceFromCareer;
 const getAvatarTypeFromPlayer = (player, avatarFile) => {

package/dist/types/models.d.ts

@@ -120,6 +120,8 @@ export interface Player extends Point {
     prevY: number | null;
     hasEndTurn: boolean;
     canUseSkills?: boolean;
+    stats?: Stat[];
+    team?: Team;
 }
 export interface PlayerWithSkill extends Player {
     skills: PlayerSkill[];
@@ -198,6 +200,7 @@ export interface Item {
     y: number;
     type: string;
     forUser?: boolean;
+    maxUsesPerKickoff?: number;
 }
 export interface UserItem {
     id: string;

package/index.ts

@@ -820,6 +820,7 @@ function canPass(
 
 function canEndTurn(player: PlayerWithSkill, game: Game) {
   return (
+    hasStatusOnField(player) &&
     player.date_next_action === null &&
     (player.has_action === false || hasMove(player, game))
   );

package/item.ts

@@ -14,6 +14,8 @@ enum ITEM_ID {
   GREEN_PILL = "green-pill",
   NEWSPAPER = "newspaper",
   BOOSTER = "booster",
+  ENERGY_GEL = "energy-gel",
+  SMELLING_SALTS = "smelling-salts",
 }
 
 enum ITEM_TYPE {
@@ -40,4 +42,4 @@ const getQteFromRarity = (rarity: RARITY) => {
   }
 };
 
-export { getQteFromRarity, ITEM_ID, ITEM_TYPE, RARITY };
+export { ITEM_ID, ITEM_TYPE, RARITY, getQteFromRarity };

package/itemUsage.ts

@@ -0,0 +1,69 @@
+import { ITEM_ID } from "item";
+import { PLAYER_STATUS } from "status";
+import { Player } from "./types/models";
+
+export interface TempCaracEffect {
+  t: number;
+  gainCarac?: string;
+  loseCarac?: string;
+  moralePenalty?: number;
+  itemId?: string;
+}
+
+export const countItemUsagesInKickoff = (
+  player: Player,
+  itemId: string
+): number => {
+  if (!player.tempCarac) {
+    return 0;
+  }
+
+  let tempCarac: Record<string, TempCaracEffect>;
+  try {
+    tempCarac = JSON.parse(player.tempCarac);
+  } catch (e) {
+    return 0;
+  }
+
+  let count = 0;
+  for (const effect of Object.values(tempCarac)) {
+    // Compter tous les effets liés à cet item
+    if (effect.itemId === itemId) {
+      count++;
+    }
+  }
+
+  return count;
+};
+
+export const canUseItem = (
+  player: Player,
+  itemId: string,
+  maxUsesPerKickoff?: number
+): boolean => {
+  if (maxUsesPerKickoff && maxUsesPerKickoff > 0) {
+    const currentUsages = countItemUsagesInKickoff(player, itemId);
+    if (currentUsages >= maxUsesPerKickoff) {
+      return false;
+    }
+  }
+
+  if (itemId === ITEM_ID.SMELLING_SALTS) {
+    return player.status === PLAYER_STATUS.KO;
+  }
+
+  return true;
+};
+
+export const getRemainingUsages = (
+  player: Player,
+  itemId: string,
+  maxUsesPerKickoff?: number
+): number => {
+  if (!maxUsesPerKickoff || maxUsesPerKickoff <= 0) {
+    return -1; // Pas de limite
+  }
+
+  const currentUsages = countItemUsagesInKickoff(player, itemId);
+  return Math.max(0, maxUsesPerKickoff - currentUsages);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enefel",
-  "version": "2.2.4",
+  "version": "2.4.0",
   "description": "Blood Bowl 3 game engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/player.ts

@@ -164,10 +164,8 @@ function getMaxAG(player: Player, game: Game) {
 
 function getMaxMA(player: Player, game: Game) {
   let c = getMaxCommun(player, PLAYER_CARAC.MA, game);
-
   if (game) {
     const maxMA = meteoMaxMA(game.meteo);
-
     if (c > maxMA) {
       c = maxMA;
     }

package/race.ts

@@ -168,7 +168,7 @@ const getPlayerAvatarPath = (player: Player) => {
 
 const getRaceFromCareer = (careerId: CAREER_ID) => {
   const career = getCareerFromKey(careerId);
-  return career.badge;
+  return career?.badge;
 };
 
 const getAvatarTypeFromPlayer = (player: Player, avatarFile: string) => {

package/types/models.ts

@@ -124,6 +124,8 @@ export interface Player extends Point {
   prevY: number | null; // add by Game
   hasEndTurn: boolean; // add by Game
   canUseSkills?: boolean; // add by Game
+  stats?: Stat[];
+  team?: Team;
 }
 
 export interface PlayerWithSkill extends Player {
@@ -208,6 +210,7 @@ export interface Item {
   y: number;
   type: string;
   forUser?: boolean;
+  maxUsesPerKickoff?: number;
 }
 
 export interface UserItem {