Working on 0.8.x

- Xp spent curriculum/total for titles
This commit is contained in:
Vlyan
2021-05-25 17:08:49 +02:00
parent a62781ba69
commit fcb3f2b58d
12 changed files with 100 additions and 34 deletions

View File

@@ -1,10 +1,12 @@
<tr class="flexrow row advancement">
{{#if show_curriculum_toggle}}<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>{{/if}}
<td class="name" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}{{#if advancement.data.bond_type}} ({{advancement.data.bond_type}}){{/if}}</td>
<td class="xp" name="advancement.xp">{{advancement.data.xp_used}}</td>
<td class="xp" name="advancement.xp">{{#if advancement.data.xp_used_total}}{{advancement.data.xp_used_total}}{{else}}{{advancement.data.xp_used}}{{/if}}</td>
<td class="rank" name="advancement.rank">{{advancement.data.rank}}</td>
{{#if editable}}
<td class="actions">
<ul>
{{#if show_curriculum_toggle}}<li data-item-id="{{advancement._id}}" class="item-control item-curriculum" title="{{localize 'l5r5e.advancements.curriculum'}}"><i class="fas fa-graduation-cap"></i></li>{{/if}}
<li data-item-id="{{advancement._id}}" class="item-control item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
<li data-item-id="{{advancement._id}}" class="item-control item-delete" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></li>
</ul>

View File

@@ -1,6 +1,6 @@
<tr data-group="advancements" data-tab="advancement_rank_{{rank}}" class="flexrow row advancement tab">
<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>
<td class="name" name="advancement.name"><img src="{{ advancement.img }}" title="{{advancement.name}}"> {{advancement.name}}</td>
<td class="name" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}</td>
<td class="xp" name="advancement.xp">{{advancement.data.xp_used}}</td>
<td class="rank" name="advancement.rank">{{advancement.data.rank}}</td>
{{#if editable}}

View File

@@ -53,7 +53,8 @@
{{/ifCond}}
</th>
<th class="">
{{localize 'l5r5e.advancements.total_xp_rank'}} : {{rankObject.spent}}{{#if rankObject.goal}} / {{rankObject.goal}}{{/if}}
{{localize 'l5r5e.advancements.total_xp_curriculum'}} : {{rankObject.spent.curriculum}}{{#if rankObject.goal}} / {{rankObject.goal}}{{/if}}
<br>{{localize 'l5r5e.advancements.total_xp_spent'}} : {{rankObject.spent.total}}
</th>
</tr>
{{/ifCond}}
@@ -77,13 +78,13 @@
</thead>
<tbody class="flex">
{{#each data.advancementsOthers as |advancement advancementId|}}
{{> 'systems/l5r5e/templates/actors/character/advancement-others.html' advancement=advancement editable=../options.editable}}
{{> 'systems/l5r5e/templates/actors/character/advancement-others.html' advancement=advancement show_curriculum_toggle=false editable=../options.editable}}
{{/each}}
</tbody>
<tfoot class="flex">
<tr>
<th>
{{localize 'l5r5e.advancements.total_xp_rank'}} : {{data.advancementsOthersTotalXp}}
{{localize 'l5r5e.advancements.total_xp_spent'}} : {{data.advancementsOthersTotalXp}}
</th>
</tr>
</tfoot>

View File

@@ -31,7 +31,7 @@
{{!-- bonds --}}
<fieldset>
<legend class="text-block-header">
{{localize 'l5r5e.social.bonds' }}
{{localize 'l5r5e.social.bonds'}}
{{#if options.editable}}
<a data-item-type="bond" class="bond-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
{{/if}}

View File

@@ -1,4 +1,6 @@
<form class="{{cssClass}}" autocomplete="off">
<input type="hidden" name="data.xp_used" value="{{data.data.xp_used}}" data-dtype="Number">
<input type="hidden" name="data.xp_used_total" value="{{data.data.xp_used_total}}" data-dtype="Number">
<header class="sheet-header">
<img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/>
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1>
@@ -16,10 +18,6 @@
{{localize 'l5r5e.advancements.cost'}}
<input class="select-on-focus" type="number" name="data.xp_cost" value="{{data.data.xp_cost}}" data-dtype="Number" min="0" placeholder="0"/>
</label>
<label class="attribute">
{{localize 'l5r5e.advancements.spent'}}
<input class="select-on-focus" type="number" name="data.xp_used" value="{{data.data.xp_used}}" data-dtype="Number" min="0" placeholder="0" readonly/>
</label>
<label class="attribute">
{{localize 'l5r5e.rank'}}
<input class="select-on-focus" type="number" name="data.rank" value="{{data.data.rank}}" data-dtype="Number" min="0" placeholder="0"/>
@@ -38,6 +36,7 @@
<table>
<thead class="flex">
<tr class="flexrow row">
<th class="curriculum"></th>
<th class="name">{{localize 'l5r5e.name'}}</th>
<th class="xp">{{localize 'l5r5e.advancements.spent'}}</th>
<th class="rank">{{localize 'l5r5e.rank'}}</th>
@@ -48,9 +47,17 @@
</thead>
<tbody class="flex">
{{#each data.embedItemsList as |advancement|}}
{{> 'systems/l5r5e/templates/actors/character/advancement-others.html' advancement=advancement editable=../options.editable}}
{{> 'systems/l5r5e/templates/actors/character/advancement-others.html' advancement=advancement show_curriculum_toggle=true editable=../options.editable}}
{{/each}}
</tbody>
<tfoot>
<tr>
<th class="" colspan="5">{{localize 'l5r5e.advancements.total_xp_curriculum'}} : {{data.data.xp_used}} / {{data.data.xp_cost}}</th>
</tr>
<tr>
<th class="" colspan="5">{{localize 'l5r5e.advancements.total_xp_spent'}} : {{data.data.xp_used_total}}</th>
</tr>
</tfoot>
</table>
</fieldset>
</article>