From 60db1f65e46ea3664e9f2dd6f10d95c15e0ba368 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Mon, 10 Mar 2025 15:52:37 +0100 Subject: [PATCH] Prit fix sur equipement et armes d'hast --- modules/actors/tedeum-actor-sheet.js | 1 + modules/actors/tedeum-actor.js | 3 ++- packs/aides/{000041.log => 000045.log} | 0 packs/aides/MANIFEST-000039 | Bin 220 -> 0 bytes packs/armes/{000143.log => 000147.log} | 0 packs/armes/MANIFEST-000141 | Bin 177 -> 0 bytes packs/armures/{000143.log => 000147.log} | 0 packs/armures/MANIFEST-000141 | Bin 176 -> 0 bytes packs/competences/{000140.log => 000144.log} | 0 packs/competences/MANIFEST-000138 | Bin 177 -> 0 bytes packs/education/{000150.log => 000154.log} | 0 packs/education/MANIFEST-000148 | Bin 178 -> 0 bytes packs/graces/{000142.log => 000146.log} | 0 packs/graces/MANIFEST-000140 | Bin 173 -> 0 bytes packs/maladies/{000142.log => 000146.log} | 0 packs/maladies/MANIFEST-000140 | Bin 172 -> 0 bytes packs/scenes/{000080.log => 000084.log} | 0 packs/scenes/MANIFEST-000078 | Bin 207 -> 0 bytes packs/simples/{000142.log => 000146.log} | 0 packs/simples/MANIFEST-000140 | Bin 173 -> 0 bytes templates/actors/actor-sheet.hbs | 4 ++-- 21 files changed, 5 insertions(+), 3 deletions(-) rename packs/aides/{000041.log => 000045.log} (100%) delete mode 100644 packs/aides/MANIFEST-000039 rename packs/armes/{000143.log => 000147.log} (100%) delete mode 100644 packs/armes/MANIFEST-000141 rename packs/armures/{000143.log => 000147.log} (100%) delete mode 100644 packs/armures/MANIFEST-000141 rename packs/competences/{000140.log => 000144.log} (100%) delete mode 100644 packs/competences/MANIFEST-000138 rename packs/education/{000150.log => 000154.log} (100%) delete mode 100644 packs/education/MANIFEST-000148 rename packs/graces/{000142.log => 000146.log} (100%) delete mode 100644 packs/graces/MANIFEST-000140 rename packs/maladies/{000142.log => 000146.log} (100%) delete mode 100644 packs/maladies/MANIFEST-000140 rename packs/scenes/{000080.log => 000084.log} (100%) delete mode 100644 packs/scenes/MANIFEST-000078 rename packs/simples/{000142.log => 000146.log} (100%) delete mode 100644 packs/simples/MANIFEST-000140 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 7c35b731a4375ec1e311c114d035aab5d450cec7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmZ<_SBT!uz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P92p_r9lT9lWVqgRla zo?5I}>R0ZSo@tUD;pChdmFwuCm!Fs67iy3jk>OvE;uq!R#>meA2JB2iXJiy%x-s-I oib0f-ZoVKy`pgoS$2eSd>_jU&P9wsF;?Ylag9gtmtiQ zXp$RZ9OmVc>Xz+amdvQm00!)g0S`VfBGh^2IR~bO1f_(SW<~f$SQs%fL)6JDW|pMp z7AuxlczR?P6(mlZI|LgXj>a1!QXU}WlJ6w%$zz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P9wsF;?Ylag9gtXOCi zUX)mn;^$UY?po;{V8$rN00!)g0oP*@%8bfGyqvO(Q!CS3<`@%f*83V@}JxHe&b?bWa?w&WMJ-RWRYuKS1kh)=m!Z*1PTBE Dnt?EC 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 0b4a3adc8f84e4f89382ea171f4596289126938b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmZ3Yo#EKVz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Fub5eqnp>=xR}kix znCx0r6j`pgoS$2eSd>_jU&P8Fub5eqnp><`>6GSN zWMS$a5nND}5tQx57|h530_=?ajK7-r6&2I+b5c@^iWMyb0yB+$%1lj)3X&@l%kmjL z!0O-zRk`N`l?0eq1?OdFm6n#KGHOB$%H-a+otuG?X(}Tp1M@USmK#h{R4Z`pgoS$2eSd>_jU&P8Fub5eqnp><`6&mRo z=3nYo5L8-ZndlhAsKEdR?2MdU(-~o^49#=1%F2T+f{dNad~)*L8O0&0VDh+3$-Yt` e&&9yV)XT`pz}&~kVt6kszXK%D2NIY76aWAyfGs}& 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 3660091b863fbe0652f84de44906b05ceab0cb6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZQR=jqwZz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Fub5eqnp><`S?r#g z5t(ZkmhBr}5I d7Xu?xFC!-da~~s%V5r39Ss;NvkiZ0>007*pEVKXs 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 abb70c4301765f7fcf37068cb86381f4316d83be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmYev3(#A|z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMHd6-*4u{b$3FSS_F z%`2ibJtZmIsle6CH6_T5k%a*a;0i)aO`Xkxib{&p3e&UA9W5D{APU%-SdVbwRK>_h jz!;bUam(uqIT#q3{5ctz16Ww*Sy|lxaRY$dAQlz?sDd;l 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 2a62373243a5f73df259daae8b0cc2822ce0614c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmYc=+5E1Bfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfDVUNN&IHMdx?s@Tjt z+oZU{IWxs9Kg8RZQJDb@*cmx@EM$bKGE8#xG4c%zD+qH+F-SIzVw8iZg304DWl3*e e4Hp9=Q!gVY19KlEi;AI8?^BRKA4p&VPyhf;3M~Hs 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}}
    @@ -348,7 +348,7 @@
     
    -