Merge branch 'release/2.3'

CHANGELOG.txt

@@ -1,3 +1,7 @@
+v2.3
+- Added shortened attribute names to use in templates
+- Handlebars "concat" helper added
+
 v2.2
 - Spanish translation added
 - Cohorts localization fix

lang/en.json

@@ -138,18 +138,21 @@
   "BITD.EffectGreat": "Great",
 
   "BITD.SkillsInsight": "Insight",
+  "BITD.SkillsInsightShort": "Insight",
   "BITD.SkillsHunt": "Hunt",
   "BITD.SkillsStudy": "Study",
   "BITD.SkillsSurvey": "Survey",
   "BITD.SkillsTinker": "Tinker",
 
   "BITD.SkillsProwess": "Prowess",
+  "BITD.SkillsProwessShort": "Prowess",
   "BITD.SkillsFinesse": "Finesse",
   "BITD.SkillsProwl": "Prowl",
   "BITD.SkillsSkirmish": "Skirmish",
   "BITD.SkillsWreck": "Wreck",
 
   "BITD.SkillsResolve": "Resolve",
+  "BITD.SkillsResolveShort": "Resolve",
   "BITD.SkillsAttune": "Attune",
   "BITD.SkillsCommand": "Command",
   "BITD.SkillsConsort": "Consort",

lang/es.json

@@ -138,18 +138,21 @@
   "BITD.EffectGreat": "Excelente",
 
   "BITD.SkillsInsight": "Perspicacia",
+  "BITD.SkillsInsightShort": "Per.",
   "BITD.SkillsHunt": "Cazar",
   "BITD.SkillsStudy": "Estudiar",
   "BITD.SkillsSurvey": "Analizar",
   "BITD.SkillsTinker": "Trastear",
 
   "BITD.SkillsProwess": "Destreza",
+  "BITD.SkillsProwessShort": "Des.",
   "BITD.SkillsFinesse": "Afinar",
   "BITD.SkillsProwl": "Acechar",
   "BITD.SkillsSkirmish": "Pelear",
   "BITD.SkillsWreck": "Destrozar",
 
   "BITD.SkillsResolve": "Voluntad",
+  "BITD.SkillsResolveShort": "Vol.",
   "BITD.SkillsAttune": "Armonizar",
   "BITD.SkillsCommand": "Mandar",
   "BITD.SkillsConsort": "Socializar",

lang/ru.json

@@ -131,16 +131,19 @@
   "BITD.EffectStandard": "Средняя",
   "BITD.EffectGreat": "Высокая",
   "BITD.SkillsInsight": "Чутьё",
+  "BITD.SkillsInsightShort": "Чутьё",
   "BITD.SkillsHunt": "Охота",
   "BITD.SkillsStudy": "Изучение",
   "BITD.SkillsSurvey": "Разведка",
   "BITD.SkillsTinker": "Ремесло",
   "BITD.SkillsProwess": "Удаль",
+  "BITD.SkillsProwessShort": "Удаль",
   "BITD.SkillsFinesse": "Сноровка",
   "BITD.SkillsProwl": "Проникновение",
   "BITD.SkillsSkirmish": "Драка",
   "BITD.SkillsWreck": "Разрушение",
   "BITD.SkillsResolve": "Воля",
+  "BITD.SkillsResolveShort": "Воля",
   "BITD.SkillsAttune": "Манипулирование",
   "BITD.SkillsCommand": "Приказ",
   "BITD.SkillsConsort": "Общение",

module/blades-sheet.js

@@ -88,9 +88,7 @@ export class BladesSheet extends ActorSheet {
 
       items_to_add.push(items.find(e => e._id === $(this).val()));
     });
-    items_to_add.forEach(e => {
-      this.actor.createEmbeddedEntity("OwnedItem", duplicate(e));
-    });
+    this.actor.createEmbeddedEntity("OwnedItem", items_to_add);
   }
   /* -------------------------------------------- */
 

module/blades.js

@@ -165,6 +165,19 @@ Hooks.once("init", async function() {
     return accum;
   });
 
+  // Concat helper
+  // https://gist.github.com/adg29/f312d6fab93652944a8a1026142491b1
+  // Usage: (concat 'first 'second')
+  Handlebars.registerHelper('concat', function() {
+    var outStr = '';
+    for(var arg in arguments){
+        if(typeof arguments[arg]!='object'){
+            outStr += arguments[arg];
+        }
+    }
+    return outStr;
+  });
+
 });
 
 /**

system.json

@@ -2,8 +2,8 @@
   "name": "blades-in-the-dark",
   "title": "Blades in the Dark",
   "description": "Blades in the dark game system.",
-  "version": "2.2",
-  "minimumCoreVersion": "0.5.3",
+  "version": "2.3",
+  "minimumCoreVersion": "0.6.6",
   "compatibleCoreVersion": "0.7.2",
   "templateVersion": 1,
   "author": "megastruktur",
@@ -31,8 +31,8 @@
     }
   ],
   "url": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/",
-  "manifest": "https://raw.githubusercontent.com/megastruktur/foundryvtt-blades-in-the-dark/2.2/system.json",
-  "download": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/archive/2.2.zip",
+  "manifest": "https://raw.githubusercontent.com/megastruktur/foundryvtt-blades-in-the-dark/2.3/system.json",
+  "download": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/archive/2.3.zip",
   "packs": [
     {
       "name": "class",

templates/parts/attributes.html

@@ -5,7 +5,7 @@
   <div id="attributes-{{attribute_name}}" class="attribute">
     <div id="attributes-{{attribute_name}}-title" class="attributes-exp">
       <div class="stripe">
-        <a class="attribute-label roll-die-attribute rollable-text" data-roll-attribute="{{attribute_name}}">{{localize attribute.label}}</a>
+        <a class="attribute-label roll-die-attribute rollable-text" data-roll-attribute="{{attribute_name}}">{{localize (concat attribute.label 'Short')}}</a>
       </div>
       <div class="stripe-tooth-body">
         {{#multiboxes attribute.exp}}