Merge branch 'develop'

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.9.6] 2020-11-14
+### Bugfix
+- PF1 - Non-GM players now see the unidentified item name in their HUD until item is identified.
+
 ## [0.9.5] 2020-11-14
 ### Bugfix
 - Magic Items now correctly hide themselves if they do not meet attuned or equipped requirement.

scripts/actions/pf1/pf1-actions.js

@@ -597,7 +597,8 @@ export class ActionHandlerPf1 extends ActionHandler {
         let encodedValue = [macroType, tokenId, item._id].join(this.delimiter);
         let img = this._getImage(item);
         let icon = this._getActionIcon(item.data?.activation?.type);
-        let result = { name: item.name, id: item._id, encodedValue: encodedValue, img: img, icon: icon }
+        let name = this._getItemName(item);
+        let result = { name: name, id: item._id, encodedValue: encodedValue, img: img, icon: icon }
 
         if (item.data.recharge && !item.data.recharge.charged && item.data.recharge.value) {
             result.name += ` (${this.i18n('tokenactionhud.recharge')})`;
@@ -612,6 +613,20 @@ export class ActionHandlerPf1 extends ActionHandler {
         return result;
     }
 
+    _getItemName(item) {
+        let name;
+
+        if (item.data.identified || game.user.isGM)
+            name = item.data.identifiedName
+        else
+            name = item.data.unidentified?.name;
+
+        if (!name)
+            name = item.name;
+
+        return name;
+    }
+
     _getImage(item) {
         let result = '';
         if (settings.get('showIcons'))