First round of changes

system/templates/actors/character/aspects.html

@@ -0,0 +1,30 @@
+<div class="aspects-section">
+    <div class="aspect-fields">
+        <label class="attribute-label">
+            {{localize 'chiaroscuro.aspects.solar'}}
+            <input type="number" name="system.aspects.aspects.solar" value="{{data.system.aspects.aspects.solar}}" class="select-on-focus" data-dtype="Number" min="0" max="100" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+        </label>
+        <label class="attribute-label">
+            {{localize 'chiaroscuro.aspects.lunar'}}
+            <input type="number" name="system.aspects.aspects.lunar" value="{{data.system.aspects.aspects.lunar}}" class="select-on-focus" data-dtype="Number" min="0" max="100" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+        </label>
+        <label class="attribute-label">
+            {{localize 'chiaroscuro.aspects.gauge'}}
+            <input type="number" name="system.aspects.aspects.gauge" value="{{data.system.aspects.aspects.gauge}}" class="select-on-focus" data-dtype="Number" min="-10" max="10" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+        </label>
+        <div class="gauge-bar-wrapper">
+            <div class="gauge-bar" style="width: {{data.aspectsData.gaugePercent}}%; background-color: {{data.aspectsData.gaugeColor}};"></div>
+        </div>
+    </div>
+    {{#if data.etatItems.length}}
+    <div class="etat-summary">
+        <span class="etat-summary-label">{{localize 'chiaroscuro.etat.title'}}</span>
+        {{#each data.etatItems as |etat|}}
+            <span class="etat-badge l5r5e-tooltip" title="{{etat.system.effect}}">
+                <img src="{{etat.img}}" width="16" height="16" />
+                {{etat.name}}
+            </span>
+        {{/each}}
+    </div>
+    {{/if}}
+</div>

system/templates/actors/character/identity-text.html

@@ -0,0 +1,10 @@
+<div class="identity-text-wrapper flexrow">
+    <fieldset class="identity-text-block">
+        <legend class="text-block-header">{{localize 'chiaroscuro.tabs.identity_text1'}}</legend>
+        {{editor data.enrichedHtml.identity_text1 target="system.identity_text1" button=true editable=options.editable engine="prosemirror" collaborate=false}}
+    </fieldset>
+    <fieldset class="identity-text-block">
+        <legend class="text-block-header">{{localize 'chiaroscuro.tabs.identity_text2'}}</legend>
+        {{editor data.enrichedHtml.identity_text2 target="system.identity_text2" button=true editable=options.editable engine="prosemirror" collaborate=false}}
+    </fieldset>
+</div>

system/templates/actors/character/identity.html

@@ -1,21 +1,27 @@
 <ul class="identity-content">
+    <li>
+        <label class="attribute-label is-samurai-label">
+            {{localize 'chiaroscuro.character.is_samurai'}}
+            <input type="checkbox" name="system.is_samurai" {{checked data.system.is_samurai}} {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+        </label>
+    </li>
     <li>
         <label class="attribute-label">
-            {{#ifCond data.system.template '==' 'pow'}}
-                {{localize 'l5r5e.sheets.region'}}
-            {{else}}
+            {{#if data.system.is_samurai}}
                 {{localize 'l5r5e.clans.label'}}
-            {{/ifCond}}
+            {{else}}
+                {{localize 'chiaroscuro.character.region'}}
+            {{/if}}
             <input type="text" name="system.identity.clan" value="{{data.system.identity.clan}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li>
         <label class="attribute-label">
-            {{#ifCond data.system.template '==' 'pow'}}
-                {{localize 'l5r5e.sheets.upbringing'}}
-            {{else}}
+            {{#if data.system.is_samurai}}
                 {{localize 'l5r5e.sheets.family'}}
-            {{/ifCond}}
+            {{else}}
+                {{localize 'chiaroscuro.character.education'}}
+            {{/if}}
             <input type="text" name="system.identity.family" value="{{data.system.identity.family}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
@@ -37,4 +43,10 @@
             <input type="text" name="system.identity.roles" value="{{data.system.identity.roles}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
+    <li>
+        <label class="attribute-label quick-info-label">
+            {{localize 'chiaroscuro.character.quick_info'}}
+            <input type="text" name="system.quick_info" value="{{data.system.quick_info}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
+        </label>
+    </li>
 </ul>

system/templates/actors/character/invocations.html

@@ -0,0 +1,17 @@
+<div class="invocations-wrapper">
+    {{#each data.splitInvocationsList as |list type|}}
+    <fieldset class="section-header flexrow">
+        <legend class="technique-controls">
+            <span>{{localize (concat 'chiaroscuro.technique.invocation_types.' type)}}</span>
+            {{#if ../data.editable_not_soft_locked}}
+            <a data-item-type="technique" class="technique-control item-add" data-tech-type="mot_invocation" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
+            {{/if}}
+        </legend>
+        <ul class="item-list">
+            {{#each list as |item|}}
+                {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item editable=../../data.editable_not_soft_locked}}
+            {{/each}}
+        </ul>
+    </fieldset>
+    {{/each}}
+</div>

system/templates/actors/character/narrative.html

@@ -7,12 +7,16 @@
             <textarea type="text" name="system.social.ninjo" {{^if data.editable_not_soft_locked}}disabled{{/if}}>{{data.system.social.ninjo}}</textarea>
         </label>
         <label class="attribute-label">
-            {{#ifCond data.system.template '==' 'pow'}}
-                {{localize 'l5r5e.social.past'}}
-            {{else}}
+            {{#if data.system.is_samurai}}
                 {{localize 'l5r5e.social.giri'}}
-            {{/ifCond}}
-            <textarea type="text" name="system.social.giri" {{^if data.editable_not_soft_locked}}disabled{{/if}}>{{data.system.social.giri}}</textarea>
+            {{else}}
+                {{localize 'chiaroscuro.character.past_problems'}}
+            {{/if}}
+            {{#if data.system.is_samurai}}
+                <textarea type="text" name="system.social.giri" {{^if data.editable_not_soft_locked}}disabled{{/if}}>{{data.system.social.giri}}</textarea>
+            {{else}}
+                <textarea type="text" name="system.social.past_problems" {{^if data.editable_not_soft_locked}}disabled{{/if}}>{{data.system.social.past_problems}}</textarea>
+            {{/if}}
         </label>
     </fieldset>
     {{!-- Bushido Tenets --}}

system/templates/actors/character/rings.html

@@ -2,35 +2,35 @@
     <li id="earth">
         <label class="earth {{#ifCond 'earth' '==' data.system.stance}}stance-active{{/ifCond}}">
             <i class="i_earth dice-picker rollable" data-ring="earth"></i>
-            <strong>{{localizeRing 'earth'}}</strong>
+            <strong class="ring-set-default {{#ifCond 'earth' '==' data.system.default_ring}}default-ring{{/ifCond}}" data-ring="earth" title="{{localize 'chiaroscuro.character.default_ring'}}">{{localizeRing 'earth'}}</strong>
             <input class="centered-input select-on-focus" type="number" name="system.rings.earth" value="{{data.system.rings.earth}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li id="air">
         <label class="air {{#ifCond 'air' '==' data.system.stance}}stance-active{{/ifCond}}">
             <i class="i_air dice-picker rollable" data-ring="air"></i>
-            <strong>{{localizeRing 'air'}}</strong>
+            <strong class="ring-set-default {{#ifCond 'air' '==' data.system.default_ring}}default-ring{{/ifCond}}" data-ring="air" title="{{localize 'chiaroscuro.character.default_ring'}}">{{localizeRing 'air'}}</strong>
             <input class="centered-input select-on-focus" type="number" name="system.rings.air" value="{{data.system.rings.air}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li  id="water">
         <label class="water {{#ifCond 'water' '==' data.system.stance}}stance-active{{/ifCond}}">
             <i class="i_water dice-picker rollable" data-ring="water"></i>
-            <strong>{{localizeRing 'water'}}</strong>
+            <strong class="ring-set-default {{#ifCond 'water' '==' data.system.default_ring}}default-ring{{/ifCond}}" data-ring="water" title="{{localize 'chiaroscuro.character.default_ring'}}">{{localizeRing 'water'}}</strong>
             <input class="centered-input select-on-focus" type="number" name="system.rings.water" value="{{data.system.rings.water}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li id="fire">
         <label class="fire {{#ifCond 'fire' '==' data.system.stance}}stance-active{{/ifCond}}">
             <i class="i_fire dice-picker rollable" data-ring="fire"></i>
-            <strong>{{localizeRing 'fire'}}</strong>
+            <strong class="ring-set-default {{#ifCond 'fire' '==' data.system.default_ring}}default-ring{{/ifCond}}" data-ring="fire" title="{{localize 'chiaroscuro.character.default_ring'}}">{{localizeRing 'fire'}}</strong>
             <input class="centered-input select-on-focus" type="number" name="system.rings.fire" value="{{data.system.rings.fire}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>
     <li id="void">
         <label class="void {{#ifCond 'void' '==' data.system.stance}}stance-active{{/ifCond}}">
             <i class="i_void dice-picker rollable" data-ring="void"></i>
-            <strong>{{localizeRing 'void'}}</strong>
+            <strong class="ring-set-default {{#ifCond 'void' '==' data.system.default_ring}}default-ring{{/ifCond}}" data-ring="void" title="{{localize 'chiaroscuro.character.default_ring'}}">{{localizeRing 'void'}}</strong>
             <input class="centered-input select-on-focus" type="number" name="system.rings.void" value="{{data.system.rings.void}}" data-dtype="Number" min="1" max="9" placeholder="0" {{^if data.editable_not_soft_locked}}disabled{{/if}}/>
         </label>
     </li>

system/templates/actors/character/skill.html

@@ -1,16 +1,9 @@
 <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}}
-        />
+        <select name="system.skills.{{categoryId}}.{{skillId}}" {{^if data.editable_not_soft_locked}}disabled{{/if}}>
+            {{selectOptions data.skillRanksList selected=skill valueAttr='id' labelAttr='label'}}
+        </select>
+        {{#ifCond skill '!=' '0'}}<span class="skill-bonus">+{{skillRankBonus skill}}</span>{{/ifCond}}
     </label>
 </li>

system/templates/actors/character/techniques.html

@@ -45,4 +45,27 @@
             {{/each}}
         </ul>
     </fieldset>
+    {{!-- Arcane items list --}}
+    <fieldset class="section-header flexrow">
+        <legend class="text-block-header">
+            {{localize 'chiaroscuro.arcane.title'}}
+            {{#if data.editable_not_soft_locked}}
+            <a data-item-type="arcane" class="arcane-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
+            {{/if}}
+        </legend>
+        <ul class="item-list">
+            {{#each data.arcaneItems as |item|}}
+            <li class="item technique flexcol" data-item-id="{{item._id}}">
+                <ul class="item-header technique-controls">
+                    <li class="item-img"><img src="{{item.img}}" title="{{item.name}}" width="32px" height="32px"/></li>
+                    <li class="item-name l5r5e-tooltip" data-item-id="{{item._id}}">{{item.name}}</li>
+                    {{#if ../data.editable_not_soft_locked}}
+                    <li data-item-id="{{item._id}}" class="item-control item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
+                    <li data-item-id="{{item._id}}" class="item-control item-delete" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></li>
+                    {{/if}}
+                </ul>
+            </li>
+            {{/each}}
+        </ul>
+    </fieldset>
 </div>