diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index fb21e9e6..ec0b9885 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -105,7 +105,6 @@ export class RdDActorSheet extends ActorSheet {
formData.hautreve = {
isDemiReve: this.actor.getEffect(STATUSES.StatusDemiReve),
rencontres: duplicate(formData.system.reve.rencontre.list),
- casesTmr: formData.itemsByType.casetmr,
cacheTMR: this.actor.isTMRCache()
}
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 905694ff..200ccc2d 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -115,15 +115,36 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/actor-creature-sheet.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-entite-sheet.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html',
+ // sous-parties de feuilles de personnages
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html',
- 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-competences.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessure.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-maladies-poisons.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-possessions.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-actor-sheet-taches.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-taches.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvres.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-jeux.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-alchimie.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-astrologie.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-haut-revant.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html',
- // Conteneur/item in Actor sheet
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-souffles.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-tetes.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-signes-draconiques.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-rencontres.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts-reserve.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-meditations.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-casestmr.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-journal.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html',
@@ -131,7 +152,6 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html',
- 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
//Items
'systems/foundryvtt-reve-de-dragon/templates/header-item.html',
'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
@@ -374,6 +394,7 @@ export class RdDUtility {
RdDUtility.filterEquipementParType(formData);
formData.sorts = this.arrayOrEmpty(formData.itemsByType['sort']);
+ formData.casestmr = this.arrayOrEmpty(formData.itemsByType['casetmr']);
formData.signesdraconiques = this.arrayOrEmpty(formData.itemsByType['signedraconique']);
formData.queues = this.arrayOrEmpty(formData.itemsByType['queue']);
formData.souffles = this.arrayOrEmpty(formData.itemsByType['souffle']);
diff --git a/styles/simple.css b/styles/simple.css
index 70c7a19c..67ec038f 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -937,6 +937,12 @@ ul, li {
margin-right: 0.2rem;
margin-left: 0.2rem;
}
+.initiative-value {
+ flex-grow: 0;
+ flex-basis: 3rem;
+ margin-right: 0.2rem;
+ margin-left: 0.2rem;
+}
.description-value {
flex-grow: 0;
flex-basis: 4rem;
diff --git a/templates/actor-sheet-alchimie.html b/templates/actor-sheet-alchimie.html
new file mode 100644
index 00000000..7a27fb7a
--- /dev/null
+++ b/templates/actor-sheet-alchimie.html
@@ -0,0 +1,13 @@
+{{#if recettesAlchimiques.length}}
+
Recettes Alchimiques
+
+ {{#each recettesAlchimiques as |recette id|}}
+ {{recette.name}}
+
+
+ {{/each}}
+
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-astrologie.html b/templates/actor-sheet-astrologie.html
new file mode 100644
index 00000000..d5094e1e
--- /dev/null
+++ b/templates/actor-sheet-astrologie.html
@@ -0,0 +1,2 @@
+Astrologie
+Astrologie : Nombres Astraux
diff --git a/templates/actor-sheet-blessures.html b/templates/actor-sheet-blessures.html
index ec809d1f..b6853800 100644
--- a/templates/actor-sheet-blessures.html
+++ b/templates/actor-sheet-blessures.html
@@ -1,7 +1,6 @@
-Blessures:
+
+ Ré-insertion aléatoire (ie TMR cachée)
+
+
+ Montrer les TMR
+
+
+{{/if}}
+
+ Demi rêve :
+ {{#if options.isGM}}
+ {{caseTmr-label system.reve.tmrpos.coord}}
+
+
+ {{else if hautreve.cacheTMR}}
+ {{caseTmr-type system.reve.tmrpos.coord}}
+
+ ??
+ {{else}}
+ {{caseTmr-label system.reve.tmrpos.coord}}
+
+ {{system.reve.tmrpos.coord}}
+ {{/if}}
+
+
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html"}}
+
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-signes-draconiques.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-rencontres.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-sorts-reserve.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-meditations.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-hr-casestmr.html"}}
diff --git a/templates/actor-sheet-hr-casestmr.html b/templates/actor-sheet-hr-casestmr.html
new file mode 100644
index 00000000..1c1f3fd8
--- /dev/null
+++ b/templates/actor-sheet-hr-casestmr.html
@@ -0,0 +1,15 @@
+{{#if casestmr.length}}
+ Effets sur les cases des TMR
+
+ {{#each casestmr as |casetmr key|}}
+
+
+ {{casetmr.name}}
+ {{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}
+
+
+ {{/each}}
+
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-hr-meditations.html b/templates/actor-sheet-hr-meditations.html
new file mode 100644
index 00000000..9f7cb1d0
--- /dev/null
+++ b/templates/actor-sheet-hr-meditations.html
@@ -0,0 +1,15 @@
+{{#if meditations.length}}
+Méditations
+
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-hr-rencontres.html b/templates/actor-sheet-hr-rencontres.html
new file mode 100644
index 00000000..f13be489
--- /dev/null
+++ b/templates/actor-sheet-hr-rencontres.html
@@ -0,0 +1,17 @@
+{{#if hautreve.rencontres.length}}
+Rencontres en attente dans les TMR
+
+ {{#each hautreve.rencontres as |rencontre key|}}
+
+ {{rencontre.name}} r{{rencontre.force}}
+ {{rencontre.coord}} - {{caseTmr-label rencontre.coord}}
+ {{#if rencontre.date}}
+ {{upperFirst rencontre.heure}}, le {{rencontre.date}}
+ {{/if}}
+
+
+ {{/each}}
+
+{{/if}}
diff --git a/templates/actor-sheet-hr-signes-draconiques.html b/templates/actor-sheet-hr-signes-draconiques.html
new file mode 100644
index 00000000..1edb8f1c
--- /dev/null
+++ b/templates/actor-sheet-hr-signes-draconiques.html
@@ -0,0 +1,15 @@
+{{#if (and options.isGM signesdraconiques.length)}}
+Signes draconiques
+
+ {{#each signesdraconiques as |signe key|}}
+
+
+ {{signe.name}}
+ {{signe.system.difficulte}}
+
+
+ {{/each}}
+
+{{/if}}
diff --git a/templates/actor-sheet-hr-sorts-reserve.html b/templates/actor-sheet-hr-sorts-reserve.html
new file mode 100644
index 00000000..3214bceb
--- /dev/null
+++ b/templates/actor-sheet-hr-sorts-reserve.html
@@ -0,0 +1,15 @@
+{{#if sortsReserve.length}}
+Sorts en Réserve
+
+{{/if}}
diff --git a/templates/actor-sheet-hr-sorts.html b/templates/actor-sheet-hr-sorts.html
new file mode 100644
index 00000000..8ebb8fc8
--- /dev/null
+++ b/templates/actor-sheet-hr-sorts.html
@@ -0,0 +1,19 @@
+{{#if sorts.length}}
+Sorts
+
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-jeux.html b/templates/actor-sheet-jeux.html
new file mode 100644
index 00000000..38b5cf35
--- /dev/null
+++ b/templates/actor-sheet-jeux.html
@@ -0,0 +1,13 @@
+{{#if jeux.length}}
+Jeux :
+
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-maladies-poisons.html b/templates/actor-sheet-maladies-poisons.html
new file mode 100644
index 00000000..aa3de0c2
--- /dev/null
+++ b/templates/actor-sheet-maladies-poisons.html
@@ -0,0 +1,34 @@
+{{#if maladiesPoisons.length}}
+Maladies & Poisons:
+
+
+ {{#each maladiesPoisons as |maladie key|}}
+
+
+ {{#if (or @root.options.isGM maladie.system.identifie)}}
+ {{maladie.name}}
+ {{else}}
+ Inconnue
+ {{/if}}
+
+ {{maladie.type}}
+
+ {{#if (or @root.options.isGM maladie.system.remedesconnus)}}
+ {{maladie.system.remedes}}
+ {{else}}
+ Remèdes Inconnus
+ {{/if}}
+
+
+
+ {{/each}}
+
+{{/if}}
diff --git a/templates/actor-sheet-non-haut-revant.html b/templates/actor-sheet-non-haut-revant.html
new file mode 100644
index 00000000..8349a8f5
--- /dev/null
+++ b/templates/actor-sheet-non-haut-revant.html
@@ -0,0 +1,26 @@
+
+
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-souffles.html"}}
+{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-tetes.html"}}
diff --git a/templates/actor-sheet-oeuvres.html b/templates/actor-sheet-oeuvres.html
new file mode 100644
index 00000000..f6819673
--- /dev/null
+++ b/templates/actor-sheet-oeuvres.html
@@ -0,0 +1,18 @@
+Oeuvres diverses Créer une oeuvre
+
+ {{#each chants as |chant id|}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
+ {{/each}}
+ {{#each musiques as |musique id|}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
+ {{/each}}
+ {{#each danses as |danse id|}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
+ {{/each}}
+ {{#each oeuvres as |oeuvre id|}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=oeuvre typeOeuvre=oeuvre.system.competence classOeuvre="oeuvre-label"}}
+ {{/each}}
+ {{#each recettescuisine as |recette id|}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
+ {{/each}}
+
diff --git a/templates/actor-sheet-possessions.html b/templates/actor-sheet-possessions.html
new file mode 100644
index 00000000..893d9caa
--- /dev/null
+++ b/templates/actor-sheet-possessions.html
@@ -0,0 +1,22 @@
+{{#if possessions.length}}
+{{!-- Possession --}}
+Possession:
+
+{{/if}}
diff --git a/templates/actor-sheet-queues.html b/templates/actor-sheet-queues.html
index a91a3388..9bbb716a 100644
--- a/templates/actor-sheet-queues.html
+++ b/templates/actor-sheet-queues.html
@@ -3,7 +3,7 @@
{{#if queues.length}}Queues de Dragon{{/if}}
{{#if (and queues.length ombres.length)}} et {{/if}}
{{#if ombres.length}}Ombres de Thanatos{{/if}}
- :
+
{{#each queues as |queue key|}}
{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-item-queue.html" queue=queue key=key}}
diff --git a/templates/actor-sheet-souffles.html b/templates/actor-sheet-souffles.html
new file mode 100644
index 00000000..aa28abab
--- /dev/null
+++ b/templates/actor-sheet-souffles.html
@@ -0,0 +1,14 @@
+{{#if souffles.length}}
+Souffles
+
+{{/if}}
\ No newline at end of file
diff --git a/templates/actor-sheet-taches.html b/templates/actor-sheet-taches.html
new file mode 100644
index 00000000..526d465b
--- /dev/null
+++ b/templates/actor-sheet-taches.html
@@ -0,0 +1,16 @@
+Tâches Créer une nouvelle Tâche
+
diff --git a/templates/actor-sheet-tetes.html b/templates/actor-sheet-tetes.html
new file mode 100644
index 00000000..fc65ed54
--- /dev/null
+++ b/templates/actor-sheet-tetes.html
@@ -0,0 +1,14 @@
+{{#if tetes.length}}
+Tetes
+
+ {{#each tetes as |tete key|}}
+
+
+ {{tete.name}}
+
+
+ {{/each}}
+
+{{/if}}
diff --git a/templates/actor-sheet-xp-competences.html b/templates/actor-sheet-xp-competences.html
new file mode 100644
index 00000000..28720100
--- /dev/null
+++ b/templates/actor-sheet-xp-competences.html
@@ -0,0 +1,23 @@
+
diff --git a/templates/actor-sheet-xp-journal.html b/templates/actor-sheet-xp-journal.html
new file mode 100644
index 00000000..15c509b9
--- /dev/null
+++ b/templates/actor-sheet-xp-journal.html
@@ -0,0 +1,13 @@
+Journal d'Experience
+
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 67c49c11..81c2a3c2 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -243,309 +243,41 @@
{{#if (or system.attributs.hautrevant.value options.vueDetaillee)}}
{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}}
{{/if}}
-
-
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-competences.html"}}
{{!-- Combat Tab --}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html" this}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html" this}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-maladies-poisons.html" this}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-possessions.html" this}}
-
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html"}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html"}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-maladies-poisons.html"}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-possessions.html"}}
+
-
+
{{!-- Connaissances Tab --}}
-
Tâches Créer une nouvelle Tâche
-
-
-
Oeuvres diverses : Créer une oeuvre
-
- {{#each chants as |chant id|}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=chant typeOeuvre="Chant" classOeuvre="chant-label"}}
- {{/each}}
- {{#each musiques as |musique id|}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=musique typeOeuvre="Musique" classOeuvre="musique-label"}}
- {{/each}}
- {{#each danses as |danse id|}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=danse typeOeuvre="Danse" classOeuvre="danse-label"}}
- {{/each}}
- {{#each oeuvres as |oeuvre id|}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=oeuvre typeOeuvre=oeuvre.system.competence classOeuvre="oeuvre-label"}}
- {{/each}}
- {{#each recettescuisine as |recette id|}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html" oeuvre=recette typeOeuvre="Recette de cuisine" classOeuvre="recettecuisine-label"}}
- {{/each}}
-
-
Jeux :
-
-
Recettes Alchimiques
-
- {{#each recettesAlchimiques as |recette id|}}
- {{recette.name}}
-
-
- {{/each}}
-
-
-
Astrologie
-
Astrologie : Nombres Astraux
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-taches.html"}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvres.html"}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-jeux.html"}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-alchimie.html"}}
-
+
{{!-- hautreve Tab --}}
{{#if system.attributs.hautrevant.value}}
Haut rêvant
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-haut-revant.html"}}
{{else}}
-
Vous n'avez pas le don de haut-rêve! Il faut attribuer la Tête de Dragon 'Don de Haut Rêve' si votre personnage est ou devient Haut-Rêvant.
+
Vous n'avez pas le don de haut-rêve
+
Attribuer la Tête de Dragon 'Don de Haut Rêve' pour rendre le personnage Haut-Rêvant.
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-non-haut-revant.html"}}
{{/if}}
-
+
-
- {{!-- Queues, Souffles, Tetes, Ombre --}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html"}}
- {{#if souffles.length}}
-
Souffles:
-
- {{/if}}
- {{#if tetes.length}}
-
Tetes:
-
- {{#each tetes as |tete key|}}
-
-
- {{tete.name}}
-
-
- {{/each}}
-
- {{/if}}
- {{#if system.attributs.hautrevant.value}}
- {{#if (and options.isGM signesdraconiques.length)}}
-
Signes draconiques
-
- {{#each signesdraconiques as |signe key|}}
-
-
- {{signe.name}}
- {{signe.system.difficulte}}
-
-
- {{/each}}
-
- {{/if}}
-
- {{#if hautreve.rencontres.length}}
-
Rencontres présentes:
-
- {{#each hautreve.rencontres as |rencontre key|}}
-
- {{rencontre.name}} r{{rencontre.force}}
- {{rencontre.coord}} - {{caseTmr-label rencontre.coord}}
- {{#if rencontre.date}}
- {{upperFirst rencontre.heure}}, le {{rencontre.date}}
- {{/if}}
-
-
- {{/each}}
-
- {{/if}}
- {{#if sortsReserve.length}}
-
Sorts en Réserve:
-
- {{/if}}
-
-
-
-
Sorts:
-
-
-
Méditations:
-
-
- {{#if hautreve.casesTmr}}
-
Cases Spéciales:
-
- {{#each hautreve.casesTmr as |casetmr key|}}
-
-
- {{casetmr.name}}
- {{casetmr.system.coord}} - {{caseTmr-label casetmr.system.coord}}
-
-
- {{/each}}
-
- {{/if}}
-
- {{/if}}
{{!-- Equipment Tab --}}
@@ -620,21 +352,8 @@
{{editor notes target="system.notes" button=true owner=owner editable=editable}}
- Journal d'Experience
-
-
- {{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-xp-journal.html"}}
+ {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}