Merge pull request 'Corrections less/css v13' (#763) from VincentVk/foundryvtt-reve-de-dragon:v13 into v13

Reviewed-on: public/foundryvtt-reve-de-dragon#763

.gitea/workflows/release.yaml

@@ -64,13 +64,13 @@ jobs:
           system.json
         api_key: '${{secrets.ALLOW_PUSH_RELEASE}}'
 
-    #- name: Publish to Foundry server
+    - name: Publish to Foundry server
-    #  uses: djlechuck/foundryvtt-publish-package-action@v1
+      uses: djlechuck/foundryvtt-publish-package-action@v1
-    #  with:
+      with:
-    #    token: ${{ secrets.FOUNDRYVTT_RELEASE_TOKEN }}
+        token: ${{ secrets.FOUNDRYVTT_RELEASE_TOKEN }}
-    #    id: 'foundryvtt-reve-de-dragon'
+        id: 'foundryvtt-reve-de-dragon'
-    #    version: ${{github.event.release.tag_name}}
+        version: ${{github.event.release.tag_name}}
-    #    manifest: 'https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json'
+        manifest: 'https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/system.json'
-    #    notes: 'https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v13/changelog.md'
+        notes: 'https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v13/changelog.md'
-    #    compatibility-minimum: '13'
+        compatibility-minimum: '13'
-    #    compatibility-verified: '13'
+        compatibility-verified: '13'

changelog.md

@@ -1,5 +1,15 @@
 # 13.0
 
+## 13.0.3 - La dernière auberge d'Illysis
+
+- On peut de nouveau acheter aux commerces
+- La description des Grizzal a des espaces
+- Corrections v13
+  - Affichage des images et noms d'objets en ligne
+  - affichage des compétences de créature sur une ligne
+  - Affichage des informations d'acteur sur une ligne dans l'astrologie
+  - Affichage des résultat de recherche
+
 ## 13.0.0 - Le début de l'errance d'Illysis
 
 - Migration vers la version 13 de Foundry

css/foundryvtt-reve-de-dragon.css

@@ -79,6 +79,11 @@ select,
 :root {
   /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */
   /* =================== 3. some constants ============ */
+  --fieldset-background: url(/ui/parchment.jpg);
+  --rdd-color-text-primary: rgba(10, 10, 10, 0.9);
+  --rdd-input-background: rgba(0, 0, 0, 0.05);
+  --rdd-color-border-input: rgba(0, 0, 0, 0.2);
+  --rdd-bg-input: rgba(255, 255, 255, 0.1);
   --color-controls: rgba(0, 0, 0, 0.9);
   --color-controls-light: hsla(0, 0%, 20%, 0.8);
   --color-controls-hover: hsla(60, 100%, 75%, 0.7);
@@ -139,30 +144,274 @@ select,
   /*when navigating through the items using the arrow keys:*/
   /*************************************************************/
 }
-.system-foundryvtt-reve-de-dragon .application.sheet.fvtt-rdd .window-content {
+.system-foundryvtt-reve-de-dragon .monnaie-content {
+  padding: 0px;
+  background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top;
+  color: #ffffff;
+}
+.system-foundryvtt-reve-de-dragon .monnaie-content .editor,
+.system-foundryvtt-reve-de-dragon .monnaie-content .editor-content {
+  height: auto;
+  min-height: 100px;
+  background: var(--rdd-bg-input-alt);
+  padding: 5px;
+  border-radius: 3px;
+  color: var(--rdd-color-text-primary);
+}
+.system-foundryvtt-reve-de-dragon .monnaie-content .window-content {
   font-family: CaslonAntique;
   text-align: justify;
   font-size: 1rem;
   letter-spacing: 1px;
+  padding: 0% 0 0 0;
   font-size: calc(var(--font-size-standard) * 1);
   color: var(--color-dark-1);
-  background: var(--background-image-base) no-repeat;
   background-size: 100% 100%;
 }
-.system-foundryvtt-reve-de-dragon .application.sheet.fvtt-rdd section.window-content {
+.system-foundryvtt-reve-de-dragon .monnaie-content fieldset {
-  padding: 0rem;
+  background: var(--fieldset-background);
+  color: var(--rdd-color-text-primary);
+  margin-bottom: 4px;
+  border-radius: 6px;
+  border-color: var(--rdd-color-text-primary);
+  border-width: 2px;
 }
-.system-foundryvtt-reve-de-dragon .application.sheet.fvtt-rdd section.window-content section header.sheet-header {
+.system-foundryvtt-reve-de-dragon .monnaie-content .form-group {
-  background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top;
+  display: flex;
-  color: #ffffff;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: center;
+  padding: 2px 0;
+  border-bottom: 1px solid var(--rdd-color-shadow-primary);
+  font-size: 0.9rem;
 }
-.system-foundryvtt-reve-de-dragon .application.sheet.fvtt-rdd section.window-content section header.sheet-header :is(
+.system-foundryvtt-reve-de-dragon .monnaie-content .form-group label {
+  font-weight: normal;
+  flex: 2;
+  padding-left: 5px;
+  margin: 0;
+  color: var(--rdd-color-text-primary);
+}
+.system-foundryvtt-reve-de-dragon .monnaie-content .form-group .attribute-value,
+.system-foundryvtt-reve-de-dragon .monnaie-content .form-group input[type="text"],
+.system-foundryvtt-reve-de-dragon .monnaie-content .form-group input[type="number"],
+.system-foundryvtt-reve-de-dragon .monnaie-content .form-group select {
+  flex: 3;
+  background: var(--rdd-input-background);
+  border: 1px solid var(--rdd-color-border-input);
+  color: var(--rdd-color-text-input);
+  padding: 2px 2px;
+  border-radius: 3px;
+}
+.system-foundryvtt-reve-de-dragon .monnaie-content .form-group input[type="checkbox"] {
+  flex: 0 0 20px;
+  margin-left: 5px;
+}
+.system-foundryvtt-reve-de-dragon .monnaie-content .sheet-header-row {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.system-foundryvtt-reve-de-dragon .monnaie-content .sheet-header-row h1,
+.system-foundryvtt-reve-de-dragon .monnaie-content .sheet-header-row input {
+  font-family: CaslonAntique;
+  font-size: 2.5rem;
+  font-weight: normal;
+  color: var(--window-header-title-color);
+  margin: 4px;
+  height: 3rem;
+}
+.system-foundryvtt-reve-de-dragon .monnaie-content :is(
     input[type="text"],
     input[type="number"],
     input[type="password"],
     input[type="datetime-local"],
     input[type="date"],
-    input[type="time"]) {
+    input[type="time"]
+  ) {
+  color: rgba(255, 255, 255, 0.75);
+  background: rgba(255, 255, 255, 0.1);
+  border: 0 none;
+  margin-bottom: 0.2rem;
+}
+.system-foundryvtt-reve-de-dragon .munition-content {
+  padding: 0px;
+  background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top;
+  color: #ffffff;
+}
+.system-foundryvtt-reve-de-dragon .munition-content .editor,
+.system-foundryvtt-reve-de-dragon .munition-content .editor-content {
+  height: auto;
+  min-height: 100px;
+  background: var(--rdd-bg-input-alt);
+  padding: 5px;
+  border-radius: 3px;
+  color: var(--rdd-color-text-primary);
+}
+.system-foundryvtt-reve-de-dragon .munition-content .window-content {
+  font-family: CaslonAntique;
+  text-align: justify;
+  font-size: 1rem;
+  letter-spacing: 1px;
+  padding: 0% 0 0 0;
+  font-size: calc(var(--font-size-standard) * 1);
+  color: var(--color-dark-1);
+  background-size: 100% 100%;
+}
+.system-foundryvtt-reve-de-dragon .munition-content fieldset {
+  background: var(--fieldset-background);
+  color: var(--rdd-color-text-primary);
+  margin-bottom: 4px;
+  border-radius: 6px;
+  border-color: var(--rdd-color-text-primary);
+  border-width: 2px;
+}
+.system-foundryvtt-reve-de-dragon .munition-content .form-group {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: center;
+  padding: 2px 0;
+  border-bottom: 1px solid var(--rdd-color-shadow-primary);
+  font-size: 0.9rem;
+}
+.system-foundryvtt-reve-de-dragon .munition-content .form-group label {
+  font-weight: normal;
+  flex: 2;
+  padding-left: 5px;
+  margin: 0;
+  color: var(--rdd-color-text-primary);
+}
+.system-foundryvtt-reve-de-dragon .munition-content .form-group .attribute-value,
+.system-foundryvtt-reve-de-dragon .munition-content .form-group input[type="text"],
+.system-foundryvtt-reve-de-dragon .munition-content .form-group input[type="number"],
+.system-foundryvtt-reve-de-dragon .munition-content .form-group select {
+  flex: 3;
+  background: var(--rdd-input-background);
+  border: 1px solid var(--rdd-color-border-input);
+  color: var(--rdd-color-text-input);
+  padding: 2px 2px;
+  border-radius: 3px;
+}
+.system-foundryvtt-reve-de-dragon .munition-content .form-group input[type="checkbox"] {
+  flex: 0 0 20px;
+  margin-left: 5px;
+}
+.system-foundryvtt-reve-de-dragon .munition-content .sheet-header-row {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.system-foundryvtt-reve-de-dragon .munition-content .sheet-header-row h1,
+.system-foundryvtt-reve-de-dragon .munition-content .sheet-header-row input {
+  font-family: CaslonAntique;
+  font-size: 2.5rem;
+  font-weight: normal;
+  color: var(--window-header-title-color);
+  margin: 4px;
+  height: 3rem;
+}
+.system-foundryvtt-reve-de-dragon .munition-content :is(
+    input[type="text"],
+    input[type="number"],
+    input[type="password"],
+    input[type="datetime-local"],
+    input[type="date"],
+    input[type="time"]
+  ) {
+  color: rgba(255, 255, 255, 0.75);
+  background: rgba(255, 255, 255, 0.1);
+  border: 0 none;
+  margin-bottom: 0.2rem;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content {
+  padding: 0px;
+  background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top;
+  color: #ffffff;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content .editor,
+.system-foundryvtt-reve-de-dragon .tarot-content .editor-content {
+  height: auto;
+  min-height: 100px;
+  background: var(--rdd-bg-input-alt);
+  padding: 5px;
+  border-radius: 3px;
+  color: var(--rdd-color-text-primary);
+}
+.system-foundryvtt-reve-de-dragon .tarot-content .window-content {
+  font-family: CaslonAntique;
+  text-align: justify;
+  font-size: 1rem;
+  letter-spacing: 1px;
+  padding: 0% 0 0 0;
+  font-size: calc(var(--font-size-standard) * 1);
+  color: var(--color-dark-1);
+  background-size: 100% 100%;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content fieldset {
+  background: var(--fieldset-background);
+  color: var(--rdd-color-text-primary);
+  margin-bottom: 4px;
+  border-radius: 6px;
+  border-color: var(--rdd-color-text-primary);
+  border-width: 2px;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content .form-group {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: center;
+  padding: 2px 0;
+  border-bottom: 1px solid var(--rdd-color-shadow-primary);
+  font-size: 0.9rem;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content .form-group label {
+  font-weight: normal;
+  flex: 2;
+  padding-left: 5px;
+  margin: 0;
+  color: var(--rdd-color-text-primary);
+}
+.system-foundryvtt-reve-de-dragon .tarot-content .form-group .attribute-value,
+.system-foundryvtt-reve-de-dragon .tarot-content .form-group input[type="text"],
+.system-foundryvtt-reve-de-dragon .tarot-content .form-group input[type="number"],
+.system-foundryvtt-reve-de-dragon .tarot-content .form-group select {
+  flex: 3;
+  background: var(--rdd-input-background);
+  border: 1px solid var(--rdd-color-border-input);
+  color: var(--rdd-color-text-input);
+  padding: 2px 2px;
+  border-radius: 3px;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content .form-group input[type="checkbox"] {
+  flex: 0 0 20px;
+  margin-left: 5px;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content .sheet-header-row {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content .sheet-header-row h1,
+.system-foundryvtt-reve-de-dragon .tarot-content .sheet-header-row input {
+  font-family: CaslonAntique;
+  font-size: 2.5rem;
+  font-weight: normal;
+  color: var(--window-header-title-color);
+  margin: 4px;
+  height: 3rem;
+}
+.system-foundryvtt-reve-de-dragon .tarot-content :is(
+    input[type="text"],
+    input[type="number"],
+    input[type="password"],
+    input[type="datetime-local"],
+    input[type="date"],
+    input[type="time"]
+  ) {
   color: rgba(255, 255, 255, 0.75);
   background: rgba(255, 255, 255, 0.1);
   border: 0 none;
@@ -472,6 +721,7 @@ select,
   margin: 0;
   justify-content: center;
   text-align: left;
+  display: ruby;
 }
 .system-foundryvtt-reve-de-dragon .equipement-valeur {
   margin: 0;
@@ -491,6 +741,8 @@ select,
   align-items: center;
   justify-content: center;
   text-align: center;
+  display: flex;
+  flex-direction: row;
 }
 .system-foundryvtt-reve-de-dragon .equipement-button {
   margin: 0;
@@ -1042,8 +1294,7 @@ select,
   white-space: nowrap;
   word-break: break-all;
 }
-.system-foundryvtt-reve-de-dragon span.content-link,
+.system-foundryvtt-reve-de-dragon .content-link {
-.system-foundryvtt-reve-de-dragon a.content-link {
   background: hsla(45, 100%, 80%, 0.2);
   color: hsla(300, 70%, 20%, 0.8);
   font-weight: 560;
@@ -1052,6 +1303,7 @@ select,
   border-radius: 0.25rem;
   white-space: nowrap;
   word-break: break-all;
+  display: ruby;
 }
 .system-foundryvtt-reve-de-dragon a.roll-text i.fas {
   color: var(--color-text-dark-inactive);
@@ -1288,6 +1540,8 @@ select,
 .system-foundryvtt-reve-de-dragon .list-item-label,
 .system-foundryvtt-reve-de-dragon .list-title-label {
   flex-grow: 2;
+  display: flex;
+  flex-direction: row;
 }
 .system-foundryvtt-reve-de-dragon .attribut-value,
 .system-foundryvtt-reve-de-dragon .carac-value {
@@ -1339,9 +1593,13 @@ select,
 .system-foundryvtt-reve-de-dragon table.table-nombres-astraux th > td {
   font-size: 1rem;
 }
-.system-foundryvtt-reve-de-dragon table.table-nombres-astraux tr > td {
+.system-foundryvtt-reve-de-dragon table.table-nombres-astraux tr td {
   font-size: 0.8rem;
 }
+.system-foundryvtt-reve-de-dragon table.table-nombres-astraux tr td.info-acteur {
+  flex-direction: row;
+  display: flex;
+}
 .system-foundryvtt-reve-de-dragon table.table-nombres-astraux :is(tr, th, td) {
   border-style: solid;
   border-width: 1px;

gulpfile.js

@@ -19,7 +19,7 @@ const css = gulp.series(compileLESS);
 /* ----------------------------------------- */
 /*  Watch Updates
 /* ----------------------------------------- */
-const SIMPLE_LESS = ["less/*.less"];
+const SIMPLE_LESS = ["less/*.less", "less/item/*.less"];
 
 function watchUpdates() {
   gulp.watch(SIMPLE_LESS, css);

less/colors.less

@@ -9,7 +9,13 @@
     // --debug-box-shadow-blue: inset 0 0 2px blue;
     // --debug-box-shadow-green: inset 0 0 2px green;
 
+
   /* =================== 3. some constants ============ */
+    --fieldset-background: url(/ui/parchment.jpg);
+    --rdd-color-text-primary: rgba(10, 10, 10, 0.9);
+    --rdd-input-background:rgba(0, 0, 0, 0.05);
+    --rdd-color-border-input: rgba(0, 0, 0, 0.2);
+    --rdd-bg-input: rgba(255, 255, 255, 0.1);
     --color-controls:rgba(0, 0, 0, 0.9);
     --color-controls-light:hsla(0, 0%, 20%, 0.8);
     --color-controls-hover:hsla(60, 100%, 75%, 0.7);
@@ -42,4 +48,3 @@
     --background-error:hsla(16, 100%, 50%, 0.8);
     --color-profile-border: hsla(0, 0%, 80%, 0.05);
   }
-  

less/foundryvtt-reve-de-dragon.less

@@ -4,6 +4,8 @@
 .system-foundryvtt-reve-de-dragon {
   @import "sheets.less";
   @import "item/monnaie.less";
+  @import "item/munition.less";
+  @import "item/tarot.less";
 
   // body {
   //   --input-height: 1.4rem;
@@ -354,6 +356,7 @@
     margin: 0;
     justify-content: center;
     text-align: left;
+    display: ruby;
   }
   .equipement-valeur {
     margin: 0;
@@ -373,6 +376,8 @@
     align-items: center;
     justify-content: center;
     text-align: center;
+    display: flex;
+    flex-direction: row;
   }
   .equipement-button {
     margin: 0;
@@ -960,8 +965,7 @@
     word-break: break-all;
   }
 
-  span.content-link,
+  .content-link {
-  a.content-link {
     background: hsla(45, 100%, 80%, 0.2);
     color: hsla(300, 70%, 20%, 0.8);
     font-weight: 560;
@@ -970,6 +974,7 @@
     border-radius: 0.25rem;
     white-space: nowrap;
     word-break: break-all;
+    display: ruby;
   }
   a.roll-text i.fas{
     color: var(--color-text-dark-inactive);
@@ -1220,6 +1225,8 @@
   .list-item-label,
   .list-title-label {
     flex-grow: 2;
+    display: flex;
+    flex-direction: row;
   }
   .attribut-value,
   .carac-value {
@@ -1273,9 +1280,13 @@
   table.table-nombres-astraux th >td {
     font-size: 1rem;
   }
-  table.table-nombres-astraux tr >td {
+  table.table-nombres-astraux tr td {
     font-size: 0.8rem;
   }
+  table.table-nombres-astraux tr td.info-acteur {
+    flex-direction: row;
+    display: flex;
+  }
   table.table-nombres-astraux :is(tr, th, td) {
     border-style: solid;
     border-width: 1px;

less/item/monnaie.less

@@ -1,10 +1,7 @@
-.application.sheet.fvtt-rdd {
+// Styles pour la feuille d'objet Monnaie
-  .sheet-common();
+.monnaie-content {
-  section.window-content{
+
-    padding: 0rem;
+  .item-sheet-common();
+  .item-sheet-header();
 
-    section header.sheet-header {
-        .sheet-header();
-    }
-  }
 }

less/item/munition.less

@@ -0,0 +1,7 @@
+// Styles pour la feuille d'objet Monnaie
+.munition-content {
+
+  .item-sheet-common();
+  .item-sheet-header();
+
+}

less/item/tarot.less

@@ -0,0 +1,7 @@
+// Styles pour la feuille d'objet Monnaie
+.tarot-content {
+
+  .item-sheet-common();
+  .item-sheet-header();
+
+}

less/sheets.less

@@ -1,21 +1,96 @@
-.sheet-common() {
+.item-sheet-common() {
+  padding: 0px;
+
+  // Styles pour la section de description, si le partiel utilise une structure standard
+  .editor,
+  .editor-content {
+    height: auto; // Ajuster selon le besoin
+    min-height: 100px; // Hauteur minimale pour la description
+    background: var(--rdd-bg-input-alt); // Une couleur de fond alternative
+    padding: 5px;
+    border-radius: 3px;
+    color: var(--rdd-color-text-primary);
+  }
 
   .window-content {
     font-family: CaslonAntique;
     text-align: justify;
     font-size: 1rem;
     letter-spacing: 1px;
+    padding: 0% 0 0 0;
 
     font-size: calc(var(--font-size-standard) * 1);
     color: var(--color-dark-1);
-    background: var(--background-image-base) no-repeat;
     background-size: 100% 100%;
   }
+
+  fieldset {
+    background: var(--fieldset-background);
+    color: var(--rdd-color-text-primary);
+    margin-bottom: 4px;
+    border-radius: 6px;
+    border-color: var(--rdd-color-text-primary);
+    border-width: 2px;
+  }
+
+  .form-group {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 2px 0;
+    border-bottom: 1px solid var(--rdd-color-shadow-primary);
+    font-size: 0.9rem;
+
+    label {
+      font-weight: normal;
+      flex: 2;
+      padding-left: 5px;
+      margin: 0;
+      color: var(
+        --rdd-color-text-primary
+      ); // Assurez-vous que cette variable existe dans colors.less
+    }
+
+    .attribute-value,
+    input[type="text"],
+    input[type="number"],
+    select {
+      flex: 3;
+      background: var(--rdd-input-background);
+      border: 1px solid var(--rdd-color-border-input); // Assurez-vous que cette variable existe
+      color: var(
+        --rdd-color-text-input
+      ); // Assurez-vous que cette variable existe
+      padding: 2px 2px; // Augmentation du padding vertical
+      border-radius: 3px;
+    }
+
+    input[type="checkbox"] {
+      flex: 0 0 20px; // Taille fixe pour les cases à cocher
+      margin-left: 5px;
+    }
+  }
 }
 
-.sheet-header() {
+.item-sheet-header() {
   background: #011d33 url(../assets/ui/bg_header.webp) no-repeat left top;
   color: rgba(255, 255, 255, 1);
+  .sheet-header-row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    h1,
+    input {
+      font-family: CaslonAntique;
+      font-size: 2.5rem;
+      font-weight: normal;
+      color: var(--window-header-title-color);
+      margin: 4px;
+      height: 3rem;
+    }
+  }
 
   :is(
     input[type="text"],
@@ -23,7 +98,8 @@
     input[type="password"],
     input[type="datetime-local"],
     input[type="date"],
-    input[type="time"]) {
+    input[type="time"]
+  ) {
     color: rgba(255, 255, 255, 0.75);
     background: rgba(255, 255, 255, 0.1);
     border: 0 none;

module/actor/base-actor-sheet.js

@@ -15,6 +15,7 @@ import { ItemAction } from "../item/item-actions.js";
  * @extends {ActorSheet}
  */
 export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet {
+  static _warnedAppV1 = true
 
   /** @override */
   static get defaultOptions() {

module/actor/commerce-sheet.js

@@ -1,6 +1,4 @@
-import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
 import { RdDItem } from "../item.js";
-import { RdDUtility } from "../rdd-utility.js";
 import { RdDBaseActorSheet } from "./base-actor-sheet.js";
 
 /**
@@ -44,13 +42,8 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
   activateListeners(html) {
     super.activateListeners(html);
 
-    this.html.find('a.item-acheter').click(async event => await this.vente(this.getItem(event)));
-    this.html.find('.service-acheter').click(async event => await this.vente(this.getItem(event)));
-
     if (!this.options.editable) return;
 
-    this.html.find('a.item-quantite-moins').click(async event => await this.getItem(event)?.quantiteIncDec(-1, { supprimerSiZero: false }));
-    this.html.find('a.item-quantite-plus').click(async event => await this.getItem(event)?.quantiteIncDec(1));
     this.html.find('input.item-quantite').change(async event => {
       const newQuantite = Math.max(0, Number.parseInt(this.html.find(event.currentTarget).val()));
       await this.getItem(event)?.update({ "system.quantite": newQuantite });
@@ -64,28 +57,4 @@ export class RdDCommerceSheet extends RdDBaseActorSheet {
   getTypesInventaire() {
     return RdDItem.getItemTypesInventaire('all');
   }
-
-
-  async vente(item) {
-    const acheteur = RdDUtility.getSelectedActor();
-    if (!acheteur) {
-      ui.notifications.warn(`Pas d'acheteur sélectionné`);
-      return;
-    }
-    const disponible = this.actor.getQuantiteDisponible(item)
-    if (disponible == 0) {
-      ui.notifications.warn(`${this.getAlias()} n'a plus de ${item.name} en vente`);
-      return;
-    }
-
-    await DialogItemAchat.onAcheter({
-      item,
-      vendeur: this.actor,
-      acheteur,
-      quantiteIllimite: disponible == undefined,
-      nbLots: disponible ?? 1,
-      tailleLot: 1,
-      prixLot: item.calculerPrixCommercant()
-    });
-  }
 }

module/actor/commerce.js

@@ -1,4 +1,6 @@
+import { DialogItemAchat } from "../achat-vente/dialog-item-achat.js";
 import { Misc } from "../misc.js";
+import { RdDUtility } from "../rdd-utility.js";
 import { RdDBaseActor } from "./base-actor.js";
 
 export class RdDCommerce extends RdDBaseActor {
@@ -37,4 +39,27 @@ export class RdDCommerce extends RdDBaseActor {
     const pourcentage = this.system.pourcentage ?? 100;
     return Misc.keepDecimals(Math.ceil(item.system.cout * pourcentage) / 100, 2);
   }
+  async vente(item) {
+    const acheteur = RdDUtility.getSelectedActor();
+    if (!acheteur) {
+      ui.notifications.warn(`Pas d'acheteur sélectionné`);
+      return;
+    }
+    const disponible = this.getQuantiteDisponible(item)
+    if (disponible == 0) {
+      ui.notifications.warn(`${this.getAlias()} n'a plus de ${item.name} en vente`);
+      return;
+    }
+
+    await DialogItemAchat.onAcheter({
+      item,
+      vendeur: this,
+      acheteur,
+      quantiteIllimite: disponible == undefined,
+      nbLots: disponible ?? 1,
+      tailleLot: 1,
+      prixLot: item.calculerPrixCommercant()
+    });
+  }
+  
 }

module/applications/sheets/common-item-sheet.mjs

@@ -53,7 +53,7 @@ export default class RdDItemBaseSheet extends HandlebarsApplicationMixin(foundry
   static DEFAULT_OPTIONS = {
     classes: ["fvtt-rdd", "item"],
     position: {
-      width: 600,
+      width: 448,
       height: "auto",
     },
     form: {

module/applications/sheets/monnaie-sheet.mjs

@@ -13,7 +13,7 @@ export default class RdDMonnaieSheet extends RdDItemBaseSheet {
     RdDItemBaseSheet.DEFAULT_OPTIONS,
     {
       classes: ["fvtt-rdd", "item", "monnaie"],
-      position: { width: 400 },
+      position: { width: 448 },
       window: { contentClasses: ["monnaie-content"] }
     })
 

module/applications/sheets/munition-sheet.mjs

@@ -12,7 +12,7 @@ export default class RdDMunitionSheet extends RdDItemBaseSheet {
     RdDItemBaseSheet.DEFAULT_OPTIONS,
     {
       classes: ["fvtt-rdd", "item", "munition"],
-      position: { width: 400 },
+      position: { width: 448 },
       window: { contentClasses: ["munition-content"] }
     })
 

module/applications/sheets/tarot-sheet.mjs

@@ -12,7 +12,7 @@ export default class RdDTarotSheet extends RdDItemBaseSheet {
     RdDItemBaseSheet.DEFAULT_OPTIONS,
     {
       classes: ["fvtt-rdd", "item", "tarot"],
-      position: { width: 400 },
+      position: { width: 448 },
       window: { contentClasses: ["tarot-content"] }
     })
 

module/documents/monnaie.mjs

@@ -1,7 +1,11 @@
 import { RdDItem } from "../item.js";
 
 export default class RdDItemMonnaie extends RdDItem {
-  static get defaultIcon() {
+
-    return 'systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp'
+  constructor(data, context) {
+    if (!data.img) {
+      data.img = 'systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp'
+    }
+    super(data, context);
   }
 }

module/documents/tarot.mjs

@@ -2,6 +2,6 @@ import { RdDItem } from "../item.js";
 
 export default class RdDItemTarot extends RdDItem {
   static get defaultIcon() {
-    return 'systems/foundryvtt-reve-de-dragon/icons/objets/tarot.webp'
+    return 'systems/foundryvtt-reve-de-dragon/icons/tarots/dos-tarot.webp'
   }
 }

module/item.js

@@ -78,6 +78,8 @@ export const defaultItemImg = {
   souffle: "systems/foundryvtt-reve-de-dragon/icons/souffle_dragon.webp",
   tarot: "systems/foundryvtt-reve-de-dragon/icons/tarots/dos-tarot.webp",
   tete: "systems/foundryvtt-reve-de-dragon/icons/tete_dragon.webp",
+  monnaie:"systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp",
+  munition: "systems/foundryvtt-reve-de-dragon/icons/objets/fleche.webp"
 }
 
 /* -------------------------------------------- */

module/item/item-actions.js

@@ -1,3 +1,4 @@
+import { ACTOR_TYPES } from "../constants.js"
 import { Misc } from "../misc.js"
 import { RdDSheetUtility } from "../rdd-sheet-utility.js"
 import { RdDUtility } from "../rdd-utility.js"
@@ -19,9 +20,8 @@ const _VENDRE = {
 }
 const _ACHAT_SERVICE = {
   code: 'item-service-acheter', label: 'Acheter', icon: it => 'fa-regular fa-coins',
-  //filter: it => Misc.toInt(it.system.quantite) > 0,
+  filter: it => Misc.toInt(it.system.quantite) > 0 && it.parent?.type == ACTOR_TYPES.commerce,
-  //optionsFilter: options => options.editable,
+  action: (item, actor) => actor.vente(item)
-  //action: (item, actor) => item.proposerVente()
 }
 const _MONTRER = {
   code: 'item-montrer', label: 'Montrer', icon: it => 'fa-solid fa-comment',

module/rdd-token-hud.js

@@ -112,6 +112,7 @@ export class RdDTokenHud {
 
   /* -------------------------------------------- */
   static async addTokenHudExtensions(app, html, tokenId) {
+    console.log(`Adding token HUD extensions for token ${tokenId}`);
     const controlIconCombat = $(html).find('.control-icon[data-action=combat]');
     if (controlIconCombat.length > 0) {
       controlIconCombat.click(event => {
@@ -129,7 +130,7 @@ export class RdDTokenHud {
 
   /* -------------------------------------------- */
   static async _configureSubMenu(insertionPoint, template, hudData, onMenuItem) {
-    const hud = $(await renderTemplate(template, hudData));
+    const hud = $(await foundry.applications.handlebars.renderTemplate(template, hudData));
     const list = hud.find('div.rdd-hud-list');
 
     RdDTokenHud._toggleHudListActive(hud, list);

module/time/rdd-calendrier.js

@@ -15,6 +15,8 @@ const TEMPLATE_CALENDRIER = "systems/foundryvtt-reve-de-dragon/templates/time/ca
 const INITIAL_CALENDAR_POS = { top: 200, left: 200, horlogeAnalogique: true };
 /* -------------------------------------------- */
 export class RdDCalendrier extends Application {
+  static _warnedAppV1 = true
+
   static initSettings() {
     game.settings.register(SYSTEM_RDD, "liste-nombre-astral", {
       name: "liste-nombre-astral",

templates/actor/inventaire-item.hbs

@@ -1,7 +1,7 @@
 {{#unless item.system.isHidden}}
 {{#if (or options.isObserver (ne item.type 'monnaie'))}}
 <li class="item flexrow list-item" data-item-id="{{item._id}}" draggable="true" data-tooltip="{{#if (gt item.system.quantite 1)}}{{item.system.quantite}} {{/if}}{{item.name}}">
-  <span class="equipement-nom flexrow {{#if (eq item.type 'conteneur')}}conteneur-name{{/if}} ">
+  <span class="equipement-nom {{#if (eq item.type 'conteneur')}}conteneur-name{{/if}} ">
     {{#if (eq item.type 'conteneur')}}
     <a>
       <i class="{{~#if vide}}far fa-square

templates/item/monnaie-sheet.hbs

@@ -1,14 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.hbs"}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="informations">Informations</a>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-tab-environnement.hbs"}}
-  </nav>
-  <section class="sheet-body">
-    <div class="tab items flexcol" data-group="primary" data-tab="informations">
-      {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.hbs"}}
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.hbs"}}
-    </div>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-environnement.hbs"}}
-  </section>
-</form>

templates/item/munition-sheet.hbs

@@ -1,14 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.hbs"}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="informations">Informations</a>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-tab-environnement.hbs"}}
-  </nav>
-  <section class="sheet-body">
-    <div class="tab items flexcol" data-group="primary" data-tab="informations">
-      {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.hbs"}}
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.hbs"}}
-    </div>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-environnement.hbs"}}
-  </section>
-</form>

templates/item/munition.hbs

@@ -1,14 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.hbs"}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="informations">Informations</a>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-tab-environnement.hbs"}}
-  </nav>
-  <section class="sheet-body">
-    <div class="tab items flexcol" data-group="primary" data-tab="informations">
-      {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-inventaire.hbs"}}
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.hbs"}}
-    </div>
-    {{>"systems/foundryvtt-reve-de-dragon/templates/item/partial-environnement.hbs"}}
-  </section>
-</form>

templates/item/tarot-sheet.hbs

@@ -1,27 +0,0 @@
-<form class="rdd-item-sheet-tarot" autocomplete="off">
-  <header class="sheet-header">
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-    </div>
-  </header>
-  <section class="sheet-body">
-    <div class="flexrow">
-      <img class="profile-img" src="{{img}}" data-edit="img" data-tooltip="{{name}}"/>
-      <div class="flexcol">
-        <div class="form-group">
-          <label for="system.concept">Aspect</label>
-          <input class="attribute-value" type="text" name="system.concept" value="{{system.concept}}" data-dtype="String" />
-        </div>
-        <div class="form-group">
-          <label for="system.aspect">Sens</label>
-          <select name="system.aspect" data-dtype="String">
-            {{#select system.aspect}}
-            {{>"systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.hbs"}}
-            {{/select}}
-          </select>
-        </div>
-        {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-frequence.hbs"}}
-        {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.hbs"}}
-      </div>
-    </section>
-</form>

templates/sheets/item/common/header.hbs

@@ -1,6 +1,8 @@
 <header class="sheet-header">
+  <div class="sheet-header-row">
     <img class="profile-img" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}"/>
     <div class="header-fields">
         <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
     </div>
+  </div>
 </header>

templates/sheets/item/tarot.hbs

@@ -0,0 +1,22 @@
+<section>
+  {{> "systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/header.hbs"}}
+
+  <fieldset>
+    <div class="form-group">
+      <label for="system.concept">Concept</label>
+      <input type="text" name="system.concept" value="{{system.concept}}" />
+    </div>
+
+    <div class="form-group">
+      <label for="system.aspect">Aspect</label>
+      <input type="text" name="system.aspect" value="{{system.aspect}}" />
+    </div>
+
+    <div class="form-group">
+      <label for="system.frequence">Fréquence</label>
+      <input type="number" name="system.frequence" value="{{system.frequence}}" data-dtype="Number" />
+    </div>
+  </fieldset>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/sheets/item/common/template-description.hbs"}}
+
+</section>

templates/sommeil/astrologie-gardien.hbs

@@ -36,9 +36,10 @@
     </tr>
     {{#each gmAstrologie.ajustementsActors as |ajustementActeur|}}
     <tr class="heure-naissance" data-heure-naissance="{{actor.system.heure}}">
-      <td>
+      <td class="info-acteur">
         <img class="img-signe-heure" src="{{actor.img}}" data-tooltip="{{actor.name}}" />
-        {{actor.name}} {{timestamp-imgSigneHeure actor.system.heure}}
+        <span>{{actor.name}}</span>
+        {{timestamp-imgSigneHeure actor.system.heure}}
       </td>
       {{#each ajustementActeur.ajustements as |ajustement|}}
       <td>{{#if (ne ajustement.ajustement 0)}}