Gestion des signes draconiques #455

Closed
vincent.vandeme wants to merge 233 commits from v1.4-signes-draconiques into master
6 changed files with 72 additions and 75 deletions
Showing only changes of commit 42407eaa15 - Show all commits

View File

@ -40,7 +40,7 @@ export class RdDTMRDialog extends Dialog {
const dialogOptions = { const dialogOptions = {
classes: ["tmrdialog"], classes: ["tmrdialog"],
width: 920, height: 980, width: 920, height: 980,
'z-index': 20 'z-index': 40
} }
super(dialogConf, dialogOptions); super(dialogConf, dialogOptions);

View File

@ -20,7 +20,7 @@ export class RdDTMRRencontreDialog extends Dialog {
const dialogOptions = { const dialogOptions = {
classes: ["tmrrencdialog"], classes: ["tmrrencdialog"],
width: 320, height: 240, width: 320, height: 240,
'z-index': 20 'z-index': 50
} }
super(dialogConf, dialogOptions); super(dialogConf, dialogOptions);

View File

@ -4,6 +4,7 @@ import { ChatUtility } from "./chat-utility.js";
import { RdDCombat } from "./rdd-combat.js"; import { RdDCombat } from "./rdd-combat.js";
import { Misc } from "./misc.js"; import { Misc } from "./misc.js";
import { Grammar } from "./grammar.js"; import { Grammar } from "./grammar.js";
import { TMRUtility } from "./tmr-utility.js";
/* -------------------------------------------- */ /* -------------------------------------------- */
// This table starts at 0 -> niveau -10 // This table starts at 0 -> niveau -10
@ -210,6 +211,8 @@ export class RdDUtility {
Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str)); Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str));
Handlebars.registerHelper('accord', (genre, ...args) => Grammar.accord(genre, args)); Handlebars.registerHelper('accord', (genre, ...args) => Grammar.accord(genre, args));
Handlebars.registerHelper('buildConteneur', (objet) => { return RdDUtility.buildConteneur(objet); }); Handlebars.registerHelper('buildConteneur', (objet) => { return RdDUtility.buildConteneur(objet); });
Handlebars.registerHelper('caseTmr-label', coord => TMRUtility.getTMRLabel(coord));
Handlebars.registerHelper('caseTmr-type', coord => TMRUtility.getTMRType(coord));
return loadTemplates(templatePaths); return loadTemplates(templatePaths);
} }

View File

