Merge branch 'develop'

espositos · Feb 18, 2021 · 2e6b69b · 2e6b69b
2 parents d26286e + bf56e31
commit 2e6b69b
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.10.34] 2020-02-18
+### Added
+- SW5e class features thanks to Therasin/Zasshem
+
 ## [0.10.33] 2020-02-06
 ### Added
 - Option to toggle between drop-up and drop-down categories

diff --git a/lang/br.json b/lang/br.json
@@ -57,6 +57,7 @@
   "tokenactionhud.tools": "Ferramentas",
 
   "tokenactionhud.features": "Talentos",
+  "tokenactionhud.classFeatures": "Características da aula",
   "tokenactionhud.levelAbbreviation": "Lvl",
 
   "tokenactionhud.blocklistLabel": "Lista Bloquiada (somente esconder) ou Lista Permitida (somente exibir)",

diff --git a/lang/cn.json b/lang/cn.json
@@ -26,6 +26,7 @@
     "tokenactionhud.magicItems": "魔法物品",
     "tokenactionhud.feats": "专长",
     "tokenactionhud.features": "特性",
+	"tokenactionhud.classFeatures": "班级特色",
     "tokenactionhud.free": "自由",
     "tokenactionhud.inconsumables": "非消耗品",
     "tokenactionhud.instinct": "直感",

diff --git a/lang/en.json b/lang/en.json
@@ -28,6 +28,7 @@
     "tokenactionhud.magicItems": "Magic Items",
     "tokenactionhud.feats": "Feats",
     "tokenactionhud.features": "Features",
+	"tokenactionhud.classFeatures": "Class Features",
     "tokenactionhud.free": "Free",
     "tokenactionhud.inconsumables": "Inconsumables",
     "tokenactionhud.instinct": "Instinct",

diff --git a/lang/es.json b/lang/es.json
@@ -11,6 +11,7 @@
     "tokenactionhud.dmg": "Dañ",
     "tokenactionhud.feats": "Dotes",
     "tokenactionhud.features": "Dotes",
+	"tokenactionhud.classFeatures": "Características de clase",
     "tokenactionhud.inconsumables": "Consumibles",
     "tokenactionhud.instinct": "Instinto",
     "tokenactionhud.monsterMoves": "Movimientos de Monstruo",

diff --git a/lang/fr.json b/lang/fr.json
@@ -25,6 +25,7 @@
     "tokenactionhud.equipment": "Equipement",
     "tokenactionhud.magicItems": "Objets Magiques",
     "tokenactionhud.feats": "Dons",
+	"tokenactionhud.classFeatures": "Capacités de classe",
     "tokenactionhud.features": "Capacités",
     "tokenactionhud.free": "Libre",
     "tokenactionhud.inconsumables": "Non consommables",

diff --git a/lang/ja.json b/lang/ja.json
@@ -28,6 +28,7 @@
     "tokenactionhud.magicItems": "魔法アイテム",
     "tokenactionhud.feats": "特技",
     "tokenactionhud.features": "特徴",
+	"tokenactionhud.classFeatures": "クラスの特徴",
     "tokenactionhud.free": "無料",
     "tokenactionhud.inconsumables": "非消耗品",
     "tokenactionhud.instinct": "直感",

diff --git a/lang/ko.json b/lang/ko.json
@@ -25,6 +25,7 @@
     "tokenactionhud.equipment": "장비",
     "tokenactionhud.magicItems": "매직 아이템",
     "tokenactionhud.feats": "피트",
+	"tokenactionhud.classFeatures": "Class Features",
     "tokenactionhud.features": "특징",
     "tokenactionhud.free": "자유",
     "tokenactionhud.inconsumables": "비소모품",

diff --git a/lang/pl.json b/lang/pl.json
@@ -25,6 +25,7 @@
   "tokenactionhud.equipment": "Ekwipunek",
   "tokenactionhud.magicItems": "Magiczne Przedmioty",
   "tokenactionhud.feats": "Feats",
+  "tokenactionhud.classFeatures": "Class Features",
   "tokenactionhud.features": "Features",
   "tokenactionhud.free": "Darmowe",
   "tokenactionhud.inconsumables": "Inconsumables",

diff --git a/scripts/actions/sw5e/sw5e-actions.js b/scripts/actions/sw5e/sw5e-actions.js
@@ -34,17 +34,20 @@ export class ActionHandlerSw5e extends ActionHandler {
         let items = this._getItemList(actor, tokenId);
         let powers = this._getPowersList(actor, tokenId);
         let feats = this._getFeatsList(actor, tokenId);
+		let classFeatures = this._getClassFeaturesList(actor, tokenId);
         let skills = this._getSkillsList(actor.data.data.skills, tokenId);
         let utility = this._getUtilityList(actor, tokenId);
 
         let itemsTitle = this.i18n('tokenactionhud.inventory');
         let powersTitle = this.i18n('tokenactionhud.powers');
         let featsTitle = this.i18n('tokenactionhud.features');
+		let classFeaturesTitle = this.i18n('tokenactionhud.classFeatures');
         let skillsTitle = this.i18n('tokenactionhud.skills');
 
         this._combineCategoryWithList(result, itemsTitle, items);
         this._combineCategoryWithList(result, powersTitle, powers);
         this._combineCategoryWithList(result, featsTitle, feats);
+		this._combineCategoryWithList(result, classFeaturesTitle, classFeatures);
         this._combineCategoryWithList(result, skillsTitle, skills);
 
         let savesTitle = this.i18n('tokenactionhud.saves');
@@ -305,7 +308,7 @@ export class ActionHandlerSw5e extends ActionHandler {
         if (c?.concentration)
             power.info2 += this.i18n('SW5E.Concentration').charAt(0).toUpperCase();
     }
-    
+	
     /** FEATS **/
 
     /** @private */
@@ -316,6 +319,15 @@ export class ActionHandlerSw5e extends ActionHandler {
 
         return feats;
     }
+
+    /** @private */
+    _getClassFeaturesList(actor, tokenId) {
+        let validClassfeature = this._filterLongerActions(actor.data.items.filter(i => i.type == 'classfeature'));
+	    let sortedClassfeature = this._sortByItemSort(validClassfeature);
+        let classfeatures = this._categoriseFeats(tokenId, actor, sortedClassfeature);
+
+        return classfeatures;
+    }
 
     /** @private */
     _categoriseFeats(tokenId, actor, feats) {