Use socket to manage loksyu

- `magicOrder` ArrayField + ▲/▼ buttons for manual reordering
- Magic rolls use school's aspect for Wu Xing, not speciality's element
- Spell power: `difficulty × (aspectValue + freePowerLevels)` (not `successes × diff`)
- Prompt replaces `aspectspeciality`/`bonusmalusspeciality`/`heispend` with `freepowerlevels`

fix: code review issues
- combat.js: guard undefined `ids` in rollInitiative
- rolling.js: catch Dice So Nice promise, normalize French→English kungfu aspects
- weapon/armor/ingredient: `{ min: 0 }` on quantity
- character.js/npc.js: catch rollForActor fire-and-forget promises
- roll-actions.js/tinji-app.js: await ChatMessage.create
- sanhei.js: null guard on properties
- spell.js/kungfu.js: fix aspect name comments (French→English)

css/cde-theme.css

@@ -2179,6 +2179,25 @@ section.npc .cde-neon-tabs .item.active {
 .cde-magic-toggle:hover i {
   color: #e2e8f4;
 }
+.cde-magic-order-btn {
+  width: 20px;
+  height: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  color: #7d94b8;
+  border-radius: 3px;
+  flex-shrink: 0;
+  transition: color 0.12s, background 0.12s;
+}
+.cde-magic-order-btn i {
+  font-size: 9px;
+}
+.cde-magic-order-btn:hover {
+  color: #e2e8f4;
+  background: rgba(38, 56, 83, 0.25);
+}
 .cde-magic-specialities {
   border-top: 1px solid #1a2436;
   padding: 4px 0;
@@ -3190,7 +3209,9 @@ ol.item-list li.item h4.item-name {
   flex: 1 1 0;
   margin: 0;
   font-size: 13px;
+  font-weight: 600;
   color: #e2e8f4;
+  font-family: "Signika", sans-serif;
 }
 ol.item-list li.item .cde-item-stat {
   font-family: monospace;
@@ -3523,6 +3544,12 @@ ol.item-list li.item .item-controls a.item-control:hover {
   color: var(--rr-accent, #e2e8f4);
   text-shadow: 0 0 12px var(--rr-accent, transparent);
 }
+.cde-roll-result .cde-rr-hero .cde-rr-spell-power .cde-rr-spell-power-formula {
+  font-size: 10px;
+  color: #7d94b8;
+  margin: 2px 0;
+  white-space: nowrap;
+}
 .cde-roll-result .cde-rr-hero .cde-rr-spell-power .cde-rr-spell-power-label {
   font-size: 9px;
   font-weight: 700;
@@ -4418,6 +4445,105 @@ ol.item-list li.item .item-controls a.item-control:hover {
   color: #7d94b8;
   text-align: center;
 }
+/* Duplicate row highlight */
+.cde-migration-row-duplicate {
+  background: rgba(212, 175, 55, 0.15);
+}
+.cde-migration-duplicate-icon {
+  color: #d4af37;
+  margin-right: 4px;
+  font-size: 11px;
+}
+/* Confirmation bar */
+.cde-migration-confirm-bar {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 12px;
+  border: 1px solid rgba(212, 175, 55, 0.7);
+  border-radius: 6px;
+  background: rgba(212, 175, 55, 0.1);
+}
+.cde-migration-confirm-msg {
+  margin: 0;
+  font-size: 12px;
+  color: #e2e8f4;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.cde-migration-confirm-msg i {
+  color: #d4af37;
+}
+.cde-migration-confirm-duplicates {
+  margin: 0;
+  font-size: 11px;
+  color: #e07070;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.cde-migration-confirm-duplicates i {
+  color: #e07070;
+}
+.cde-migration-confirm-actions {
+  display: flex;
+  gap: 8px;
+  justify-content: center;
+  margin-top: 4px;
+}
+.cde-migration-confirm-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 9px 24px;
+  border: none;
+  border-radius: 6px;
+  background: #4a9eff;
+  color: #fff;
+  font-size: 13px;
+  font-weight: 700;
+  cursor: pointer;
+  transition: filter 0.15s;
+}
+.cde-migration-confirm-btn:hover {
+  filter: brightness(1.15);
+}
+.cde-migration-cancel-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 9px 24px;
+  border: 1px solid #1a2436;
+  border-radius: 6px;
+  background: none;
+  color: #7d94b8;
+  font-size: 13px;
+  cursor: pointer;
+  transition: color 0.15s, border-color 0.15s;
+}
+.cde-migration-cancel-btn:hover {
+  color: #e04444;
+  border-color: #e04444;
+}
+/* Progress section */
+.cde-migration-progress {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  padding: 16px;
+  font-size: 13px;
+  color: #e2e8f4;
+}
+.cde-migration-progress i {
+  color: #4a9eff;
+}
+.cde-migration-progress-count {
+  font-weight: 700;
+  color: #4a9eff;
+  font-variant-numeric: tabular-nums;
+}
 .cde-welcome-message {
   display: flex;
   flex-direction: column;

css/cde-theme.less

@@ -2253,6 +2253,23 @@ section.npc        .cde-neon-tabs .item.active { color: @cde-supernatural; borde
   &:hover i { color: @cde-text; }
 }
 
+.cde-magic-order-btn {
+  width: 20px;
+  height: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  color: @cde-muted;
+  border-radius: 3px;
+  flex-shrink: 0;
+  transition: color 0.12s, background 0.12s;
+
+  i { font-size: 9px; }
+
+  &:hover { color: @cde-text; background: fade(@cde-border-hi, 25%); }
+}
+
 // Specialities list
 .cde-magic-specialities {
   border-top: 1px solid @cde-border;
@@ -3247,7 +3264,7 @@ ol.item-list {
 
     img { border: none; border-radius: 3px; flex-shrink: 0; }
 
-    h4.item-name { flex: 1 1 0; margin: 0; font-size: 13px; color: @cde-text; }
+    h4.item-name { flex: 1 1 0; margin: 0; font-size: 13px; font-weight: 600; color: @cde-text; font-family: "Signika", sans-serif; }
 
     .cde-item-stat {
       font-family: monospace;
@@ -3582,6 +3599,13 @@ ol.item-list {
         text-shadow: 0 0 12px var(--rr-accent, transparent);
       }
 
+      .cde-rr-spell-power-formula {
+        font-size: 10px;
+        color: @cde-muted;
+        margin: 2px 0;
+        white-space: nowrap;
+      }
+
       .cde-rr-spell-power-label {
         font-size: 9px;
         font-weight: 700;
@@ -4607,6 +4631,112 @@ ol.item-list {
   text-align: center;
 }
 
+/* Duplicate row highlight */
+.cde-migration-row-duplicate {
+  background: fadeout(#d4af37, 85%);
+}
+
+.cde-migration-duplicate-icon {
+  color: #d4af37;
+  margin-right: 4px;
+  font-size: 11px;
+}
+
+/* Confirmation bar */
+.cde-migration-confirm-bar {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 12px;
+  border: 1px solid fadeout(#d4af37, 30%);
+  border-radius: 6px;
+  background: fadeout(#d4af37, 90%);
+}
+
+.cde-migration-confirm-msg {
+  margin: 0;
+  font-size: 12px;
+  color: @cde-text;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+
+  i { color: #d4af37; }
+}
+
+.cde-migration-confirm-duplicates {
+  margin: 0;
+  font-size: 11px;
+  color: #e07070;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+
+  i { color: #e07070; }
+}
+
+.cde-migration-confirm-actions {
+  display: flex;
+  gap: 8px;
+  justify-content: center;
+  margin-top: 4px;
+}
+
+.cde-migration-confirm-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 9px 24px;
+  border: none;
+  border-radius: 6px;
+  background: @cde-spell;
+  color: #fff;
+  font-size: 13px;
+  font-weight: 700;
+  cursor: pointer;
+  transition: filter 0.15s;
+
+  &:hover { filter: brightness(1.15); }
+}
+
+.cde-migration-cancel-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 9px 24px;
+  border: 1px solid @cde-border;
+  border-radius: 6px;
+  background: none;
+  color: @cde-muted;
+  font-size: 13px;
+  cursor: pointer;
+  transition: color 0.15s, border-color 0.15s;
+
+  &:hover {
+    color: #e04444;
+    border-color: #e04444;
+  }
+}
+
+/* Progress section */
+.cde-migration-progress {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  padding: 16px;
+  font-size: 13px;
+  color: @cde-text;
+
+  i { color: @cde-spell; }
+}
+
+.cde-migration-progress-count {
+  font-weight: 700;
+  color: @cde-spell;
+  font-variant-numeric: tabular-nums;
+}
+
 // ============================================================
 // Welcome message
 // ============================================================

dist/system.js

@@ -311,6 +311,89 @@ function migrateSupernaturalItem(oldItem) {
     }
   };
 }
+function migrateWeaponItem(oldItem) {
+  const s = oldItem.system ?? {};
+  return {
+    name: oldItem.name,
+    type: "weapon",
+    img: oldItem.img || DEFAULT_ITEM_IMG,
+    system: {
+      reference: s.reference ?? "",
+      description: s.description ?? "",
+      hasSpeciality: Boolean(s.hasSpeciality),
+      weaponType: s.weaponType || "melee",
+      material: s.material ?? "",
+      damageAspect: elementKey(s.damageAspect ?? ""),
+      damageBase: Number(s.damageBase ?? 0),
+      range: s.range || "contact",
+      obtainLevel: Number(s.obtainLevel ?? 0),
+      obtainDifficulty: Number(s.obtainDifficulty ?? 0),
+      quantity: Number(s.quantity ?? 1),
+      notes: s.notes ?? ""
+    }
+  };
+}
+function migrateArmorItem(oldItem) {
+  const s = oldItem.system ?? {};
+  return {
+    name: oldItem.name,
+    type: "armor",
+    img: oldItem.img || DEFAULT_ITEM_IMG,
+    system: {
+      reference: s.reference ?? "",
+      description: s.description ?? "",
+      protectionValue: Number(s.protectionValue ?? 0),
+      domain: s.domain ?? "",
+      obtainLevel: Number(s.obtainLevel ?? 0),
+      obtainDifficulty: Number(s.obtainDifficulty ?? 0),
+      quantity: Number(s.quantity ?? 1),
+      notes: s.notes ?? ""
+    }
+  };
+}
+function migrateSanheiItem(oldItem) {
+  const s = oldItem.system ?? {};
+  const props = s.properties ?? {};
+  const propSchema = (p) => ({
+    name: p?.name ?? "",
+    heiCost: Number(p?.heiCost ?? 0),
+    heiType: heiKey(p?.heiType ?? ""),
+    description: p?.description ?? ""
+  });
+  return {
+    name: oldItem.name,
+    type: "sanhei",
+    img: oldItem.img || DEFAULT_ITEM_IMG,
+    system: {
+      reference: s.reference ?? "",
+      description: s.description ?? "",
+      heiType: heiKey(s.heiType ?? ""),
+      properties: {
+        prop1: propSchema(props.prop1),
+        prop2: propSchema(props.prop2),
+        prop3: propSchema(props.prop3)
+      },
+      notes: s.notes ?? ""
+    }
+  };
+}
+function migrateIngredientItem(oldItem) {
+  const s = oldItem.system ?? {};
+  return {
+    name: oldItem.name,
+    type: "ingredient",
+    img: oldItem.img || DEFAULT_ITEM_IMG,
+    system: {
+      reference: s.reference ?? "",
+      description: s.description ?? "",
+      school: s.school ?? "all",
+      obtainLevel: Number(s.obtainLevel ?? 0),
+      obtainDifficulty: Number(s.obtainDifficulty ?? 0),
+      quantity: Number(s.quantity ?? 1),
+      notes: s.notes ?? ""
+    }
+  };
+}
 function migrateItem(oldItem) {
   switch (oldItem.type) {
     case "item":
@@ -321,6 +404,14 @@ function migrateItem(oldItem) {
       return migrateSpellItem(oldItem);
     case "supernatural":
       return migrateSupernaturalItem(oldItem);
+    case "weapon":
+      return migrateWeaponItem(oldItem);
+    case "armor":
+      return migrateArmorItem(oldItem);
+    case "sanhei":
+      return migrateSanheiItem(oldItem);
+    case "ingredient":
+      return migrateIngredientItem(oldItem);
     default:
       return migrateEquipmentItem({ ...oldItem, type: "item" });
   }
@@ -394,6 +485,7 @@ function migrateCharacter(old) {
       resources,
       component,
       magics,
+      magicOrder: [],
       threetreasures,
       experience: {
         value: Number(s.experience?.value ?? 0),
@@ -471,10 +563,12 @@ var CDEMigrationApp = class _CDEMigrationApp extends foundry.applications.api.Ha
       icon: "fas fa-file-import",
       resizable: false
     },
-    position: { width: 560, height: "auto" },
+    position: { width: 600, height: "auto" },
     actions: {
       clearFiles: _CDEMigrationApp.#clearFiles,
-      doImport: _CDEMigrationApp.#doImport
+      doImport: _CDEMigrationApp.#doImport,
+      confirmImport: _CDEMigrationApp.#confirmImport,
+      cancelImport: _CDEMigrationApp.#cancelImport
     }
   };
   static PARTS = {
@@ -484,13 +578,28 @@ var CDEMigrationApp = class _CDEMigrationApp extends foundry.applications.api.Ha
   #pending = [];
   /** @type {string[]} - error messages per file */
   #errors = [];
+  /** @type {"idle"|"confirm"|"importing"} */
+  #importState = "idle";
+  /** @type {number} - actors created so far (during importing) */
+  #progress = 0;
   async _prepareContext(options) {
+    const enrichDuplicate = (a) => ({
+      ...a,
+      _duplicate: game.actors?.getName(a.name) !== null
+    });
+    const pending = this.#pending.map(enrichDuplicate);
+    const duplicateCount = pending.filter((a) => a._duplicate).length;
     return {
-      pending: this.#pending,
+      pending,
       errors: this.#errors,
       hasPending: this.#pending.length > 0,
       hasErrors: this.#errors.length > 0,
-      count: this.#pending.length
+      hasDuplicates: duplicateCount > 0,
+      duplicateCount,
+      count: this.#pending.length,
+      importState: this.#importState,
+      progress: this.#progress,
+      total: this.#pending.length
     };
   }
   /** After render, wire up the file input. */
@@ -528,37 +637,59 @@ var CDEMigrationApp = class _CDEMigrationApp extends foundry.applications.api.Ha
         const actors = parseLegacyJson(text);
         for (const actor of actors) {
           actor._srcFile = file.name;
-          if (!this.#pending.some((p) => p.name === actor.name)) {
-            this.#pending.push(actor);
+          if (this.#pending.some((p) => p.name === actor.name)) {
+            this.#errors.push(`\xAB ${actor.name} \xBB ignor\xE9 (nom d\xE9j\xE0 dans la liste d'attente, fichier \xAB ${file.name} \xBB)`);
+            continue;
           }
+          this.#pending.push(actor);
         }
       } catch (err) {
         this.#errors.push(game.i18n.format("CDE.MigrationErrorParse", { file: file.name, error: err.message }));
       }
     }
+    this.#importState = "idle";
     this.render();
   }
   static async #clearFiles() {
     this.#pending = [];
     this.#errors = [];
+    this.#importState = "idle";
+    this.#progress = 0;
     this.render();
   }
+  /** First click: switch to confirmation state instead of importing immediately. */
   static async #doImport() {
     if (!this.#pending.length) return;
+    this.#importState = "confirm";
+    this.render();
+  }
+  /** Second click: actually perform the import. */
+  static async #confirmImport() {
+    if (!this.#pending.length) return;
+    this.#importState = "importing";
+    this.#progress = 0;
+    this.render();
+    const total = this.#pending.length;
     const created = [];
     const failed = [];
-    for (const data of this.#pending) {
+    for (let i = 0; i < total; i++) {
+      const data = this.#pending[i];
       try {
         const { _srcFile, ...actorData } = data;
         const actor = await Actor.create(actorData);
         created.push(actor.name);
       } catch (err) {
         failed.push(`${data.name}: ${err.message}`);
-        console.error(`CHRONIQUESDELETRANGE | Migration failed for "${data.name}":`, err);
+        console.error(`CHRONIQUESDELETRANGE | Import failed for "${data.name}":`, err);
       }
+      this.#progress = i + 1;
+      const progEl = this.element?.querySelector(".cde-migration-progress-count");
+      if (progEl) progEl.textContent = `${this.#progress}/${total}`;
     }
     this.#pending = [];
     this.#errors = failed;
+    this.#importState = "idle";
+    this.#progress = 0;
     this.render();
     if (created.length) {
       ui.notifications.info(
@@ -571,6 +702,10 @@ var CDEMigrationApp = class _CDEMigrationApp extends foundry.applications.api.Ha
       );
     }
   }
+  static async #cancelImport() {
+    this.#importState = "idle";
+    this.render();
+  }
 };
 
 // src/config/settings.js
@@ -595,6 +730,20 @@ function registerSettings() {
       water: { yin: 0, yang: 0 }
     }
   });
+  game.settings.register(SYSTEM_ID, "loksyuConsumptionOrder", {
+    name: "CDE.Settings.LoksyuConsumptionOrder",
+    hint: "CDE.Settings.LoksyuConsumptionOrderHint",
+    scope: "world",
+    config: true,
+    type: String,
+    choices: {
+      "yang-first": "CDE.Settings.LoksyuOrderYangFirst",
+      "yin-first": "CDE.Settings.LoksyuOrderYinFirst",
+      "balanced": "CDE.Settings.LoksyuOrderBalanced"
+    },
+    default: "yang-first",
+    onChange: () => Hooks.callAll("cde:loksyuUpdated")
+  });
   game.settings.register(SYSTEM_ID, "tinjiData", {
     scope: "world",
     config: false,
@@ -647,6 +796,7 @@ function preLocalizeConfig() {
     magic.aspectlabel = game.i18n.localize(magic.aspectlabel);
     Object.values(magic.speciality).forEach((spec) => {
       spec.label = game.i18n.localize(spec.label);
+      spec.labelelementkey = spec.labelelement;
       spec.labelelement = game.i18n.localize(spec.labelelement);
     });
   });
@@ -760,9 +910,8 @@ var CharacterDataModel = class extends foundry.abstract.TypeDataModel {
           typeofthrow: numberField(0),
           aspectskill: numberField(0),
           bonusmalusskill: numberField(0),
-          aspectspeciality: numberField(0),
           rolldifficulty: numberField(0),
-          bonusmalusspeciality: numberField(0)
+          freepowerlevels: numberField(0)
         })
       }),
       aspect: new fields.SchemaField({
@@ -801,6 +950,10 @@ var CharacterDataModel = class extends foundry.abstract.TypeDataModel {
         nine: componentField(),
         zero: componentField()
       }),
+      magicOrder: new fields.ArrayField(
+        new fields.StringField({ required: true, nullable: false, initial: "" }),
+        { required: true, initial: [] }
+      ),
       magics: new fields.SchemaField({
         internalcinnabar: magicField(),
         alchemy: magicField(),
@@ -917,7 +1070,7 @@ var KungfuDataModel = class extends foundry.abstract.TypeDataModel {
       orientation: stringField("yin"),
       // yin | yang | yinyang
       aspect: stringField("metal"),
-      // metal | eau | terre | feu | bois
+      // metal | water | earth | fire | wood
       skill: stringField("kungfu"),
       // kungfu | rangedcombat
       speciality: stringField(""),
@@ -943,7 +1096,7 @@ var SpellDataModel = class extends foundry.abstract.TypeDataModel {
       description: htmlField(""),
       specialityname: stringField(""),
       associatedelement: stringField("metal"),
-      // metal | eau | terre | feu | bois
+      // metal | water | earth | fire | wood
       hei: stringField(""),
       realizationtimeritual: stringField(""),
       realizationtimeaccelerated: stringField(""),
@@ -985,18 +1138,20 @@ var WeaponDataModel = class extends foundry.abstract.TypeDataModel {
     const stringField = (initial = "") => new fields.StringField({ required: true, nullable: false, initial });
     const htmlField = (initial = "") => new fields.HTMLField({ required: true, nullable: false, initial, textSearch: true });
     const intField = (initial = 0, opts = {}) => new fields.NumberField({ required: true, nullable: false, integer: true, initial, ...opts });
+    const boolField = (initial = false) => new fields.BooleanField({ required: true, initial });
     return {
       reference: stringField(""),
       description: htmlField(""),
+      hasSpeciality: boolField(false),
       weaponType: stringField("melee"),
       material: stringField(""),
       damageAspect: stringField("metal"),
-      damageBase: intField(1),
+      damageBase: intField(0),
       range: stringField("contact"),
       // contact | courte | mediane | longue | extreme
       obtainLevel: intField(0, { min: 0, max: 5 }),
       obtainDifficulty: intField(0, { min: 0, max: 3 }),
-      quantity: intField(1),
+      quantity: intField(1, { min: 0 }),
       notes: htmlField("")
     };
   }
@@ -1016,7 +1171,7 @@ var ArmorDataModel = class extends foundry.abstract.TypeDataModel {
       domain: stringField(""),
       obtainLevel: intField(0, { min: 0, max: 5 }),
       obtainDifficulty: intField(0, { min: 0, max: 3 }),
-      quantity: intField(1),
+      quantity: intField(1, { min: 0 }),
       notes: htmlField("")
     };
   }
@@ -1062,7 +1217,7 @@ var IngredientDataModel = class extends foundry.abstract.TypeDataModel {
       school: stringField("all"),
       obtainLevel: intField(0, { min: 0, max: 5 }),
       obtainDifficulty: intField(0, { min: 0, max: 3 }),
-      quantity: intField(1),
+      quantity: intField(1, { min: 0 }),
       notes: htmlField("")
     };
   }
@@ -1406,6 +1561,7 @@ async function rollInitiativeNPC(actor) {
 }
 
 // src/ui/apps/singletons.js
+var SOCKET_CHANNEL = `system.${SYSTEM_ID}`;
 function getLoksyuData() {
   return game.settings.get(SYSTEM_ID, "loksyuData") ?? {
     wood: { yin: 0, yang: 0 },
@@ -1415,16 +1571,75 @@ function getLoksyuData() {
     water: { yin: 0, yang: 0 }
   };
 }
-async function setLoksyuData(data) {
+async function writeLoksyuData(data) {
   await game.settings.set(SYSTEM_ID, "loksyuData", data);
   Hooks.callAll("cde:loksyuUpdated", data);
 }
+async function writeTinjiValue(value) {
+  value = Math.max(0, value);
+  await game.settings.set(SYSTEM_ID, "tinjiData", value);
+  Hooks.callAll("cde:tinjiUpdated", value);
+}
+async function setLoksyuData(data) {
+  if (game.user.isGM) return writeLoksyuData(data);
+  game.socket.emit(SOCKET_CHANNEL, { action: "setLoksyuData", data });
+}
 function getTinjiValue() {
   return game.settings.get(SYSTEM_ID, "tinjiData") ?? 0;
 }
 async function setTinjiValue(value) {
-  await game.settings.set(SYSTEM_ID, "tinjiData", Math.max(0, value));
-  Hooks.callAll("cde:tinjiUpdated", Math.max(0, value));
+  if (game.user.isGM) return writeTinjiValue(value);
+  game.socket.emit(SOCKET_CHANNEL, { action: "setTinjiValue", value });
+}
+function requestLoksyuDraw(aspect, order) {
+  game.socket.emit(SOCKET_CHANNEL, { action: "loksyuDraw", aspect, order });
+}
+function requestTinjiSpend() {
+  game.socket.emit(SOCKET_CHANNEL, { action: "tinjiSpend" });
+}
+function registerSingletonSocket() {
+  game.socket.on(SOCKET_CHANNEL, async (payload) => {
+    if (!game.user.isGM) return;
+    switch (payload.action) {
+      case "setLoksyuData":
+        await writeLoksyuData(payload.data);
+        break;
+      case "setTinjiValue":
+        await writeTinjiValue(payload.value);
+        break;
+      case "updateLoksyuFromRoll":
+        await updateLoksyuFromRoll(payload.activeAspect, payload.faces);
+        break;
+      case "updateTinjiFromRoll":
+        await updateTinjiFromRoll(payload.delta);
+        break;
+      case "loksyuDraw": {
+        const data = getLoksyuData();
+        const entry = data[payload.aspect] ?? { yin: 0, yang: 0 };
+        const order = payload.order ?? "yang-first";
+        if (order === "yin-first") {
+          if (entry.yin > 0) entry.yin--;
+          else entry.yang--;
+        } else if (order === "balanced") {
+          if (entry.yin > entry.yang) entry.yin--;
+          else if (entry.yang > entry.yin) entry.yang--;
+          else if (entry.yang > 0) entry.yang--;
+          else entry.yin--;
+        } else {
+          if (entry.yang > 0) entry.yang--;
+          else entry.yin--;
+        }
+        data[payload.aspect] = entry;
+        await writeLoksyuData(data);
+        break;
+      }
+      case "tinjiSpend": {
+        const cur = getTinjiValue();
+        if (cur > 0) await writeTinjiValue(cur - 1);
+        break;
+      }
+    }
+  });
 }
 async function updateLoksyuFromRoll(activeAspect, faces) {
   const cycle = WU_XING_CYCLE[activeAspect];
@@ -1435,18 +1650,23 @@ async function updateLoksyuFromRoll(activeAspect, faces) {
   const yinCount = faces[yinFace] ?? 0;
   const yangCount = faces[yangFace] ?? 0;
   if (yinCount === 0 && yangCount === 0) return;
-  const data = getLoksyuData();
-  const current = data[lokAspect] ?? { yin: 0, yang: 0 };
-  data[lokAspect] = {
-    yin: (current.yin ?? 0) + yinCount,
-    yang: (current.yang ?? 0) + yangCount
-  };
-  await setLoksyuData(data);
+  if (game.user.isGM) {
+    const data = getLoksyuData();
+    const current = data[lokAspect] ?? { yin: 0, yang: 0 };
+    data[lokAspect] = { yin: (current.yin ?? 0) + yinCount, yang: (current.yang ?? 0) + yangCount };
+    await writeLoksyuData(data);
+  } else {
+    game.socket.emit(SOCKET_CHANNEL, { action: "updateLoksyuFromRoll", activeAspect, faces });
+  }
 }
 async function updateTinjiFromRoll(count) {
   if (!count || count <= 0) return;
-  const current = getTinjiValue();
-  await setTinjiValue(current + count);
+  if (game.user.isGM) {
+    const current = getTinjiValue();
+    await writeTinjiValue(current + count);
+  } else {
+    game.socket.emit(SOCKET_CHANNEL, { action: "updateTinjiFromRoll", delta: count });
+  }
 }
 
 // src/ui/rolling.js
@@ -1552,20 +1772,16 @@ async function showMagicPrompt(params) {
       aspectskill: Number(params.aspectskill ?? 0),
       bonusmalusskill: params.bonusmalusskill ?? 0,
       bonusauspiciousdice: params.bonusauspiciousdice ?? 0,
-      aspectspeciality: Number(params.aspectspeciality ?? 0),
       rolldifficulty: params.rolldifficulty ?? 1,
-      bonusmalusspeciality: params.bonusmalusspeciality ?? 0,
-      heispend: params.heispend ?? 0,
+      freepowerlevels: params.freepowerlevels ?? 0,
       typeofthrow: Number(params.typeofthrow ?? 0)
     },
     fields: [
       "aspectskill",
       "bonusmalusskill",
       "bonusauspiciousdice",
-      "aspectspeciality",
       "rolldifficulty",
-      "bonusmalusspeciality",
-      "heispend",
+      "freepowerlevels",
       "typeofthrow"
     ]
   });
@@ -1580,7 +1796,7 @@ async function showWeaponPrompt(params) {
       weaponTypeLabel: params.weaponTypeLabel ?? "CDE.Weapon",
       weaponAspectIcon: params.weaponAspectIcon ?? "",
       weaponAspectLabel: params.weaponAspectLabel ?? "",
-      damageBase: params.damageBase ?? 1,
+      damageBase: params.damageBase ?? 0,
       weaponskill: params.weaponskill ?? "kungfu",
       aspect: Number(params.aspect ?? 0),
       effectiverange: params.effectiverange ?? "contact",
@@ -1695,7 +1911,9 @@ async function rollForActor(actor, rollKey) {
       const kfSkill = kfItem.system.skill ?? "kungfu";
       numberofdice = sys.skills?.[kfSkill]?.value ?? 0;
       title = `${kfItem.name} [${game.i18n.localize(sys.skills?.[kfSkill]?.label ?? "CDE.KungFu")}]`;
-      kfDefaultAspect = ASPECT_NAMES.indexOf(kfItem.system.aspect ?? "metal");
+      const kfAspect = kfItem.system.aspect?.toLowerCase() ?? "metal";
+      const ASPECT_NORMALIZE = { eau: "water", terre: "earth", feu: "fire", bois: "wood" };
+      kfDefaultAspect = ASPECT_NAMES.indexOf(ASPECT_NORMALIZE[kfAspect] ?? kfAspect);
       if (kfDefaultAspect < 0) kfDefaultAspect = 0;
       break;
     }
@@ -1724,7 +1942,7 @@ async function rollForActor(actor, rollKey) {
         weaponTypeLabel: WEAPON_TYPE_LABELS[wpType] ?? "CDE.Weapon",
         weaponAspectIcon: ASPECT_ICONS[ASPECT_NAMES[wpAspectIdx]] ?? "",
         weaponAspectLabel: game.i18n.localize(ASPECT_LABELS[ASPECT_NAMES[wpAspectIdx]] ?? ""),
-        damageBase: wpItem.system.damageBase ?? 1,
+        damageBase: wpItem.system.damageBase ?? 0,
         weaponskill: wpSkill,
         aspect: wpAspectIdx,
         effectiverange: wpRange,
@@ -1743,8 +1961,9 @@ async function rollForActor(actor, rollKey) {
       const wpWoundMalus = Number(wParams.woundmalus ?? 0);
       const wpBonusAusp = Number(wParams.bonusauspiciousdice ?? 0);
       const wpThrowMode = Number(wParams.typeofthrow ?? 0);
-      const wpDamageBase = wpItem.system.damageBase ?? 1;
-      const wpTotalDice = wpSkillDice + wpAspectDice + wpRangeMalus + wpBonusMalus - wpWoundMalus;
+      const wpDamageBase = wpItem.system.damageBase ?? 0;
+      const wpSpecialtyBonus = wpItem.system.hasSpeciality ? 1 : 0;
+      const wpTotalDice = wpSkillDice + wpAspectDice + wpRangeMalus + wpBonusMalus - wpWoundMalus + wpSpecialtyBonus;
       if (wpTotalDice <= 0) {
         ui.notifications.warn(game.i18n.localize("CDE.Error0"));
         return;
@@ -1760,6 +1979,11 @@ async function rollForActor(actor, rollKey) {
       if (wpBonusMalus !== 0) wpModParts.push(`${wpBonusMalus > 0 ? "+" : ""}${wpBonusMalus} ${game.i18n.localize("CDE.BonusMalus")}`);
       if (wpWoundMalus !== 0) wpModParts.push(`-${wpWoundMalus} ${game.i18n.localize("CDE.WoundMalus")}`);
       if (wpBonusAusp !== 0) wpModParts.push(`+${wpBonusAusp} ${game.i18n.localize("CDE.BonusAuspiciousDice")}`);
+      const wpDamageAspectRaw = wpItem.system.damageAspect ?? "metal";
+      const wpDamageAspectIdx = WEAPON_ASPECT_INDEX[wpDamageAspectRaw] ?? 0;
+      const wpDamageAspectName = ASPECT_NAMES[wpDamageAspectIdx];
+      const wpDamageAspectValue = sys.aspect?.[wpDamageAspectName]?.value ?? 0;
+      const wpDamageAspectLabel = game.i18n.localize(ASPECT_LABELS[wpDamageAspectName] ?? "");
       const wpMsg = await sendResultMessage(actor, {
         rollLabel: `${wpItem.name}`,
         aspectName: wpAspectName,
@@ -1774,7 +1998,9 @@ async function rollForActor(actor, rollKey) {
         // weapon-specific
         weaponName: wpItem.name,
         damageBase: wpDamageBase,
-        totalDamage: wpResults.successesdice * wpDamageBase,
+        damageAspectValue: wpDamageAspectValue,
+        damageAspectLabel: wpDamageAspectLabel,
+        totalDamage: wpDamageBase + wpDamageAspectValue,
         ...wpResults,
         aspect: wpAspectName,
         d1: wpFaces[1],
@@ -1789,7 +2015,10 @@ async function rollForActor(actor, rollKey) {
         d0: wpFaces[0]
       }, wpRoll, ROLL_MODES[wpThrowMode] ?? "roll");
       if (game.modules.get("dice-so-nice")?.active && wpMsg?.id) {
-        await game.dice3d.waitFor3DAnimationByMessageID(wpMsg.id);
+        try {
+          await game.dice3d.waitFor3DAnimationByMessageID(wpMsg.id);
+        } catch (_e) {
+        }
       }
       if ((wpResults.loksyudice ?? 0) > 0) await updateLoksyuFromRoll(wpAspectName, wpFaces);
       if ((wpResults.tinjidice ?? 0) > 0) await updateTinjiFromRoll(wpResults.tinjidice);
@@ -1822,14 +2051,6 @@ async function rollForActor(actor, rollKey) {
   if (kfDefaultAspect >= 0) {
     defaultAspect = kfDefaultAspect;
   }
-  let defaultSpecialAspect = 0;
-  if (isMagicSpecial && specialLibel) {
-    const specialCfg = MAGICS?.[skillLibel]?.speciality?.[specialLibel];
-    const aspectName = LABELELEMENT_TO_ASPECT[specialCfg?.labelelement];
-    if (aspectName) {
-      defaultSpecialAspect = ASPECT_NAMES.indexOf(aspectName);
-    }
-  }
   let params;
   if (isMagic) {
     params = await showMagicPrompt({
@@ -1838,10 +2059,8 @@ async function rollForActor(actor, rollKey) {
       aspectskill: defaultAspect,
       bonusmalusskill: 0,
       bonusauspiciousdice: 0,
-      aspectspeciality: defaultSpecialAspect,
       rolldifficulty: 1,
-      bonusmalusspeciality: 0,
-      heispend: 0,
+      freepowerlevels: 0,
       typeofthrow: typeOfThrow
     });
   } else {
@@ -1858,20 +2077,16 @@ async function rollForActor(actor, rollKey) {
   }
   if (!params) return;
   let aspectIndex, bonusMalus, bonusAuspicious, throwMode;
-  let spellAspectIndex = null;
   let rollDifficulty = 1;
   if (isMagic) {
     const skillAspectIndex = Number(params.aspectskill ?? 0);
-    spellAspectIndex = Number(params.aspectspeciality ?? skillAspectIndex);
     aspectIndex = skillAspectIndex;
     bonusMalus = Number(params.bonusmalusskill ?? 0);
     bonusAuspicious = Number(params.bonusauspiciousdice ?? 0);
     rollDifficulty = Math.max(1, Number(params.rolldifficulty ?? 1));
     throwMode = Number(params.typeofthrow ?? 0);
     const aspectDice = sys.aspect?.[ASPECT_NAMES[aspectIndex]]?.value ?? 0;
-    const bonusSpec = Number(params.bonusmalusspeciality ?? 0);
-    const heiDice = Number(params.heispend ?? 0);
-    numberofdice = numberofdice + aspectDice + bonusMalus + 1 + bonusSpec + heiDice;
+    numberofdice = numberofdice + aspectDice + bonusMalus + 1;
   } else {
     aspectIndex = Number(params.aspect ?? 0);
     bonusMalus = Number(params.bonusmalus ?? 0);
@@ -1889,22 +2104,33 @@ async function rollForActor(actor, rollKey) {
   const roll = new Roll(`${numberofdice}d10`);
   await roll.evaluate();
   const rollModeKey = ROLL_MODES[throwMode] ?? "roll";
-  const wuXingAspectName = spellAspectIndex !== null ? ASPECT_NAMES[spellAspectIndex] : ASPECT_NAMES[aspectIndex];
+  let spellPower = null;
+  let spellPowerAspectName = null;
+  let spellPowerAspectValue = null;
+  if (isMagic) {
+    if (isMagicSpecial && specialLibel) {
+      const specialCfg = MAGICS?.[skillLibel]?.speciality?.[specialLibel];
+      const elemName = LABELELEMENT_TO_ASPECT[specialCfg?.labelelementkey];
+      if (elemName) spellPowerAspectName = elemName;
+    }
+    if (!spellPowerAspectName) spellPowerAspectName = ASPECT_NAMES[aspectIndex];
+    spellPowerAspectValue = sys.aspect?.[spellPowerAspectName]?.value ?? 0;
+    const freePowerLevels = Number(params.freepowerlevels ?? 0);
+    spellPower = rollDifficulty * (spellPowerAspectValue + freePowerLevels);
+  }
+  const wuXingAspectName = ASPECT_NAMES[aspectIndex];
   const allResults = roll.dice[0]?.results ?? [];
   const faces = countFaces(allResults);
   const results = computeWuXingResults(faces, wuXingAspectName, bonusAuspicious);
   if (!results) return;
-  const spellPower = isMagic ? results.successesdice * rollDifficulty : null;
   const modParts = [];
   if (isMagic) {
     const bm = Number(params.bonusmalusskill ?? 0);
-    const bs = Number(params.bonusmalusspeciality ?? 0);
-    const hs = Number(params.heispend ?? 0);
     const ba = Number(params.bonusauspiciousdice ?? 0);
+    const fp = Number(params.freepowerlevels ?? 0);
     if (bm !== 0) modParts.push(`${bm > 0 ? "+" : ""}${bm} ${game.i18n.localize("CDE.BonusMalus")}`);
-    if (bs !== 0) modParts.push(`${bs > 0 ? "+" : ""}${bs} ${game.i18n.localize("CDE.SpellBonus")}`);
     if (ba !== 0) modParts.push(`+${ba} ${game.i18n.localize("CDE.BonusAuspiciousDice")}`);
-    if (hs !== 0) modParts.push(`${hs} ${game.i18n.localize("CDE.HeiSpend")}`);
+    if (fp !== 0) modParts.push(`+${fp} ${game.i18n.localize("CDE.FreePowerLevels")}`);
     if (rollDifficulty !== 1) modParts.push(`\xD7${rollDifficulty} ${game.i18n.localize("CDE.RollDifficulty")}`);
   } else {
     const bm = Number(params.bonusmalus ?? 0);
@@ -1924,6 +2150,9 @@ async function rollForActor(actor, rollKey) {
     modifiersText: modParts.length ? modParts.join(" \xB7 ") : "",
     // Spell power (magic only)
     spellPower,
+    spellPowerAspectLabel: spellPowerAspectName ? game.i18n.localize(ASPECT_LABELS[spellPowerAspectName] ?? "") : "",
+    spellPowerAspectValue,
+    spellPowerFreeLevels: isMagic ? Number(params.freepowerlevels ?? 0) : 0,
     rollDifficulty: isMagic ? rollDifficulty : null,
     // Actor info
     actorName: actor.name ?? "",
@@ -1944,7 +2173,10 @@ async function rollForActor(actor, rollKey) {
     d0: faces[0]
   }, roll, rollModeKey);
   if (game.modules.get("dice-so-nice")?.active && msg?.id) {
-    await game.dice3d.waitFor3DAnimationByMessageID(msg.id);
+    try {
+      await game.dice3d.waitFor3DAnimationByMessageID(msg.id);
+    } catch (_e) {
+    }
   }
   if ((results.loksyudice ?? 0) > 0) await updateLoksyuFromRoll(wuXingAspectName, faces);
   if ((results.tinjidice ?? 0) > 0) await updateTinjiFromRoll(results.tinjidice);
@@ -2040,9 +2272,13 @@ var CDEBaseActorSheet = class _CDEBaseActorSheet extends HandlebarsApplicationMi
 };
 
 // src/ui/sheets/actors/character.js
-var CDECharacterSheet = class extends CDEBaseActorSheet {
+var CDECharacterSheet = class _CDECharacterSheet extends CDEBaseActorSheet {
   static DEFAULT_OPTIONS = {
-    classes: ["character"]
+    classes: ["character"],
+    actions: {
+      moveMagicUp: _CDECharacterSheet.#onMoveMagicUp,
+      moveMagicDown: _CDECharacterSheet.#onMoveMagicDown
+    }
   };
   static PARTS = {
     main: { template: "systems/fvtt-chroniques-de-l-etrange/templates/actor/cde-character-sheet.html" }
@@ -2065,25 +2301,35 @@ var CDECharacterSheet = class extends CDEBaseActorSheet {
       spellsByDiscipline[disc].push(spell);
     }
     const systemMagics = context.systemData.magics ?? {};
-    context.magicsDisplay = Object.fromEntries(
-      Object.entries(MAGICS).map(([magicKey, magicDef]) => {
-        const magicData = systemMagics[magicKey] ?? {};
-        return [
-          magicKey,
-          {
-            value: magicData.value ?? 0,
-            visible: magicData.visible ?? false,
-            speciality: Object.fromEntries(
-              Object.keys(magicDef.speciality).map((specKey) => [
-                specKey,
-                { check: magicData.speciality?.[specKey]?.check ?? false }
-              ])
-            ),
-            grimoire: spellsByDiscipline[magicKey] ?? []
-          }
-        ];
-      })
-    );
+    const magicEntries = Object.entries(MAGICS).map(([magicKey, magicDef]) => {
+      const magicData = systemMagics[magicKey] ?? {};
+      return [
+        magicKey,
+        {
+          value: magicData.value ?? 0,
+          visible: magicData.visible ?? false,
+          speciality: Object.fromEntries(
+            Object.keys(magicDef.speciality).map((specKey) => [
+              specKey,
+              { check: magicData.speciality?.[specKey]?.check ?? false }
+            ])
+          ),
+          grimoire: spellsByDiscipline[magicKey] ?? []
+        }
+      ];
+    });
+    const order = context.systemData.magicOrder ?? [];
+    if (order.length > 0) {
+      magicEntries.sort((a, b) => {
+        const ia = order.indexOf(a[0]);
+        const ib = order.indexOf(b[0]);
+        if (ia === -1 && ib === -1) return 0;
+        if (ia === -1) return 1;
+        if (ib === -1) return -1;
+        return ia - ib;
+      });
+    }
+    context.magicsDisplay = Object.fromEntries(magicEntries);
     return context;
   }
   _onRender(context, options) {
@@ -2167,7 +2413,7 @@ var CDECharacterSheet = class extends CDEBaseActorSheet {
       cell.addEventListener("click", (event) => {
         event.preventDefault();
         const rollKey = cell.dataset.libelId;
-        if (rollKey) rollForActor(this.document, rollKey);
+        if (rollKey) rollForActor(this.document, rollKey)?.catch((err) => console.error("Roll failed:", err));
       });
     });
   }
@@ -2181,6 +2427,26 @@ var CDECharacterSheet = class extends CDEBaseActorSheet {
       }).render(true);
     });
   }
+  static async #onMoveMagicUp(event, target) {
+    const key = target.dataset.magicKey;
+    let order = this.document.system.magicOrder ?? [];
+    if (!order.length) order = [...Object.keys(MAGICS)];
+    else order = [...order];
+    const idx = order.indexOf(key);
+    if (idx <= 0) return;
+    [order[idx - 1], order[idx]] = [order[idx], order[idx - 1]];
+    await this.document.update({ "system.magicOrder": order });
+  }
+  static async #onMoveMagicDown(event, target) {
+    const key = target.dataset.magicKey;
+    let order = this.document.system.magicOrder ?? [];
+    if (!order.length) order = [...Object.keys(MAGICS)];
+    else order = [...order];
+    const idx = order.indexOf(key);
+    if (idx === -1 || idx >= order.length - 1) return;
+    [order[idx], order[idx + 1]] = [order[idx + 1], order[idx]];
+    await this.document.update({ "system.magicOrder": order });
+  }
   #bindComponentRandomize() {
     const btn = this.element?.querySelector("[data-action='randomize-component']");
     if (!btn) return;
@@ -2250,7 +2516,7 @@ var CDENpcSheet = class extends CDEBaseActorSheet {
       cell.addEventListener("click", (event) => {
         event.preventDefault();
         const rollKey = cell.dataset.libelId;
-        if (rollKey) rollForActor(this.document, rollKey);
+        if (rollKey) rollForActor(this.document, rollKey)?.catch((err) => console.error("Roll failed:", err));
       });
     });
   }
@@ -2437,11 +2703,11 @@ var CDESanheiSheet = class extends CDEBaseItemSheet {
   async _prepareContext() {
     const context = await super._prepareContext();
     const enrich = (content) => foundry.applications.ux.TextEditor.implementation.enrichHTML(content ?? "", { async: true });
-    const props = this.document.system.properties;
-    context.prop1DescriptionHTML = await enrich(props.prop1.description);
-    context.prop2DescriptionHTML = await enrich(props.prop2.description);
-    context.prop3DescriptionHTML = await enrich(props.prop3.description);
-    context.propFields = this.document.system.schema.fields.properties.fields;
+    const props = this.document.system.properties ?? {};
+    context.prop1DescriptionHTML = await enrich(props.prop1?.description);
+    context.prop2DescriptionHTML = await enrich(props.prop2?.description);
+    context.prop3DescriptionHTML = await enrich(props.prop3?.description);
+    context.propFields = this.document.system.schema.fields.properties?.fields;
     return context;
   }
 };
@@ -2484,6 +2750,8 @@ var CDELoksyuApp = class _CDELoksyuApp extends foundry.applications.api.Handleba
   };
   /** @type {Function|null} bound hook handler */
   _updateHook = null;
+  /** @type {Function|null} updateSetting hook handler (for socket-propagated writes) */
+  _settingHook = null;
   /** Singleton accessor — open or bring to front */
   static open() {
     const existing = Array.from(foundry.applications.instances.values()).find(
@@ -2518,13 +2786,24 @@ var CDELoksyuApp = class _CDELoksyuApp extends foundry.applications.api.Handleba
   _onRender(context, options) {
     super._onRender(context, options);
     this.#bindInputs();
-    this._updateHook = Hooks.on("cde:loksyuUpdated", () => this.render());
+    if (!this._updateHook) {
+      this._updateHook = Hooks.on("cde:loksyuUpdated", () => this.render());
+    }
+    if (!this._settingHook) {
+      this._settingHook = Hooks.on("updateSetting", (setting) => {
+        if (setting.key === `${SYSTEM_ID}.loksyuData`) this.render();
+      });
+    }
   }
   _onClose(options) {
     if (this._updateHook !== null) {
       Hooks.off("cde:loksyuUpdated", this._updateHook);
       this._updateHook = null;
     }
+    if (this._settingHook !== null) {
+      Hooks.off("updateSetting", this._settingHook);
+      this._settingHook = null;
+    }
     super._onClose(options);
   }
   #bindInputs() {
@@ -2593,6 +2872,8 @@ var CDETinjiApp = class _CDETinjiApp extends foundry.applications.api.Handlebars
   };
   /** @type {Function|null} */
   _updateHook = null;
+  /** @type {Function|null} */
+  _settingHook = null;
   static open() {
     const existing = Array.from(foundry.applications.instances.values()).find(
       (app2) => app2 instanceof _CDETinjiApp
@@ -2614,13 +2895,24 @@ var CDETinjiApp = class _CDETinjiApp extends foundry.applications.api.Handlebars
   _onRender(context, options) {
     super._onRender(context, options);
     this.#bindDirectInput();
-    this._updateHook = Hooks.on("cde:tinjiUpdated", () => this.render());
+    if (!this._updateHook) {
+      this._updateHook = Hooks.on("cde:tinjiUpdated", () => this.render());
+    }
+    if (!this._settingHook) {
+      this._settingHook = Hooks.on("updateSetting", (setting) => {
+        if (setting.key === `${SYSTEM_ID}.tinjiData`) this.render();
+      });
+    }
   }
   _onClose(options) {
     if (this._updateHook !== null) {
       Hooks.off("cde:tinjiUpdated", this._updateHook);
       this._updateHook = null;
     }
+    if (this._settingHook !== null) {
+      Hooks.off("updateSetting", this._settingHook);
+      this._settingHook = null;
+    }
     super._onClose(options);
   }
   #bindDirectInput() {
@@ -2649,7 +2941,7 @@ var CDETinjiApp = class _CDETinjiApp extends foundry.applications.api.Handlebars
       return;
     }
     await setTinjiValue(current - 1);
-    ChatMessage.create({
+    await ChatMessage.create({
       user: game.user.id,
       content: `<div class="cde-tinji-spend-msg">
         <i class="fas fa-star"></i>
@@ -2668,7 +2960,7 @@ var CDECombat = class extends Combat {
    * for each selected combatant, then sync the result to the Combatant document.
    */
   async rollInitiative(ids, options = {}) {
-    const combatantIds = typeof ids === "string" ? [ids] : ids;
+    const combatantIds = ids ? typeof ids === "string" ? [ids] : ids : this.combatants.map((c) => c.id);
     for (const id of combatantIds) {
       const combatant = this.combatants.get(id);
       if (!combatant) continue;
@@ -2877,8 +3169,7 @@ function refreshRollActions(rollCard, aspect, message) {
   const tinji = getTinjiValue();
   const successAvail = (loksyu[aspect]?.yin ?? 0) + (loksyu[aspect]?.yang ?? 0);
   const fasteAvail = (loksyu[fasteAspect]?.yin ?? 0) + (loksyu[fasteAspect]?.yang ?? 0);
-  const isGM = game.user.isGM;
-  const hasSomething = successAvail > 0 || fasteAvail > 0 || isGM && tinji > 0;
+  const hasSomething = successAvail > 0 || fasteAvail > 0 || tinji > 0;
   if (!hasSomething) return;
   const aspLabel = game.i18n.localize(ASPECT_LABELS[aspect]);
   const fasteLabel = game.i18n.localize(ASPECT_LABELS[fasteAspect]);
@@ -2897,7 +3188,7 @@ function refreshRollActions(rollCard, aspect, message) {
       <span class="cde-roll-action-count">${fasteAvail}</span>
     </button>`;
   }
-  if (isGM && tinji > 0) {
+  if (tinji > 0) {
     btns += `<button class="cde-roll-action-btn cde-roll-action--tinji" data-action="tinji">
       <span class="cde-roll-action-tinji-char">\u5929</span>
       <span class="cde-roll-action-label">${game.i18n.localize("CDE.TinJi2")}</span>
@@ -2936,17 +3227,32 @@ async function _drawFromLoksyu(message, aspect, type, aspectLabel) {
     ui.notifications.warn(game.i18n.localize("CDE.LoksyuEmpty"));
     return;
   }
-  if (entry.yang > 0) entry.yang--;
-  else entry.yin--;
+  const order = game.settings.get(SYSTEM_ID, "loksyuConsumptionOrder");
+  if (order === "yin-first") {
+    if (entry.yin > 0) entry.yin--;
+    else entry.yang--;
+  } else if (order === "balanced") {
+    if (entry.yin > entry.yang) entry.yin--;
+    else if (entry.yang > entry.yin) entry.yang--;
+    else if (entry.yang > 0) entry.yang--;
+    else entry.yin--;
+  } else {
+    if (entry.yang > 0) entry.yang--;
+    else entry.yin--;
+  }
   data[aspect] = entry;
-  await setLoksyuData(data);
+  if (game.user.isGM) {
+    await setLoksyuData(data);
+  } else {
+    requestLoksyuDraw(aspect, order);
+  }
   const flags = message?.flags?.[SYSTEM_ID];
   if (flags?.rollResult && message.isOwner) {
     const updated = foundry.utils.deepClone(flags.rollResult);
     if (type === "success") {
       updated.successesdice = (updated.successesdice ?? 0) + 1;
       updated.loksyuBonusSuc = (updated.loksyuBonusSuc ?? 0) + 1;
-      if (updated.damageBase) updated.totalDamage = updated.successesdice * updated.damageBase;
+      if (updated.damageBase != null) updated.totalDamage = updated.damageBase + (updated.damageAspectValue ?? 0);
     } else {
       updated.auspiciousdice = (updated.auspiciousdice ?? 0) + 1;
       updated.loksyuBonusFaste = (updated.loksyuBonusFaste ?? 0) + 1;
@@ -2959,7 +3265,7 @@ async function _drawFromLoksyu(message, aspect, type, aspectLabel) {
   }
   const remain = entry.yin + entry.yang;
   const typeLabel = type === "success" ? game.i18n.localize("CDE.Successes") : game.i18n.localize("CDE.AuspiciousDie");
-  ChatMessage.create({
+  await ChatMessage.create({
     user: game.user.id,
     content: `<div class="cde-loksyu-draw-msg">
       <div class="cde-loksyu-draw-header">
@@ -2978,14 +3284,17 @@ async function _drawFromLoksyu(message, aspect, type, aspectLabel) {
   });
 }
 async function _spendTinjiPostRoll() {
-  if (!game.user.isGM) return;
   const current = getTinjiValue();
   if (current <= 0) {
     ui.notifications.warn(game.i18n.localize("CDE.TinjiEmpty"));
     return;
   }
-  await setTinjiValue(current - 1);
-  ChatMessage.create({
+  if (game.user.isGM) {
+    await setTinjiValue(current - 1);
+  } else {
+    requestTinjiSpend();
+  }
+  await ChatMessage.create({
     user: game.user.id,
     content: `<div class="cde-tinji-spend-msg">
       <span class="cde-tinji-icon">\u5929</span>
@@ -3051,7 +3360,14 @@ function injectWelcomeActions(_message, html) {
 // src/system.js
 Hooks.once("i18nInit", preLocalizeConfig);
 Hooks.once("init", async () => {
-  console.info(`CHRONIQUESDELETRANGE | Initializing ${SYSTEM_ID}`);
+  console.log(
+    "%c\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557\n%c\u2551              Chroniques de l'\xC9trange \u2014 FoundryVTT        \u2551\n%c\u2551              Syst\xE8me de jeu par Antre-Monde \xC9ditions     \u2551\n%c\u2551          Made by Uberwald - https://www.ubwerwald.me      \u2551\n%c\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D",
+    "color: #d4af37; font-weight: bold;",
+    "color: #e2e8f4;",
+    "color: #7d94b8;",
+    "color: #5a7a9a;",
+    "color: #d4af37; font-weight: bold;"
+  );
   registerSettings();
   game.system.CONST = { MAGICS, SUBTYPES };
   game.cde = { CDELoksyuApp, CDETinjiApp, CDEWheelApp };
@@ -3135,6 +3451,7 @@ Hooks.once("ready", async () => {
   await migrateIfNeeded();
   await loadWelcomeSceneIfNeeded();
   CDEWheelApp.registerHooks();
+  registerSingletonSocket();
   if (game.user.isGM) showWelcomeMessage();
 });
 Hooks.on("renderChatLog", (_app, html) => {

lang/fr-cde.json

@@ -34,6 +34,7 @@
   "CDE.HeiSpend": "Dépense HEI",
   "CDE.SpellBonus": "Bonus Sort",
   "CDE.SpellPower": "Puissance du Sort",
+  "CDE.BonusMalus": "Bonus/Malus",
   "CDE.Boss": "Boss",
   "CDE.Cancel": "Annuler",
   "CDE.CancelChanges": "Annuler les modifications",
@@ -81,6 +82,7 @@
   "CDE.EarthlyPrayer": "Prière Terrestre",
   "CDE.Effects": "Effets",
   "CDE.Elixirs": "Élixirs",
+  "CDE.EnablePrompt": "Toujours demander avant de lancer",
   "CDE.Error0": "Impossible de poursuivre : le nombre total de vos dés à lancer est inférieur à 1.",
   "CDE.Error1": "Impossible de poursuivre : vous ne possédez pas cette Compétence.",
   "CDE.Error10": "Impossible de poursuivre : vous avez 0 ou moins dans cet Aspect.",
@@ -148,6 +150,11 @@
   "CDE.MigrationPartialError": "{count} personnage(s) n'ont pas pu être importés.",
   "CDE.MigrationErrorNotJson": "Le fichier « {file} » n'est pas un fichier JSON.",
   "CDE.MigrationErrorParse": "Erreur lors de la lecture de « {file} » : {error}",
+  "CDE.MigrationConfirmAction": "Confirmer l'importation",
+  "CDE.MigrationDuplicate": "Ce nom existe déjà dans le monde",
+  "CDE.MigrationDuplicateCount": "{count} personnage(s) existent déjà dans le monde",
+  "CDE.MigrationImportConfirm": "Vous allez importer {count} personnage(s). Confirmez-vous ?",
+  "CDE.MigrationImporting": "Importation en cours...",
   "CDE.InitiativeWheel": "Roue d'Initiative",
   "CDE.InitiativeWheelOpen": "Ouvrir la Roue d'Initiative",
   "CDE.InitiativeWheelHint": "Roue d'initiative – Les Chroniques de l'Étrange",
@@ -199,6 +206,7 @@
   "CDE.MartialArts": "Arts Martiaux",
   "CDE.Masterized": "Vous maîtrisez cette Technique",
   "CDE.MasteryOfTheWay": "Maîtrise de la Voie",
+  "CDE.Material": "Matériau",
   "CDE.Max": "Max",
   "CDE.Max-Present-Malus-Present-Max": "Max ● Actuel ● Malus ● Actuel ● Max",
   "CDE.Max-Present-Present-Max": "Max ● Actuel ● Actuel ● Max",
@@ -217,8 +225,11 @@
   "CDE.MsgMagic2": "s'élève à ",
   "CDE.MsgMagic3": ". La puissance à invoquer est de ",
   "CDE.MsgMagic4": ", si toutefois le sort est lancé avec succès.",
+  "CDE.MoveUp": "Monter",
+  "CDE.MoveDown": "Descendre",
   "CDE.NPCName": "Nom du PNJ",
   "CDE.FatSi": "Fat Si",
+  "CDE.FreePowerLevels": "Niveaux de puissance gratuits",
   "CDE.PNJ": "PNJ",
   "CDE.Name": "Nom",
   "CDE.Necromancy": "Nécromancie",
@@ -280,6 +291,7 @@
   "CDE.ResourceValue": "Valeur",
   "CDE.Resources": "Ressources",
   "CDE.Results": "Résultats :",
+  "CDE.Roll": "Jet",
   "CDE.RollDifficulty": "Difficulté du Jet",
   "CDE.SAN-ZING": "SAN ● ZING",
   "CDE.Sanhei": "Sanhei",
@@ -321,12 +333,18 @@
   "CDE.Technique": "Technique",
   "CDE.Technologies": "Technologies",
   "CDE.Threat": "Niveau de Menace",
+  "CDE.ThrowType": "Type de jet",
   "CDE.TinJi": "Tin Ji :",
   "CDE.TinJi2": "Tin Ji",
   "CDE.TinJiName": "Nom de la Tin Ji",
   "CDE.TinjiNotFound": "Aucun acteur Tin Ji trouvé. Le Maître du Jeu doit en créer un.",
   "CDE.TinjiEmpty": "Il n'y a plus de dés de Tin Ji disponibles.",
   "CDE.TinjiSpent": "{name} dépense 1 dé de Tin Ji.",
+  "CDE.Settings.LoksyuConsumptionOrder": "Ordre de consommation du Loksyu",
+  "CDE.Settings.LoksyuConsumptionOrderHint": "Définit quelle polarité (Yin ou Yang) est consommée en priorité lorsqu'un dé est puisé dans la réserve de Loksyu.",
+  "CDE.Settings.LoksyuOrderYangFirst": "Yang d'abord",
+  "CDE.Settings.LoksyuOrderYinFirst": "Yin d'abord",
+  "CDE.Settings.LoksyuOrderBalanced": "Équilibré (consomme la polarité la plus fournie)",
   "CDE.PostRollActions": "Puiser dans le Loksyu / Dépenser Tin Ji",
   "CDE.LoksyuDrawsA": "pioche",
   "CDE.LoksyuFromAspect": "du",

packs/cde-armors/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-armors/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.880760 7f52c5bfd6c0 Delete type=3 #1
-2026/06/01-22:35:51.016255 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:51.016270 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:51.023046 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:51.047956 7f52c4bfb6c0 Manual compaction at level-0 from '!items!3aig6MWvZCRoWXPW' @ 72057594037927935 : 1 .. '!items!cXaQG1TBE0jzrbNt' @ 0 : 0; will stop at '!items!cXaQG1TBE0jzrbNt' @ 8 : 1
-2026/06/01-22:35:51.047965 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:51.051139 7f52c4bfb6c0 Generated table #27@0: 4 keys, 1387 bytes
-2026/06/01-22:35:51.051154 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 1387 bytes
-2026/06/01-22:35:51.057027 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:51.057087 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.067136 7f52c4bfb6c0 Manual compaction at level-0 from '!items!cXaQG1TBE0jzrbNt' @ 8 : 1 .. '!items!cXaQG1TBE0jzrbNt' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.100287 7f29d5fed6c0 Recovering log #50
+2026/06/14-22:49:59.110340 7f29d5fed6c0 Delete type=3 #48
+2026/06/14-22:49:59.110396 7f29d5fed6c0 Delete type=0 #50
+2026/06/14-22:52:09.917197 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.917225 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.923646 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.923831 7f29d4feb6c0 Manual compaction at level-0 from '!items!3aig6MWvZCRoWXPW' @ 72057594037927935 : 1 .. '!items!cXaQG1TBE0jzrbNt' @ 0 : 0; will stop at (end)

packs/cde-armors/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.858708 7f52c5bfd6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.858788 7f52c5bfd6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-armors/000021.log: OK
-2026/06/01-22:35:11.858829 7f52c5bfd6c0 Table #10: 4 entries OK
-2026/06/01-22:35:11.862084 7f52c5bfd6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-armors; recovered 1 files; 1387 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.661219 7f29d6fef6c0 Recovering log #46
+2026/06/14-22:22:39.671056 7f29d6fef6c0 Delete type=3 #44
+2026/06/14-22:22:39.671114 7f29d6fef6c0 Delete type=0 #46
+2026/06/14-22:32:37.952133 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.952163 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:37.958637 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:37.965966 7f29d4feb6c0 Manual compaction at level-0 from '!items!3aig6MWvZCRoWXPW' @ 72057594037927935 : 1 .. '!items!cXaQG1TBE0jzrbNt' @ 0 : 0; will stop at (end)

packs/cde-help/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-help/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.987923 7f52c53fc6c0 Delete type=3 #1
-2026/06/01-22:35:51.085088 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:51.085109 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:51.091460 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:51.107759 7f52c4bfb6c0 Manual compaction at level-0 from '!journal!CDEGuideMain0001' @ 72057594037927935 : 1 .. '!journal.pages!CDEGuideMain0001.wgqIHHVlO9miegn1' @ 0 : 0; will stop at '!journal.pages!CDEGuideMain0001.wgqIHHVlO9miegn1' @ 17 : 1
-2026/06/01-22:35:51.107763 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:51.111831 7f52c4bfb6c0 Generated table #27@0: 21 keys, 18033 bytes
-2026/06/01-22:35:51.111846 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 18033 bytes
-2026/06/01-22:35:51.117896 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:51.117946 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.124817 7f52c4bfb6c0 Manual compaction at level-0 from '!journal.pages!CDEGuideMain0001.wgqIHHVlO9miegn1' @ 17 : 1 .. '!journal.pages!CDEGuideMain0001.wgqIHHVlO9miegn1' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.185177 7f29d5fed6c0 Recovering log #50
+2026/06/14-22:49:59.194849 7f29d5fed6c0 Delete type=3 #48
+2026/06/14-22:49:59.194912 7f29d5fed6c0 Delete type=0 #50
+2026/06/14-22:52:09.979071 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.979102 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.985673 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:10.010878 7f29d4feb6c0 Manual compaction at level-0 from '!journal!CDEGuideMain0001' @ 72057594037927935 : 1 .. '!journal.pages!CDEGuideMain0001.wgqIHHVlO9miegn1' @ 0 : 0; will stop at (end)

packs/cde-help/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.970906 7f52c53fc6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.971023 7f52c53fc6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-help/000021.log: OK
-2026/06/01-22:35:11.971154 7f52c53fc6c0 Table #10: 21 entries OK
-2026/06/01-22:35:11.974528 7f52c53fc6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-help; recovered 1 files; 18033 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.748395 7f29d6fef6c0 Recovering log #46
+2026/06/14-22:22:39.759263 7f29d6fef6c0 Delete type=3 #44
+2026/06/14-22:22:39.759326 7f29d6fef6c0 Delete type=0 #46
+2026/06/14-22:32:38.022572 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:38.022623 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:38.028952 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:38.054477 7f29d4feb6c0 Manual compaction at level-0 from '!journal!CDEGuideMain0001' @ 72057594037927935 : 1 .. '!journal.pages!CDEGuideMain0001.wgqIHHVlO9miegn1' @ 0 : 0; will stop at (end)

packs/cde-ingredients/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-ingredients/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.914967 7f52c6bff6c0 Delete type=3 #1
-2026/06/01-22:35:51.023125 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:51.023151 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:51.028968 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:51.057155 7f52c4bfb6c0 Manual compaction at level-0 from '!items!0NDBw1YB54q3hLH0' @ 72057594037927935 : 1 .. '!items!ykekdZlirabRobEF' @ 0 : 0; will stop at '!items!ykekdZlirabRobEF' @ 108 : 1
-2026/06/01-22:35:51.057162 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:51.060536 7f52c4bfb6c0 Generated table #27@0: 54 keys, 8881 bytes
-2026/06/01-22:35:51.060550 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 8881 bytes
-2026/06/01-22:35:51.067003 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:51.067054 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.073072 7f52c4bfb6c0 Manual compaction at level-0 from '!items!ykekdZlirabRobEF' @ 108 : 1 .. '!items!ykekdZlirabRobEF' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.128336 7f29d5fed6c0 Recovering log #50
+2026/06/14-22:49:59.138475 7f29d5fed6c0 Delete type=3 #48
+2026/06/14-22:49:59.138521 7f29d5fed6c0 Delete type=0 #50
+2026/06/14-22:52:09.937223 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.937263 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.944028 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.951911 7f29d4feb6c0 Manual compaction at level-0 from '!items!0NDBw1YB54q3hLH0' @ 72057594037927935 : 1 .. '!items!ykekdZlirabRobEF' @ 0 : 0; will stop at (end)

packs/cde-ingredients/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.900722 7f52c6bff6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.900766 7f52c6bff6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-ingredients/000021.log: OK
-2026/06/01-22:35:11.900837 7f52c6bff6c0 Table #10: 54 entries OK
-2026/06/01-22:35:11.904105 7f52c6bff6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-ingredients; recovered 1 files; 8881 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.688631 7f29d6fef6c0 Recovering log #46
+2026/06/14-22:22:39.699291 7f29d6fef6c0 Delete type=3 #44
+2026/06/14-22:22:39.699355 7f29d6fef6c0 Delete type=0 #46
+2026/06/14-22:32:37.979476 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.979507 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:37.985981 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:37.994186 7f29d4feb6c0 Manual compaction at level-0 from '!items!0NDBw1YB54q3hLH0' @ 72057594037927935 : 1 .. '!items!ykekdZlirabRobEF' @ 0 : 0; will stop at (end)

packs/cde-items/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-items/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.932171 7f52c63fe6c0 Delete type=3 #1
-2026/06/01-22:35:51.010289 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:51.010313 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:51.016160 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:51.037980 7f52c4bfb6c0 Manual compaction at level-0 from '!items!HKq5ANSGiBIdcnki' @ 72057594037927935 : 1 .. '!items!HKq5ANSGiBIdcnki' @ 0 : 0; will stop at '!items!HKq5ANSGiBIdcnki' @ 2 : 1
-2026/06/01-22:35:51.037986 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:51.041162 7f52c4bfb6c0 Generated table #27@0: 1 keys, 596 bytes
-2026/06/01-22:35:51.041178 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 596 bytes
-2026/06/01-22:35:51.047786 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:51.047867 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.067128 7f52c4bfb6c0 Manual compaction at level-0 from '!items!HKq5ANSGiBIdcnki' @ 2 : 1 .. '!items!HKq5ANSGiBIdcnki' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.141353 7f29d6fef6c0 Recovering log #50
+2026/06/14-22:49:59.151373 7f29d6fef6c0 Delete type=3 #48
+2026/06/14-22:49:59.151426 7f29d6fef6c0 Delete type=0 #50
+2026/06/14-22:52:09.944165 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.944196 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.951751 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.952015 7f29d4feb6c0 Manual compaction at level-0 from '!items!HKq5ANSGiBIdcnki' @ 72057594037927935 : 1 .. '!items!HKq5ANSGiBIdcnki' @ 0 : 0; will stop at (end)

packs/cde-items/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.918464 7f52c63fe6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.918512 7f52c63fe6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-items/000021.log: OK
-2026/06/01-22:35:11.918537 7f52c63fe6c0 Table #10: 1 entries OK
-2026/06/01-22:35:11.921448 7f52c63fe6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-items; recovered 1 files; 596 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.702477 7f29d5fed6c0 Recovering log #46
+2026/06/14-22:22:39.712938 7f29d5fed6c0 Delete type=3 #44
+2026/06/14-22:22:39.712993 7f29d5fed6c0 Delete type=0 #46
+2026/06/14-22:32:37.986092 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.986120 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:37.994045 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:37.994361 7f29d4feb6c0 Manual compaction at level-0 from '!items!HKq5ANSGiBIdcnki' @ 72057594037927935 : 1 .. '!items!HKq5ANSGiBIdcnki' @ 0 : 0; will stop at (end)

packs/cde-kungfus/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-kungfus/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.796994 7f52c63fe6c0 Delete type=3 #1
-2026/06/01-22:35:50.937098 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:50.937158 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:50.943430 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:50.962798 7f52c4bfb6c0 Manual compaction at level-0 from '!items!2nKXEHLG0fXtSOdy' @ 72057594037927935 : 1 .. '!items!tlIc1bmIAbQeUwj7' @ 0 : 0; will stop at '!items!tlIc1bmIAbQeUwj7' @ 40 : 1
-2026/06/01-22:35:50.962805 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:50.966120 7f52c4bfb6c0 Generated table #27@0: 20 keys, 34454 bytes
-2026/06/01-22:35:50.966138 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 34454 bytes
-2026/06/01-22:35:50.972309 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:50.972597 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.004209 7f52c4bfb6c0 Manual compaction at level-0 from '!items!tlIc1bmIAbQeUwj7' @ 40 : 1 .. '!items!tlIc1bmIAbQeUwj7' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.045733 7f29d57ec6c0 Recovering log #50
+2026/06/14-22:49:59.056842 7f29d57ec6c0 Delete type=3 #48
+2026/06/14-22:49:59.056897 7f29d57ec6c0 Delete type=0 #50
+2026/06/14-22:52:09.896535 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.896595 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.903914 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.923752 7f29d4feb6c0 Manual compaction at level-0 from '!items!2nKXEHLG0fXtSOdy' @ 72057594037927935 : 1 .. '!items!tlIc1bmIAbQeUwj7' @ 0 : 0; will stop at (end)

packs/cde-kungfus/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.733217 7f52c63fe6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.733303 7f52c63fe6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-kungfus/000021.log: OK
-2026/06/01-22:35:11.733464 7f52c63fe6c0 Table #10: 20 entries OK
-2026/06/01-22:35:11.736813 7f52c63fe6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-kungfus; recovered 1 files; 34454 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.603745 7f29d67ee6c0 Recovering log #46
+2026/06/14-22:22:39.614957 7f29d67ee6c0 Delete type=3 #44
+2026/06/14-22:22:39.615010 7f29d67ee6c0 Delete type=0 #46
+2026/06/14-22:32:37.939036 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.939102 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:37.945655 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:37.965934 7f29d4feb6c0 Manual compaction at level-0 from '!items!2nKXEHLG0fXtSOdy' @ 72057594037927935 : 1 .. '!items!tlIc1bmIAbQeUwj7' @ 0 : 0; will stop at (end)

packs/cde-npcs/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-npcs/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.950430 7f52c6bff6c0 Delete type=3 #1
-2026/06/01-22:35:51.067200 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:51.067214 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:51.072998 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:51.091558 7f52c4bfb6c0 Manual compaction at level-0 from '!actors!4ZjFZ1HoJV9mJStt' @ 72057594037927935 : 1 .. '!actors!zVpmacwoWEG8YTCQ' @ 0 : 0; will stop at '!actors!zVpmacwoWEG8YTCQ' @ 98 : 1
-2026/06/01-22:35:51.091566 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:51.095457 7f52c4bfb6c0 Generated table #27@0: 49 keys, 50053 bytes
-2026/06/01-22:35:51.095470 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 50053 bytes
-2026/06/01-22:35:51.101290 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:51.101339 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.118034 7f52c4bfb6c0 Manual compaction at level-0 from '!actors!zVpmacwoWEG8YTCQ' @ 98 : 1 .. '!actors!zVpmacwoWEG8YTCQ' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.154286 7f29d5fed6c0 Recovering log #50
+2026/06/14-22:49:59.165791 7f29d5fed6c0 Delete type=3 #48
+2026/06/14-22:49:59.165837 7f29d5fed6c0 Delete type=0 #50
+2026/06/14-22:52:09.952102 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.952142 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.958682 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.978831 7f29d4feb6c0 Manual compaction at level-0 from '!actors!4ZjFZ1HoJV9mJStt' @ 72057594037927935 : 1 .. '!actors!zVpmacwoWEG8YTCQ' @ 0 : 0; will stop at (end)

packs/cde-npcs/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.935539 7f52c6bff6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.935591 7f52c6bff6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-npcs/000021.log: OK
-2026/06/01-22:35:11.935674 7f52c6bff6c0 Table #10: 49 entries OK
-2026/06/01-22:35:11.939231 7f52c6bff6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-npcs; recovered 1 files; 50053 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.716564 7f29d6fef6c0 Recovering log #46
+2026/06/14-22:22:39.726981 7f29d6fef6c0 Delete type=3 #44
+2026/06/14-22:22:39.727264 7f29d6fef6c0 Delete type=0 #46
+2026/06/14-22:32:37.994382 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.994411 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:38.000939 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:38.022274 7f29d4feb6c0 Manual compaction at level-0 from '!actors!4ZjFZ1HoJV9mJStt' @ 72057594037927935 : 1 .. '!actors!zVpmacwoWEG8YTCQ' @ 0 : 0; will stop at (end)

packs/cde-pretires/CURRENT

@@ -1 +1 @@
-MANIFEST-000002
+MANIFEST-000030

packs/cde-pretires/LOG

@@ -1,5 +1,8 @@
-2026/06/01-22:35:11.966943 7f52c5bfd6c0 Delete type=3 #1
-2026/06/01-22:35:51.073080 7f52c4bfb6c0 Level-0 table #5: started
-2026/06/01-22:35:51.079046 7f52c4bfb6c0 Level-0 table #5: 429877 bytes OK
-2026/06/01-22:35:51.084913 7f52c4bfb6c0 Delete type=0 #3
-2026/06/01-22:35:51.107744 7f52c4bfb6c0 Manual compaction at level-0 from '!actors!5OGW1fRUn12aNMMV' @ 72057594037927935 : 1 .. '!actors.items!zSWwOmFiFjN4YxC9.w8LXSYQ1eIygtlKV' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.169462 7f29d5fed6c0 Recovering log #28
+2026/06/14-22:49:59.179433 7f29d5fed6c0 Delete type=3 #26
+2026/06/14-22:49:59.179471 7f29d5fed6c0 Delete type=0 #28
+2026/06/14-22:52:09.985789 7f29d4feb6c0 Level-0 table #33: started
+2026/06/14-22:52:09.985816 7f29d4feb6c0 Level-0 table #33: 0 bytes OK
+2026/06/14-22:52:09.992966 7f29d4feb6c0 Delete type=0 #31
+2026/06/14-22:52:10.010894 7f29d4feb6c0 Manual compaction at level-0 from '!actors!5OGW1fRUn12aNMMV' @ 72057594037927935 : 1 .. '!actors.items!zSWwOmFiFjN4YxC9.w8LXSYQ1eIygtlKV' @ 0 : 0; will stop at (end)
+2026/06/14-22:52:10.011012 7f29d4feb6c0 Manual compaction at level-1 from '!actors!5OGW1fRUn12aNMMV' @ 72057594037927935 : 1 .. '!actors.items!zSWwOmFiFjN4YxC9.w8LXSYQ1eIygtlKV' @ 0 : 0; will stop at (end)

packs/cde-pretires/LOG.old

@@ -0,0 +1,8 @@
+2026/06/14-22:22:39.731841 7f29d6fef6c0 Recovering log #24
+2026/06/14-22:22:39.741957 7f29d6fef6c0 Delete type=3 #22
+2026/06/14-22:22:39.742028 7f29d6fef6c0 Delete type=0 #24
+2026/06/14-22:32:38.007843 7f29d4feb6c0 Level-0 table #29: started
+2026/06/14-22:32:38.007886 7f29d4feb6c0 Level-0 table #29: 0 bytes OK
+2026/06/14-22:32:38.014714 7f29d4feb6c0 Delete type=0 #27
+2026/06/14-22:32:38.022308 7f29d4feb6c0 Manual compaction at level-0 from '!actors!5OGW1fRUn12aNMMV' @ 72057594037927935 : 1 .. '!actors.items!zSWwOmFiFjN4YxC9.w8LXSYQ1eIygtlKV' @ 0 : 0; will stop at (end)
+2026/06/14-22:32:38.022452 7f29d4feb6c0 Manual compaction at level-1 from '!actors!5OGW1fRUn12aNMMV' @ 72057594037927935 : 1 .. '!actors.items!zSWwOmFiFjN4YxC9.w8LXSYQ1eIygtlKV' @ 0 : 0; will stop at (end)

packs/cde-sanhei/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-sanhei/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.897294 7f52c63fe6c0 Delete type=3 #1
-2026/06/01-22:35:51.004437 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:51.004459 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:51.010228 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:51.029047 7f52c4bfb6c0 Manual compaction at level-0 from '!items!DC2kimCi9sWxqhXG' @ 72057594037927935 : 1 .. '!items!qzfAEhmvVxEMzm0k' @ 0 : 0; will stop at '!items!qzfAEhmvVxEMzm0k' @ 10 : 1
-2026/06/01-22:35:51.029057 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:51.032066 7f52c4bfb6c0 Generated table #27@0: 5 keys, 4934 bytes
-2026/06/01-22:35:51.032071 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 4934 bytes
-2026/06/01-22:35:51.037821 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:51.037900 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.067117 7f52c4bfb6c0 Manual compaction at level-0 from '!items!qzfAEhmvVxEMzm0k' @ 10 : 1 .. '!items!qzfAEhmvVxEMzm0k' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.113546 7f29d67ee6c0 Recovering log #50
+2026/06/14-22:49:59.125289 7f29d67ee6c0 Delete type=3 #48
+2026/06/14-22:49:59.125333 7f29d67ee6c0 Delete type=0 #50
+2026/06/14-22:52:09.930699 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.930727 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.937112 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.951899 7f29d4feb6c0 Manual compaction at level-0 from '!items!DC2kimCi9sWxqhXG' @ 72057594037927935 : 1 .. '!items!qzfAEhmvVxEMzm0k' @ 0 : 0; will stop at (end)

packs/cde-sanhei/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.883439 7f52c63fe6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.883485 7f52c63fe6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-sanhei/000021.log: OK
-2026/06/01-22:35:11.883523 7f52c63fe6c0 Table #10: 5 entries OK
-2026/06/01-22:35:11.886566 7f52c63fe6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-sanhei; recovered 1 files; 4934 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.674682 7f29d5fed6c0 Recovering log #46
+2026/06/14-22:22:39.685769 7f29d5fed6c0 Delete type=3 #44
+2026/06/14-22:22:39.685821 7f29d5fed6c0 Delete type=0 #46
+2026/06/14-22:32:37.972754 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.972783 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:37.979353 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:37.994176 7f29d4feb6c0 Manual compaction at level-0 from '!items!DC2kimCi9sWxqhXG' @ 72057594037927935 : 1 .. '!items!qzfAEhmvVxEMzm0k' @ 0 : 0; will stop at (end)

packs/cde-scenes/CURRENT

@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000072

packs/cde-scenes/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:12.007471 7f52c63fe6c0 Delete type=3 #1
-2026/06/01-22:35:51.124825 7f52c4bfb6c0 Level-0 table #45: started
-2026/06/01-22:35:51.124844 7f52c4bfb6c0 Level-0 table #45: 0 bytes OK
-2026/06/01-22:35:51.131445 7f52c4bfb6c0 Delete type=0 #43
-2026/06/01-22:35:51.145660 7f52c4bfb6c0 Manual compaction at level-0 from '!scenes!2C6gyZpvPxWlsVZi' @ 72057594037927935 : 1 .. '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 0 : 0; will stop at '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 1 : 1
-2026/06/01-22:35:51.145675 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:51.149105 7f52c4bfb6c0 Generated table #46@0: 8 keys, 3172 bytes
-2026/06/01-22:35:51.149125 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 3172 bytes
-2026/06/01-22:35:51.155673 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:51.155780 7f52c4bfb6c0 Delete type=2 #5
-2026/06/01-22:35:51.163444 7f52c4bfb6c0 Manual compaction at level-0 from '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 1 : 1 .. '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.198719 7f29d57ec6c0 Recovering log #69
+2026/06/14-22:49:59.210387 7f29d57ec6c0 Delete type=3 #67
+2026/06/14-22:49:59.210425 7f29d57ec6c0 Delete type=0 #69
+2026/06/14-22:52:09.958777 7f29d4feb6c0 Level-0 table #75: started
+2026/06/14-22:52:09.958803 7f29d4feb6c0 Level-0 table #75: 0 bytes OK
+2026/06/14-22:52:09.965059 7f29d4feb6c0 Delete type=0 #73
+2026/06/14-22:52:09.978852 7f29d4feb6c0 Manual compaction at level-0 from '!scenes!2C6gyZpvPxWlsVZi' @ 72057594037927935 : 1 .. '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 0 : 0; will stop at (end)

packs/cde-scenes/LOG.old

@@ -1,4 +1,14 @@
-2026/06/01-22:35:11.992251 7f52c63fe6c0 Log #40: 0 ops saved to Table #41 OK
-2026/06/01-22:35:11.992349 7f52c63fe6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-scenes/000040.log: OK
-2026/06/01-22:35:11.992433 7f52c63fe6c0 Table #5: 22 entries OK
-2026/06/01-22:35:11.995902 7f52c63fe6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-scenes; recovered 1 files; 7078 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.763440 7f29d67ee6c0 Recovering log #65
+2026/06/14-22:22:39.773982 7f29d67ee6c0 Delete type=3 #63
+2026/06/14-22:22:39.774029 7f29d67ee6c0 Delete type=0 #65
+2026/06/14-22:32:38.029088 7f29d4feb6c0 Level-0 table #70: started
+2026/06/14-22:32:38.032823 7f29d4feb6c0 Level-0 table #70: 3169 bytes OK
+2026/06/14-22:32:38.039619 7f29d4feb6c0 Delete type=0 #68
+2026/06/14-22:32:38.054502 7f29d4feb6c0 Manual compaction at level-0 from '!scenes!2C6gyZpvPxWlsVZi' @ 72057594037927935 : 1 .. '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 0 : 0; will stop at '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 29 : 1
+2026/06/14-22:32:38.054509 7f29d4feb6c0 Compacting 1@0 + 1@1 files
+2026/06/14-22:32:38.058254 7f29d4feb6c0 Generated table #71@0: 8 keys, 3169 bytes
+2026/06/14-22:32:38.058277 7f29d4feb6c0 Compacted 1@0 + 1@1 files => 3169 bytes
+2026/06/14-22:32:38.064919 7f29d4feb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
+2026/06/14-22:32:38.065170 7f29d4feb6c0 Delete type=2 #46
+2026/06/14-22:32:38.065328 7f29d4feb6c0 Delete type=2 #70
+2026/06/14-22:32:38.072993 7f29d4feb6c0 Manual compaction at level-0 from '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 29 : 1 .. '!scenes.levels!olYe9bhuXwRWQ8j7.defaultLevel0000' @ 0 : 0; will stop at (end)

packs/cde-spells/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-spells/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.817600 7f52c53fc6c0 Delete type=3 #1
-2026/06/01-22:35:50.950071 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:50.950101 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:50.956859 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:50.982784 7f52c4bfb6c0 Manual compaction at level-0 from '!items!2f51pcvFkcZjaxDk' @ 72057594037927935 : 1 .. '!items!yVN7PZw35iIaBl0H' @ 0 : 0; will stop at '!items!yVN7PZw35iIaBl0H' @ 50 : 1
-2026/06/01-22:35:50.982795 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:50.988505 7f52c4bfb6c0 Generated table #27@0: 25 keys, 124022 bytes
-2026/06/01-22:35:50.988522 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 124022 bytes
-2026/06/01-22:35:50.994813 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:50.994888 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.004229 7f52c4bfb6c0 Manual compaction at level-0 from '!items!yVN7PZw35iIaBl0H' @ 50 : 1 .. '!items!yVN7PZw35iIaBl0H' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.060460 7f29d5fed6c0 Recovering log #50
+2026/06/14-22:49:59.070829 7f29d5fed6c0 Delete type=3 #48
+2026/06/14-22:49:59.070872 7f29d5fed6c0 Delete type=0 #50
+2026/06/14-22:52:09.904026 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.904053 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.910627 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.923769 7f29d4feb6c0 Manual compaction at level-0 from '!items!2f51pcvFkcZjaxDk' @ 72057594037927935 : 1 .. '!items!yVN7PZw35iIaBl0H' @ 0 : 0; will stop at (end)

packs/cde-spells/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.800364 7f52c53fc6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.800471 7f52c53fc6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-spells/000021.log: OK
-2026/06/01-22:35:11.801036 7f52c53fc6c0 Table #10: 25 entries OK
-2026/06/01-22:35:11.805168 7f52c53fc6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-spells; recovered 1 files; 124022 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.618536 7f29d57ec6c0 Recovering log #46
+2026/06/14-22:22:39.628785 7f29d57ec6c0 Delete type=3 #44
+2026/06/14-22:22:39.628834 7f29d57ec6c0 Delete type=0 #46
+2026/06/14-22:32:37.966108 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.966141 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:37.972646 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:37.994161 7f29d4feb6c0 Manual compaction at level-0 from '!items!2f51pcvFkcZjaxDk' @ 72057594037927935 : 1 .. '!items!yVN7PZw35iIaBl0H' @ 0 : 0; will stop at (end)

packs/cde-supernaturals/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-supernaturals/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.836158 7f52c63fe6c0 Delete type=3 #1
-2026/06/01-22:35:50.943540 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:50.943578 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:50.949973 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:50.972693 7f52c4bfb6c0 Manual compaction at level-0 from '!items!APN91pQL0NBfZsG7' @ 72057594037927935 : 1 .. '!items!xxZKGqDVxAfr140W' @ 0 : 0; will stop at '!items!xxZKGqDVxAfr140W' @ 32 : 1
-2026/06/01-22:35:50.972702 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:50.976827 7f52c4bfb6c0 Generated table #27@0: 16 keys, 8790 bytes
-2026/06/01-22:35:50.976844 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 8790 bytes
-2026/06/01-22:35:50.982579 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:50.982676 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.004221 7f52c4bfb6c0 Manual compaction at level-0 from '!items!xxZKGqDVxAfr140W' @ 32 : 1 .. '!items!xxZKGqDVxAfr140W' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.074203 7f29d57ec6c0 Recovering log #50
+2026/06/14-22:49:59.085196 7f29d57ec6c0 Delete type=3 #48
+2026/06/14-22:49:59.085240 7f29d57ec6c0 Delete type=0 #50
+2026/06/14-22:52:09.923913 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.923940 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.930579 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.951882 7f29d4feb6c0 Manual compaction at level-0 from '!items!APN91pQL0NBfZsG7' @ 72057594037927935 : 1 .. '!items!xxZKGqDVxAfr140W' @ 0 : 0; will stop at (end)

packs/cde-supernaturals/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.821755 7f52c63fe6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.821828 7f52c63fe6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-supernaturals/000021.log: OK
-2026/06/01-22:35:11.821868 7f52c63fe6c0 Table #10: 16 entries OK
-2026/06/01-22:35:11.824849 7f52c63fe6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-supernaturals; recovered 1 files; 8790 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.633149 7f29d6fef6c0 Recovering log #46
+2026/06/14-22:22:39.644445 7f29d6fef6c0 Delete type=3 #44
+2026/06/14-22:22:39.644504 7f29d6fef6c0 Delete type=0 #46
+2026/06/14-22:32:37.945805 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.945837 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:37.952016 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:37.965952 7f29d4feb6c0 Manual compaction at level-0 from '!items!APN91pQL0NBfZsG7' @ 72057594037927935 : 1 .. '!items!xxZKGqDVxAfr140W' @ 0 : 0; will stop at (end)

packs/cde-weapons/CURRENT

@@ -1 +1 @@
-MANIFEST-000023
+MANIFEST-000052

packs/cde-weapons/LOG

@@ -1,11 +1,7 @@
-2026/06/01-22:35:11.855333 7f52c53fc6c0 Delete type=3 #1
-2026/06/01-22:35:50.956960 7f52c4bfb6c0 Level-0 table #26: started
-2026/06/01-22:35:50.956991 7f52c4bfb6c0 Level-0 table #26: 0 bytes OK
-2026/06/01-22:35:50.962751 7f52c4bfb6c0 Delete type=0 #24
-2026/06/01-22:35:50.994960 7f52c4bfb6c0 Manual compaction at level-0 from '!items!2IYbyCPF9LJojzsj' @ 72057594037927935 : 1 .. '!items!uOpWyMGK3oiUJ1Sl' @ 0 : 0; will stop at '!items!uOpWyMGK3oiUJ1Sl' @ 30 : 1
-2026/06/01-22:35:50.994966 7f52c4bfb6c0 Compacting 1@0 + 0@1 files
-2026/06/01-22:35:50.998285 7f52c4bfb6c0 Generated table #27@0: 15 keys, 4529 bytes
-2026/06/01-22:35:50.998300 7f52c4bfb6c0 Compacted 1@0 + 0@1 files => 4529 bytes
-2026/06/01-22:35:51.004081 7f52c4bfb6c0 compacted to: files[ 0 1 0 0 0 0 0 ]
-2026/06/01-22:35:51.004146 7f52c4bfb6c0 Delete type=2 #10
-2026/06/01-22:35:51.004357 7f52c4bfb6c0 Manual compaction at level-0 from '!items!uOpWyMGK3oiUJ1Sl' @ 30 : 1 .. '!items!uOpWyMGK3oiUJ1Sl' @ 0 : 0; will stop at (end)
+2026/06/14-22:49:59.087477 7f29d67ee6c0 Recovering log #50
+2026/06/14-22:49:59.097614 7f29d67ee6c0 Delete type=3 #48
+2026/06/14-22:49:59.097669 7f29d67ee6c0 Delete type=0 #50
+2026/06/14-22:52:09.910724 7f29d4feb6c0 Level-0 table #55: started
+2026/06/14-22:52:09.910751 7f29d4feb6c0 Level-0 table #55: 0 bytes OK
+2026/06/14-22:52:09.917084 7f29d4feb6c0 Delete type=0 #53
+2026/06/14-22:52:09.923779 7f29d4feb6c0 Manual compaction at level-0 from '!items!2IYbyCPF9LJojzsj' @ 72057594037927935 : 1 .. '!items!uOpWyMGK3oiUJ1Sl' @ 0 : 0; will stop at (end)

packs/cde-weapons/LOG.old

@@ -1,4 +1,7 @@
-2026/06/01-22:35:11.839235 7f52c53fc6c0 Log #21: 0 ops saved to Table #22 OK
-2026/06/01-22:35:11.839283 7f52c53fc6c0 Archiving /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-weapons/000021.log: OK
-2026/06/01-22:35:11.839312 7f52c53fc6c0 Table #10: 15 entries OK
-2026/06/01-22:35:11.842894 7f52c53fc6c0 **** Repaired leveldb /home/morr/foundry/foundrydata-dev/Data/systems/fvtt-chroniques-de-l-etrange/packs/cde-weapons; recovered 1 files; 4529 bytes. Some data may have been lost. ****
+2026/06/14-22:22:39.647097 7f29d67ee6c0 Recovering log #46
+2026/06/14-22:22:39.657645 7f29d67ee6c0 Delete type=3 #44
+2026/06/14-22:22:39.657692 7f29d67ee6c0 Delete type=0 #46
+2026/06/14-22:32:37.958747 7f29d4feb6c0 Level-0 table #51: started
+2026/06/14-22:32:37.958775 7f29d4feb6c0 Level-0 table #51: 0 bytes OK
+2026/06/14-22:32:37.965805 7f29d4feb6c0 Delete type=0 #49
+2026/06/14-22:32:37.966067 7f29d4feb6c0 Manual compaction at level-0 from '!items!2IYbyCPF9LJojzsj' @ 72057594037927935 : 1 .. '!items!uOpWyMGK3oiUJ1Sl' @ 0 : 0; will stop at (end)

sample_data/fvtt-Actor-billy-lau-BXvMmiWRcnOzGXSM.json

@@ -801,18 +801,20 @@
     },
     {
       "name": "Revolver Glock 17, munitions à têtes en bois de saule (dégâts 3, distance longue)",
-      "type": "item",
+      "type": "weapon",
       "_id": "nyLUo3lMYKVNohQj",
       "img": "https://assets.forge-vtt.com/630dd9fa56bd61d804eb1dec/systems/chroniquesdeletrange/images/jetons/aides_de_jeu/jetons_technologie/pistol-gun.png",
       "system": {
-        "subtype": "weapon",
         "reference": "",
         "description": "<p> Revolver Glock 17, munitions à têtes en bois de saule (dégâts 3, distance longue)</p>",
-        "quantity": 1,
-        "weight": 0,
-        "protection": "",
-        "damage": "3",
+        "weaponType": "firearm",
+        "material": "",
+        "damageAspect": "feu",
+        "damageBase": 0,
         "range": "longue",
+        "obtainLevel": 0,
+        "obtainDifficulty": 0,
+        "quantity": 1,
         "notes": ""
       },
       "effects": [],

sample_data/fvtt-Actor-billy-lau-zSWwOmFiFjN4YxC9.json

@@ -762,13 +762,19 @@
     },
     {
       "name": "Revolver Glock 17, munitions à têtes en bois de saule (dégâts 3, distance longue)",
-      "type": "item",
+      "type": "weapon",
       "img": "https://assets.forge-vtt.com/630dd9fa56bd61d804eb1dec/systems/chroniquesdeletrange/images/jetons/aides_de_jeu/jetons_technologie/pistol-gun.png",
       "system": {
         "reference": "",
         "description": "<p> Revolver Glock 17, munitions à têtes en bois de saule (dégâts 3, distance longue)</p>",
+        "weaponType": "firearm",
+        "material": "",
+        "damageAspect": "feu",
+        "damageBase": 0,
+        "range": "longue",
+        "obtainLevel": 0,
+        "obtainDifficulty": 0,
         "quantity": 1,
-        "weight": 0,
         "notes": ""
       },
       "_id": "W6uaY31VuCSetszi",

sample_data/fvtt-Actor-brenda-kang-X7kM9pQ2rT5vW8nZ.json

@@ -863,13 +863,19 @@
     },
     {
       "name": "Pistolet LDB à cartouches alchimiques (et 3 fioles adaptées)",
-      "type": "item",
+      "type": "weapon",
       "img": "",
       "system": {
         "reference": "",
         "description": "<p>Pistolet LDB à cartouches alchimiques (et 3 fioles adaptées) – dégâts 2+, distance longue</p>",
+        "weaponType": "firearm",
+        "material": "",
+        "damageAspect": "feu",
+        "damageBase": 0,
+        "range": "longue",
+        "obtainLevel": 0,
+        "obtainDifficulty": 0,
         "quantity": 1,
-        "weight": 0,
         "notes": ""
       },
       "_id": "vW6xY8zA0bC2dE4fG6hI8jK0",

sample_data/fvtt-Actor-lily-chiu-YRIuWZJowkm0gJuc.json

@@ -801,13 +801,19 @@
     },
     {
       "name": "Pistolet dissimulé et un chargeur rempli de balles en argent gravées d'idéogrammes rituels (dégâts 2)",
-      "type": "item",
+      "type": "weapon",
       "img": "",
       "system": {
         "reference": "",
         "description": "<p>Pistolet dissimulé et un chargeur rempli de balles en argent gravées d'idéogrammes rituels (dégâts 2)</p>",
+        "weaponType": "firearm",
+        "material": "",
+        "damageAspect": "feu",
+        "damageBase": 0,
+        "range": "longue",
+        "obtainLevel": 0,
+        "obtainDifficulty": 0,
         "quantity": 1,
-        "weight": 0,
         "notes": ""
       },
       "_id": "v6B5n4M3l2K1j0H9",

sample_data/fvtt-Actor-mallory-tin-We0fDm06Ua2msJte.json

@@ -762,13 +762,19 @@
     },
     {
       "name": "7 poignards ornés d'or et de jade (dégâts 2+Eau(4) avec Hei Yin)",
-      "type": "item",
+      "type": "weapon",
       "img": "",
       "system": {
         "reference": "",
         "description": "<p>7 poignards ornés d'or et de jade (dégâts 2+Eau(4) avec Hei Yin)</p>",
+        "weaponType": "melee",
+        "material": "",
+        "damageAspect": "metal",
+        "damageBase": 2,
+        "range": "contact",
+        "obtainLevel": 0,
+        "obtainDifficulty": 0,
         "quantity": 1,
-        "weight": 0,
         "notes": ""
       },
       "_id": "OllJUo8Qbq",

sample_data/fvtt-Actor-penny-woo-a1b2c3d4e5f6g7h8.json

@@ -756,13 +756,19 @@
     },
     {
       "name": "Arc composite de très bonne qualité et 20 flèches artisanales (dégâts 2, distance longue)",
-      "type": "item",
+      "type": "weapon",
       "img": "https://assets.forge-vtt.com/630dd9fa56bd61d804eb1dec/systems/chroniquesdeletrange/images/jetons/aides_de_jeu/jetons_technologie/bow.png",
       "system": {
         "reference": "",
         "description": "<p>Arc composite de très bonne qualité et 20 flèches artisanales (dégâts 2, distance longue)</p>",
+        "weaponType": "ranged",
+        "material": "",
+        "damageAspect": "terre",
+        "damageBase": 0,
+        "range": "longue",
+        "obtainLevel": 0,
+        "obtainDifficulty": 0,
         "quantity": 1,
-        "weight": 0,
         "notes": ""
       },
       "_id": "aRcCoMpOsItE01",

src/config/localize.js

@@ -28,6 +28,7 @@ export function preLocalizeConfig() {
     magic.aspectlabel = game.i18n.localize(magic.aspectlabel)
     Object.values(magic.speciality).forEach((spec) => {
       spec.label = game.i18n.localize(spec.label)
+      spec.labelelementkey = spec.labelelement
       spec.labelelement = game.i18n.localize(spec.labelelement)
     })
   })

src/config/settings.js

@@ -41,6 +41,21 @@ export function registerSettings() {
     },
   })
 
+  game.settings.register(SYSTEM_ID, "loksyuConsumptionOrder", {
+    name: "CDE.Settings.LoksyuConsumptionOrder",
+    hint: "CDE.Settings.LoksyuConsumptionOrderHint",
+    scope: "world",
+    config: true,
+    type: String,
+    choices: {
+      "yang-first": "CDE.Settings.LoksyuOrderYangFirst",
+      "yin-first": "CDE.Settings.LoksyuOrderYinFirst",
+      "balanced": "CDE.Settings.LoksyuOrderBalanced",
+    },
+    default: "yang-first",
+    onChange: () => Hooks.callAll("cde:loksyuUpdated"),
+  })
+
   game.settings.register(SYSTEM_ID, "tinjiData", {
     scope: "world",
     config: false,

src/data/actors/character.js

@@ -122,9 +122,8 @@ export default class CharacterDataModel extends foundry.abstract.TypeDataModel {
           typeofthrow: numberField(0),
           aspectskill: numberField(0),
           bonusmalusskill: numberField(0),
-          aspectspeciality: numberField(0),
           rolldifficulty: numberField(0),
-          bonusmalusspeciality: numberField(0),
+          freepowerlevels: numberField(0),
         }),
       }),
       aspect: new fields.SchemaField({
@@ -163,6 +162,10 @@ export default class CharacterDataModel extends foundry.abstract.TypeDataModel {
         nine: componentField(),
         zero: componentField(),
       }),
+      magicOrder: new fields.ArrayField(
+        new fields.StringField({ required: true, nullable: false, initial: "" }),
+        { required: true, initial: [] }
+      ),
       magics: new fields.SchemaField({
         internalcinnabar: magicField(),
         alchemy: magicField(),

src/data/items/armor.js

@@ -25,7 +25,7 @@ export default class ArmorDataModel extends foundry.abstract.TypeDataModel {
       domain: stringField(""),
       obtainLevel: intField(0, { min: 0, max: 5 }),
       obtainDifficulty: intField(0, { min: 0, max: 3 }),
-      quantity: intField(1),
+      quantity: intField(1, { min: 0 }),
       notes: htmlField(""),
     }
   }

src/data/items/ingredient.js

@@ -24,7 +24,7 @@ export default class IngredientDataModel extends foundry.abstract.TypeDataModel
       school: stringField("all"),
       obtainLevel: intField(0, { min: 0, max: 5 }),
       obtainDifficulty: intField(0, { min: 0, max: 3 }),
-      quantity: intField(1),
+      quantity: intField(1, { min: 0 }),
       notes: htmlField(""),
     }
   }

src/data/items/kungfu.js

@@ -30,7 +30,7 @@ export default class KungfuDataModel extends foundry.abstract.TypeDataModel {
       reference: stringField(""),
       description: htmlField(""),
       orientation: stringField("yin"), // yin | yang | yinyang
-      aspect: stringField("metal"), // metal | eau | terre | feu | bois
+      aspect: stringField("metal"), // metal | water | earth | fire | wood
       skill: stringField("kungfu"), // kungfu | rangedcombat
       speciality: stringField(""),
       style: stringField(""),

src/data/items/spell.js

@@ -21,7 +21,7 @@ export default class SpellDataModel extends foundry.abstract.TypeDataModel {
       reference: stringField(""),
       description: htmlField(""),
       specialityname: stringField(""),
-      associatedelement: stringField("metal"), // metal | eau | terre | feu | bois
+      associatedelement: stringField("metal"), // metal | water | earth | fire | wood
       hei: stringField(""),
       realizationtimeritual: stringField(""),
       realizationtimeaccelerated: stringField(""),

src/data/items/weapon.js

@@ -17,18 +17,20 @@ export default class WeaponDataModel extends foundry.abstract.TypeDataModel {
     const stringField = (initial = "") => new fields.StringField({ required: true, nullable: false, initial })
     const htmlField = (initial = "") => new fields.HTMLField({ required: true, nullable: false, initial, textSearch: true })
     const intField = (initial = 0, opts = {}) => new fields.NumberField({ required: true, nullable: false, integer: true, initial, ...opts })
+    const boolField = (initial = false) => new fields.BooleanField({ required: true, initial })
 
     return {
       reference: stringField(""),
       description: htmlField(""),
+      hasSpeciality: boolField(false),
       weaponType: stringField("melee"),
       material: stringField(""),
       damageAspect: stringField("metal"),
-      damageBase: intField(1),
+      damageBase: intField(0),
       range: stringField("contact"), // contact | courte | mediane | longue | extreme
       obtainLevel: intField(0, { min: 0, max: 5 }),
       obtainDifficulty: intField(0, { min: 0, max: 3 }),
-      quantity: intField(1),
+      quantity: intField(1, { min: 0 }),
       notes: htmlField(""),
     }
   }

src/documents/combat.js

@@ -31,7 +31,9 @@ export class CDECombat extends Combat {
    * for each selected combatant, then sync the result to the Combatant document.
    */
   async rollInitiative(ids, options = {}) {
-    const combatantIds = typeof ids === "string" ? [ids] : ids
+    const combatantIds = ids
+      ? (typeof ids === "string" ? [ids] : ids)
+      : this.combatants.map(c => c.id)
     for (const id of combatantIds) {
       const combatant = this.combatants.get(id)
       if (!combatant) continue

src/migration/migrator.js

@@ -231,12 +231,103 @@ function migrateSupernaturalItem(oldItem) {
   }
 }
 
+function migrateWeaponItem(oldItem) {
+  const s = oldItem.system ?? {}
+  return {
+    name: oldItem.name,
+    type: "weapon",
+    img:  oldItem.img || DEFAULT_ITEM_IMG,
+    system: {
+      reference:         s.reference ?? "",
+      description:       s.description ?? "",
+      hasSpeciality:     Boolean(s.hasSpeciality),
+      weaponType:        s.weaponType || "melee",
+      material:          s.material ?? "",
+      damageAspect:      elementKey(s.damageAspect ?? ""),
+      damageBase:        Number(s.damageBase ?? 0),
+      range:             s.range || "contact",
+      obtainLevel:       Number(s.obtainLevel ?? 0),
+      obtainDifficulty:  Number(s.obtainDifficulty ?? 0),
+      quantity:          Number(s.quantity ?? 1),
+      notes:             s.notes ?? "",
+    },
+  }
+}
+
+function migrateArmorItem(oldItem) {
+  const s = oldItem.system ?? {}
+  return {
+    name: oldItem.name,
+    type: "armor",
+    img:  oldItem.img || DEFAULT_ITEM_IMG,
+    system: {
+      reference:         s.reference ?? "",
+      description:       s.description ?? "",
+      protectionValue:   Number(s.protectionValue ?? 0),
+      domain:            s.domain ?? "",
+      obtainLevel:       Number(s.obtainLevel ?? 0),
+      obtainDifficulty:  Number(s.obtainDifficulty ?? 0),
+      quantity:          Number(s.quantity ?? 1),
+      notes:             s.notes ?? "",
+    },
+  }
+}
+
+function migrateSanheiItem(oldItem) {
+  const s = oldItem.system ?? {}
+  const props = s.properties ?? {}
+  const propSchema = (p) => ({
+    name:        p?.name ?? "",
+    heiCost:     Number(p?.heiCost ?? 0),
+    heiType:     heiKey(p?.heiType ?? ""),
+    description: p?.description ?? "",
+  })
+  return {
+    name: oldItem.name,
+    type: "sanhei",
+    img:  oldItem.img || DEFAULT_ITEM_IMG,
+    system: {
+      reference:   s.reference ?? "",
+      description: s.description ?? "",
+      heiType:     heiKey(s.heiType ?? ""),
+      properties: {
+        prop1: propSchema(props.prop1),
+        prop2: propSchema(props.prop2),
+        prop3: propSchema(props.prop3),
+      },
+      notes: s.notes ?? "",
+    },
+  }
+}
+
+function migrateIngredientItem(oldItem) {
+  const s = oldItem.system ?? {}
+  return {
+    name: oldItem.name,
+    type: "ingredient",
+    img:  oldItem.img || DEFAULT_ITEM_IMG,
+    system: {
+      reference:         s.reference ?? "",
+      description:       s.description ?? "",
+      school:            s.school ?? "all",
+      obtainLevel:       Number(s.obtainLevel ?? 0),
+      obtainDifficulty:  Number(s.obtainDifficulty ?? 0),
+      quantity:          Number(s.quantity ?? 1),
+      notes:             s.notes ?? "",
+    },
+  }
+}
+
 function migrateItem(oldItem) {
   switch (oldItem.type) {
     case "item":          return migrateEquipmentItem(oldItem)
     case "kungfu":        return migrateKungfuItem(oldItem)
     case "spell":         return migrateSpellItem(oldItem)
     case "supernatural":  return migrateSupernaturalItem(oldItem)
+    case "weapon":        return migrateWeaponItem(oldItem)
+    case "armor":         return migrateArmorItem(oldItem)
+    case "sanhei":        return migrateSanheiItem(oldItem)
+    case "ingredient":    return migrateIngredientItem(oldItem)
     default:
       // Unknown item type: keep as generic equipment
       return migrateEquipmentItem({ ...oldItem, type: "item" })
@@ -329,6 +420,7 @@ function migrateCharacter(old) {
       resources,
       component,
       magics,
+      magicOrder: [],
       threetreasures,
       experience: {
         value: Number(s.experience?.value ?? 0),

src/system.js

@@ -28,6 +28,7 @@ import { CDEItemSheet, CDEKungfuSheet, CDESpellSheet, CDESupernaturalSheet, CDEW
 import { CDELoksyuApp } from "./ui/apps/loksyu-app.js"
 import { CDETinjiApp } from "./ui/apps/tinji-app.js"
 import { CDEWheelApp } from "./ui/apps/wheel-app.js"
+import { registerSingletonSocket } from "./ui/apps/singletons.js"
 import { injectRollActions, refreshAllRollActions } from "./ui/roll-actions.js"
 import { CDECombat } from "./documents/combat.js"
 import { showWelcomeMessage, injectWelcomeActions } from "./ui/apps/welcome.js"
@@ -35,7 +36,18 @@ import { showWelcomeMessage, injectWelcomeActions } from "./ui/apps/welcome.js"
 Hooks.once("i18nInit", preLocalizeConfig)
 
 Hooks.once("init", async () => {
-  console.info(`CHRONIQUESDELETRANGE | Initializing ${SYSTEM_ID}`)
+  console.log(
+    "%c╔══════════════════════════════════════════════════════════╗\n" +
+    "%c║              Chroniques de l'Étrange — FoundryVTT        ║\n" +
+    "%c║              Système de jeu par Antre-Monde Éditions     ║\n" +
+    "%c║          Made by Uberwald - https://www.ubwerwald.me      ║\n" +
+    "%c╚══════════════════════════════════════════════════════════╝",
+    "color: #d4af37; font-weight: bold;",
+    "color: #e2e8f4;",
+    "color: #7d94b8;",
+    "color: #5a7a9a;",
+    "color: #d4af37; font-weight: bold;",
+  )
 
   registerSettings()
 
@@ -133,6 +145,7 @@ Hooks.once("ready", async () => {
   await migrateIfNeeded()
   await loadWelcomeSceneIfNeeded()
   CDEWheelApp.registerHooks()
+  registerSingletonSocket()
   if (game.user.isGM) showWelcomeMessage()
 })
 

src/ui/apps/loksyu-app.js

@@ -43,6 +43,9 @@ export class CDELoksyuApp extends foundry.applications.api.HandlebarsApplication
   /** @type {Function|null} bound hook handler */
   _updateHook = null
 
+  /** @type {Function|null} updateSetting hook handler (for socket-propagated writes) */
+  _settingHook = null
+
   /** Singleton accessor — open or bring to front */
   static open() {
     const existing = Array.from(foundry.applications.instances.values()).find(
@@ -78,7 +81,14 @@ export class CDELoksyuApp extends foundry.applications.api.HandlebarsApplication
     super._onRender(context, options)
     this.#bindInputs()
 
-    this._updateHook = Hooks.on("cde:loksyuUpdated", () => this.render())
+    if (!this._updateHook) {
+      this._updateHook = Hooks.on("cde:loksyuUpdated", () => this.render())
+    }
+    if (!this._settingHook) {
+      this._settingHook = Hooks.on("updateSetting", (setting) => {
+        if (setting.key === `${SYSTEM_ID}.loksyuData`) this.render()
+      })
+    }
   }
 
   _onClose(options) {
@@ -86,6 +96,10 @@ export class CDELoksyuApp extends foundry.applications.api.HandlebarsApplication
       Hooks.off("cde:loksyuUpdated", this._updateHook)
       this._updateHook = null
     }
+    if (this._settingHook !== null) {
+      Hooks.off("updateSetting", this._settingHook)
+      this._settingHook = null
+    }
     super._onClose(options)
   }
 

src/ui/apps/migration-app.js

@@ -1,16 +1,3 @@
-/**
- * Chroniques de l'Étrange — Système FoundryVTT
- *
- * Chroniques de l'Étrange est un jeu de rôle édité par Antre-Monde Éditions.
- * Ce système FoundryVTT est une implémentation indépendante et n'est pas
- * affilié à Antre-Monde Éditions,
- * mais a été réalisé avec l'autorisation d'Antre-Monde Éditions.
- *
- * @author    LeRatierBretonnien
- * @copyright 2024–2026 LeRatierBretonnien
- * @license   CC BY-NC-SA 4.0 – https://creativecommons.org/licenses/by-nc-sa/4.0/
- */
-
 import { parseLegacyJson } from "../../migration/migrator.js"
 
 const MIGRATION_TEMPLATE = "systems/fvtt-chroniques-de-l-etrange/templates/apps/cde-migration-app.html"
@@ -33,10 +20,12 @@ export class CDEMigrationApp extends foundry.applications.api.HandlebarsApplicat
       icon:      "fas fa-file-import",
       resizable: false,
     },
-    position: { width: 560, height: "auto" },
+    position: { width: 600, height: "auto" },
     actions: {
-      clearFiles:   CDEMigrationApp.#clearFiles,
-      doImport:     CDEMigrationApp.#doImport,
+      clearFiles:    CDEMigrationApp.#clearFiles,
+      doImport:      CDEMigrationApp.#doImport,
+      confirmImport: CDEMigrationApp.#confirmImport,
+      cancelImport:  CDEMigrationApp.#cancelImport,
     },
   }
 
@@ -50,13 +39,31 @@ export class CDEMigrationApp extends foundry.applications.api.HandlebarsApplicat
   /** @type {string[]} - error messages per file */
   #errors = []
 
+  /** @type {"idle"|"confirm"|"importing"} */
+  #importState = "idle"
+
+  /** @type {number} - actors created so far (during importing) */
+  #progress = 0
+
   async _prepareContext(options) {
+    // Compute _duplicate live from the world each render, to avoid stale flags
+    const enrichDuplicate = (a) => ({
+      ...a,
+      _duplicate: game.actors?.getName(a.name) !== null,
+    })
+    const pending = this.#pending.map(enrichDuplicate)
+    const duplicateCount = pending.filter(a => a._duplicate).length
     return {
-      pending:    this.#pending,
+      pending,
       errors:     this.#errors,
       hasPending: this.#pending.length > 0,
       hasErrors:  this.#errors.length > 0,
+      hasDuplicates: duplicateCount > 0,
+      duplicateCount,
       count:      this.#pending.length,
+      importState: this.#importState,
+      progress:   this.#progress,
+      total:      this.#pending.length,
     }
   }
 
@@ -95,43 +102,68 @@ export class CDEMigrationApp extends foundry.applications.api.HandlebarsApplicat
         const actors = parseLegacyJson(text)
         for (const actor of actors) {
           actor._srcFile = file.name
-          // Avoid duplicates by name
-          if (!this.#pending.some(p => p.name === actor.name)) {
-            this.#pending.push(actor)
+          // Avoid duplicates-by-name in our pending list
+          if (this.#pending.some(p => p.name === actor.name)) {
+            this.#errors.push(`« ${actor.name} » ignoré (nom déjà dans la liste d'attente, fichier « ${file.name} »)`)
+            continue
           }
+          this.#pending.push(actor)
         }
       } catch (err) {
         this.#errors.push(game.i18n.format("CDE.MigrationErrorParse", { file: file.name, error: err.message }))
       }
     }
+    this.#importState = "idle"
     this.render()
   }
 
   static async #clearFiles() {
     this.#pending = []
     this.#errors = []
+    this.#importState = "idle"
+    this.#progress = 0
     this.render()
   }
 
+  /** First click: switch to confirmation state instead of importing immediately. */
   static async #doImport() {
     if (!this.#pending.length) return
+    this.#importState = "confirm"
+    this.render()
+  }
 
+  /** Second click: actually perform the import. */
+  static async #confirmImport() {
+    if (!this.#pending.length) return
+
+    this.#importState = "importing"
+    this.#progress = 0
+    this.render()
+
+    const total = this.#pending.length
     const created = []
     const failed  = []
 
-    for (const data of this.#pending) {
+    for (let i = 0; i < total; i++) {
+      const data = this.#pending[i]
       try {
         const { _srcFile, ...actorData } = data
         const actor = await Actor.create(actorData)
         created.push(actor.name)
       } catch (err) {
         failed.push(`${data.name}: ${err.message}`)
-        console.error(`CHRONIQUESDELETRANGE | Migration failed for "${data.name}":`, err)
+        console.error(`CHRONIQUESDELETRANGE | Import failed for "${data.name}":`, err)
       }
+      this.#progress = i + 1
+      // Live-update the progress element in the DOM without full re-render
+      const progEl = this.element?.querySelector(".cde-migration-progress-count")
+      if (progEl) progEl.textContent = `${this.#progress}/${total}`
     }
 
     this.#pending = []
     this.#errors = failed
+    this.#importState = "idle"
+    this.#progress = 0
     this.render()
 
     if (created.length) {
@@ -145,4 +177,9 @@ export class CDEMigrationApp extends foundry.applications.api.HandlebarsApplicat
       )
     }
   }
+
+  static async #cancelImport() {
+    this.#importState = "idle"
+    this.render()
+  }
 }

src/ui/apps/singletons.js

@@ -15,10 +15,14 @@
  * Loksyu / TinJi settings-based helpers.
  *
  * Data is stored as world settings instead of singleton Actor documents.
+ * Socket-based replication allows non-GM players to update Loksyu and
+ * TinJi — the GM processes the actual writes.
  */
 
 import { SYSTEM_ID, WU_XING_CYCLE, ASPECT_FACES } from "../../config/constants.js"
 
+const SOCKET_CHANNEL = `system.${SYSTEM_ID}`
+
 /** Read the current loksyu data object from world settings */
 export function getLoksyuData() {
   return game.settings.get(SYSTEM_ID, "loksyuData") ?? {
@@ -26,27 +30,112 @@ export function getLoksyuData() {
   }
 }
 
-/** Write the loksyu data object to world settings */
-export async function setLoksyuData(data) {
+/** Write the loksyu data object to world settings (GM only). */
+async function writeLoksyuData(data) {
   await game.settings.set(SYSTEM_ID, "loksyuData", data)
   Hooks.callAll("cde:loksyuUpdated", data)
 }
 
+/** Write TinJi value to world settings (GM only). */
+async function writeTinjiValue(value) {
+  value = Math.max(0, value)
+  await game.settings.set(SYSTEM_ID, "tinjiData", value)
+  Hooks.callAll("cde:tinjiUpdated", value)
+}
+
+/** Write the loksyu data object — non-GM emits via socket. */
+export async function setLoksyuData(data) {
+  if (game.user.isGM) return writeLoksyuData(data)
+  game.socket.emit(SOCKET_CHANNEL, { action: "setLoksyuData", data })
+}
+
 /** Read current TinJi value from world settings */
 export function getTinjiValue() {
   return game.settings.get(SYSTEM_ID, "tinjiData") ?? 0
 }
 
-/** Write TinJi value to world settings */
+/** Write TinJi value — non-GM emits via socket. */
 export async function setTinjiValue(value) {
-  await game.settings.set(SYSTEM_ID, "tinjiData", Math.max(0, value))
-  Hooks.callAll("cde:tinjiUpdated", Math.max(0, value))
+  if (game.user.isGM) return writeTinjiValue(value)
+  game.socket.emit(SOCKET_CHANNEL, { action: "setTinjiValue", value })
+}
+
+/**
+ * Non-GM: request an atomic Loksyu die draw via socket. The GM reads
+ * current state, decrements, and writes — avoiding stale-read races.
+ */
+export function requestLoksyuDraw(aspect, order) {
+  game.socket.emit(SOCKET_CHANNEL, { action: "loksyuDraw", aspect, order })
+}
+
+/**
+ * Non-GM: request an atomic TinJi spend via socket. The GM reads current
+ * value, decrements if > 0, and writes.
+ */
+export function requestTinjiSpend() {
+  game.socket.emit(SOCKET_CHANNEL, { action: "tinjiSpend" })
+}
+
+/**
+ * Register the socket listener that processes Loksyu/TinJi write requests
+ * from non-GM clients. Only the GM actually performs the writes; other
+ * clients ignore the message.
+ *
+ * Must be called after the `ready` hook (when game.socket is available).
+ */
+export function registerSingletonSocket() {
+  game.socket.on(SOCKET_CHANNEL, async (payload) => {
+    if (!game.user.isGM) return
+    switch (payload.action) {
+      case "setLoksyuData":
+        await writeLoksyuData(payload.data)
+        break
+      case "setTinjiValue":
+        await writeTinjiValue(payload.value)
+        break
+      case "updateLoksyuFromRoll":
+        await updateLoksyuFromRoll(payload.activeAspect, payload.faces)
+        break
+      case "updateTinjiFromRoll":
+        await updateTinjiFromRoll(payload.delta)
+        break
+      case "loksyuDraw": {
+        const data = getLoksyuData()
+        const entry = data[payload.aspect] ?? { yin: 0, yang: 0 }
+        const order = payload.order ?? "yang-first"
+        if (order === "yin-first") {
+          if (entry.yin > 0) entry.yin--
+          else entry.yang--
+        } else if (order === "balanced") {
+          if (entry.yin > entry.yang) entry.yin--
+          else if (entry.yang > entry.yin) entry.yang--
+          else if (entry.yang > 0) entry.yang--
+          else entry.yin--
+        } else {
+          if (entry.yang > 0) entry.yang--
+          else entry.yin--
+        }
+        data[payload.aspect] = entry
+        await writeLoksyuData(data)
+        break
+      }
+      case "tinjiSpend": {
+        const cur = getTinjiValue()
+        if (cur > 0) await writeTinjiValue(cur - 1)
+        break
+      }
+    }
+  })
 }
 
 /**
  * After a WuXing roll, add the loksyu faces (yin + yang) of the relevant
  * aspect to the loksyu settings data.
  *
+ * Non-GM: emits raw activeAspect+faces via socket so the GM recomputes
+ * from current state — avoids stale-read races when two players roll
+ * simultaneously.
+ *
  * @param {string} activeAspect  - e.g. "fire"
  * @param {Object} faces         - Die face counts { 0: n, 1: n, …, 9: n }
  */
@@ -62,22 +151,30 @@ export async function updateLoksyuFromRoll(activeAspect, faces) {
   const yangCount = faces[yangFace] ?? 0
   if (yinCount === 0 && yangCount === 0) return
 
-  const data = getLoksyuData()
-  const current = data[lokAspect] ?? { yin: 0, yang: 0 }
-  data[lokAspect] = {
-    yin:  (current.yin  ?? 0) + yinCount,
-    yang: (current.yang ?? 0) + yangCount,
+  if (game.user.isGM) {
+    const data = getLoksyuData()
+    const current = data[lokAspect] ?? { yin: 0, yang: 0 }
+    data[lokAspect] = { yin: (current.yin ?? 0) + yinCount, yang: (current.yang ?? 0) + yangCount }
+    await writeLoksyuData(data)
+  } else {
+    game.socket.emit(SOCKET_CHANNEL, { action: "updateLoksyuFromRoll", activeAspect, faces })
   }
-  await setLoksyuData(data)
 }
 
 /**
  * After a WuXing roll, add tinji faces to the TinJi settings.
  *
+ * Non-GM: emits delta via socket so the GM adds to the current value
+ * atomically.
+ *
  * @param {number} count - Number of tinji faces rolled
  */
 export async function updateTinjiFromRoll(count) {
   if (!count || count <= 0) return
-  const current = getTinjiValue()
-  await setTinjiValue(current + count)
+  if (game.user.isGM) {
+    const current = getTinjiValue()
+    await writeTinjiValue(current + count)
+  } else {
+    game.socket.emit(SOCKET_CHANNEL, { action: "updateTinjiFromRoll", delta: count })
+  }
 }

src/ui/apps/tinji-app.js

@@ -44,6 +44,9 @@ export class CDETinjiApp extends foundry.applications.api.HandlebarsApplicationM
   /** @type {Function|null} */
   _updateHook = null
 
+  /** @type {Function|null} */
+  _settingHook = null
+
   static open() {
     const existing = Array.from(foundry.applications.instances.values()).find(
       (app) => app instanceof CDETinjiApp
@@ -64,7 +67,14 @@ export class CDETinjiApp extends foundry.applications.api.HandlebarsApplicationM
   _onRender(context, options) {
     super._onRender(context, options)
     this.#bindDirectInput()
-    this._updateHook = Hooks.on("cde:tinjiUpdated", () => this.render())
+    if (!this._updateHook) {
+      this._updateHook = Hooks.on("cde:tinjiUpdated", () => this.render())
+    }
+    if (!this._settingHook) {
+      this._settingHook = Hooks.on("updateSetting", (setting) => {
+        if (setting.key === `${SYSTEM_ID}.tinjiData`) this.render()
+      })
+    }
   }
 
   _onClose(options) {
@@ -72,6 +82,10 @@ export class CDETinjiApp extends foundry.applications.api.HandlebarsApplicationM
       Hooks.off("cde:tinjiUpdated", this._updateHook)
       this._updateHook = null
     }
+    if (this._settingHook !== null) {
+      Hooks.off("updateSetting", this._settingHook)
+      this._settingHook = null
+    }
     super._onClose(options)
   }
 
@@ -105,7 +119,7 @@ export class CDETinjiApp extends foundry.applications.api.HandlebarsApplicationM
       return
     }
     await setTinjiValue(current - 1)
-    ChatMessage.create({
+    await ChatMessage.create({
       user:    game.user.id,
       content: `<div class="cde-tinji-spend-msg">
         <i class="fas fa-star"></i>

src/ui/roll-actions.js

@@ -20,7 +20,7 @@
  * with the new counts, without creating noise.
  */
 
-import { getLoksyuData, setLoksyuData, getTinjiValue, setTinjiValue } from "./apps/singletons.js"
+import { getLoksyuData, setLoksyuData, getTinjiValue, setTinjiValue, requestLoksyuDraw, requestTinjiSpend } from "./apps/singletons.js"
 import { SYSTEM_ID, WU_XING_CYCLE, ASPECT_LABELS, ASPECT_ICONS } from "../config/constants.js"
 
 const RESULT_TEMPLATE = "systems/fvtt-chroniques-de-l-etrange/templates/form/cde-dice-result.html"
@@ -53,9 +53,8 @@ function refreshRollActions(rollCard, aspect, message) {
 
   const successAvail = (loksyu[aspect]?.yin ?? 0) + (loksyu[aspect]?.yang ?? 0)
   const fasteAvail   = (loksyu[fasteAspect]?.yin ?? 0) + (loksyu[fasteAspect]?.yang ?? 0)
-  const isGM         = game.user.isGM
 
-  const hasSomething = successAvail > 0 || fasteAvail > 0 || (isGM && tinji > 0)
+  const hasSomething = successAvail > 0 || fasteAvail > 0 || tinji > 0
   if (!hasSomething) return
 
   const aspLabel   = game.i18n.localize(ASPECT_LABELS[aspect])
@@ -79,7 +78,7 @@ function refreshRollActions(rollCard, aspect, message) {
     </button>`
   }
 
-  if (isGM && tinji > 0) {
+  if (tinji > 0) {
     btns += `<button class="cde-roll-action-btn cde-roll-action--tinji" data-action="tinji">
       <span class="cde-roll-action-tinji-char">天</span>
       <span class="cde-roll-action-label">${game.i18n.localize("CDE.TinJi2")}</span>
@@ -133,11 +132,27 @@ async function _drawFromLoksyu(message, aspect, type, aspectLabel) {
     return
   }
 
-  // Remove 1 die (prefer yang first)
-  if (entry.yang > 0) entry.yang--
-  else entry.yin--
+  // Remove 1 die according to the consumption order setting
+  const order = game.settings.get(SYSTEM_ID, "loksyuConsumptionOrder")
+  if (order === "yin-first") {
+    if (entry.yin > 0) entry.yin--
+    else entry.yang--
+  } else if (order === "balanced") {
+    if (entry.yin > entry.yang) entry.yin--
+    else if (entry.yang > entry.yin) entry.yang--
+    else if (entry.yang > 0) entry.yang--
+    else entry.yin--
+  } else {
+    // yang-first (default)
+    if (entry.yang > 0) entry.yang--
+    else entry.yin--
+  }
   data[aspect] = entry
-  await setLoksyuData(data)
+  if (game.user.isGM) {
+    await setLoksyuData(data)
+  } else {
+    requestLoksyuDraw(aspect, order)
+  }
 
   // Update the roll-result message in-place if it has stored flags
   const flags = message?.flags?.[SYSTEM_ID]
@@ -147,7 +162,7 @@ async function _drawFromLoksyu(message, aspect, type, aspectLabel) {
       updated.successesdice    = (updated.successesdice ?? 0) + 1
       updated.loksyuBonusSuc   = (updated.loksyuBonusSuc ?? 0) + 1
       // Recalculate weapon damage if applicable
-      if (updated.damageBase) updated.totalDamage = updated.successesdice * updated.damageBase
+      if (updated.damageBase != null) updated.totalDamage = updated.damageBase + (updated.damageAspectValue ?? 0)
     } else {
       updated.auspiciousdice  = (updated.auspiciousdice ?? 0) + 1
       updated.loksyuBonusFaste = (updated.loksyuBonusFaste ?? 0) + 1
@@ -165,7 +180,7 @@ async function _drawFromLoksyu(message, aspect, type, aspectLabel) {
     ? game.i18n.localize("CDE.Successes")
     : game.i18n.localize("CDE.AuspiciousDie")
 
-  ChatMessage.create({
+  await ChatMessage.create({
     user:    game.user.id,
     content: `<div class="cde-loksyu-draw-msg">
       <div class="cde-loksyu-draw-header">
@@ -188,14 +203,17 @@ async function _drawFromLoksyu(message, aspect, type, aspectLabel) {
  * Spend 1 Tin Ji point (GM only) and post a notification.
  */
 async function _spendTinjiPostRoll() {
-  if (!game.user.isGM) return
   const current = getTinjiValue()
   if (current <= 0) {
     ui.notifications.warn(game.i18n.localize("CDE.TinjiEmpty"))
     return
   }
-  await setTinjiValue(current - 1)
-  ChatMessage.create({
+  if (game.user.isGM) {
+    await setTinjiValue(current - 1)
+  } else {
+    requestTinjiSpend()
+  }
+  await ChatMessage.create({
     user:    game.user.id,
     content: `<div class="cde-tinji-spend-msg">
       <span class="cde-tinji-icon">天</span>