Foundry v13 migration

changelog.md

@@ -1,3 +1,8 @@
+v12.0.0
+
+- Support Foundry v11/v12
+- Correction sur le niveau de jeu par défaut
+ 
 v11.0.39
 
 - Modification sur la prise en compte des traits en bonus/malus

modules/actors/ecryme-actor-sheet.js

@@ -6,12 +6,12 @@
 import { EcrymeUtility } from "../common/ecryme-utility.js";
 
 /* -------------------------------------------- */
-export class EcrymeActorSheet extends ActorSheet {
+export class EcrymeActorSheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-ecryme", "sheet", "actor"],
       template: "systems/fvtt-ecryme/templates/actors/actor-sheet.hbs",
       width: 860,
@@ -33,7 +33,7 @@ export class EcrymeActorSheet extends ActorSheet {
       name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      system: duplicate(this.object.system),
+      system: foundry.utils.duplicate(this.object.system),
       limited: this.object.limited,
       skills: this.actor.prepareSkills(),
       traits: this.actor.getRollTraits(),
@@ -41,21 +41,21 @@ export class EcrymeActorSheet extends ActorSheet {
       ideal: this.actor.getIdeal(),
       spleen: this.actor.getSpleen(),
       impacts: this.object.getImpacts(),
-      config: duplicate(game.system.ecryme.config),
+      config: foundry.utils.duplicate(game.system.ecryme.config),
       weapons: this.actor.getWeapons(),
       maneuvers: this.actor.getManeuvers(),
       impactsMalus: this.actor.getImpactsMalus(),
-      archetype: duplicate(this.actor.getArchetype()),
+      archetype: foundry.utils.duplicate(this.actor.getArchetype()),
       equipments: this.actor.getEquipments(),
       hasCephaly: EcrymeUtility.hasCephaly(),
       hasBoheme: EcrymeUtility.hasBoheme(),
       hasAmertume: EcrymeUtility.hasAmertume(),
       cephalySkills: this.actor.getCephalySkills(),
-      subActors: duplicate(this.actor.getSubActors()),
+      subActors: foundry.utils.duplicate(this.actor.getSubActors()),
       annency: this.actor.getAnnency(),
-      description: await TextEditor.enrichHTML(this.object.system.biodata.description, { async: true }),
+      description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, { async: true }),
-      notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, { async: true }),
+      notes: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.notes, { async: true }),
-      equipementlibre: await TextEditor.enrichHTML(this.object.system.equipmentfree, { async: true }),
+      equipementlibre: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.equipmentfree, { async: true }),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -75,10 +75,10 @@ export class EcrymeActorSheet extends ActorSheet {
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
-    
+
     html.bind("keydown", function(e) { // Ignore Enter in actores sheet
       if (e.keyCode === 13) return false;
-    });  
+    });
 
     html.find('.open-annency').click(ev => {
       let actorId = $(ev.currentTarget).data("annency-id")
@@ -90,6 +90,9 @@ export class EcrymeActorSheet extends ActorSheet {
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item")
       let itemId = li.data("item-id")
+      if (!itemId) {
+        itemId = $(ev.currentTarget).data("item-id")
+      }
       const item = this.actor.items.get( itemId );
       item.sheet.render(true);
     });
@@ -102,14 +105,14 @@ export class EcrymeActorSheet extends ActorSheet {
       let dataType = $(ev.currentTarget).data("type")
       this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true })
     })
-        
+
     html.find('.subactor-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       let actorId = li.data("actor-id");
       let actor = game.actors.get( actorId );
       actor.sheet.render(true);
     });
-    
+
     html.find('.subactor-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       let actorId = li.data("actor-id");
@@ -128,13 +131,13 @@ export class EcrymeActorSheet extends ActorSheet {
       let categKey = $(event.currentTarget).data("category-key")
       let skillKey = $(event.currentTarget).data("skill-key")
       this.actor.rollSkill(categKey, skillKey)
-    });    
+    });
     html.find('.roll-spec').click((event) => {
       let categKey = $(event.currentTarget).data("category-key")
       let skillKey = $(event.currentTarget).data("skill-key")
       let specId = $(event.currentTarget).data("spec-id")
       this.actor.rollSpec(categKey, skillKey, specId)
-    });    
+    });
     html.find('.roll-skill-confront').click((event) => {
       let categKey = $(event.currentTarget).data("category-key")
       let skillKey = $(event.currentTarget).data("skill-key")
@@ -148,36 +151,36 @@ export class EcrymeActorSheet extends ActorSheet {
       const li = $(event.currentTarget).parents(".item")
       let weaponId = li.data("item-id");
       this.actor.rollWeaponConfront(weaponId)
-    });    
+    });
-    
+
     html.find('.impact-modify').click((event) => {
       let impactType = $(event.currentTarget).data("impact-type")
       let impactLevel = $(event.currentTarget).data("impact-level")
       let modifier = Number($(event.currentTarget).data("impact-modifier"))
       this.actor.modifyImpact(impactType, impactLevel, modifier)
     });
-    
+
     html.find('.roll-weapon').click((event) => {
       const armeId = $(event.currentTarget).data("arme-id")
       this.actor.rollArme(armeId)
     });
-    
+
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
       this.render(true);
-    });    
+    });
     html.find('.item-equip').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       this.actor.equipItem( li.data("item-id") );
-      this.render(true);      
+      this.render(true);
     });
     html.find('.update-field').change(ev => {
       const fieldName = $(ev.currentTarget).data("field-name");
       let value = Number(ev.currentTarget.value);
       this.actor.update( { [`${fieldName}`]: value } );
-    });    
+    });
   }
