Some progression work, and fixed start rank level to 1

system/lang/en-en.json

@@ -252,8 +252,9 @@
             "total": "Total",
             "spent": "Used",
             "saved": "Saved",
-            "rank": "Rank Total Xp: ",
+            "rank": "Rank Total Xp",
-            "curriculum": "in curriculum"
+            "curriculum": "in curriculum",
+            "curriculum_validate": "Complete this rank"
         },
         "npc": {
             "types": {

system/lang/es-es.json

@@ -252,8 +252,9 @@
             "total": "Total",
             "spent": "Usada",
             "saved": "Restante",
-            "rank": "Rank Total Xp: ",
+            "rank": "Rank Total Xp",
-            "curriculum": "in curriculum"
+            "curriculum": "in curriculum",
+            "curriculum_validate": "Complete this rank"
         },
         "npc": {
             "types": {

system/lang/fr-fr.json

@@ -252,8 +252,9 @@
             "total": "Totale",
             "spent": "Dépensée",
             "saved": "Restante",
-            "rank": "Xp Total du rang : ",
+            "total_xp_rank": "Xp Total du rang",
-            "curriculum": "Inclus dans le cursus"
+            "curriculum": "Inclus dans le cursus",
+            "curriculum_validate": "Valider la progression"
         },
         "npc": {
             "types": {

system/scripts/actors/base-sheet.js

@@ -64,25 +64,6 @@ export class BaseSheetL5r5e extends ActorSheet {
             return;
         }
 
-        // Check if technique is allowed for this character
-        if (
-            !game.user.isGM &&
-            item.data.type === "technique" &&
-            !this.actor.data.data.techniques[item.data.data.technique_type]
-        ) {
-            new Dialog({
-                title: game.i18n.localize("l5r5e.techniques.title"),
-                content: game.i18n.localize("l5r5e.techniques.not_allowed"),
-                buttons: {
-                    ok: {
-                        label: game.i18n.localize("l5r5e.global.ok"),
-                        icon: '<i class="fas fa-check"></i>',
-                    },
-                },
-            }).render(true);
-            return;
-        }
-
         // Dropped a item with same "id" as one owned, add qte instead
         if (item.data.data.quantity && this.actor.data.items) {
             const tmpItem = this.actor.data.items.find((e) => e.name === item.name && e.type === item.type);
@@ -104,6 +85,31 @@ export class BaseSheetL5r5e extends ActorSheet {
             );
         }
 
+        // Item subtype specific
+        switch (item.data.type) {
+            case "advancement":
+                // Modify the bought at rank to the current actor rank
+                item.data.data.bought_at_rank = this.actor.data.data.identity.school_rank;
+                break;
+
+            case "technique":
+                // Check if technique is allowed for this character
+                if (!game.user.isGM && !this.actor.data.data.techniques[item.data.data.technique_type]) {
+                    new Dialog({
+                        title: game.i18n.localize("l5r5e.techniques.title"),
+                        content: game.i18n.localize("l5r5e.techniques.not_allowed"),
+                        buttons: {
+                            ok: {
+                                label: game.i18n.localize("l5r5e.global.ok"),
+                                icon: '<i class="fas fa-check"></i>',
+                            },
+                        },
+                    }).render(true);
+                    return;
+                }
+                break;
+        }
+
         // Ok add item - Foundry override cause props
         const allowed = Hooks.call("dropActorSheetData", this.actor, this, item);
         if (allowed === false) {
@@ -159,6 +165,18 @@ export class BaseSheetL5r5e extends ActorSheet {
         html.find(`.item-curriculum`).on("click", (event) => {
             this._switchSubItemCurriculum(event);
         });
+        html.find(`button[name=validate-curriculum]`).on("click", (event) => {
+            this.actor.data.data.identity.school_rank = this.actor.data.data.identity.school_rank + 1;
+            // Update actor
+            this.actor.update({
+                data: {
+                    identity: {
+                        school_rank: this.actor.data.data.identity.school_rank,
+                    },
+                },
+            });
+            this.render(false);
+        });
     }
 
     /**
@@ -180,6 +198,12 @@ export class BaseSheetL5r5e extends ActorSheet {
             type: type,
         });
         const item = this.actor.getOwnedItem(created._id);
+
+        // assign current school rank to the new tech
+        if (item.data.type === "advancement") {
+            item.data.data.bought_at_rank = this.actor.data.data.identity.school_rank;
+        }
+
         item.sheet.render(true);
     }
 

system/scripts/actors/character-sheet.js

@@ -39,33 +39,45 @@ export class CharacterSheetL5r5e extends BaseSheetL5r5e {
     getData() {
         const sheetData = super.getData();
 
-        // Sort Items by rank 0->6 for advancements tab
+        // Sort Items by rank 1->6 for advancements tab
         sheetData.items.sort((a, b) => {
-            return (a.data.bought_at_rank || 0) - (b.data.bought_at_rank || 0);
+            return (a.data.bought_at_rank || 1) - (b.data.bought_at_rank || 1);
         });
 
+        // Min rank = 1
+        this.actor.data.data.identity.school_rank = Math.max(1, this.actor.data.data.identity.school_rank);
+
         // Xp spent only in current rank
-        sheetData.data.xp_spent_rank = this.getXpSpentInThisRank();
+        const totalXp = this._getXpSpent();
+        sheetData.data.xp_spent_rank = totalXp.rank;
+        sheetData.data.xp_spent = totalXp.total;
+        sheetData.data.xp_saved = sheetData.data.xp_total - sheetData.data.xp_spent;
+        sheetData.data.xp_goal = CONFIG.l5r5e.xpPerRank[this.actor.data.data.identity.school_rank - 1] || null;
 
         return sheetData;
     }
 
     /**
-     * Return the current total xp spent for this rank
+     * Return the total xp spent and the current total xp spent for this rank
      */
-    getXpSpentInThisRank() {
+    _getXpSpent() {
-        const currentRank = this.actor.data.data.identity.school_rank || 0;
+        const total = {
-        return this.actor.items.reduce((tot, item) => {
+            total: 0,
-            if (currentRank + 1 === item.data.data.rank) {
+            rank: 0,
-                let xp = item.data.data.xp_used || 0;
+        };
+        const currentRank = this.actor.data.data.identity.school_rank;
+        this.actor.items.map((item) => {
+            let xp = item.data.data.xp_used || 0;
+            total.total = total.total + xp;
 
+            if (currentRank === item.data.data.rank) {
                 // if not in curriculum, xp spent /2 for this item
                 if (!item.data.data.in_curriculum && xp > 0) {
                     xp = Math.floor(xp / 2);
                 }
-                return tot + xp;
+                total.rank = total.rank + xp;
             }
-            return tot;
+        });
-        }, 0);
+        return total;
     }
 }

system/scripts/config.js

@@ -7,6 +7,7 @@ L5R5E.paths = {
 
 L5R5E.stances = ["earth", "air", "water", "fire", "void"];
 L5R5E.techniques = ["kata", "kiho", "invocation", "ritual", "shuji", "maho", "ninjutsu"];
+L5R5E.xpPerRank = [20, 24, 32, 44, 60];
 
 // Map SkillId - CategoryId
 L5R5E.skills = new Map();

system/template.json

@@ -7,7 +7,7 @@
                     "clan": "",
                     "family": "",
                     "school": "",
-                    "school_rank": 0,
+                    "school_rank": 1,
                     "roles": ""
                 }
             },

system/templates/actors/character/experience.html

@@ -2,20 +2,15 @@
     <legend>{{ localize 'l5r5e.experience'}}</legend>
     <label class="attribute-label">
         {{ localize 'l5r5e.advancements.total' }}
-        <input class="centered-input select-on-focus" type="number" name="data.advancement.xp_total" value="{{ data.advancement.xp_total }}" data-dtype="Number" min="0" placeholder="0"/>
+        <input class="centered-input select-on-focus" type="number" name="data.xp_total" value="{{ data.xp_total }}" data-dtype="Number" min="0" placeholder="0"/>
     </label>
     <label class="attribute-label">
         {{ localize 'l5r5e.advancements.spent' }}
-        <input class="centered-input select-on-focus" type="number" name="data.xp_spent" value="{{ data.xp_spent }}" data-dtype="Number" min="0" placeholder="0"/>
+        <input class="centered-input select-on-focus" type="number" name="data.xp_spent" value="{{ data.xp_spent }}" data-dtype="Number" min="0" placeholder="0" disabled/>
     </label>
     <label class="attribute-label">
         {{ localize 'l5r5e.advancements.saved' }}
-        <input class="centered-input select-on-focus" type="number" name="data.advancement.xp_saved" value="{{ data.advancement.xp_saved }}" data-dtype="Number" min="0" placeholder="0"/>
+        <input class="centered-input select-on-focus" type="number" name="data.xp_saved" value="{{ data.xp_saved }}" data-dtype="Number" min="0" placeholder="0" disabled/>
-    </label>
-
-    <label class="attribute-label">
-        {{ localize 'l5r5e.advancements.rank' }}
-        {{ data.xp_spent_rank }}
     </label>
 </fieldset>
 <fieldset class="advancement">
@@ -37,6 +32,22 @@
                 {{> 'systems/l5r5e/templates/actors/character/advancement.html' advancement=advancement editable=../editable }}
             {{/ifCond}}
         {{/each}}
+        <tfooter class="flex">
+            <tr class="flexrow row">
+                <th class="">
+                    {{#ifCond data.xp_spent_rank '>=' data.xp_goal}}
+                    <button type="button" name="validate-curriculum">
+                        <i class='fas fa-check-square'></i> {{ localize 'l5r5e.advancements.curriculum_validate' }}
+                    </button>
+                    {{/ifCond}}
+                </th>
+                <th class="">
+                    {{ localize 'l5r5e.advancements.total_xp_rank' }} ({{data.identity.school_rank}}) :
+                    {{ data.xp_spent_rank }}
+                    {{#if data.xp_goal}}/{{data.xp_goal}}{{/if}}
+                </th>
+            </tr>
+        </tfooter>
         </tbody>
     </table>
 </fieldset>

system/templates/actors/character/identity.html

@@ -14,7 +14,7 @@
     <li>
         <label class="attribute-label">
             {{ localize 'l5r5e.schoolrank' }}
-            <input type="number" name="data.identity.school_rank" value="{{data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="0" placeholder="0"/>
+            <input type="number" name="data.identity.school_rank" value="{{data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="1" placeholder="1"/>
         </label>
     </li>
     <li>

system/templates/actors/limited-sheet.html

@@ -20,7 +20,7 @@
             <li>
                 <label class="attribute-label">
                     {{ localize 'l5r5e.schoolrank' }}
-                    <input type="number" name="data.identity.school_rank" value="{{data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="0" placeholder="0"/>
+                    <input type="number" name="data.identity.school_rank" value="{{data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="1" placeholder="1"/>
                 </label>
             </li>
             <li>