@ -1,5 +1,6 @@
import { TMRRencontres } from "./tmr-rencontres.js"; import { TMRRencontres } from "./tmr-rencontres.js";
import { Misc } from "./misc.js"; import { Misc } from "./misc.js";
import { Grammar } from "./grammar.js";
/* -------------------------------------------- */ /* -------------------------------------------- */
const TMRMapping = { const TMRMapping = {

View File

@ -26,8 +26,8 @@ export class Pelerinage extends Draconique {
return pixiTMR.sprite(this.code(), { return pixiTMR.sprite(this.code(), {
zIndex: tmrTokenZIndex.conquete, zIndex: tmrTokenZIndex.conquete,
alpha: 1, alpha: 1,
taille: tmrConstants.twoThird, taille: tmrConstants.full,
decallage: tmrConstants.right decallage: tmrConstants.center
}); });
} }

View File

@ -384,14 +384,16 @@
</li> </li>
{{/if}} {{/if}}
<li class="item flexrow"> <li class="item flexrow">
<span class="competence-label">Position en TMR :</span> <span class="competence-label">Demi rêve :</span>
<span> <span>
{{#if options.isGM}} {{#if options.isGM}}
{{caseTmr-label data.reve.tmrpos.coord}}
<input class="competence-value" type="text" name="data.reve.tmrpos.coord" value="{{data.reve.tmrpos.coord}}" data-dtype="String"/> <input class="competence-value" type="text" name="data.reve.tmrpos.coord" value="{{data.reve.tmrpos.coord}}" data-dtype="String"/>
{{else}} {{else}}
{{#if hautreve.cacheTMR}} {{#if hautreve.cacheTMR}}
?? ??
{{else}} {{else}}
{{caseTmr-label data.reve.tmrpos.coord}}
{{data.reve.tmrpos.coord}} {{data.reve.tmrpos.coord}}
{{/if}} {{/if}}
{{/if}} {{/if}}
@ -422,77 +424,43 @@
</div> </div>
<hr> <hr>
{{#if data.attributs.hautrevant.value}} {{#if data.attributs.hautrevant.value}}
<div> <h3>Sorts:</h3>
<h3>Sorts:</h3> <ul class="item-list alterne-list">
<ul class="item-list"> {{#each sorts as |mysort key|}}
{{#each sorts as |mysort key|}} <li class="item list-item flexrow" data-item-id="{{mysort._id}}" data-attribute="{{key}}">
<li class="item flexrow" data-item-id="{{mysort._id}}" data-attribute="{{key}}"> <span class="sort-label"> <a data-id="{{mysort._id}}">{{mysort.name}}</a></span>
<span class="sort-label"> <a data-id="{{mysort._id}}">{{mysort.name}}</a></span> <span>{{mysort.data.draconic}} / {{mysort.data.difficulte}}</span>
<span>{{mysort.data.draconic}} / {{mysort.data.difficulte}}</span> <div class="item-controls">
<div class="item-controls"> <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
<a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a> </div>
</div> </li>
</li> {{/each}}
{{/each}} </ul>
</ul>
</div> <h3>Sorts en Réserve:</h3>
<hr> <ul class="item-list alterne-list">
<div> {{#each hautreve.sortsReserve as |reserve key|}}
<h3>Sorts en Réserve:</h3> <li class="item list-item flexrow" data-item-id="{{mysort._id}}" data-attribute="{{key}}">
<ul class="item-list"> <img class="sheet-competence-img" src="{{reserve.sort.img}}" />
{{#each hautreve.sortsReserve as |reserve key|}} <span class="sort-label"> {{reserve.sort.name}} - {{reserve.coord}} - {{caseTmr-label reserve.coord}} - r{{reserve.sort.data.ptreve_reel}}</span>
<li class="item flexrow" data-item-id="{{mysort._id}}" data-attribute="{{key}}"> </li>
<span class="sort-label"> {{reserve.sort.name}} - {{reserve.coord}}</span> {{/each}}
</li> </ul>
{{/each}}
</ul> <h3>Méditations:</h3>
</div> <ul class="item-list">
<hr> {{#each meditations as |meditation key|}}
<div> <li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}">
<h3>Méditations:</h3> <span class="meditation-label"><a data-id="{{meditation._id}}">{{meditation.name}} - {{meditation.data.competence}}</a></span>
<ul class="item-list"> <div class="item-controls">
{{#each meditations as |meditation key|}} <a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a>
<li class="item flexrow" data-item-id="{{meditation._id}}" data-attribute="{{key}}"> <a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
<span class="meditation-label"><a data-id="{{meditation._id}}">{{meditation.name}} - {{meditation.data.competence}}</a></span> </div>
<div class="item-controls"> </li>
<a class="item-control item-edit" title="Editer"><i class="fas fa-edit"></i></a> {{/each}}
<a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a> </ul>
</div>
</li>
{{/each}}
</ul>
</div>
<hr>
<div>
<h3>Cases Spéciales:</h3>
<ul class="item-list">
{{#each hautreve.casesTmr as |casetmr key|}}
<li class="item flexrow" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
<span class="case-label"><a data-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
<div class="item-controls">
<a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
</div>
</li>
{{/each}}
</ul>
</div>
<hr>
<div>
<h3>Rencontres présentes:</h3>
<ul class="item-list">
{{#each hautreve.rencontres as |rencontre key|}}
<li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
<span class="case-label"><a data-id="{{key}}">{{rencontre.rencontre.name}} - {{rencontre.coord}} {{#if rencontre.rencontre.date}}({{rencontre.rencontre.date}} - {{rencontre.rencontre.heure}}){{/if}}</a></span>
<div class="item-controls">
<a class="item-control rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
</div>
</li>
{{/each}}
</ul>
</div>
<hr> <hr>
{{/if}} {{/if}}
{{!-- Queues, Souffles, Tetes, Ombre --}} {{!-- Queues, Souffles, Tetes, Ombre --}}
<h3>Queues:</h3> <h3>Queues:</h3>
<ul class="flex-group-left"> <ul class="flex-group-left">
@ -538,7 +506,32 @@
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
{{#if data.attributs.hautrevant.value}}
<hr>
<h3>Rencontres présentes:</h3>
<ul class="item-list">
{{#each hautreve.rencontres as |rencontre key|}}
<li class="item flexrow" data-item-id="{{key}}" data-attribute="{{key}}">
<span class="case-label"><a data-id="{{key}}">{{rencontre.rencontre.name}} - {{rencontre.coord}} {{#if rencontre.rencontre.date}}({{rencontre.rencontre.date}} - {{rencontre.rencontre.heure}}){{/if}}</a></span>
<div class="item-controls">
<a class="item-control rencontre-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
</div>
</li>
{{/each}}
</ul>
<hr>
<h3>Cases Spéciales:</h3>
<ul class="item-list">
{{#each hautreve.casesTmr as |casetmr key|}}
<li class="item" data-item-id="{{casetmr._id}}" data-attribute="{{key}}">
<span class="item-controls">
<a class="item-control item-delete" title="Supprimer"><i class="fas fa-trash"></i></a>
</span>
<span class="case-label"><a data-id="{{casetmr._id}}">{{casetmr.name}}</a></span>
</li>
{{/each}}
</ul>
{{/if}}
</div> </div>
{{!-- Equipment Tab --}} {{!-- Equipment Tab --}}