-  
+
   /* -------------------------------------------- */
   /** @override */
   setPosition(options = {}) {

modules/actors/ecryme-actor.js

@@ -29,7 +29,7 @@ export class EcrymeActor extends Actor {
     if (data instanceof Array) {
       return super.create(data, options);
     }
-    // If the created actor has items (only applicable to duplicated actors) bypass the new actor creation logic
+    // If the created actor has items (only applicable to foundry.utils.duplicated actors) bypass the new actor creation logic
     if (data.items) {
       let actor = super.create(data, options);
       return actor;
@@ -73,7 +73,7 @@ export class EcrymeActor extends Actor {
     return comp;
   }
   getArchetype() {
-    let comp = duplicate(this.items.find(item => item.type == 'archetype') || { name: "Pas d'archetype" })
+    let comp = foundry.utils.duplicate(this.items.find(item => item.type == 'archetype') || { name: "Pas d'archetype" })
     if (comp?.system) {
       comp.tarot = EcrymeUtility.getTarot(comp.system.lametutelaire)
     }
@@ -92,7 +92,7 @@ export class EcrymeActor extends Actor {
   }
   /* -----------------------  --------------------- */
   addAnnencyActor(actorId) {
-    let members = duplicate(this.system.base.characters)
+    let members = foundry.utils.duplicate(this.system.base.characters)
     members.push(actorId)
     this.update({ 'system.base.characters': members })
   }
@@ -103,7 +103,8 @@ export class EcrymeActor extends Actor {
 
   /* -------------------------------------------- */
   getAnnency() {
-    return game.actors.find(a => a.type == 'annency' && a.system.base.characters.includes(this.id))
+    let annency = game.actors.find(a => a.type == 'annency' && a.system.base.characters.includes(this.id))
+    return annency || {}
   }
   /* -------------------------------------------- */
   getConfrontations() {
@@ -135,7 +136,7 @@ export class EcrymeActor extends Actor {
   }
   /* -------------------------------------------- */
   prepareSkills() {
-    let skills = duplicate(this.system.skills)
+    let skills = foundry.utils.duplicate(this.system.skills)
     for (let categKey in skills) {
       let category = skills[categKey]
       for (let skillKey in category.skilllist) {
@@ -147,22 +148,22 @@ export class EcrymeActor extends Actor {
   }
   /* -------------------------------------------- */
   getCephalySkills() {
-    let skills = duplicate(this.system.cephaly.skilllist)
+    let skills = foundry.utils.duplicate(this.system.cephaly.skilllist)
     return skills
   }
   /* -------------------------------------------- */
   getImpacts() {
-    let comp = duplicate(this.items.filter(item => item.type == 'impact') || [])
+    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'impact') || [])
     return comp;
   }
   /* -------------------------------------------- */
   getWeapons() {
-    let comp = duplicate(this.items.filter(item => item.type == 'weapon') || [])
+    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'weapon') || [])
     EcrymeUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   getManeuvers() {
-    let comp = duplicate(this.items.filter(item => item.type == 'maneuver') || [])
+    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'maneuver') || [])
     EcrymeUtility.sortArrayObjectsByName(comp)
     return comp;
   }
@@ -170,7 +171,7 @@ export class EcrymeActor extends Actor {
   getItemById(id) {
     let item = this.items.find(item => item.id == id);
     if (item) {
-      item = duplicate(item)
+      item = foundry.utils.duplicate(item)
     }
     return item;
   }
@@ -205,7 +206,7 @@ export class EcrymeActor extends Actor {
 
   /* ------------------------------------------- */
   async buildContainerTree() {
-    let equipments = duplicate(this.items.filter(item => item.type == "equipment") || [])
+    let equipments = foundry.utils.duplicate(this.items.filter(item => item.type == "equipment") || [])
     for (let equip1 of equipments) {
       if (equip1.system.iscontainer) {
         equip1.system.contents = []
@@ -300,13 +301,13 @@ export class EcrymeActor extends Actor {
   getSubActors() {
     let subActors = [];
     for (let id of this.system.subactors) {
-      subActors.push(duplicate(game.actors.get(id)))
+      subActors.push(foundry.utils.duplicate(game.actors.get(id)))
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = duplicate(this.system.subactors);
+    let subActors = foundry.utils.duplicate(this.system.subactors);
     subActors.push(subActorId);
     await this.update({ 'system.subactors': subActors });
   }
@@ -377,9 +378,10 @@ export class EcrymeActor extends Actor {
     rollData.actorId = this.id
     rollData.img = this.img
     rollData.isReroll = false
-    rollData.traits = duplicate(this.getRollTraits())
+    rollData.config = game.system.ecryme.config
-    rollData.spleen = duplicate(this.getSpleen() || {})
+    rollData.traits = foundry.utils.duplicate(this.getRollTraits())
-    rollData.ideal = duplicate(this.getIdeal() || {})
+    rollData.spleen = foundry.utils.duplicate(this.getSpleen() || {})
+    rollData.ideal = foundry.utils.duplicate(this.getIdeal() || {})
     rollData.confrontBonus = this.getBonusList()
 
     return rollData
@@ -387,14 +389,30 @@ export class EcrymeActor extends Actor {
 
   /* -------------------------------------------- */
   getCommonSkill(categKey, skillKey) {
-    let skill = this.system.skills[categKey].skilllist[skillKey]
     let rollData = this.getCommonRollData()
+
+    // Specific NPC case
+    let skill
+    if (skillKey == "rawnpc") {
+      skill = {
+            name: "ECRY.ui." + categKey,
+            max: 10,
+            value: this.system.skills[categKey].pnjvalue,
+            spec: []
+      }
+    } else {
+      skill = this.system.skills[categKey].skilllist[skillKey]
+      skill = foundry.utils.duplicate(skill)
+      skill.spec = this.getSpecializations(skillKey)  
+    }
     
-    skill = duplicate(skill)
+    rollData.skillLevelOptions = [];
+    for (let i=0; i<=skill.value; i++) {
+      rollData.skillLevelOptions[i] = `${i}`
+    }
+
     skill.categKey = categKey
     skill.skillKey = skillKey
-    skill.spec = this.getSpecializations(skillKey)
-
     rollData.skill = skill
     rollData.img = skill.img
     rollData.impactMalus = this.getImpactMalus(categKey)
@@ -416,7 +434,7 @@ export class EcrymeActor extends Actor {
     let spec = this.items.find(it => it.type == "specialization" && it.id == specId)
     rollData.mode = "skill"
     rollData.selectedSpecs = [spec.id]
-    rollData.forcedSpec = duplicate(spec)
+    rollData.forcedSpec = foundry.utils.duplicate(spec)
     rollData.title = game.i18n.localize(rollData.skill.name)
     this.startRoll(rollData).catch("Error on startRoll")
   }
@@ -429,8 +447,9 @@ export class EcrymeActor extends Actor {
     rollData.executionTotal    = rollData.skill.value
     rollData.preservationTotal = rollData.skill.value
     rollData.applyTranscendence = "execution"
-    rollData.traitsBonus = duplicate(rollData.traits)
+    rollData.traitsBonus = foundry.utils.duplicate(rollData.traits)
-    rollData.traitsMalus = duplicate(rollData.traits)
+    rollData.traitsMalus = foundry.utils.duplicate(rollData.traits)
+    console.log("ROLLDATA", rollData)
     let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
     confrontStartDialog.render(true)
   }
@@ -438,17 +457,16 @@ export class EcrymeActor extends Actor {
   async rollCephalySkillConfront(skillKey) {
     let rollData = this.getCommonRollData()
     rollData.mode = "cephaly"
-    rollData.skill = duplicate(this.system.cephaly.skilllist[skillKey])
+    rollData.skill = foundry.utils.duplicate(this.system.cephaly.skilllist[skillKey])
-    rollData.annency = duplicate(this.getAnnency())
+    rollData.annency = foundry.utils.duplicate(this.getAnnency())
     rollData.img = rollData.skill.img
     rollData.skill.categKey = "cephaly"
     rollData.skill.skillKey = skillKey
-    //rollData.impactMalus = this.getImpactMalus(categKey)
     rollData.title = game.i18n.localize("ECRY.ui.cephaly") + " : " + game.i18n.localize(rollData.skill.name)
     rollData.executionTotal    = rollData.skill.value
     rollData.preservationTotal = rollData.skill.value
-    rollData.traitsBonus = duplicate(rollData.traits)
+    rollData.traitsBonus = foundry.utils.duplicate(rollData.traits)
-    rollData.traitsMalus = duplicate(rollData.traits)
+    rollData.traitsMalus = foundry.utils.duplicate(rollData.traits)
     rollData.applyTranscendence = "execution"
     let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
     confrontStartDialog.render(true)
@@ -464,12 +482,12 @@ export class EcrymeActor extends Actor {
       rollData = this.getCommonSkill("physical", "shooting")
     }
     rollData.mode = "weapon"
-    rollData.weapon = duplicate(weapon)
+    rollData.weapon = foundry.utils.duplicate(weapon)
     rollData.title = game.i18n.localize("ECRY.ui.confrontation") + " : " + game.i18n.localize(rollData.skill.name)
     rollData.executionTotal    = rollData.skill.value
     rollData.preservationTotal = rollData.skill.value
-    rollData.traitsBonus = duplicate(rollData.traits)
+    rollData.traitsBonus = foundry.utils.duplicate(rollData.traits)
-    rollData.traitsMalus = duplicate(rollData.traits)
+    rollData.traitsMalus = foundry.utils.duplicate(rollData.traits)
     rollData.applyTranscendence = "execution"
     let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
     confrontStartDialog.render(true)
@@ -479,12 +497,12 @@ export class EcrymeActor extends Actor {
   rollWeapon(weaponId) {
     let weapon = this.items.get(weaponId)
     if (weapon) {
-      weapon = duplicate(weapon)
+      weapon = foundry.utils.duplicate(weapon)
       let rollData = this.getCommonRollData()
       if (weapon.system.armetype == "mainsnues" || weapon.system.armetype == "epee") {
         rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor((this.getPhysiqueMalus() + this.system.attributs.physique.value + this.system.attributs.habilite.value) / 2) }
       } else {
-        rollData.attr = duplicate(this.system.attributs.habilite)
+        rollData.attr = foundry.utils.duplicate(this.system.attributs.habilite)
       }
       rollData.mode = "weapon"
       rollData.weapon = weapon

modules/actors/ecryme-annency-sheet.js

@@ -6,12 +6,12 @@
 import { EcrymeUtility } from "../common/ecryme-utility.js";
 
 /* -------------------------------------------- */
-export class EcrymeAnnencySheet extends ActorSheet {
+export class EcrymeAnnencySheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-ecryme", "sheet", "actor"],
       template: "systems/fvtt-ecryme/templates/actors/annency-sheet.hbs",
       width: 640,
@@ -33,9 +33,9 @@ export class EcrymeAnnencySheet extends ActorSheet {
       name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      system: duplicate(this.object.system),
+      system: foundry.utils.duplicate(this.object.system),
       limited: this.object.limited,
-      config: duplicate(game.system.ecryme.config),
+      config: foundry.utils.duplicate(game.system.ecryme.config),
       hasCephaly: EcrymeUtility.hasCephaly(),
       hasBoheme: EcrymeUtility.hasBoheme(),
       hasAmertume: EcrymeUtility.hasAmertume(),
@@ -75,7 +75,7 @@ export class EcrymeAnnencySheet extends ActorSheet {
       let actorId = li.data("actor-id")
       this.actor.removeAnnencyActor(actorId)
     })
-    
+
 
     // Update Inventory Item
     html.find('.item-edit').click(ev => {

modules/app/ecryme-summary-app.js

@@ -43,7 +43,7 @@ export class EcrymeCharacterSummary extends Application {
 
   /* -------------------------------------------- */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       template: "systems/fvtt-ecryme/templates/dialogs/character-summary.hbs",
       popOut: true,
       resizable: true,

modules/common/ecryme-config.js

@@ -10,14 +10,14 @@ export const ECRYME_CONFIG = {
     "melee": "ECRY.ui.melee",
     "ranged": "ECRY.ui.ranged"
   },
-  traitLevel: [
+  traitLevel: {
-    {value: -3, text: "-3"},
+    "-3":{value: "-3", text: "-3"},
-    {value: -2, text: "-2"},
+    "-2":{value: "-2", text: "-2"},
-    {value: -1, text: "-1"},
+    "-1":{value: "-1", text: "-1"},
-    {value: +1, text: "+1"},
+    "+1":{value: "+1", text: "+1"},
-    {value: +2, text: "+2"},
+    "+2":{value: "+2", text: "+2"},
-    {value: +3, text: "+3"}
+    "+3":{value: "+3", text: "+3"}
-  ],
+  },
   impactTypes: {
     physical: "ECRY.ui.physical",
     mental: "ECRY.ui.mental",
@@ -30,7 +30,7 @@ export const ECRYME_CONFIG = {
     major: "ECRY.ui.major"
   },
   difficulty: {
-    "-1": {difficulty: "ECRY.ui.none", frequency: "ECRY.ui.none", value: "-"},
+    "-1": {difficulty: "ECRY.ui.none", frequency: "ECRY.ui.none", value: "-1"},
     "8": { difficulty: "ECRY.ui.troublesome", frequency: "ECRY.ui.occasional", value: 8 },
     "10": { difficulty: "ECRY.ui.difficult", frequency: "ECRY.ui.uncommon", value: 10 },
     "12": { difficulty: "ECRY.ui.verydifficult", frequency: "ECRY.ui.rare", value: 12 },
@@ -57,6 +57,19 @@ export const ECRYME_CONFIG = {
     "lige": {name: "ECRY.ui.lige", value: 100 },
     "hurle": {name: "ECRY.ui.hurle", value: 10 },
     "coin": {name: "ECRY.ui.coin", value: 1 }
+  },
+  transcendanceOptions: {
+    "execution": "ECRY.ui.execution",
+    "preservation": "ECRY.ui.preservation"
+  },
+  bonusMalusPersoOptions: {
+    "-3": {value: "-3", label: "-3"},
+    "-2": {value: "-2", label: "-2"},
+    "-1": {value: "-1", label: "-1"},
+    "0":  {value: "0",  label: "0"},
+    "+1": {value: "1", label: "+1"},
+    "+2": {value: "2", label: "+2"},
+    "+3": {value: "3", label: "+3"}
   }
 
 }

modules/common/ecryme-utility.js

@@ -36,7 +36,7 @@ export class EcrymeUtility {
   /* -------------------------------------------- */
   static async init() {
     Hooks.on('renderChatLog', (log, html, data) => EcrymeUtility.chatListeners(html));
-    Hooks.on("getChatLogEntryContext", (html, options) => EcrymeUtility.chatMenuManager(html, options));
+    Hooks.on("getChatMessageContextOptions", (html, options) => EcrymeUtility.chatMenuManager(html, options));
 
     this.rollDataStore = {}
     this.defenderStore = {}
@@ -97,6 +97,7 @@ export class EcrymeUtility {
         "level_b": game.i18n.localize("ECRY.settings.boheme"),
         "level_a": game.i18n.localize("ECRY.settings.amertume"),
       },
+      default: "level_a",
       restricted: true
     })
 
@@ -119,14 +120,14 @@ export class EcrymeUtility {
     let level = game.settings.get("fvtt-ecryme", "ecryme-game-level")
     return level == "level_a"
   }
-  
+
   /*-------------------------------------------- */
   static buildSkillConfig() {
     game.system.ecryme.config.skills = {}
     for (let categKey in game.data.template.Actor.templates.core.skills) {
       let category = game.data.template.Actor.templates.core.skills[categKey]
       for (let skillKey in category.skilllist) {
-        let skill = duplicate(category.skilllist[skillKey])
+        let skill = foundry.utils.duplicate(category.skilllist[skillKey])
         skill.categKey = categKey // Auto reference the category
         game.system.ecryme.config.skills[skillKey] = skill
       }
@@ -215,7 +216,7 @@ export class EcrymeUtility {
       confront.impactPreservation = this.getImpactFromEffect(Math.abs(confront.effectPreservation))
     }
     if (confront.marginPreservation > 0) {
-      confront.bonus1 = -confront.marginPreservation
+      confront.bonus1 = confront.marginPreservation
     }
 
     let msg = await this.createChatWithRollMode(this.confrontData1.alias, {
@@ -272,20 +273,17 @@ export class EcrymeUtility {
     let canTranscendRoll = []
     for (let i = 1; i <= 10; i++) {
       canTranscendRoll[i] = function (li) {
-        let message = game.messages.get(li.attr("data-message-id"))
+        let message = game.messages.get($(li).attr("data-message-id"))
         let rollData = message.getFlag("world", "rolldata")
         //console.log(">>>>>>>>>>>>>>>>>>>>>>>>>> Menu !!!!", rollData)
-        if (rollData.skill && rollData.skill.value >= i && !rollData.transcendUsed && rollData.spec) {
+        return (rollData?.skill?.value >= i && !rollData.transcendUsed && rollData.spec)
-          return true
-        }
-        return false
       }
       options.push({
         name: game.i18n.localize("ECRY.chat.spectranscend") + i,
         icon: '<i class="fas fa-plus-square"></i>',
         condition: canTranscendRoll[i],
         callback: li => {
-          let message = game.messages.get(li.attr("data-message-id"))
+          let message = game.messages.get($(li).attr("data-message-id"))
           let rollData = message.getFlag("world", "rolldata")
           EcrymeUtility.transcendFromSpec(rollData, i).catch("Error on Transcend")
         }
@@ -296,27 +294,27 @@ export class EcrymeUtility {
   /* -------------------------------------------- */
   static async chatListeners(html) {
 
-    html.on("click", '.button-select-confront', event => {
+    $(html).on("click", '.button-select-confront', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "ecryme-rolldata")
       ui.notifications.info( game.i18n.localize("ECRY.chat.confrontselect"))
       EcrymeUtility.manageConfrontation(rollData)
     })
-    html.on("click", '.button-apply-cephaly-difficulty', event => {
+    $(html).on("click", '.button-apply-cephaly-difficulty', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "ecryme-rolldata")
       let difficulty = $("#" + rollData.rollId + "-cephaly-difficulty").val()
       EcrymeUtility.manageCephalyDifficulty(rollData, difficulty)
     })
-    html.on("click", '.button-apply-impact', event => {
+    $(html).on("click", '.button-apply-impact', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let actor = game.actors.get($(event.currentTarget).data("actor-id"))
       actor.modifyImpact($(event.currentTarget).data("impact-type"), $(event.currentTarget).data("impact"), 1)
     })
-    html.on("click", '.button-apply-bonus', event => {
+    $(html).on("click", '.button-apply-bonus', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let actor = game.actors.get($(event.currentTarget).data("actor-id"))
@@ -338,7 +336,7 @@ export class EcrymeUtility {
       'systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs',
       'systems/fvtt-ecryme/templates/actors/partial-impacts.hbs',
     ]
-    return loadTemplates(templatePaths);
+    return foundry.applications.handlebars.loadTemplates(templatePaths);
   }
 
   /* -------------------------------------------- */
@@ -404,7 +402,7 @@ export class EcrymeUtility {
 
     let id = rollData.rollId
     let oldRollData = this.rollDataStore[id] || {}
-    let newRollData = mergeObject(oldRollData, rollData)
+    let newRollData = foundry.utils.mergeObject(oldRollData, rollData)
     this.rollDataStore[id] = newRollData
   }
 
@@ -557,7 +555,7 @@ export class EcrymeUtility {
 
     let actor = game.actors.get(rollData.actorId)
     // Fix difficulty
-    if (!rollData.difficulty || rollData.difficulty == "-") {
+    if (!rollData.difficulty || rollData.difficulty == "-1") {
       rollData.difficulty = 0
     }
     rollData.difficulty = Number(rollData.difficulty)
@@ -565,16 +563,16 @@ export class EcrymeUtility {
     let diceFormula = this.computeRollFormula(rollData, actor)
 
     // Performs roll
-    let myRoll = new Roll(diceFormula).roll({ async: false })
+    let myRoll = await new Roll(diceFormula).roll()
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = duplicate(myRoll)
+    rollData.roll = foundry.utils.duplicate(myRoll)
     rollData.total = myRoll.total
     rollData.diceSum = myRoll.terms[0].total
 
     this.computeResults(rollData)
 
     let msg = await this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData)
     })
     await msg.setFlag("world", "ecryme-rolldata", rollData)
     console.log("Rolldata result", rollData)
@@ -660,7 +658,7 @@ export class EcrymeUtility {
     }
     return array;
   }
-  
+
   /* -------------------------------------------- */
   static async createChatMessage(name, rollMode, chatOptions) {
     switch (rollMode) {
@@ -682,20 +680,20 @@ export class EcrymeUtility {
   /* -------------------------------------------- */
   static getBasicRollData() {
     let rollData = {
-      rollId: randomID(16),
+      rollId: foundry.utils.randomID(16),
       type: "roll-data",
-      bonusMalusPerso: 0,
+      bonusMalusPerso: "0",
       bonusMalusSituation: 0,
       bonusMalusDef: 0,
       annencyBonus: 0,
       bonusMalusPortee: 0,
       skillTranscendence: 0,
       rollMode: game.settings.get("core", "rollMode"),
-      difficulty: "-",
+      difficulty: "-1",
       useSpleen: false,
       useIdeal: false,
       impactMalus: 0,
-      config: duplicate(game.system.ecryme.config)
+      config: foundry.utils.duplicate(game.system.ecryme.config)
     }
     EcrymeUtility.updateWithTarget(rollData)
     return rollData

modules/dialogs/ecryme-confront-dialog.js

@@ -6,13 +6,13 @@ export class EcrymeConfrontDialog extends Dialog {
   /* -------------------------------------------- */
   static async create(actor, rollData) {
 
-    let options = mergeObject(super.defaultOptions, {
+    let options = foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-ecryme ecryme-confrontation-dialog"],
       dragDrop: [{ dragSelector: ".confront-dice-container", dropSelector: null }],
       width: 620, height: 'fit-content', 'z-index': 99999
     });
 
-    let html = await renderTemplate('systems/fvtt-ecryme/templates/dialogs/confront-dialog.hbs', rollData);
+    let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-ecryme/templates/dialogs/confront-dialog.hbs', rollData);
     return new EcrymeConfrontDialog(actor, rollData, html, options);
   }
 
@@ -72,7 +72,7 @@ export class EcrymeConfrontDialog extends Dialog {
     $("#confront-dice-pool").html(content)
     content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs", this.rollData )
     $("#confront-bonus-pool").html(content)
-    
+
   }
   /* -------------------------------------------- */
   async refreshDialog() {
@@ -83,7 +83,7 @@ export class EcrymeConfrontDialog extends Dialog {
     let button = this.buttonDisabled
     setTimeout(function () { $(".launchConfront").attr("disabled", button) }, 180)
   }
-  
+
   /* ------------------ -------------------------- */
   _canDragStart(selector) {
     console.log("CAN DRAG START", selector, super._canDragStart(selector) )
@@ -124,23 +124,23 @@ export class EcrymeConfrontDialog extends Dialog {
     if ( data.dragType == "dice") {
       let idx = Number(data.diceIndex)
       console.log("DATA", data, event, event.srcElement.className)
-      if (event.srcElement.className.includes("execution") && 
+      if (event.srcElement.className.includes("execution") &&
         this.rollData.availableDices.filter(d => d.location == "execution").length < 2) {
         this.rollData.availableDices[idx].location = "execution"
       }
-      if (event.srcElement.className.includes("preservation") && 
+      if (event.srcElement.className.includes("preservation") &&
         this.rollData.availableDices.filter(d => d.location == "preservation").length < 2) {
         this.rollData.availableDices[idx].location = "preservation"
       }
       if (event.srcElement.className.includes("dice-list")) {
         this.rollData.availableDices[idx].location = "mainpool"
       }
-  
+
       if (this.rollData.availableDices.filter(d => d.location == "execution").length == 2 && this.rollData.availableDices.filter(d => d.location == "preservation").length == 2) {
         this.buttonDisabled = false
       } else {
         this.buttonDisabled = true
-      }  
+      }
     } else {
       let idx = Number(data.bonusIndex)
       if (event.srcElement.className.includes("execution")) {
@@ -163,9 +163,9 @@ export class EcrymeConfrontDialog extends Dialog {
     // Apply Transcend if needed
     if (this.rollData.skillTranscendence > 0) {
       if (this.rollData.applyTranscendence == "execution") {
-        this.rollData.executionTotal += this.rollData.skillTranscendence
+        this.rollData.executionTotal += Number(this.rollData.skillTranscendence)
       } else {
-        this.rollData.preservationTotal += this.rollData.skillTranscendence
+        this.rollData.preservationTotal += Number(this.rollData.skillTranscendence)
       }
     }
   }
@@ -192,7 +192,7 @@ export class EcrymeConfrontDialog extends Dialog {
     this.processTranscendence()
 
     if (rollData.selectedSpecs && rollData.selectedSpecs.length > 0) {
-      rollData.spec = duplicate(actor.getSpecialization(rollData.selectedSpecs[0]))    
+      rollData.spec = foundry.utils.duplicate(actor.getSpecialization(rollData.selectedSpecs[0]))
       rollData.specApplied = true
       rollData.executionTotal += 2
       rollData.preservationTotal += 2
@@ -212,19 +212,19 @@ export class EcrymeConfrontDialog extends Dialog {
       for (let id of rollData.traitsBonusSelected) {
         let trait = rollData.traitsBonus.find(t => t._id == id)
         trait.activated = true
-        rollData.bonusMalusTraits += trait.system.level
+        rollData.bonusMalusTraits += Number(trait.system.level)
       }
     }
     if (rollData.traitsMalusSelected && rollData.traitsMalusSelected.length > 0) {
       for (let id of rollData.traitsMalusSelected) {
         let trait = rollData.traitsMalus.find(t => t._id == id)
         trait.activated = true
-        rollData.bonusMalusTraits -= trait.system.level
+        rollData.bonusMalusTraits -= Number(trait.system.level)
       }
     }
 
-    rollData.executionTotal += rollData.bonusMalusTraits + rollData.bonusMalusPerso
+    rollData.executionTotal += Number(rollData.bonusMalusTraits) + Number(rollData.bonusMalusPerso)
-    rollData.preservationTotal += rollData.bonusMalusTraits + rollData.bonusMalusPerso
+    rollData.preservationTotal += Number(rollData.bonusMalusTraits) + Number(rollData.bonusMalusPerso)
 
     this.refreshDialog()
   }
@@ -234,7 +234,7 @@ export class EcrymeConfrontDialog extends Dialog {
     super.activateListeners(html);
 
     html.find('#bonusMalusPerso').change((event) => {
-      this.rollData.bonusMalusPerso = Number(event.currentTarget.value)
+      this.rollData.bonusMalusPerso = event.currentTarget.value
       this.computeTotals()
     })
     html.find('#roll-specialization').change((event) => {

modules/dialogs/ecryme-confront-start-dialog.js

@@ -7,7 +7,7 @@ export class EcrymeConfrontStartDialog extends Dialog {
   static async create(actor, rollData) {
 
     let options = { classes: ["fvtt-ecryme ecryme-confront-dialog"], width: 540, height: 'fit-content', 'z-index': 99999 }
-    let html = await renderTemplate('systems/fvtt-ecryme/templates/dialogs/confront-start-dialog.hbs', rollData);
+    let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-ecryme/templates/dialogs/confront-start-dialog.hbs', rollData);
     return new EcrymeConfrontStartDialog(actor, rollData, html, options);
   }
 
@@ -50,15 +50,15 @@ export class EcrymeConfrontStartDialog extends Dialog {
   /* -------------------------------------------- */
   async rollConfront( diceFormula ) {
     // Do the initial roll
-    let myRoll = new Roll(diceFormula).roll({async: false})
+    let myRoll = await new Roll(diceFormula).roll()
     await EcrymeUtility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
     // Fill the available dice table
     let rollData = this.rollData
-    rollData.roll = duplicate(myRoll)
+    rollData.roll = foundry.utils.duplicate(myRoll)
     rollData.availableDices = []
     for (let result of myRoll.terms[0].results) {
       if ( !result.discarded) {
-        let resultDup = duplicate(result)
+        let resultDup = foundry.utils.duplicate(result)
         resultDup.location = "mainpool"
         rollData.availableDices.push(resultDup)
       }

modules/dialogs/ecryme-roll-dialog.js

@@ -6,7 +6,7 @@ export class EcrymeRollDialog extends Dialog {
   static async create(actor, rollData) {
 
     let options = { classes: ["ecryme-roll-dialog"], width: 540, height: 'fit-content', 'z-index': 99999 }
-    let html = await renderTemplate('systems/fvtt-ecryme/templates/dialogs/roll-dialog-generic.hbs', rollData);
+    let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-ecryme/templates/dialogs/roll-dialog-generic.hbs', rollData);
     return new EcrymeRollDialog(actor, rollData, html, options);
   }
 
@@ -52,12 +52,12 @@ export class EcrymeRollDialog extends Dialog {
   activateListeners(html) {
     super.activateListeners(html);
 
-    var dialog = this;
     function onLoad() {
     }
     $(function () { onLoad(); });
 
     html.find('#bonusMalusPerso').change((event) => {
+      console.log("DIFF", event.currentTarget.value)
       this.rollData.bonusMalusPerso = Number(event.currentTarget.value)
     })
     html.find('#roll-difficulty').change((event) => {
@@ -74,13 +74,13 @@ export class EcrymeRollDialog extends Dialog {
     })
     html.find('#roll-select-transcendence').change((event) => {
       this.rollData.skillTranscendence = Number($('#roll-select-transcendence').val())
-    })    
+    })
     html.find('#roll-use-spleen').change((event) => {
       this.rollData.useSpleen = event.currentTarget.checked
-    })      
+    })
     html.find('#roll-use-ideal').change((event) => {
       this.rollData.useIdeal = event.currentTarget.checked
-    })      
+    })
 
   }
 }

modules/ecryme-main.js

@@ -38,7 +38,7 @@ Hooks.once("init", async function () {
   EcrymeUtility.preloadHandlebarsTemplates();
 
   /* -------------------------------------------- */
-  // Set an initiative formula for the system 
+  // Set an initiative formula for the system
   CONFIG.Combat.initiative = {
     formula: "1d6",
     decimals: 1
@@ -57,18 +57,16 @@ Hooks.once("init", async function () {
 
   /* -------------------------------------------- */
   // Register sheet application classes
-  Actors.unregisterSheet("core", ActorSheet);
+  foundry.documents.collections.Actors.unregisterSheet("core", foundry.appv1.sheets.ActorSheet);
-  Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["pc"], makeDefault: true });
+  foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["pc"], makeDefault: true });
-  Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["npc"], makeDefault: true });
+  foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["npc"], makeDefault: true });
-  Actors.registerSheet("fvtt-ecryme", EcrymeAnnencySheet, { types: ["annency"], makeDefault: false });
+  foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeAnnencySheet, { types: ["annency"], makeDefault: false });
 
-  Items.unregisterSheet("core", ItemSheet);
+  foundry.documents.collections.Items.unregisterSheet("core", foundry.appv1.sheets.ItemSheet);
-  Items.registerSheet("fvtt-ecryme", EcrymeItemSheet, { makeDefault: true });
+  foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeItemSheet, { makeDefault: true });
 
   EcrymeUtility.init()
 
-  Babele.get().setSystemTranslationsDir("translated")
-
 });
 
 /* -------------------------------------------- */
@@ -91,6 +89,7 @@ async function importDefaultScene() {
     await game.scenes.documentClass.create(newDocuments);
     game.scenes.find(i => i.name == "Landing page 1").activate();
   }
+
 }
 
 /* -------------------------------------------- */
@@ -107,10 +106,10 @@ Hooks.once("ready", function () {
     });
   }
 
-  import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter=>{
+  import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter => {
     console.log("ClassCounter loaded", moduleCounter)
     moduleCounter.ClassCounter.registerUsageCount()
-  }).catch(err=>
+  }).catch(err =>
     console.log("No stats available, giving up.")
   )
 
@@ -119,6 +118,9 @@ Hooks.once("ready", function () {
   EcrymeCharacterSummary.ready();
   importDefaultScene();
 
+  // Load translations
+  Babele.get().setSystemTranslationsDir("translated")
+
 })
 
 
@@ -135,4 +137,3 @@ Hooks.on("chatMessage", (html, content, msg) => {
   }
   return true;
 });
-

modules/items/ecryme-item-sheet.js

@@ -4,11 +4,11 @@ import { EcrymeUtility } from "../common/ecryme-utility.js";
  * Extend the basic ItemSheet with some very simple modifications
  * @extends {ItemSheet}
  */
-export class EcrymeItemSheet extends ItemSheet {
+export class EcrymeItemSheet extends foundry.appv1.sheets.ItemSheet {
 
   /** @override */
   static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
+    return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["fvtt-ecryme", "sheet", "item"],
       template: "systems/fvtt-ecryme/templates/item-sheet.hbs",
       dragDrop: [{ dragSelector: null, dropSelector: null }],
@@ -56,20 +56,20 @@ export class EcrymeItemSheet extends ItemSheet {
       name: this.object.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      system: duplicate(this.object.system),
+      system: foundry.utils.duplicate(this.object.system),
-      config: duplicate(game.system.ecryme.config),
+      config: foundry.utils.duplicate(game.system.ecryme.config),
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner,
-      description: await TextEditor.enrichHTML(this.object.system.description, { async: true }),
+      description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.description, { async: true }),
-      notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }),
+      notes: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.notes, { async: true }),
       isGM: game.user.isGM
     }
 
     if ( this.object.type == "archetype")  {
       formData.tarots = EcrymeUtility.getTarots()
     }
-    
+
     this.options.editable = !(this.object.origin == "embeddedItem");
     console.log("ITEM DATA", formData, this);
     return formData;
@@ -89,7 +89,7 @@ export class EcrymeItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   postItem() {
-    let chatData = duplicate(this.item)
+    let chatData = foundry.utils.duplicate(this.item)
     if (this.actor) {
       chatData.actor = { id: this.actor.id };
     }
@@ -115,7 +115,7 @@ export class EcrymeItemSheet extends ItemSheet {
     let levelIndex = Number($(ev.currentTarget).parents(".item").data("level-index"))
     let choiceIndex = Number($(ev.currentTarget).parents(".item").data("choice-index"))
     let featureId = $(ev.currentTarget).parents(".item").data("feature-id")
-    
+
     let itemData = this.object.system.levels[levelIndex].choices[choiceIndex].features[featureId]
 
     if (itemData.name != 'None') {

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000134
+MANIFEST-000205

packs/equipment/LOG

@@ -1,7 +1,7 @@
-2024/03/18-21:27:36.619259 7fb017e006c0 Recovering log #132
+2025/05/01-23:23:34.950257 7f11177fe6c0 Recovering log #203
-2024/03/18-21:27:36.630215 7fb017e006c0 Delete type=3 #130
+2025/05/01-23:23:34.960390 7f11177fe6c0 Delete type=3 #201
-2024/03/18-21:27:36.630317 7fb017e006c0 Delete type=0 #132
+2025/05/01-23:23:34.960497 7f11177fe6c0 Delete type=0 #203
-2024/03/18-21:44:13.762166 7fb015a006c0 Level-0 table #137: started
+2025/05/01-23:27:45.498796 7f11153ff6c0 Level-0 table #208: started
-2024/03/18-21:44:13.762215 7fb015a006c0 Level-0 table #137: 0 bytes OK
+2025/05/01-23:27:45.498850 7f11153ff6c0 Level-0 table #208: 0 bytes OK
-2024/03/18-21:44:13.768765 7fb015a006c0 Delete type=0 #135
+2025/05/01-23:27:45.505411 7f11153ff6c0 Delete type=0 #206
-2024/03/18-21:44:13.775818 7fb015a006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)
+2025/05/01-23:27:45.518830 7f11153ff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)

packs/equipment/LOG.old

@@ -1,7 +1,7 @@
-2024/03/15-16:29:29.461394 7f7df20006c0 Recovering log #128
+2025/05/01-23:18:27.056956 7f1115ffb6c0 Recovering log #199
-2024/03/15-16:29:29.471348 7f7df20006c0 Delete type=3 #126
+2025/05/01-23:18:27.067437 7f1115ffb6c0 Delete type=3 #197
-2024/03/15-16:29:29.471493 7f7df20006c0 Delete type=0 #128
+2025/05/01-23:18:27.067539 7f1115ffb6c0 Delete type=0 #199
-2024/03/15-16:35:28.397309 7f7debe006c0 Level-0 table #133: started
+2025/05/01-23:23:12.722068 7f11153ff6c0 Level-0 table #204: started
-2024/03/15-16:35:28.397348 7f7debe006c0 Level-0 table #133: 0 bytes OK
+2025/05/01-23:23:12.722089 7f11153ff6c0 Level-0 table #204: 0 bytes OK
-2024/03/15-16:35:28.403860 7f7debe006c0 Delete type=0 #131
+2025/05/01-23:23:12.728871 7f11153ff6c0 Delete type=0 #202
-2024/03/15-16:35:28.411176 7f7debe006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)
+2025/05/01-23:23:12.744842 7f11153ff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)

packs/help/CURRENT

@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000142

packs/help/LOG

@@ -1,15 +1,8 @@
-2024/03/18-21:27:36.675619 7fb0174006c0 Recovering log #68
+2025/05/01-23:23:35.002627 7f1116ffd6c0 Recovering log #140
-2024/03/18-21:27:36.685388 7fb0174006c0 Delete type=3 #66
+2025/05/01-23:23:35.013325 7f1116ffd6c0 Delete type=3 #138
-2024/03/18-21:27:36.685495 7fb0174006c0 Delete type=0 #68
+2025/05/01-23:23:35.013430 7f1116ffd6c0 Delete type=0 #140
-2024/03/18-21:44:13.790087 7fb015a006c0 Level-0 table #73: started
+2025/05/01-23:27:45.532648 7f11153ff6c0 Level-0 table #145: started
-2024/03/18-21:44:13.801144 7fb015a006c0 Level-0 table #73: 2207 bytes OK
+2025/05/01-23:27:45.532688 7f11153ff6c0 Level-0 table #145: 0 bytes OK
-2024/03/18-21:44:13.808000 7fb015a006c0 Delete type=0 #71
+2025/05/01-23:27:45.540035 7f11153ff6c0 Delete type=0 #143
-2024/03/18-21:44:13.808225 7fb015a006c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+2025/05/01-23:27:45.546611 7f11153ff6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
-2024/03/18-21:44:13.808250 7fb015a006c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 10 : 1
+2025/05/01-23:27:45.546647 7f11153ff6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
-2024/03/18-21:44:13.808256 7fb015a006c0 Compacting 1@1 + 1@2 files
-2024/03/18-21:44:13.811516 7fb015a006c0 Generated table #74@1: 4 keys, 2136 bytes
-2024/03/18-21:44:13.811547 7fb015a006c0 Compacted 1@1 + 1@2 files => 2136 bytes
-2024/03/18-21:44:13.817935 7fb015a006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/03/18-21:44:13.818041 7fb015a006c0 Delete type=2 #5
-2024/03/18-21:44:13.818166 7fb015a006c0 Delete type=2 #73
-2024/03/18-21:44:13.818271 7fb015a006c0 Manual compaction at level-1 from '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 10 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)

packs/help/LOG.old

@@ -1,8 +1,8 @@
-2024/03/15-16:29:29.511445 7f7df34006c0 Recovering log #64
+2025/05/01-23:18:27.111839 7f1116ffd6c0 Recovering log #136
-2024/03/15-16:29:29.522076 7f7df34006c0 Delete type=3 #62
+2025/05/01-23:18:27.122280 7f1116ffd6c0 Delete type=3 #134
-2024/03/15-16:29:29.522169 7f7df34006c0 Delete type=0 #64
+2025/05/01-23:18:27.122337 7f1116ffd6c0 Delete type=0 #136
-2024/03/15-16:35:28.411192 7f7debe006c0 Level-0 table #69: started
+2025/05/01-23:23:12.768196 7f11153ff6c0 Level-0 table #141: started
-2024/03/15-16:35:28.411232 7f7debe006c0 Level-0 table #69: 0 bytes OK
+2025/05/01-23:23:12.768227 7f11153ff6c0 Level-0 table #141: 0 bytes OK
-2024/03/15-16:35:28.417476 7f7debe006c0 Delete type=0 #67
+2025/05/01-23:23:12.774547 7f11153ff6c0 Delete type=0 #139
-2024/03/15-16:35:28.424950 7f7debe006c0 Manual compaction at level-0 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+2025/05/01-23:23:12.774689 7f11153ff6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
-2024/03/15-16:35:28.424986 7f7debe006c0 Manual compaction at level-1 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+2025/05/01-23:23:12.774707 7f11153ff6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000134
+MANIFEST-000205

packs/maneuvers/LOG

@@ -1,7 +1,7 @@
-2024/03/18-21:27:36.662299 7fb017e006c0 Recovering log #132
+2025/05/01-23:23:34.989243 7f11177fe6c0 Recovering log #203
-2024/03/18-21:27:36.672660 7fb017e006c0 Delete type=3 #130
+2025/05/01-23:23:34.999290 7f11177fe6c0 Delete type=3 #201
-2024/03/18-21:27:36.672727 7fb017e006c0 Delete type=0 #132
+2025/05/01-23:23:34.999338 7f11177fe6c0 Delete type=0 #203
-2024/03/18-21:44:13.783262 7fb015a006c0 Level-0 table #137: started
+2025/05/01-23:27:45.505528 7f11153ff6c0 Level-0 table #208: started
-2024/03/18-21:44:13.783332 7fb015a006c0 Level-0 table #137: 0 bytes OK
+2025/05/01-23:27:45.505551 7f11153ff6c0 Level-0 table #208: 0 bytes OK
-2024/03/18-21:44:13.789886 7fb015a006c0 Delete type=0 #135
+2025/05/01-23:27:45.512071 7f11153ff6c0 Delete type=0 #206
-2024/03/18-21:44:13.808213 7fb015a006c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)
+2025/05/01-23:27:45.518845 7f11153ff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)

packs/maneuvers/LOG.old

@@ -1,7 +1,7 @@
-2024/03/15-16:29:29.499552 7f7df20006c0 Recovering log #128
+2025/05/01-23:18:27.099266 7f1115ffb6c0 Recovering log #199
-2024/03/15-16:29:29.509238 7f7df20006c0 Delete type=3 #126
+2025/05/01-23:18:27.109501 7f1115ffb6c0 Delete type=3 #197
-2024/03/15-16:29:29.509293 7f7df20006c0 Delete type=0 #128
+2025/05/01-23:18:27.109566 7f1115ffb6c0 Delete type=0 #199
-2024/03/15-16:35:28.417564 7f7debe006c0 Level-0 table #133: started
+2025/05/01-23:23:12.745080 7f11153ff6c0 Level-0 table #204: started
-2024/03/15-16:35:28.417584 7f7debe006c0 Level-0 table #133: 0 bytes OK
+2025/05/01-23:23:12.745126 7f11153ff6c0 Level-0 table #204: 0 bytes OK
-2024/03/15-16:35:28.424846 7f7debe006c0 Delete type=0 #131
+2025/05/01-23:23:12.751818 7f11153ff6c0 Delete type=0 #202
-2024/03/15-16:35:28.424970 7f7debe006c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)
+2025/05/01-23:23:12.774663 7f11153ff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)

packs/scenes/CURRENT

@@ -1 +1 @@
-MANIFEST-000018
+MANIFEST-000091

packs/scenes/LOG

@@ -1,8 +1,8 @@
-2024/03/18-21:27:36.648797 7fb017e006c0 Recovering log #16
+2025/05/01-23:23:34.977246 7f1116ffd6c0 Recovering log #88
-2024/03/18-21:27:36.658451 7fb017e006c0 Delete type=3 #14
+2025/05/01-23:23:34.986582 7f1116ffd6c0 Delete type=3 #86
-2024/03/18-21:27:36.658875 7fb017e006c0 Delete type=0 #16
+2025/05/01-23:23:34.986642 7f1116ffd6c0 Delete type=0 #88
-2024/03/18-21:44:13.775844 7fb015a006c0 Level-0 table #21: started
+2025/05/01-23:27:45.512228 7f11153ff6c0 Level-0 table #94: started
-2024/03/18-21:44:13.775912 7fb015a006c0 Level-0 table #21: 0 bytes OK
+2025/05/01-23:27:45.512262 7f11153ff6c0 Level-0 table #94: 0 bytes OK
-2024/03/18-21:44:13.782966 7fb015a006c0 Delete type=0 #19
+2025/05/01-23:27:45.518665 7f11153ff6c0 Delete type=0 #92
-2024/03/18-21:44:13.808193 7fb015a006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end)
+2025/05/01-23:27:45.518856 7f11153ff6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end)
-2024/03/18-21:44:13.808235 7fb015a006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end)
+2025/05/01-23:27:45.518892 7f11153ff6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end)

packs/scenes/LOG.old

@@ -1,8 +1,15 @@
-2024/03/15-16:29:29.486982 7f7df20006c0 Recovering log #12
+2025/05/01-23:18:27.084819 7f1116ffd6c0 Recovering log #82
-2024/03/15-16:29:29.496623 7f7df20006c0 Delete type=3 #10
+2025/05/01-23:18:27.095491 7f1116ffd6c0 Delete type=3 #80
-2024/03/15-16:29:29.496680 7f7df20006c0 Delete type=0 #12
+2025/05/01-23:18:27.095539 7f1116ffd6c0 Delete type=0 #82
-2024/03/15-16:35:28.404055 7f7debe006c0 Level-0 table #17: started
+2025/05/01-23:23:12.735355 7f11153ff6c0 Level-0 table #89: started
-2024/03/15-16:35:28.404098 7f7debe006c0 Level-0 table #17: 0 bytes OK
+2025/05/01-23:23:12.738432 7f11153ff6c0 Level-0 table #89: 1551 bytes OK
-2024/03/15-16:35:28.410985 7f7debe006c0 Delete type=0 #15
+2025/05/01-23:23:12.744606 7f11153ff6c0 Delete type=0 #87
-2024/03/15-16:35:28.417555 7f7debe006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end)
+2025/05/01-23:23:12.744906 7f11153ff6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end)
-2024/03/15-16:35:28.424962 7f7debe006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end)
+2025/05/01-23:23:12.751899 7f11153ff6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at '!scenes!zvY1RwBhTfwdZIBa' @ 18 : 1
+2025/05/01-23:23:12.751905 7f11153ff6c0 Compacting 1@1 + 1@2 files
+2025/05/01-23:23:12.755259 7f11153ff6c0 Generated table #90@1: 2 keys, 1586 bytes
+2025/05/01-23:23:12.755289 7f11153ff6c0 Compacted 1@1 + 1@2 files => 1586 bytes
+2025/05/01-23:23:12.761436 7f11153ff6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2025/05/01-23:23:12.761603 7f11153ff6c0 Delete type=2 #85
+2025/05/01-23:23:12.761813 7f11153ff6c0 Delete type=2 #89
+2025/05/01-23:23:12.774673 7f11153ff6c0 Manual compaction at level-1 from '!scenes!zvY1RwBhTfwdZIBa' @ 18 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end)

packs/specialisation/CURRENT

@@ -1 +1 @@
-MANIFEST-000134
+MANIFEST-000205

packs/specialisation/LOG

@@ -1,7 +1,7 @@
-2024/03/18-21:27:36.605584 7fb0174006c0 Recovering log #132
+2025/05/01-23:23:34.938221 7f1116ffd6c0 Recovering log #203
-2024/03/18-21:27:36.615261 7fb0174006c0 Delete type=3 #130
+2025/05/01-23:23:34.947805 7f1116ffd6c0 Delete type=3 #201
-2024/03/18-21:27:36.615507 7fb0174006c0 Delete type=0 #132
+2025/05/01-23:23:34.947853 7f1116ffd6c0 Delete type=0 #203
-2024/03/18-21:44:13.755365 7fb015a006c0 Level-0 table #137: started
+2025/05/01-23:27:45.491261 7f11153ff6c0 Level-0 table #208: started
-2024/03/18-21:44:13.755406 7fb015a006c0 Level-0 table #137: 0 bytes OK
+2025/05/01-23:27:45.491305 7f11153ff6c0 Level-0 table #208: 0 bytes OK
-2024/03/18-21:44:13.761940 7fb015a006c0 Delete type=0 #135
+2025/05/01-23:27:45.498558 7f11153ff6c0 Delete type=0 #206
-2024/03/18-21:44:13.775775 7fb015a006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)
+2025/05/01-23:27:45.518813 7f11153ff6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)

packs/specialisation/LOG.old

@@ -1,7 +1,7 @@
-2024/03/15-16:29:29.447153 7f7df34006c0 Recovering log #128
+2025/05/01-23:18:27.043700 7f11167fc6c0 Recovering log #199
-2024/03/15-16:29:29.458144 7f7df34006c0 Delete type=3 #126
+2025/05/01-23:18:27.054373 7f11167fc6c0 Delete type=3 #197
-2024/03/15-16:29:29.458197 7f7df34006c0 Delete type=0 #128
+2025/05/01-23:18:27.054431 7f11167fc6c0 Delete type=0 #199
-2024/03/15-16:35:28.383414 7f7debe006c0 Level-0 table #133: started
+2025/05/01-23:23:12.728954 7f11153ff6c0 Level-0 table #204: started
-2024/03/15-16:35:28.383464 7f7debe006c0 Level-0 table #133: 0 bytes OK
+2025/05/01-23:23:12.728976 7f11153ff6c0 Level-0 table #204: 0 bytes OK
-2024/03/15-16:35:28.390768 7f7debe006c0 Delete type=0 #131
+2025/05/01-23:23:12.735241 7f11153ff6c0 Delete type=0 #202
-2024/03/15-16:35:28.404037 7f7debe006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)
+2025/05/01-23:23:12.744865 7f11153ff6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)

packs/traits/CURRENT

@@ -1 +1 @@
-MANIFEST-000134
+MANIFEST-000205

packs/traits/LOG

@@ -1,7 +1,7 @@
-2024/03/18-21:27:36.634738 7fb0174006c0 Recovering log #132
+2025/05/01-23:23:34.963229 7f1115ffb6c0 Recovering log #203
-2024/03/18-21:27:36.644980 7fb0174006c0 Delete type=3 #130
+2025/05/01-23:23:34.973922 7f1115ffb6c0 Delete type=3 #201
-2024/03/18-21:27:36.645138 7fb0174006c0 Delete type=0 #132
+2025/05/01-23:23:34.974025 7f1115ffb6c0 Delete type=0 #203
-2024/03/18-21:44:13.768924 7fb015a006c0 Level-0 table #137: started
+2025/05/01-23:27:45.518950 7f11153ff6c0 Level-0 table #208: started
-2024/03/18-21:44:13.768963 7fb015a006c0 Level-0 table #137: 0 bytes OK
+2025/05/01-23:27:45.518982 7f11153ff6c0 Level-0 table #208: 0 bytes OK
-2024/03/18-21:44:13.775416 7fb015a006c0 Delete type=0 #135
+2025/05/01-23:27:45.525989 7f11153ff6c0 Delete type=0 #206
-2024/03/18-21:44:13.783223 7fb015a006c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)
+2025/05/01-23:27:45.546586 7f11153ff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)

packs/traits/LOG.old

@@ -1,7 +1,7 @@
-2024/03/15-16:29:29.474381 7f7df34006c0 Recovering log #128
+2025/05/01-23:18:27.070994 7f11167fc6c0 Recovering log #199
-2024/03/15-16:29:29.484271 7f7df34006c0 Delete type=3 #126
+2025/05/01-23:18:27.081264 7f11167fc6c0 Delete type=3 #197
-2024/03/15-16:29:29.484356 7f7df34006c0 Delete type=0 #128
+2025/05/01-23:18:27.081417 7f11167fc6c0 Delete type=0 #199
-2024/03/15-16:35:28.390972 7f7debe006c0 Level-0 table #133: started
+2025/05/01-23:23:12.715522 7f11153ff6c0 Level-0 table #204: started
-2024/03/15-16:35:28.391026 7f7debe006c0 Level-0 table #133: 0 bytes OK
+2025/05/01-23:23:12.715566 7f11153ff6c0 Level-0 table #204: 0 bytes OK
-2024/03/15-16:35:28.397167 7f7debe006c0 Delete type=0 #131
+2025/05/01-23:23:12.721964 7f11153ff6c0 Delete type=0 #202
-2024/03/15-16:35:28.411153 7f7debe006c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)
+2025/05/01-23:23:12.744818 7f11153ff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)

postcss/ecryme.css

@@ -1265,6 +1265,7 @@ ul, li {
   min-width: 12rem;
 }
 .item-name-label-short {
+  margin-top: 4px;
   flex-grow:1;
   max-width: 4rem;
   min-width: 4rem;
@@ -1275,6 +1276,16 @@ ul, li {
   max-width: 6rem;
   min-width: 6rem;
 }
+.item-name-label-medium2 {
+  margin-top: 4px;
+  flex-grow:0;
+  max-width: 10rem;
+  min-width: 10rem;
+}
+.item-name-label-free {
+  margin-top: 4px;
+  align-self: flex-start;
+}
 .item-name-label-long2 {
   margin-top: 4px;
   flex-grow:2;
@@ -1287,10 +1298,17 @@ ul, li {
   min-width: 9rem;
 }
 .item-field-label-short {
+  margin-top: 4px;
   flex-grow:1;
   max-width: 4rem;
   min-width: 4rem;
 }
+.item-field-label-short-header {
+  margin-top: 4px;
+  flex-grow:1;
+  max-width: 2.2rem;
+  min-width: 2.2rem;
+}
 .item-field-label-medium {
   flex-grow:1;
   max-width: 6rem;
@@ -1331,6 +1349,11 @@ ul, li {
 .flexrow-no-expand {
   flex-grow: 0;  
 }
+.flexrow-start {
+  justify-content: flex-start;
+  align-content: flex-start;
+  align-self: flex-start;
+}
 .item-input-small {
   max-width: 16px;
   max-height: 12px;

styles/ecryme.css

@@ -3,7 +3,7 @@
     font-family: "MailartRubberstamp";
     src: url('../fonts/MailartRubberstamp-Regular.woff') format("woff");
   }
-  
+
   :root {
   /* =================== 1. ACTOR SHEET FONT STYLES =========== */
     --window-header-title-font-size: 1.3rem;
@@ -27,7 +27,7 @@
     --actor-label-font-weight: 700;
     --actor-label-color: rgba(70,67,49,0.76863);
 
-  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ 
+  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */
     --debug-background-color-red: rgba(255,0,0,0.32941);
     --debug-background-color-blue: rgba(29,0,255,0.32941);
     --debug-background-color-green: rgba(84,255,0,0.32941);
@@ -454,9 +454,11 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 
 /*  background: rgb(245,245,240) url("../images/ui/fond4.webp") repeat left top;*/
 
+nav.sheet-tabs a,
 nav.sheet-tabs .item {
   position: relative;
   padding: 0 0.25rem;
+  color: beige;
 }
 
 nav.sheet-tabs .item:after {
@@ -697,7 +699,7 @@ ul, li {
 
 /* ======================================== */
 .tokenhudext {
-	display: flex; 
+	display: flex;
 	flex: 0 !important;
   font-weight: 600;
 }
@@ -755,7 +757,7 @@ ul, li {
 .skill-label {
   font-size: 0.7rem;
 }
-.skill-good-checkbox {  
+.skill-good-checkbox {
   max-height: 10px;
   max-width: 10px;
 }
@@ -790,7 +792,7 @@ ul, li {
 .sidebar-tab .directory-list .entity {
     border-top: 1px dashed rgba(0,0,0,0.25);
     border-bottom: 0 none;
-    padding: 0.25rem 0; 
+    padding: 0.25rem 0;
 }
 
 .sidebar-tab .directory-list .entity:hover {
@@ -804,10 +806,10 @@ ul, li {
   text-align: center;
   vertical-align: middle;
   display: flex;
-  align-items: center; 
+  align-items: center;
 }
 
-.chat-message .message-header .flavor-text, .chat-message .message-header .whisper-to { 
+.chat-message .message-header .flavor-text, .chat-message .message-header .whisper-to {
   font-size: 0.9rem;
 }
 .chat-result-text,
@@ -978,7 +980,7 @@ ul, li {
   border-radius: 0px;
 }
 
-#hotbar .bar-controls {  
+#hotbar .bar-controls {
   background: rgba(30, 25, 20, 1);
   border: 1px solid rgba(72, 46, 28, 1);
 }
@@ -1042,7 +1044,7 @@ ul, li {
   top: 1px;
   position: absolute;
   z-index: 1;
-  
+
   /* Fade in tooltip */
   visibility: hidden;
   opacity: 0;
@@ -1148,7 +1150,7 @@ ul, li {
   height: 60px;
 }
 
-.dice-cell {  
+.dice-cell {
   padding-left: 12px;
   padding-right: 12px;
   width: 60px;
@@ -1194,8 +1196,8 @@ ul, li {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-left: auto; 
+  margin-left: auto;
-  margin-right: auto; 
+  margin-right: auto;
   text-align: center;
 }
 
@@ -1245,6 +1247,7 @@ ul, li {
   min-width: 12rem;
 }
 .item-name-label-short {
+  margin-top: 4px;
   flex-grow:1;
   max-width: 4rem;
   min-width: 4rem;
@@ -1255,6 +1258,16 @@ ul, li {
   max-width: 6rem;
   min-width: 6rem;
 }
+.item-name-label-medium2 {
+  margin-top: 4px;
+  flex-grow:0;
+  max-width: 10rem;
+  min-width: 10rem;
+}
+.item-name-label-free {
+  margin-top: 4px;
+  align-self: flex-start;
+}
 .item-name-label-long2 {
   margin-top: 4px;
   flex-grow:2;
@@ -1267,10 +1280,17 @@ ul, li {
   min-width: 9rem;
 }
 .item-field-label-short {
+  margin-top: 4px;
   flex-grow:1;
   max-width: 4rem;
   min-width: 4rem;
 }
+.item-field-label-short-header {
+  margin-top: 4px;
+  flex-grow:1;
+  max-width: 2.2rem;
+  min-width: 2.2rem;
+}
 .item-field-label-medium {
   flex-grow:1;
   max-width: 6rem;
@@ -1294,7 +1314,7 @@ ul, li {
   flex-wrap: nowrap;
 }
 .item-filler {
-  flex-grow: 6;  
+  flex-grow: 6;
   flex-shrink: 7;
 }
 .item-controls-fixed {
@@ -1309,7 +1329,12 @@ ul, li {
   font-weight: bold;
 }
 .flexrow-no-expand {
-  flex-grow: 0;  
+  flex-grow: 0;
+}
+.flexrow-start {
+  justify-content: flex-start;
+  align-content: flex-start;
+  align-self: flex-start;
 }
 .item-input-small {
   max-width: 16px;

system.json

@@ -3,8 +3,10 @@
   "esmodules": [
     "modules/ecryme-main.js"
   ],
-  "gridDistance": 1,
+  "grid": {
-  "gridUnits": "m",
+    "distance": 2,
+    "units": "m"
+  },
   "languages": [
     {
       "lang": "fr",
@@ -102,8 +104,8 @@
   "license": "LICENSE.txt",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-ecryme/raw/branch/master/system.json",
   "compatibility": {
-    "minimum": "10",
+    "minimum": "13",
-    "verified": "11"
+    "verified": "13"
   },
   "id": "fvtt-ecryme",
   "primaryTokenAttribute": "secondary.health",
@@ -123,7 +125,7 @@
   },
   "title": "Ecryme, le Jeu de Rôles",
   "url": "https://www.uberwald.me/gitea/public/fvtt-ecryme",
-  "version": "11.0.38",
+  "version": "13.0.0",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v11.0.38.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v13.0.0.zip",
   "background": "systems/fvtt-ecryme/images/assets/ecryme_extract_panel_01.webp"
 }

template.json

@@ -28,28 +28,34 @@
         "skills": {
           "physical": {
             "name": "ECRY.ui.physical",
+            "pnjvalue": 0,
             "skilllist": {
               "athletics": {
+                "key": "athletics",
                 "name": "ECRY.ui.athletics",
                 "max": 0,
                 "value": 0
               },
               "driving": {
+                "key": "driving",
                 "name": "ECRY.ui.driving",
                 "max": 0,
                 "value": 0
               },
               "fencing": {
+                "key": "fencing",
                 "name": "ECRY.ui.fencing",
                 "max": 0,
                 "value": 0
               },
               "brawling": {
+                "key": "brawling",
                 "name": "ECRY.ui.brawling",
                 "max": 0,
                 "value": 0
               },
               "shooting": {
+                "key": "shooting",
                 "name": "ECRY.ui.shooting",
                 "max": 0,
                 "value": 0
@@ -58,28 +64,34 @@
           },
           "mental": {
             "name": "ECRY.ui.mental",
+            "pnjvalue": 0,
             "skilllist": {
               "anthropomecanology": {
+                "key": "anthropomecanology",
                 "name": "ECRY.ui.anthropomecanology",
                 "value": 0,
                 "max": 10
               },
               "ecrymology": {
+                "key": "ecrymology",
                 "name": "ECRY.ui.ecrymology",
                 "value": 0,
                 "max": 10
               },
               "traumatology": {
+                "key": "traumatology",
                 "name": "ECRY.ui.traumatology",
                 "value": 0,
                 "max": 10
               },
               "traversology": {
+                "key": "traversology",
                 "name": "ECRY.ui.traversology",
                 "value": 0,
                 "max": 10
               },
               "urbatechnology": {
+                "key": "urbatechnology",
                 "name": "ECRY.ui.urbatechnology",
                 "value": 0,
                 "max": 10
@@ -88,28 +100,34 @@
           },
           "social": {
             "name": "ECRY.ui.social",
+            "pnjvalue": 0,
             "skilllist": {
               "quibbling": {
+                "key": "quibbling",
                 "name": "ECRY.ui.quibbling",
                 "value": 0,
                 "max": 10
               },
               "creativity": {
+                "key": "creativity",
                 "name": "ECRY.ui.creativity",
                 "value": 0,
                 "max": 10
               },
               "loquacity": {
+                "key": "loquacity",
                 "name": "ECRY.ui.loquacity",
                 "value": 0,
                 "max": 10
               },
               "guile": {
+                "key": "guile",
                 "name": "ECRY.ui.guile",
                 "value": 0,
                 "max": 10
               },
               "performance": {
+                "key": "performance",
                 "name": "ECRY.ui.performance",
                 "value": 0,
                 "max": 10

templates/actors/actor-sheet.hbs

@@ -15,29 +15,40 @@
           <div class="flexrow">
             <ul>
               <li class="flexrow item" data-item-id="{{spleen.id}}">
-                <label class="item-name-label-medium">Spleen :</label>
+                <label class="item-field-label-short">Spleen :</label>
                 <label class="item-name-label-long">{{spleen.name}}</label>
                 <div class="item-filler">&nbsp;</div>
                 {{#if spleen}}
                 <div class="item-controls item-controls-fixed-full">
-                  <a class="item-control item-add" data-type="trait" title="Create Trait"><i class="fas fa-plus"></i></a>
+                  <a class="item-control item-add" data-type="trait" title="Create Trait"><i
+                      class="fas fa-plus"></i></a>
                   <a class="item-control item-edit" data-type="trait" title="Edit Item"><i class="fas fa-edit"></i></a>
-                  <a class="item-control item-add" data-type="trait" title="Delete Item"><i class="fas fa-trash"></i></a>
+                  <a class="item-control item-add" data-type="trait" title="Delete Item"><i
+                      class="fas fa-trash"></i></a>
                 </div>
                 {{/if}}
               </li>
               <li class="item flexrow" data-item-id="{{ideal.id}}">
-                <label class="item-name-label-medium">Ideal :</label>
+                <label class="item-field-label-short">Ideal :</label>
                 <label class="item-name-label-long">{{ideal.name}}</label>
                 <div class="item-filler">&nbsp;</div>
                 {{#if ideal}}
                 <div class="item-controls item-controls-fixed-full">
-                  <a class="item-control item-add" data-type="trait" title="Create Trait"><i class="fas fa-plus"></i></a>
+                  <a class="item-control item-add" data-type="trait" title="Create Trait"><i
+                      class="fas fa-plus"></i></a>
                   <a class="item-control item-edit" data-type="trait" title="Edit Item"><i class="fas fa-edit"></i></a>
-                  <a class="item-control item-add" data-type="trait" title="Delete Item"><i class="fas fa-trash"></i></a>
+                  <a class="item-control item-add" data-type="trait" title="Delete Item"><i
+                      class="fas fa-trash"></i></a>
                 </div>
                 {{/if}}
               </li>
+              <li class="item flexrow flexrow-no-expand flexrow-start ">
+                <label class="item-name-label-short">Traits :</label>
+                {{#each traits as |trait key|}}
+                  <label class="item-name-label-free"><a data-item-id="{{trait._id}}" class="item-edit">{{trait.name}}</a>,&nbsp;</label>
+                {{/each}}
+              </li>
+
             </ul>
           </div>
 
@@ -74,10 +85,29 @@
           <ul class="stat-list alternate-list item-list">
             <li class="item flexrow list-item items-title-bg">
               <span class="item-name-label-header impact-title">
-                <h3><label class="items-title-text">{{localize category.name}} ({{valueAtIndex @root.impactsMalus
+                <h3>
-                    categkey}})</label></h3>
+                  
+                {{#if (eq @root.type "npc")}}
+                  <a class="roll-skill-confront" data-category-key="{{categkey}}" data-skill-key="rawnpc">
+                    <i class="fa-regular fa-swords"></i>
+                  </a>
+                  <a class="roll-skill" data-category-key="{{categkey}}" data-skill-key="rawnpc">
+                  <i class="fa-solid fa-dice-d6"></i>
+                {{/if}}
+                  <label class="items-title-text">{{localize category.name}} ({{valueAtIndex @root.impactsMalus
+                    categkey}})</label>
+                {{#if (eq @root.type "npc")}}
+                  </a>
+                  <select class="item-field-label-short-header" type="text"
+                      name="system.skills.{{categkey}}.pnjvalue" value="{{category.pnjvalue}}"
+                        data-dtype="Number">
+                        {{selectOptions @root.config.skillLevel selected=category.pnjvalue}}
+                  </select>
+                {{/if}}
+                </h3>
               </span>
             </li>
+            
             {{#each category.skilllist as |skill skillkey|}}
             <li class="item flexrow list-item">
               <span class="item-name-label-long">
@@ -91,18 +121,15 @@
               <select class="item-field-label-short" type="text"
                 name="system.skills.{{categkey}}.skilllist.{{skillkey}}.value" value="{{skill.value}}"
                 data-dtype="Number">
-                {{#select skill.value}}
+                {{selectOptions @root.config.skillLevel selected=skill.value}}
-                {{#each @root.config.skillLevel as |level key| }}
-                <option value="{{level}}">{{level}}</option>
-                {{/each}}
-                {{/select}}
               </select>
             </li>
             <li class="item flexrow list-item">
               <ul class="ul-level1">
                 {{#each skill.spec as |spec idx|}}
                 <li class="item flexrow list-item" data-item-id="{{spec._id}}" data-item-type="specialization">
-                  <a class="roll-spec" data-category-key="{{categkey}}" data-skill-key="{{skillkey}}" data-spec-id="{{spec._id}}">
+                  <a class="roll-spec" data-category-key="{{categkey}}" data-skill-key="{{skillkey}}"
+                    data-spec-id="{{spec._id}}">
                     <i class="fa-solid fa-dice-d6"></i>
                     {{spec.name}}
                   </a>
@@ -143,11 +170,7 @@
                 </a></span>
               <select class="item-field-label-short" type="text" name="system.cephaly.skilllist.{{skillkey}}.value"
                 value="{{skill.value}}" data-dtype="Number">
-                {{#select skill.value}}
+                {{selectOptions @root.config.skillLevel selected=skill.value}}
-                {{#each @root.config.skillLevel as |level key| }}
-                <option value="{{level}}">{{level}}</option>
-                {{/each}}
-                {{/select}}
               </select>
             </li>
             {{/each}}
@@ -157,7 +180,8 @@
 
         <div>
           {{#if annency}}
-          <h3>{{localize "ECRY.ui.annency"}} : <a class="open-annency" data-annency-id="{{annency.id}}">{{annency.name}}<i class="fas fa-edit"></i></a></h3>
+          <h3>{{localize "ECRY.ui.annency"}} : <a class="open-annency"
+              data-annency-id="{{annency.id}}">{{annency.name}}<i class="fas fa-edit"></i></a></h3>
           <ul class="stat-list alternate-list item-list">
             <li class="item flexrow list-item">
               <span class="item-name-label-long">

templates/dialogs/confront-dialog.hbs

@@ -55,20 +55,13 @@
     <div class="flexrow">
       <span class="roll-dialog-label">{{localize "ECRY.ui.skilltranscendence"}} : </span>
       <select class="" id="roll-select-transcendence" data-type="Number">
-        {{#select skillTranscendence}}
+        {{selectOptions config.skillLevel selected=skillTranscendence}}
-        {{#for 0 skill.value 1}}
-        <option value="{{this}}">{{this}}</option>
-        {{/for}}
-        {{/select}}
       </select>
     </div>
     <div class="flexrow">
       <span class="roll-dialog-label">{{localize "ECRY.ui.transcendapply"}} : </span>
       <select class="" id="roll-apply-transcendence" data-type="String">
-        {{#select applyTranscendence}}
+        {{selectOptions config.transcendanceOptions selected=applyTranscendence localize=true}}
-        <option value="execution">{{localize "ECRY.ui.execution"}}</option>
-        <option value="preservation">{{localize "ECRY.ui.preservation"}}</option>
-        {{/select}}
       </select>
     </div>
 
@@ -121,16 +114,8 @@
 
     <div class="flexrow">
       <span class="roll-dialog-label">Bonus/Malus : </span>
-      <select id="bonusMalusPerso" name="bonusMalusPerso">
+      <select id="bonusMalusPerso" name="bonusMalusPerso" type="text" data-dtype="String">
-        {{#select bonusMalusPerso}}
+        {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusPerso labelAttr="label"}}
-        <option value="-3">-3</option>
-        <option value="-2">-2</option>
-        <option value="-1">-1</option>
-        <option value="0">0</option>
-        <option value="1">+1</option>
-        <option value="2">+2</option>
-        <option value="3">+3</option>
-        {{/select}}
       </select>
     </div>
 

templates/dialogs/partial-common-roll-dialog.hbs

@@ -14,11 +14,7 @@
     <div class="flexrow">
       <span class="roll-dialog-label">{{localize "ECRY.ui.skilltranscendence"}} : </span>
       <select class="" id="roll-select-transcendence" data-type="Number">
-        {{#select skillTranscendence}}
+        {{selectOptions config.skillLevel selected=skillTranscendence}}
-          {{#for 0 skill.value 1}}
-            <option value="{{this}}">{{this}}</option>
-          {{/for}}
-        {{/select}}
       </select>
     </div>
 
@@ -75,16 +71,8 @@
 
     <div class="flexrow">
       <span class="roll-dialog-label">Bonus/Malus : </span>
-      <select id="bonusMalusPerso" name="bonusMalusPerso">
+      <select type="text" id="bonusMalusPerso" name="bonusMalusPerso" data-dtype="String">
-        {{#select bonusMalusPerso}}
+        {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusPerso labelAttr="label"}}
-        <option value="-3">-3</option>
-        <option value="-2">-2</option>
-        <option value="-1">-1</option>
-        <option value="0">0</option>
-        <option value="1">+1</option>
-        <option value="2">+2</option>
-        <option value="3">+3</option>
-        {{/select}}
       </select>
     </div>
 

templates/dialogs/roll-dialog-generic.hbs

@@ -12,13 +12,8 @@
 
     <div class="flexrow">
       <span class="roll-dialog-label">Difficulté : </span>
-      <select class="" type="text" id="roll-difficulty" value="{{difficulty}}" data-dtype="Number">
+      <select class="" type="text" id="roll-difficulty" data-dtype="String">
-        {{#select difficulty}}
+        {{selectOptions config.difficulty selected=difficulty localize=true labelAttr="difficulty"}}
-        {{#each config.difficulty as |diffData value| }}
-        <option value="{{diffData.value}}">{{localize diffData.difficulty}} / {{localize diffData.frequency}}
-          ({{diffData.value}})</option>
-        {{/each}}
-        {{/select}}
       </select>
     </div>
 

templates/items/item-impact-sheet.hbs

@@ -22,22 +22,14 @@
           <li class="flexrow">
             <label class="item-name-label-long">{{localize "ECRY.ui.impactType"}}</label>
             <select class="item-field-label-medium" type="text" name="system.impacttype" value="{{system.impacttype}}" data-dtype="String">
-              {{#select system.impacttype}}
+              {{selectOptions config.impactTypes selected=system.impacttype localize=true }}
-                {{#each config.impactTypes as |type key| }}
-                <option value="{{key}}">{{localize type}}</option>
-                {{/each}}
-              {{/select}}
             </select> 
           </li>
 
           <li class="flexrow">
             <label class="item-name-label-long">{{localize "ECRY.ui.impactLevel"}}</label>
             <select class="item-field-label-medium" type="text" name="system.impactlevel" value="{{system.impactlevel}}" data-dtype="String">
-              {{#select system.impactlevel}}
+              {{selectOptions config.impactLevels selected=system.impactlevel localize=true }}
-                {{#each config.impactLevels as |level key| }}
-                <option value="{{key}}">{{localize level}}</option>
-                {{/each}}
-              {{/select}}
             </select> 
           </li>
         </ul>

templates/items/item-specialization-sheet.hbs

@@ -22,11 +22,7 @@
           <li class="flexrow">
             <label class="item-name-label-long">{{localize "ECRY.ui.skill"}}</label>
             <select class="item-field-label-medium" type="text" name="system.skillkey" value="{{system.skillkey}}" data-dtype="String">
-              {{#select system.skillkey}}
+              {{selectOptions config.skills selected=system.skillkey localize=true valueAttr="key" labelAttr="name"}}
-                {{#each config.skills as |skill key| }}
-                <option value="{{key}}">{{localize skill.name}}</option>
-                {{/each}}
-              {{/select}}
             </select> 
           </li>
 

templates/items/item-trait-sheet.hbs

@@ -22,23 +22,14 @@
           <li class="flexrow">
             <label class="item-name-label-long">{{localize "ECRY.ui.traitType"}}</label>
             <select class="item-field-label-medium" type="text" name="system.traitype" value="{{system.traitype}}" data-dtype="String">
-              {{#select system.traitype}}
+              {{selectOptions config.traitTypes selected=system.traitype}}
-                {{#each config.traitTypes as |type key| }}
-                <option value="{{key}}">{{type}}</option>
-                {{/each}}
-              {{/select}}
             </select> 
           </li>
 
           <li class="flexrow">
             <label class="item-name-label-long">{{localize "ECRY.ui.niveauTrait"}}</label>
-            <select class="item-field-label-medium" type="text" name="system.level" value="{{system.level}}" data-dtype="Number">
+            <select class="item-field-label-medium" type="text" name="system.level" value="{{system.level}}" data-dtype="String">
-              {{#select system.level}}
+              {{selectOptions config.traitLevel selected=system.level labelAttr="text"}}
-                {{#each config.traitLevel as |level key| }}
-                <option value="{{level.value}}">{{level.text}}</option>
-                {{/each}}
-              {{/select}}
-            </select> 
           </li>
         </ul>
     </div>

templates/items/item-weapon-sheet.hbs

@@ -22,11 +22,7 @@
           <li class="flexrow">
             <label class="item-name-label-long">{{localize "ECRY.ui.weapontype"}}</label>
             <select class="item-field-label-medium" type="text" name="system.weapontype" value="{{system.weapontype}}" data-dtype="String">
-              {{#select system.weapontype}}
+              {{selectOptions config.weaponTypes selected=system.weapontype localize=true}}
-                {{#each config.weaponTypes as |type key| }}
-                <option value="{{key}}">{{localize type}}</option>
-                {{/each}}
-              {{/select}}
             </select> 
           </li>
 

templates/items/partial-item-equipment.hbs

@@ -8,11 +8,7 @@
   <label class="item-field-label-long">{{localize "ECRY.ui.cost"}}</label>
   <input type="text" class="item-field-label-short" name="system.cost" value="{{system.cost}}" data-dtype="Number" />
   <select class="item-field-label-medium" type="text" name="system.costunit" value="{{system.costunit}}" data-dtype="String">
-    {{#select system.costunit}}
+    {{selectOptions config.costUnits selected=system.costunit localize=true labelAttr="name"}}
-    {{#each config.costUnits as |unit key| }}
-    <option value="{{key}}">{{localize unit.name}}</option>
-    {{/each}}
-    {{/select}}
   </select>
 </li>