Working on Skills and some fixes

- Added Skills to character sheet
- Added migration to old skills
- Added icon on skills
- Added actor.isNpc
- Money out of system

system/templates/actors/actor-export.html

@@ -127,7 +127,7 @@
         {{!-- items list --}}
         <h2>{{localize 'l5r5e.sheets.equipment'}}</h2>
         <ul>
-            <li>{{localize 'l5r5e.money.title'}} : {{data.system.money.koku}} {{localize 'l5r5e.money.koku'}} / {{data.system.money.bu}} {{localize 'l5r5e.money.bu'}} / {{data.system.money.zeni}} {{localize 'l5r5e.money.zeni'}}</li>
+            <li>{{localize 'l5r5e.money.title'}} : {{data.money.koku}} {{localize 'l5r5e.money.koku'}} / {{data.money.bu}} {{localize 'l5r5e.money.bu'}} / {{data.money.zeni}} {{localize 'l5r5e.money.zeni'}}</li>
             {{#each data.splitItemsList as |cat type|}}
                 <li>
                     <strong>{{localize (localize 'l5r5e.{type}s.title' type=type)}} ({{cat.length}})</strong>

system/templates/actors/character-sheet.html

@@ -34,8 +34,8 @@
         {{!-- Skills Tab --}}
         <article class="tab skills" data-group="primary" data-tab="skills">
             <ul class="skills-wrapper">
-                {{#each data.system.skills as |category id|}}
-                    {{> 'systems/l5r5e/templates/actors/character/category.html' category=category categoryId=id data=../data}}
+                {{#each data.skillCategories as |itemsInCategory id|}}
+                    {{> 'systems/l5r5e/templates/actors/character/category.html' itemsInCategory=itemsInCategory categoryId=id data=../data}}
                 {{/each}}
             </ul>
             {{> 'systems/l5r5e/templates/actors/character/techniques.html'}}

system/templates/actors/character/category.html

@@ -1,8 +1,8 @@
 <li class="skill-category-wrapper skill-category-content">
     <h4 class="section-header toggle-on-click" data-toggle="toggle-skill-category-{{categoryId}}">{{localizeSkill categoryId 'title'}}</h4>
     <ul class="skill-category-skills-list toggle-skill-category-{{categoryId}} {{#ifCond data.storeInfos 'includes' (concat 'toggle-skill-category-' categoryId)}}toggle-hidden{{/ifCond}}">
-        {{#each category as |skill id|}}
-            {{> 'systems/l5r5e/templates/actors/character/skill.html' categoryId=../categoryId skill=skill skillId=id data=../data}}
+        {{#each itemsInCategory as |skill|}}
+            {{> 'systems/l5r5e/templates/items/skill/skill-entry.html' skill=skill data=../data}}
         {{/each}}
     </ul>
     <ul class="skill-category-ring-actions toggle-skill-category-{{categoryId}} {{#ifCond data.storeInfos 'includes' (concat 'toggle-skill-category-' categoryId)}}toggle-hidden{{/ifCond}}">

system/templates/actors/character/inventory.html

@@ -2,7 +2,7 @@
     <legend class="section-header">{{localize 'l5r5e.money.title'}}</legend>
     <label>
         {{localize 'l5r5e.money.koku'}}
-        <input name="system.money.koku" type="number" value="{{data.system.money.koku}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+        <input name="money.koku" type="number" value="{{data.money.koku}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         <span class="money-buttons">
             <i class="money-control pointer-choice fa fa-plus-square" data-type="koku" data-value="1"></i>
             <i class="money-control pointer-choice fa fa-minus-square" data-type="koku" data-value="-1"></i>
@@ -10,7 +10,7 @@
     </label>
     <label>
         {{localize 'l5r5e.money.bu'}}
-        <input name="system.money.bu" type="number" value="{{data.system.money.bu}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+        <input name="money.bu" type="number" value="{{data.money.bu}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         <span class="money-buttons">
             <i class="money-control pointer-choice fa fa-plus-square" data-type="bu" data-value="1"></i>
             <i class="money-control pointer-choice fa fa-minus-square" data-type="bu" data-value="-1"></i>
@@ -18,7 +18,7 @@
     </label>
     <label>
         {{localize 'l5r5e.money.zeni'}}
-        <input name="system.money.zeni" type="number" value="{{data.system.money.zeni}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+        <input name="money.zeni" type="number" value="{{data.money.zeni}}" data-dtype="Number" min="0" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         <span class="money-buttons">
             <i class="money-control pointer-choice fa fa-plus-square" data-type="zeni" data-value="1"></i>
             <i class="money-control pointer-choice fa fa-minus-square" data-type="zeni" data-value="-1"></i>

system/templates/actors/character/skill.html

@@ -1,16 +0,0 @@
-<li class="skill skill-wrapper">
-    <label class="skill-content">
-        <span class="dice-picker attribute-label rollable" data-skill="{{skillId}}">{{localizeSkill categoryId skillId}}</span>
-        <input
-            class="centered-input select-on-focus"
-            type="number"
-            name="system.skills.{{categoryId}}.{{skillId}}"
-            value="{{skill}}"
-            data-dtype="Number"
-            min="0"
-            max="9"
-            placeholder="0"
-            {{^if data.editable_not_soft_locked}}disabled{{/if}}
-        />
-    </label>
-</li>

system/templates/items/skill/skill-entry.html

@@ -1,10 +1,21 @@
 <li class="item skill flexcol" data-item-id="{{skill.id}}">
-    <ul class="item-header skill-controls">
+    <ul class="item-header skill-controls flexrow">
         <li class="item-img"><img src="{{skill.img}}" title="{{skill.name}}" width="32px" height="32px"/></li>
-        <li class="item-name l5r5e-tooltip" data-item-id="{{skill.id}}">{{skill.name}}</li>
-        {{#if editable}}
-            <li data-item-id="{{skill.id}}" class="item-control item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
-            <li data-item-id="{{skill.id}}" class="item-control item-delete" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></li>
+        <li class="item-name dice-picker attribute-label rollable l5r5e-tooltip" data-item-id="{{skill._id}}" data-skill="{{skill._id}}">{{skill.name}}</li>
+        <li class="item-rank"><input
+            class="centered-input select-on-focus"
+            type="number"
+            name="skillsValues.{{skill._id}}"
+            value="{{skill.system.rank}}"
+            data-dtype="Number"
+            min="0"
+            max="9"
+            placeholder="0"
+            {{^if data.editable_not_soft_locked}}disabled{{/if}}
+        /></li>
+        {{#if data.editable_not_soft_locked}}
+            <li data-item-id="{{skill._id}}" class="item-control item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
+            <li data-item-id="{{skill._id}}" class="item-control item-delete" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></li>
         {{/if}}
     </ul>
 </li>