tab on 20q and Hide rank 0 (initial) on progession

system/scripts/actors/character-sheet.js

@@ -73,10 +73,14 @@ export class CharacterSheetL5r5e extends BaseSheetL5r5e {
                 xp = Math.floor(xp / 2);
             }
 
-            const rank = Math.max(0, item.data.bought_at_rank - 1);
+            const rank = Math.max(0, item.data.bought_at_rank);
+            if (rank < 1) {
+                // Ignore starting comp/items
+                return;
+            }
             if (!adv[rank]) {
                 adv[rank] = {
-                    rank: rank + 1,
+                    rank: rank,
                     spent: 0,
                     goal: CONFIG.l5r5e.xp.costPerRank[rank] || null,
                     list: [],

system/scripts/actors/twenty-questions-dialog.js

@@ -33,7 +33,8 @@ export class TwentyQuestionsDialog extends FormApplication {
             template: CONFIG.l5r5e.paths.templates + "actors/twenty-questions-dialog.html",
             title: game.i18n.localize("l5r5e.twenty_questions.title"),
             width: 600,
-            height: 600,
+            height: 800,
+            tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "part1" }],
             resizable: true,
             closeOnSubmit: false,
             submitOnClose: false,

system/scripts/actors/twenty-questions.js

@@ -209,10 +209,10 @@ export class TwentyQuestions {
      * Fill a actor data from this object
      */
     async toActor(actor, itemsCache) {
-        const actorDatas = duplicate(actor.data.data);
+        const actorDatas = actor.data.data;
         const formData = this.data;
 
-        // Update the actor real datas
+        // Update the actor
         actorDatas.zeni = Math.floor(formData.step2.wealth * 50);
         actorDatas.identity = {
             ...actorDatas.identity,
@@ -268,24 +268,24 @@ export class TwentyQuestions {
         await actor.deleteEmbeddedEntity("OwnedItem", deleteIds);
 
         // Add items in 20Q to actor
-        Object.values(itemsCache).forEach((types) => {
+        for (const types of Object.values(itemsCache)) {
-            types.forEach((item) => {
+            for (const item of types) {
                 const itemData = duplicate(item.data);
                 if (itemData.data?.bought_at_rank) {
                     itemData.data.bought_at_rank = 0;
                 }
-                actor.createEmbeddedEntity("OwnedItem", itemData);
+                if (itemData.data?.xp_spent) {
-            });
+                    itemData.data.xp_spent = 0;
-        });
+                }
+                await actor.createEmbeddedEntity("OwnedItem", itemData);
+            }
+        }
 
         // Update actor
-        actor.update({
+        await actor.update({
             name: (formData.step2.family + " " + formData.step19.firstname).trim(),
-            data: diffObject(actor.data.data, actorDatas),
+            data: actor.data.data,
         });
-
-        // TODO Tmp
-        // console.log(actor);
     }
 
     /**

system/scripts/config.js

@@ -8,7 +8,7 @@ L5R5E.paths = {
 L5R5E.stances = ["earth", "air", "water", "fire", "void"];
 L5R5E.techniques = ["kata", "kiho", "invocation", "ritual", "shuji", "maho", "ninjutsu"];
 L5R5E.xp = {
-    costPerRank: [20, 24, 32, 44, 60],
+    costPerRank: [0, 20, 24, 32, 44, 60],
     ringCostMultiplier: 3,
     skillCostMultiplier: 2,
     techniqueCost: 3,

system/templates/actors/twenty-questions-dialog.html

@@ -7,11 +7,22 @@
         <h1>{{localize 'l5r5e.twenty_questions.title'}}</h1>
         <div>
             {{localize 'l5r5e.twenty_questions.intro'}}
+            <br>
             <br><i> {{localize 'l5r5e.twenty_questions.section'}}</i>
         </div>
 
+        <section class="sheet-body">
+            <nav class="sheet-tabs tabs" data-group="primary">
+                <a class="item" data-tab="part1">I</a>
+                <a class="item" data-tab="part2">II</a>
+                <a class="item" data-tab="part3">III</a>
+                <a class="item" data-tab="part4">IV</a>
+                <a class="item" data-tab="part5">V</a>
+                <a class="item" data-tab="part6">VI</a>
+                <a class="item" data-tab="part7">VII</a>
+            </nav>
+            <article class="tab parts part1" data-group="primary" data-tab="part1">
                 <h2>{{localize 'l5r5e.twenty_questions.part1.title'}}</h2>
-        <div class="parts part1">
                 <div>
                     <label>
                         <h3>{{localize 'l5r5e.twenty_questions.part1.q1'}}</h3>
@@ -134,10 +145,9 @@
                         </tr>
                     </table>
                 </div>
-        </div>
+            </article>
-
+            <article class="tab parts part2" data-group="primary" data-tab="part2">
                 <h2>{{localize 'l5r5e.twenty_questions.part2.title'}}</h2>
-        <div class="parts part2">
                 <div>
                     <h3>{{localize 'l5r5e.twenty_questions.part2.q3'}}</h3>
 
@@ -301,10 +311,9 @@
                         </select>
                     </label>
                 </div>
-        </div>
+            </article>
-
+            <article class="tab parts part3" data-group="primary" data-tab="part3">
                 <h2>{{localize 'l5r5e.twenty_questions.part3.title'}}</h2>
-        <div class="parts part3">
                 <div>
                     <h3>{{localize 'l5r5e.twenty_questions.part3.q5'}}</h3>
 
@@ -402,10 +411,9 @@
                         </tr>
                     </table>
                 </div>
-        </div>
+            </article>
-
+            <article class="tab parts part4" data-group="primary" data-tab="part4">
                 <h2>{{localize 'l5r5e.twenty_questions.part4.title'}}</h2>
-        <div class="parts part4">
                 <div>
                     <label>
                         <h3>{{localize 'l5r5e.twenty_questions.part4.q9'}}</h3>
@@ -495,10 +503,9 @@
                     <br>
                     {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step13.disadvantage stepName='step13.disadvantage' itemType='peculiarities' hideDndAt=1 }}
                 </div>
-        </div>
+            </article>
-
+            <article class="tab parts part5" data-group="primary" data-tab="part5">
                 <h2>{{localize 'l5r5e.twenty_questions.part5.title'}}</h2>
-        <div class="parts part5">
                 <div>
                     <label>
                         <h3>{{localize 'l5r5e.twenty_questions.part5.q14'}}</h3>
@@ -531,10 +538,9 @@
                         {{> 'systems/l5r5e/templates/actors/character/twenty-questions-item.html' itemsList=cache.step16.item stepName='step16.item' itemType='items' hideDndAt=1 }}
                     </label>
                 </div>
-        </div>
+            </article>
-
+            <article class="tab parts part6" data-group="primary" data-tab="part6">
                 <h2>{{localize 'l5r5e.twenty_questions.part6.title'}}</h2>
-        <div class="parts part6">
                 <div>
                     <label>
                         <h3>{{localize 'l5r5e.twenty_questions.part6.q17'}}</h3>
@@ -598,19 +604,15 @@
                         <textarea name="step19.firstname">{{data.step19.firstname}}</textarea>
                     </label>
                 </div>
-        </div>
+            </article>
-
+            <article class="tab parts part7" data-group="primary" data-tab="part7">
                 <h2>{{localize 'l5r5e.twenty_questions.part7.title'}}</h2>
-        <div class="parts part7">
                 <div>
                     <label>
                         <h3>{{localize 'l5r5e.twenty_questions.part7.q20'}}</h3>
                         <textarea name="step20.death">{{data.step20.death}}</textarea>
                     </label>
                 </div>
-        </div>
-    </div>
-
                 <hr>
                 {{#if hasErrors}}
                 corriger les erreurs pour poursuivre !
@@ -625,4 +627,8 @@
                     </button>
                 </div>
                 {{/if}}
+            </article>
+        </section>
+    </div>
+
 </form>