diff --git a/modules/actors/tedeum-actor-sheet.js b/modules/actors/tedeum-actor-sheet.js index 809eb69..9db4f91 100644 --- a/modules/actors/tedeum-actor-sheet.js +++ b/modules/actors/tedeum-actor-sheet.js @@ -56,6 +56,7 @@ export class TeDeumActorPJSheet extends ActorSheet { santeModifier: this.actor.getSanteModifier(), educations: this.actor.getEducations(), description: await TextEditor.enrichHTML(this.object.system.description, { async: true }), + equipmentfree: await TextEditor.enrichHTML(this.object.system.equipmentfree, { async: true }), notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }), histoire: await TextEditor.enrichHTML(this.object.system.histoire, { async: true }), options: this.options, diff --git a/modules/actors/tedeum-actor.js b/modules/actors/tedeum-actor.js index de9d941..ea78c9f 100644 --- a/modules/actors/tedeum-actor.js +++ b/modules/actors/tedeum-actor.js @@ -630,7 +630,8 @@ export class TeDeumActor extends Actor { // Setup competence + carac if (!compName) { - compName = weapon.system.competence + let compIdx = weapon.system.competence + compName = game.system.tedeum.config.armeCompetences[compIdx]?.label } let competence = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == compName.toLowerCase()) if (competence) { diff --git a/packs/aides/000041.log b/packs/aides/000045.log similarity index 100% rename from packs/aides/000041.log rename to packs/aides/000045.log diff --git a/packs/aides/MANIFEST-000039 b/packs/aides/MANIFEST-000039 deleted file mode 100644 index 7c35b73..0000000 Binary files a/packs/aides/MANIFEST-000039 and /dev/null differ diff --git a/packs/armes/000143.log b/packs/armes/000147.log similarity index 100% rename from packs/armes/000143.log rename to packs/armes/000147.log diff --git a/packs/armes/MANIFEST-000141 b/packs/armes/MANIFEST-000141 deleted file mode 100644 index a66db81..0000000 Binary files a/packs/armes/MANIFEST-000141 and /dev/null differ diff --git a/packs/armures/000143.log b/packs/armures/000147.log similarity index 100% rename from packs/armures/000143.log rename to packs/armures/000147.log diff --git a/packs/armures/MANIFEST-000141 b/packs/armures/MANIFEST-000141 deleted file mode 100644 index 892cef0..0000000 Binary files a/packs/armures/MANIFEST-000141 and /dev/null differ diff --git a/packs/competences/000140.log b/packs/competences/000144.log similarity index 100% rename from packs/competences/000140.log rename to packs/competences/000144.log diff --git a/packs/competences/MANIFEST-000138 b/packs/competences/MANIFEST-000138 deleted file mode 100644 index 0b4a3ad..0000000 Binary files a/packs/competences/MANIFEST-000138 and /dev/null differ diff --git a/packs/education/000150.log b/packs/education/000154.log similarity index 100% rename from packs/education/000150.log rename to packs/education/000154.log diff --git a/packs/education/MANIFEST-000148 b/packs/education/MANIFEST-000148 deleted file mode 100644 index f173de5..0000000 Binary files a/packs/education/MANIFEST-000148 and /dev/null differ diff --git a/packs/graces/000142.log b/packs/graces/000146.log similarity index 100% rename from packs/graces/000142.log rename to packs/graces/000146.log diff --git a/packs/graces/MANIFEST-000140 b/packs/graces/MANIFEST-000140 deleted file mode 100644 index 1a4e196..0000000 Binary files a/packs/graces/MANIFEST-000140 and /dev/null differ diff --git a/packs/maladies/000142.log b/packs/maladies/000146.log similarity index 100% rename from packs/maladies/000142.log rename to packs/maladies/000146.log diff --git a/packs/maladies/MANIFEST-000140 b/packs/maladies/MANIFEST-000140 deleted file mode 100644 index 3660091..0000000 Binary files a/packs/maladies/MANIFEST-000140 and /dev/null differ diff --git a/packs/scenes/000080.log b/packs/scenes/000084.log similarity index 100% rename from packs/scenes/000080.log rename to packs/scenes/000084.log diff --git a/packs/scenes/MANIFEST-000078 b/packs/scenes/MANIFEST-000078 deleted file mode 100644 index abb70c4..0000000 Binary files a/packs/scenes/MANIFEST-000078 and /dev/null differ diff --git a/packs/simples/000142.log b/packs/simples/000146.log similarity index 100% rename from packs/simples/000142.log rename to packs/simples/000146.log diff --git a/packs/simples/MANIFEST-000140 b/packs/simples/MANIFEST-000140 deleted file mode 100644 index 2a62373..0000000 Binary files a/packs/simples/MANIFEST-000140 and /dev/null differ diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 98f0a54..2e8bbd0 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -335,7 +335,7 @@

- {{editor equipementlibre target="system.equipmentfree" button=true owner=owner editable=editable}} + {{editor equipmentfree target="system.equipmentfree" button=true owner=owner editable=editable}}