Derniers fixs

system/scripts/actors/base-character-sheet.js

@@ -685,9 +685,9 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e {
         const data = {
             equipped: tmpItem.system.equipped,
         };
-        // Only weapons
+        // For weapons: sync readied with equipped so both toggle together
         if (tmpItem.system.readied !== undefined) {
-            data.readied = tmpItem.system.readied;
+            data.readied = type === "equipped" ? tmpItem.system.equipped : tmpItem.system.readied;
         }
 
         // Update the Item: we need to manually notify the "Gm Monitor" as the Actor himself is not updated

system/scripts/actors/character-sheet.js

@@ -11,7 +11,6 @@ export class CharacterSheetL5r5e extends BaseCharacterSheetL5r5e {
             template: CONFIG.l5r5e.paths.templates + "actors/character-sheet.html",
             tabs: [
                 { navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills" },
-                { navSelector: ".advancements-tabs", contentSelector: ".advancements-body", initial: "last" },
             ],
         });
     }
@@ -184,12 +183,6 @@ export class CharacterSheetL5r5e extends BaseCharacterSheetL5r5e {
         });
 
 
-        // Advancements Tab to current rank onload
-        // TODO class "Active" Bug on load, dunno why :/
-        this._tabs
-            .find((e) => e._navSelector === ".advancements-tabs")
-            .activate("advancement_rank_" + (this.actor.system.identity.school_rank || 0));
-
         // Arcane roll on name click
         html.find(".dice-picker-arcane").on("click", this._openDicePickerForArcane.bind(this));
     }

system/styles/scss/rings.scss

@@ -11,11 +11,11 @@
     margin: 0 auto;
     color: $white-light;
 
-    #air   { left:  86px; top:  69px; } // haut-gauche (−36°)
-    #water { left: 174px; top:  69px; } // haut-droite ( 36°)
-    #fire  { left:  59px; top: 153px; } // gauche      (252°)
-    #earth { left: 201px; top: 153px; } // droite      (108°)
-    #void  { left: 130px; top: 205px; } // bas         (180°)
+    #air   { left:  86px; top:  59px; z-index: 2; } // haut-gauche (−36°)
+    #water { left: 174px; top:  59px; z-index: 2; } // haut-droite ( 36°)
+    #fire  { left:  59px; top: 153px; z-index: 1; } // gauche      (252°)
+    #earth { left: 201px; top: 153px; z-index: 1; } // droite      (108°)
+    #void  { left: 130px; top: 205px; z-index: 1; } // bas         (180°)
 
     // — Common ring cell —
     #earth,
@@ -95,6 +95,16 @@
     // — Solaire / Lunaire : masqués sur les anneaux, affichés latéralement —
     .ring-type { display: none; }
 
+    // Air et Eau : label texte flottant AU-DESSUS de l'icône, hors du flux
+    // (position: absolute → ne décale pas le cercle, ne casse pas l'espacement)
+    #air label strong, #water label strong {
+        position: absolute;
+        bottom: calc(100% + 0.3rem); // au-dessus du ring-circle
+        left: 0; right: 0;
+        text-align: center;
+        visibility: visible;
+    }
+
     // Label vertical "☀ SOLAIRE" sur le côté gauche (entre Air et Feu)
     &::before {
         content: "☀ SOLAIRE";

system/templates/actors/character/advancement-school.html

@@ -1,4 +1,4 @@
-<tr data-group="advancements" data-tab="advancement_rank_{{rank}}" class="flexrow row advancement tab">
+<tr class="flexrow row advancement">
     <td class="name l5r5e-tooltip" data-item-id="{{advancement._id}}" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}</td>
     <td class="xp" name="advancement.xp">{{advancement.system.xp_used}}</td>
     {{#if editable}}

system/templates/actors/character/experience.html

@@ -26,9 +26,6 @@
         <a data-item-type="advancement" class="advancement-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
         {{/if}}
     </legend>
-    <nav class="advancements-tabs tabs" data-group="advancements">
-        <a class="item advancements-tab" data-tab="advancement_rank_0">{{localize 'l5r5e.advancements.school_rank_0'}}</a>
-    </nav>
     <table>
         <thead class="flex">
             <tr class="flexrow row">
@@ -48,7 +45,7 @@
                     {{#if ../data.editable_not_soft_locked}}
                         {{#ifCond ../data.system.identity.school_rank '<' 6}}
                             {{#ifCond (ifCond ../data.system.identity.school_rank '==' rankObject.rank) '&&' (ifCond rankObject.spent.curriculum '>=' rankObject.goal)}}
-                                <tr class="tfoot flexrow row tab" data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}">
+                                <tr class="tfoot flexrow row">
                                     <th>
                                         <button type="button" name="validate-curriculum">
                                             <i class='fas fa-check-square'></i> {{ localize 'l5r5e.advancements.curriculum_validate'}}

system/templates/items/weapon/weapon-entry.html

@@ -8,14 +8,12 @@
             <i class="fas fa-skull" title="{{localize 'l5r5e.weapons.deadliness'}}"> {{weapon.system.deadliness}}</i>
         </li>
         {{#if editable}}
+        <li data-item-id="{{weapon._id}}" data-type="equipped" class="equip-readied-control" title="{{localize 'l5r5e.armors.equipped'}}"><i class="fas {{#if weapon.system.equipped}}fa-tshirt{{else}}fa-weight-hanging{{/if}}"></i></li>
         <li data-item-id="{{weapon._id}}" class="item-edit" title="{{localize 'l5r5e.global.edit'}}"><i class="fas fa-edit"></i></li>
         <li data-item-id="{{weapon._id}}" class="item-delete" title="{{localize 'Delete'}}"><i class="fas fa-trash"></i></li>
         {{/if}}
     </ul>
     <ul class="item-properties">
-        <li class="equip-readied-control" data-item-id="{{weapon._id}}" data-type="readied">
-            <i class="i_readied fa{{^if weapon.system.readied}}r{{/if}} fa-check-circle" title="{{#if weapon.system.readied}}{{localize 'l5r5e.weapons.readied'}}{{else}}{{localize 'l5r5e.weapons.sheathed'}}{{/if}}"></i>
-        </li>
         {{#each weapon.system.properties as |property|}}
             <li class="l5r5e-tooltip" data-property-id="{{property.id}}">{{{property.name}}}</li>
         {{/each}}