Merge branch 'master' into dev_gennpc
# Conflicts: # system/styles/l5r5e.css
This commit is contained in:
Vlyan
@@ -1,74 +1,28 @@
|
||||
<form class="{{cssClass}}" data-lang="{{localize 'I18N.Language'}}" autocomplete="off">
|
||||
{{!-- Sheet Header --}}
|
||||
<header class="sheet-header">
|
||||
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/>
|
||||
<img class="profile-img dragndrop-actor-id pointer" src="{{data.img}}" data-edit="img" data-actor-id="{{actor.id}}" draggable="true" title="{{data.name}}"/>
|
||||
<div class="header-fields identity-wrapper">
|
||||
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1>
|
||||
</div>
|
||||
<div class="header-fields">
|
||||
<div class="warlord">
|
||||
<p>
|
||||
{{localize 'l5r5e.army.warlord'}}
|
||||
<input name="data.warlord" type="text" value="{{data.data.warlord}}" />
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.army.allies_backers'}}
|
||||
<textarea type="text" name="data.allies_backers">{{data.data.allies_backers}}</textarea>
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.army.purpose_mustering'}}
|
||||
<textarea type="text" name="data.purpose_mustering">{{data.data.purpose_mustering}}</textarea>
|
||||
</p>
|
||||
|
||||
<div class="attributes-wrapper">
|
||||
{{localize 'l5r5e.army.battle_readiness.title'}}
|
||||
<p>
|
||||
{{localize 'l5r5e.army.battle_readiness.strength'}}
|
||||
<input name="data.battle_readiness.casualties_strength.max" type="text" value="{{data.data.battle_readiness.casualties_strength.max}}" />
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.army.battle_readiness.casualties'}}
|
||||
<input name="data.battle_readiness.casualties_strength.value" type="text" value="{{data.data.battle_readiness.casualties_strength.value}}" />
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.army.battle_readiness.discipline'}}
|
||||
<input name="data.battle_readiness.panic_discipline.max" type="text" value="{{data.data.battle_readiness.panic_discipline.max}}" />
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.army.battle_readiness.panic'}}
|
||||
<input name="data.battle_readiness.panic_discipline.value" type="text" value="{{data.data.battle_readiness.panic_discipline.value}}" />
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="commander">
|
||||
<p>
|
||||
{{localize 'l5r5e.army.commander'}}
|
||||
<input name="data.commander" type="text" value="{{data.data.commander}}" />
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.army.commander_abilities'}}
|
||||
<textarea type="text" name="data.commander_abilities">{{data.data.commander_abilities}}</textarea>
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.army.army_abilities'}}
|
||||
<textarea type="text" name="data.army_abilities">{{data.data.army_abilities}}</textarea>
|
||||
</p>
|
||||
|
||||
<div class="attributes-wrapper">
|
||||
{{localize 'l5r5e.army.commander_standing'}}
|
||||
<p>
|
||||
{{localize 'l5r5e.social.honor'}}
|
||||
<input name="data.commander_standing.honor" type="text" value="{{data.data.commander_standing.honor}}" />
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.social.glory'}}
|
||||
<input name="data.commander_standing.glory" type="text" value="{{data.data.commander_standing.glory}}" />
|
||||
</p>
|
||||
<p>
|
||||
{{localize 'l5r5e.social.status'}}
|
||||
<input name="data.commander_standing.status" type="text" value="{{data.data.commander_standing.status}}" />
|
||||
</p>
|
||||
</div>
|
||||
<div class="readiness">
|
||||
<ul>
|
||||
<li>
|
||||
<input name="data.battle_readiness.casualties_strength.value" type="number" value="{{data.data.battle_readiness.casualties_strength.value}}" />
|
||||
<strong>{{localize 'l5r5e.army.battle_readiness.casualties'}}</strong>
|
||||
</li>
|
||||
<li>
|
||||
<input name="data.battle_readiness.casualties_strength.max" type="number" value="{{data.data.battle_readiness.casualties_strength.max}}" />
|
||||
<strong>{{localize 'l5r5e.army.battle_readiness.strength'}}</strong>
|
||||
</li>
|
||||
<li>
|
||||
<input name="data.battle_readiness.panic_discipline.value" type="number" value="{{data.data.battle_readiness.panic_discipline.value}}" />
|
||||
<strong>{{localize 'l5r5e.army.battle_readiness.panic'}}</strong>
|
||||
</li>
|
||||
<li>
|
||||
<input name="data.battle_readiness.panic_discipline.max" type="number" value="{{data.data.battle_readiness.panic_discipline.max}}" />
|
||||
<strong>{{localize 'l5r5e.army.battle_readiness.discipline'}}</strong>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
@@ -76,11 +30,17 @@
|
||||
<section class="sheet-body">
|
||||
{{!-- Sheet Tab Navigation --}}
|
||||
<nav class="sheet-tabs tabs" data-group="primary">
|
||||
<a class="item" data-tab="cohort">{{localize 'l5r5e.army.cohort.title'}}</a>
|
||||
<a class="item" data-tab="fortification">{{localize 'l5r5e.army.fortification.title'}}</a>
|
||||
<a class="item" data-tab="army">{{localize 'ACTOR.TypeArmy'}}</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.notes'}}</a>
|
||||
</nav>
|
||||
|
||||
{{!-- Army Tab --}}
|
||||
<article class="tab army" data-group="primary" data-tab="army">
|
||||
{{> 'systems/l5r5e/templates/actors/army/army.html'}}
|
||||
</article>
|
||||
|
||||
{{!-- Cohort Tab --}}
|
||||
<article class="tab cohort" data-group="primary" data-tab="cohort">
|
||||
{{> 'systems/l5r5e/templates/actors/army/cohort.html'}}
|
||||
|
||||
56
system/templates/actors/army/army.html
Normal file
56
system/templates/actors/army/army.html
Normal file
@@ -0,0 +1,56 @@
|
||||
<div class="header-fields warlord">
|
||||
<fieldset>
|
||||
<legend>{{^if data.data.warlord_actor_id}}<i class="fa fa-sign-in-alt" aria-hidden="true"></i> {{/if}}{{localize 'l5r5e.army.warlord'}}</legend>
|
||||
<p>
|
||||
{{#if data.data.warlord_actor_id}}
|
||||
<span data-actor-id="{{actor.id}}" data-type="warlord" class="actor-remove-control pointer" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></span>
|
||||
<a data-actor-id="{{data.data.warlord_actor_id}}" class="open-sheet-actor-id">{{data.data.warlord}}</a>
|
||||
{{else}}
|
||||
<input name="data.warlord" type="text" value="{{data.data.warlord}}" />
|
||||
{{/if}}
|
||||
</p>
|
||||
<p>
|
||||
<strong>{{localize 'l5r5e.army.allies_backers'}}</strong>
|
||||
<textarea type="text" name="data.allies_backers">{{data.data.allies_backers}}</textarea>
|
||||
</p>
|
||||
<p>
|
||||
<strong>{{localize 'l5r5e.army.purpose_mustering'}}</strong>
|
||||
<textarea type="text" name="data.purpose_mustering">{{data.data.purpose_mustering}}</textarea>
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="header-fields commander">
|
||||
<fieldset>
|
||||
<legend>{{^if data.data.commander_actor_id}}<i class="fa fa-sign-in-alt" aria-hidden="true"></i> {{/if}}{{localize 'l5r5e.army.commander'}}</legend>
|
||||
{{#if data.data.commander_actor_id}}
|
||||
<span data-actor-id="{{actor.id}}" data-type="commander" class="actor-remove-control pointer" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></span>
|
||||
<a data-actor-id="{{data.data.commander_actor_id}}" class="open-sheet-actor-id">{{data.data.commander}}</a>
|
||||
{{else}}
|
||||
<input name="data.commander" type="text" value="{{data.data.commander}}" />
|
||||
{{/if}}
|
||||
<div class="standing">
|
||||
<ul>
|
||||
<li>
|
||||
<strong>{{localize 'l5r5e.social.honor'}}</strong>
|
||||
<input name="data.commander_standing.honor" type="number" value="{{data.data.commander_standing.honor}}" />
|
||||
</li>
|
||||
<li>
|
||||
<strong>{{localize 'l5r5e.social.glory'}}</strong>
|
||||
<input name="data.commander_standing.glory" type="number" value="{{data.data.commander_standing.glory}}" />
|
||||
</li>
|
||||
<li>
|
||||
<strong>{{localize 'l5r5e.social.status'}}</strong>
|
||||
<input name="data.commander_standing.status" type="number" value="{{data.data.commander_standing.status}}" />
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<label>
|
||||
<strong>{{localize 'l5r5e.army.commander_abilities'}}</strong>
|
||||
<textarea type="text" name="data.commander_abilities">{{data.data.commander_abilities}}</textarea>
|
||||
</label>
|
||||
</fieldset>
|
||||
<fieldset class="army-abilities">
|
||||
<legend>{{localize 'l5r5e.army.army_abilities'}}</legend>
|
||||
{{editor content=data.data.army_abilities target="data.army_abilities" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
</div>
|
||||
@@ -1,25 +1,23 @@
|
||||
<div>
|
||||
{{!-- Supplies and Logistics --}}
|
||||
<fieldset class="supplies_logistics">
|
||||
<legend class="text-block-header">{{localize 'l5r5e.army.supplies_logistics'}}</legend>
|
||||
{{editor content=data.data.supplies_logistics target="data.supplies_logistics" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
{{!-- Supplies and Logistics --}}
|
||||
<fieldset class="supplies_logistics">
|
||||
<legend class="text-block-header">{{localize 'l5r5e.army.supplies_logistics'}}</legend>
|
||||
{{editor content=data.data.supplies_logistics target="data.supplies_logistics" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
|
||||
{{!-- Past Battles --}}
|
||||
<fieldset class="past_battles">
|
||||
<legend class="text-block-header">{{localize 'l5r5e.army.past_battles'}}</legend>
|
||||
{{editor content=data.data.past_battles target="data.past_battles" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
{{!-- Past Battles --}}
|
||||
<fieldset class="past_battles">
|
||||
<legend class="text-block-header">{{localize 'l5r5e.army.past_battles'}}</legend>
|
||||
{{editor content=data.data.past_battles target="data.past_battles" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
|
||||
{{!-- Description (public) --}}
|
||||
<fieldset class="description">
|
||||
<legend class="text-block-header">{{localize 'l5r5e.description'}}</legend>
|
||||
{{editor content=data.data.description target="data.description" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
{{!-- Description (public) --}}
|
||||
<fieldset class="description">
|
||||
<legend class="text-block-header">{{localize 'l5r5e.description'}}</legend>
|
||||
{{editor content=data.data.description target="data.description" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
|
||||
{{!-- Notes (private) --}}
|
||||
<fieldset class="note">
|
||||
<legend class="text-block-header">{{localize 'l5r5e.notes'}}</legend>
|
||||
{{editor content=data.data.notes target="data.notes" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
</div>
|
||||
{{!-- Notes (private) --}}
|
||||
<fieldset class="note">
|
||||
<legend class="text-block-header">{{localize 'l5r5e.notes'}}</legend>
|
||||
{{editor content=data.data.notes target="data.notes" button=true editable=options.editable}}
|
||||
</fieldset>
|
||||
@@ -1,7 +1,7 @@
|
||||
<form class="{{cssClass}}" data-lang="{{localize 'I18N.Language'}}" autocomplete="off">
|
||||
{{!-- Sheet Header --}}
|
||||
<header class="sheet-header">
|
||||
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/>
|
||||
<img class="profile-img dragndrop-actor-id pointer" src="{{data.img}}" data-edit="img" data-actor-id="{{actor.id}}" draggable="true" title="{{data.name}}"/>
|
||||
<div class="header-fields identity-wrapper">
|
||||
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1>
|
||||
{{> 'systems/l5r5e/templates/actors/character/identity.html'}}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{{!-- Sheet Header --}}
|
||||
<header class="sheet-header">
|
||||
<div class="header-fields identity-wrapper">
|
||||
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/>
|
||||
<img class="profile-img dragndrop-actor-id pointer" src="{{data.img}}" data-edit="img" data-actor-id="{{actor.id}}" draggable="true" title="{{data.name}}"/>
|
||||
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1>
|
||||
{{> 'systems/l5r5e/templates/actors/npc/identity.html'}}
|
||||
</div>
|
||||
|
||||
@@ -603,9 +603,9 @@
|
||||
</td>
|
||||
<td>
|
||||
<ul>
|
||||
<li>{{localize 'l5r5e.twenty_questions.part1.status'}} ({{summary.summary.status}})</li>
|
||||
<li>{{localize 'l5r5e.twenty_questions.part1.glory'}} ({{summary.summary.glory}})</li>
|
||||
<li>{{localize 'l5r5e.twenty_questions.part2.honor'}} ({{summary.summary.honor}})</li>
|
||||
<li>{{localize 'l5r5e.twenty_questions.part1.glory'}} ({{summary.summary.glory}})</li>
|
||||
<li>{{localize 'l5r5e.twenty_questions.part1.status'}} ({{summary.summary.status}})</li>
|
||||
<li>{{localize 'l5r5e.twenty_questions.part1.money'}} ({{data.step2.wealth}})</li>
|
||||
</ul>
|
||||
</td>
|
||||
|
||||
Reference in New Issue
Block a user