Merge pull request #1309 from kwitczak/1289_fix

1289: Fixed issue with item value being taken from another item

module/actors/actor.js

@@ -94,12 +94,8 @@ export class CoCActor extends Actor {
     if (['character', 'npc', 'creature'].includes(this.type)) {
       this.system.skills = {}
       for (const i of this.items) {
-        if (i.type === 'skill') {
-          this.system.skills[`${i.system.skillName}`] = {
-            value: i.rawValue
-          }
-          this.system.skills[`${i.id}`] = { value: i.rawValue }
-        }
+        if (i.type !== 'skill') continue
+        this.system.skills[`${i.itemIdentifier}`] = { value: i.rawValue }
       }
 
       /**

module/items/skill/data.js

@@ -82,6 +82,15 @@ export class CoC7Skill extends CoC7Item {
     return []
   }
 
+  /**
+  * Unique identifier should be used to store and obtain item to assess item uniqueness.
+  * For old items without id, fallback of skillName may still be used
+  * but if skill name is not unique it will cause problems.
+  */
+  get itemIdentifier () {
+    return this.id || this.system.skillName
+  }
+
   /**
    * This is the value of the skill score unaffected by active effects
    */
@@ -116,8 +125,7 @@ export class CoC7Skill extends CoC7Item {
    * This is the skill's value after active effects have been applied
    */
   get value () {
-    const value = this.parent?.system.skills?.[`${this.system.skillName}`]
-      ?.value
+    const value = this.parent?.system.skills?.[`${this.itemIdentifier}`]?.value
     return value || this.rawValue
   }