enefel 1.0.105 → 1.0.106

package/package.json

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

package/race.js

@@ -1023,6 +1023,12 @@ function getTeamGroups(team) {
   return groups;
 }
 
+function isPlayerNeutralGroup(player) {
+  const group = getPlayerGroup(player);
+  const neutrals = [GROUP_NAME.NEUTRAL];
+  return neutrals.includes(group);
+}
+
 function isNeutralGroup(group) {
   const neutrals = [GROUP_NAME.NEUTRAL];
   return neutrals.includes(group);
@@ -1079,5 +1085,6 @@ module.exports = {
   getTeamIncompatibleGroups,
   GROUP_NAME,
   isNeutralGroup,
+  isPlayerNeutralGroup,
   RACE,
 };

package/skill.js

@@ -171,7 +171,7 @@ function useSkill(player, skillId, date = -1, info = null) {
   skill.info = info;
 }
 
-function getSkill(player, skillId) {
+function getSkill(player, skillId, info = null) {
   if (!SKILLS.hasOwnProperty(skillId)) {
     throw `Skill '${skillId}' does not exist`;
   }
@@ -179,12 +179,20 @@ function getSkill(player, skillId) {
   if (!playerSkills) {
     return false;
   }
-  const skill = playerSkills.find((s) => s.skill_id === skillId);
+  const skill = playerSkills.find(
+    (s) => s.skill_id === skillId && (info ? s.info === info : true)
+  );
   return skill;
 }
 
-function hasSkill(player, skillId, withDate = false, checkActivated = true) {
-  const skill = getSkill(player, skillId);
+function hasSkill(
+  player,
+  skillId,
+  withDate = false,
+  checkActivated = true,
+  info = null
+) {
+  const skill = getSkill(player, skillId, info);
 
   const isActivated = (skill) =>
     checkActivated && isActivableSkills(skillId)