Merge branch 'dev' into dev_skillslist
# Conflicts: # CHANGELOG.md # system/lang/en-en.json # system/lang/fr-fr.json # system/scripts/actor.js # system/scripts/actors/base-character-sheet.js # system/scripts/combat.js # system/scripts/config.js # system/scripts/dice/dice-picker-dialog.js # system/scripts/dice/roll-n-keep-dialog.js # system/scripts/gm/gm-monitor.js # system/scripts/gm/gm-toolbox.js # system/scripts/hooks.js # system/scripts/items/technique-sheet.js # system/scripts/main-l5r5e.js # system/scripts/migration.js # system/scripts/preloadTemplates.js # system/scripts/settings.js # system/scripts/socket-handler.js # system/styles/l5r5e.css # system/system.json # system/templates/actors/character-sheet.html
This commit is contained in:
Vlyan
@@ -52,7 +52,7 @@
|
||||
<section class="sheet-body">
|
||||
{{!-- Sheet Tab Navigation --}}
|
||||
<nav class="sheet-tabs tabs" data-group="primary">
|
||||
<a class="item" data-tab="army">{{localize 'ACTOR.TypeArmy'}}</a>
|
||||
<a class="item" data-tab="army">{{localize 'TYPES.Actor.army'}}</a>
|
||||
<a class="item" data-tab="cohort">{{localize 'l5r5e.army.cohort.tab'}}</a>
|
||||
<a class="item" data-tab="fortification">{{localize 'l5r5e.army.fortification.tab'}}</a>
|
||||
<a class="item" data-tab="others">{{localize 'l5r5e.sheets.notes'}}</a>
|
||||
|
||||
@@ -1,27 +1,39 @@
|
||||
<form class="{{cssClass}}" data-lang="{{localize 'I18N.Language'}}" autocomplete="off">
|
||||
{{!-- L5R Button bar --}}
|
||||
<div class="l5r-buttons-bar">
|
||||
{{#each l5rHeaderButtons}}
|
||||
{{#each l5rHeaderButtons}}
|
||||
<a class="l5r-header-button {{this.class}}"><i class="{{this.icon}}"></i>{{localize this.label}}</a>
|
||||
{{/each}}
|
||||
{{/each}}
|
||||
</div>
|
||||
{{!-- Sheet Header --}}
|
||||
<header class="sheet-header">
|
||||
<img class="profile-img dragndrop-actor-uuid pointer" src="{{data.img}}" {{#if data.editable_not_soft_locked}}data-edit="img"{{/if}} data-actor-uuid="{{actor.uuid}}" draggable="true" title="{{data.name}}"/>
|
||||
<img class="profile-img dragndrop-actor-uuid pointer" src="{{data.img}}" {{#if
|
||||
data.editable_not_soft_locked}}data-edit="img" {{/if}} data-actor-uuid="{{actor.uuid}}" draggable="true"
|
||||
title="{{data.name}}" />
|
||||
<div class="header-fields identity-wrapper">
|
||||
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if data.editable_not_soft_locked}}disabled{{/if}}/></h1>
|
||||
<h1 class="charname">
|
||||
<input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if
|
||||
data.editable_not_soft_locked}}disabled{{/if}} />
|
||||
</h1>
|
||||
{{> 'systems/l5r5e/templates/actors/character/identity.html'}}
|
||||
</div>
|
||||
<div class="header-fields">
|
||||
<h2>{{localize 'l5r5e.social.title'}}</h2>
|
||||
<h2 class="right">{{localize 'l5r5e.attributes.title'}}</h2>
|
||||
{{> 'systems/l5r5e/templates/actors/character/social.html'}}
|
||||
{{> 'systems/l5r5e/templates/actors/character/rings.html'}}
|
||||
{{> 'systems/l5r5e/templates/actors/character/attributes.html'}}
|
||||
<div class="header-fields mid-wrapper">
|
||||
<div class="side-col">
|
||||
<h2>{{localize 'l5r5e.social.title'}}</h2>
|
||||
{{> 'systems/l5r5e/templates/actors/character/social.html'}}
|
||||
</div>
|
||||
<div class="central-col">{{> 'systems/l5r5e/templates/actors/character/rings.html'}}</div>
|
||||
<div class="side-col">
|
||||
<h2 class="right">{{localize 'l5r5e.attributes.title'}}</h2>
|
||||
{{> 'systems/l5r5e/templates/actors/character/attributes.html'}}
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
{{!-- Sheet Body --}}
|
||||
<section class="sheet-body">
|
||||
{{!-- Active effects --}}
|
||||
{{> 'systems/l5r5e/templates/actors/character/effects.html'}}
|
||||
|
||||
{{!-- Sheet Tab Navigation --}}
|
||||
<nav class="sheet-tabs tabs" data-group="primary">
|
||||
<a class="item" data-tab="skills">{{localize 'l5r5e.skills.title'}}</a>
|
||||
@@ -61,4 +73,4 @@
|
||||
{{> 'systems/l5r5e/templates/actors/character/experience.html'}}
|
||||
</article>
|
||||
</section>
|
||||
</form>
|
||||
</form>
|
||||
|
||||
8
system/templates/actors/character/effects.html
Normal file
8
system/templates/actors/character/effects.html
Normal file
@@ -0,0 +1,8 @@
|
||||
<ul class="effects">
|
||||
{{#each actor.effects as |effect|}}
|
||||
<li class="effect-container" title="{{name}}">
|
||||
<div class="effect-icon" style="background-image: url({{effect.icon}})"></div>
|
||||
<div class="effect-name"><label>{{name}}</label></div>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
@@ -1,27 +1,39 @@
|
||||
<form class="{{cssClass}}" data-lang="{{localize 'I18N.Language'}}" autocomplete="off">
|
||||
{{!-- L5R Button bar --}}
|
||||
<div class="l5r-buttons-bar">
|
||||
{{#each l5rHeaderButtons}}
|
||||
{{#each l5rHeaderButtons}}
|
||||
<a class="l5r-header-button {{this.class}}"><i class="{{this.icon}}"></i>{{localize this.label}}</a>
|
||||
{{/each}}
|
||||
{{/each}}
|
||||
</div>
|
||||
{{!-- Sheet Header --}}
|
||||
<header class="sheet-header">
|
||||
<div class="header-fields identity-wrapper">
|
||||
<img class="profile-img dragndrop-actor-uuid pointer" src="{{data.img}}" {{#if data.editable_not_soft_locked}}data-edit="img"{{/if}} data-actor-uuid="{{actor.uuid}}" draggable="true" title="{{data.name}}"/>
|
||||
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if data.editable_not_soft_locked}}disabled{{/if}}/></h1>
|
||||
<img class="profile-img dragndrop-actor-uuid pointer" src="{{data.img}}" {{#if
|
||||
data.editable_not_soft_locked}}data-edit="img" {{/if}} data-actor-uuid="{{actor.uuid}}" draggable="true"
|
||||
title="{{data.name}}" />
|
||||
<h1 class="charname">
|
||||
<input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if
|
||||
data.editable_not_soft_locked}}disabled{{/if}} />
|
||||
</h1>
|
||||
{{> 'systems/l5r5e/templates/actors/npc/identity.html'}}
|
||||
</div>
|
||||
<div class="header-fields">
|
||||
<h2>{{localize 'l5r5e.social.title'}}</h2>
|
||||
<h2 class="right">{{localize 'l5r5e.attributes.title'}}</h2>
|
||||
{{> 'systems/l5r5e/templates/actors/npc/social.html'}}
|
||||
{{> 'systems/l5r5e/templates/actors/npc/rings.html'}}
|
||||
{{> 'systems/l5r5e/templates/actors/npc/attributes.html'}}
|
||||
<div class="header-fields mid-wrapper">
|
||||
<div class="side-col">
|
||||
<h2>{{localize 'l5r5e.social.title'}}</h2>
|
||||
{{> 'systems/l5r5e/templates/actors/npc/social.html'}}
|
||||
</div>
|
||||
<div class="central-col">{{> 'systems/l5r5e/templates/actors/npc/rings.html'}}</div>
|
||||
<div class="side-col">
|
||||
<h2 class="right">{{localize 'l5r5e.attributes.title'}}</h2>
|
||||
{{> 'systems/l5r5e/templates/actors/npc/attributes.html'}}
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
{{!-- Sheet Body --}}
|
||||
<section class="sheet-body">
|
||||
{{!-- Active effects --}}
|
||||
{{> 'systems/l5r5e/templates/actors/npc/effects.html'}}
|
||||
|
||||
{{!-- Skills No Tab --}}
|
||||
{{> 'systems/l5r5e/templates/actors/npc/skill.html'}}
|
||||
|
||||
@@ -45,9 +57,9 @@
|
||||
|
||||
{{!-- Conflict Tab --}}
|
||||
<article class="tab conflict" data-group="primary" data-tab="conflict">
|
||||
{{> 'systems/l5r5e/templates/actors/npc/conflict.html'}}
|
||||
{{> 'systems/l5r5e/templates/items/weapon/weapons.html'}}
|
||||
{{> 'systems/l5r5e/templates/items/armor/armors.html'}}
|
||||
{{> 'systems/l5r5e/templates/actors/npc/conflict.html'}} {{>
|
||||
'systems/l5r5e/templates/items/weapon/weapons.html'}} {{>
|
||||
'systems/l5r5e/templates/items/armor/armors.html'}}
|
||||
</article>
|
||||
|
||||
{{!-- Inventory Tab --}}
|
||||
@@ -55,4 +67,4 @@
|
||||
{{> 'systems/l5r5e/templates/actors/npc/inventory.html'}}
|
||||
</article>
|
||||
</section>
|
||||
</form>
|
||||
</form>
|
||||
|
||||
8
system/templates/actors/npc/effects.html
Normal file
8
system/templates/actors/npc/effects.html
Normal file
@@ -0,0 +1,8 @@
|
||||
<ul class="effects">
|
||||
{{#each actor.effects as |effect|}}
|
||||
<li class="effect-container" title="{{name}}">
|
||||
<div class="effect-icon" style="background-image: url({{effect.icon}})"></div>
|
||||
<div class="effect-name"><label>{{name}}</label></div>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
@@ -258,7 +258,7 @@
|
||||
{{localize 'l5r5e.twenty_questions.part2.school_ability'}}
|
||||
{{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.school_ability stepName='step3.school_ability' itemType='techniques' hideDndAt=1}}
|
||||
{{localize 'l5r5e.twenty_questions.part2.starting_techniques'}}
|
||||
{{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.techniques stepName='step3.techniques' itemType='techniques' hideDndAt=5}}
|
||||
{{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step3.techniques stepName='step3.techniques' itemType='techniques' hideDndAt=6}}
|
||||
</td>
|
||||
<td class="fifty">
|
||||
{{localize 'l5r5e.twenty_questions.part2.outfit'}}
|
||||
|
||||
@@ -26,17 +26,17 @@
|
||||
{{#if actor.system.attitude}}<p>({{actor.system.attitude}})</p>{{/if}}
|
||||
</td>
|
||||
<td>
|
||||
<a data-actor-id="{{actor.id}}" data-type="stance" class="actor-modify-control">
|
||||
<a data-actor-uuid="{{actor.uuid}}" data-type="stance" class="actor-modify-control">
|
||||
<i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.stance'}} ({{localizeRing actor.system.stance}} - {{lookup actor.system.rings actor.system.stance}})</h2>{{localizeStanceTip actor.system.stance}}" class="i_{{actor.system.stance}} actor-infos-control"></i>
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-actor-id="{{actor.id}}" data-type="prepared" class="actor-modify-control">
|
||||
<a data-actor-uuid="{{actor.uuid}}" data-type="prepared" class="actor-modify-control">
|
||||
<i data-type="text" data-text="<h2>{{localize 'l5r5e.conflict.initiative.title'}} : {{localize (localize 'l5r5e.conflict.initiative.prepared_{value}' value=actor.isPrepared)}}</h2>" class="fa fas prepared-icon-{{actor.isPrepared}} {{#ifCond actor.isPrepared '==' 'false'}}badvalue{{/ifCond}} actor-infos-control"></i>
|
||||
</a>
|
||||
</td>
|
||||
<td>{{#if actor.haveWeaponEquipped}}<i data-type="weapons" data-actor-id="{{actor.id}}" class="fas fa-fan actor-infos-control {{#if actor.haveWeaponReadied}}badvalue{{/if}}"></i>{{/if}}</td>
|
||||
<td>{{#if actor.haveArmorEquipped}}<i data-type="armors" data-actor-id="{{actor.id}}" class="fas fa-user-shield actor-infos-control"></i>{{/if}}</td>
|
||||
<td>{{#if actor.haveWeaponEquipped}}<i data-type="weapons" data-actor-uuid="{{actor.uuid}}" class="fas fa-fan actor-infos-control {{#if actor.haveWeaponReadied}}badvalue{{/if}}"></i>{{/if}}</td>
|
||||
<td>{{#if actor.haveArmorEquipped}}<i data-type="armors" data-actor-uuid="{{actor.uuid}}" class="fas fa-user-shield actor-infos-control"></i>{{/if}}</td>
|
||||
<td>
|
||||
<p>
|
||||
{{#if actor.system.identity.school_rank}}
|
||||
@@ -56,13 +56,13 @@
|
||||
</p>
|
||||
</td>
|
||||
<td>
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-id="{{actor.id}}" data-type="fatigue" class="actor-modify-control">
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-uuid="{{actor.uuid}}" data-type="fatigue" class="actor-modify-control">
|
||||
<span class="{{#ifCond actor.system.fatigue.value '>' actor.system.fatigue.max}}badvalue{{/ifCond}}">{{actor.system.fatigue.value}}</span>
|
||||
/ {{actor.system.fatigue.max}}
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-id="{{actor.id}}" data-type="strife" class="actor-modify-control">
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-uuid="{{actor.uuid}}" data-type="strife" class="actor-modify-control">
|
||||
<span class="{{#ifCond actor.system.strife.value '>' actor.system.strife.max}}badvalue{{/ifCond}}">{{actor.system.strife.value}}</span>
|
||||
/ {{actor.system.strife.max}}
|
||||
</a>
|
||||
@@ -72,13 +72,13 @@
|
||||
/ {{#if actor.system.is_compromised}}<span class="badvalue">1</span>{{else}}{{actor.system.vigilance}}{{/if}}
|
||||
</td>
|
||||
<td>
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-id="{{actor.id}}" data-type="void_points" class="actor-modify-control">
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-uuid="{{actor.uuid}}" data-type="void_points" class="actor-modify-control">
|
||||
{{actor.system.void_points.value}}
|
||||
/ {{actor.system.void_points.max}}
|
||||
</a>
|
||||
</td>
|
||||
<td><i data-actor-id="{{actor.id}}" data-type="global" class="fas fa-question-circle actor-infos-control"></i></td>
|
||||
<td><span data-actor-id="{{actor.id}}" class="actor-remove-control pointer" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></span></td>
|
||||
<td><i data-actor-uuid="{{actor.uuid}}" data-type="global" class="fas fa-question-circle actor-infos-control"></i></td>
|
||||
<td><span data-actor-uuid="{{actor.uuid}}" class="actor-remove-control pointer" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></span></td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
</tbody>
|
||||
@@ -109,13 +109,13 @@
|
||||
{{/if}}
|
||||
</td>
|
||||
<td>
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-id="{{actor.id}}" data-type="casualties" class="actor-modify-control">
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-uuid="{{actor.uuid}}" data-type="casualties" class="actor-modify-control">
|
||||
<span class="{{#ifCond actor.system.battle_readiness.casualties_strength.value '>' actor.system.battle_readiness.casualties_strength.max}}badvalue{{/ifCond}}">{{actor.system.battle_readiness.casualties_strength.value}}</span>
|
||||
/ {{actor.system.battle_readiness.casualties_strength.max}}
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-id="{{actor.id}}" data-type="panic" class="actor-modify-control">
|
||||
<a title="{{localize 'l5r5e.gm.monitor.mouse_control'}}" data-actor-uuid="{{actor.uuid}}" data-type="panic" class="actor-modify-control">
|
||||
<span class="{{#ifCond actor.system.battle_readiness.panic_discipline.value '>' actor.system.battle_readiness.panic_discipline.max}}badvalue{{/ifCond}}">{{actor.system.battle_readiness.panic_discipline.value}}</span>
|
||||
/ {{actor.system.battle_readiness.panic_discipline.max}}
|
||||
</a>
|
||||
@@ -131,8 +131,8 @@
|
||||
/ <span class="{{#ifCond actor.system.commander_standing.glory '>' 64}}goodvalue{{/ifCond}}{{#ifCond actor.system.commander_standing.glory '<' 20}}badvalue{{/ifCond}}">{{actor.system.commander_standing.glory}}</span>
|
||||
/ {{actor.system.commander_standing.status}}
|
||||
</td>
|
||||
<td><i data-actor-id="{{actor.id}}" data-type="global" class="fas fa-question-circle actor-infos-control"></i></td>
|
||||
<td><span data-actor-id="{{actor.id}}" class="actor-remove-control pointer" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></span></td>
|
||||
<td><i data-actor-uuid="{{actor.uuid}}" data-type="global" class="fas fa-question-circle actor-infos-control"></i></td>
|
||||
<td><span data-actor-uuid="{{actor.uuid}}" class="actor-remove-control pointer" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></span></td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
</tbody>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<section>
|
||||
<h2>{{localize 'ACTOR.TypeArmy'}}</h2>
|
||||
<h2>{{localize 'TYPES.Actor.army'}}</h2>
|
||||
<ul>
|
||||
{{!-- warlord --}}
|
||||
<li><b>{{localize 'l5r5e.army.allies_backers'}}</b> : {{actorData.system.allies_backers}}</li>
|
||||
|
||||
Reference in New Issue
Block a user