Empoignade V2

module/roll/roll-part-comp.mjs

@@ -18,12 +18,16 @@ export class RollPartComp extends RollPartSelect {
   loadRefs(rollData) {
     const refs = this.getRefs(rollData)
     const selected = this.getSelected(rollData)
-    refs.all = this.$getActorComps(rollData)
-      .filter(comp => !selected.forced ||
-        (selected.key ?
-          Grammar.includesLowerCaseNoAccent(comp.name, selected.key)
-          : comp.key == '')
-      )
+    const all = this.$getActorComps(rollData)
+    if (selected.forced) {
+      refs.all = all.filter(comp => Grammar.equalsInsensitive(comp.label, selected.key))
+      if (refs.all.length == 0) {
+        refs.all = all.filter(comp => Grammar.includesLowerCaseNoAccent(comp.label, selected.key))
+      }
+    }
+    else {
+      refs.all = all
+    }
     refs.comps = refs.all
     this.$selectComp(rollData)
   }