From 5d843af069f66cec71156945694459011b83ac12 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Tue, 17 Sep 2024 16:05:50 +0200 Subject: [PATCH] Fix education + simples --- modules/common/tedeum-config.js | 4 +++- modules/data/tedeum-schema-education.js | 1 + modules/data/tedeum-schema-simple.js | 4 ++-- packs/competences/{000201.log => 000204.log} | 0 packs/competences/CURRENT | 2 +- packs/competences/LOG | 11 +++-------- packs/competences/LOG.old | 16 ++++++++-------- .../{MANIFEST-000199 => MANIFEST-000203} | Bin 178 -> 160 bytes packs/equipment/{000260.log => 000263.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 10 +++------- packs/equipment/LOG.old | 14 +++++++------- packs/equipment/MANIFEST-000258 | Bin 69 -> 0 bytes packs/equipment/MANIFEST-000262 | Bin 0 -> 52 bytes system.json | 4 ++-- templates/items/item-education-sheet.hbs | 2 +- 16 files changed, 32 insertions(+), 38 deletions(-) rename packs/competences/{000201.log => 000204.log} (100%) rename packs/competences/{MANIFEST-000199 => MANIFEST-000203} (71%) rename packs/equipment/{000260.log => 000263.log} (100%) delete mode 100644 packs/equipment/MANIFEST-000258 create mode 100644 packs/equipment/MANIFEST-000262 diff --git a/modules/common/tedeum-config.js b/modules/common/tedeum-config.js index c318a7a..e918d3c 100644 --- a/modules/common/tedeum-config.js +++ b/modules/common/tedeum-config.js @@ -131,6 +131,7 @@ export const TEDEUM_CONFIG = { arquebusade: { label: "Arquebusade", value: "arquebusade" } }, difficulte: { + aucune: { label: "Aucune", key: "aucune", value: 0 }, routine: { label: "Routine", key: "routine", value: 3 }, facile: { label: "Facile", key: "facile",value: 5 }, pardefaut: { label: "Par Défaut", key: "pardefaut", value: 7 }, @@ -178,6 +179,7 @@ export const TEDEUM_CONFIG = { tunenet: { value: 5, label: "Tué net", key: "tuenet", degatsMin: 9, degatsMax: 100, count: 1, horsCombat: true, mort: true, modifier: -12 } }, virulence: { + aucune: { label: "Aucune", value: "aucune", modifier: 0 }, fatigue: { label: "Fatigue", value: "fatigue", modifier: 0 }, epuisement: { label: "Epuisement", value: "epuisement",modifier: -1 }, souffrance: { label: "Souffrance", value: "souffrance", modifier: -2 }, @@ -190,7 +192,7 @@ export const TEDEUM_CONFIG = { grave: { label: "Grave", value: "grave" } }, virulencePoison: { - aucune: { label: "Aucune", value: "nausee", modifier: 0 }, + aucune: { label: "Aucune", value: "aucune", modifier: 0 }, nausee: { label: "Nausées & Vertiges", value: "nausee", modifier:0 }, inflammation: { label: "Inflammations & Vomissements", value: "inflammation", modifier: -1 }, elancement: { label: "Elancements & Hémorragies", value: "elancement" , modifier: -2 }, diff --git a/modules/data/tedeum-schema-education.js b/modules/data/tedeum-schema-education.js index 3bb8fec..982ac1c 100644 --- a/modules/data/tedeum-schema-education.js +++ b/modules/data/tedeum-schema-education.js @@ -35,6 +35,7 @@ export class TeDeumEducationSchema extends foundry.abstract.TypeDataModel { resp[`reponse${i}`] = new fields.SchemaField({ num: new fields.NumberField({ ...requiredInteger, initial: i, min:i }), reponse: new fields.StringField({ required: true, blank: true, initial: "" }), + compName: new fields.StringField({ required: true, blank: true, initial: "" }), toSelect: new fields.BooleanField({ initial: false }), compList: new fields.SchemaField(Array.fromRange(10, 1).reduce((comps, i) => { comps[`comp${i}`] = new fields.SchemaField({ diff --git a/modules/data/tedeum-schema-simple.js b/modules/data/tedeum-schema-simple.js index 6c4d882..418f8d7 100644 --- a/modules/data/tedeum-schema-simple.js +++ b/modules/data/tedeum-schema-simple.js @@ -4,8 +4,8 @@ export class TeDeumMaladieSchema extends foundry.abstract.TypeDataModel { const requiredInteger = { required: true, nullable: false, integer: true }; const schema = {}; - schema.difficulteEndurance = new fields.StringField({required:true, initial:"routine"}); - schema.virulence = new fields.StringField({required: true, choices: ["aucune", "nausee", "inflammation", "elancement", "convulsion", "mort"], initial: "fatigue"}); + schema.difficulteEndurance = new fields.StringField({required:true, initial:"aucun"}); + schema.virulence = new fields.StringField({required: true, choices: ["nausee", "inflammation", "elancement", "convulsion", "mort"], initial: "aucune"}); schema.vertus = new fields.HTMLField({ required: true, blank: true }); schema.toxicite = new fields.HTMLField({ required: true, blank: true }); schema.appliquee = new fields.BooleanField({initial: false}), diff --git a/packs/competences/000201.log b/packs/competences/000204.log similarity index 100% rename from packs/competences/000201.log rename to packs/competences/000204.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index d0dd497..183d782 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000199 +MANIFEST-000203 diff --git a/packs/competences/LOG b/packs/competences/LOG index 27f071f..e0b4b49 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,3 @@ -2024/09/16-18:32:36.554014 7fe046a006c0 Recovering log #197 -2024/09/16-18:32:36.565518 7fe046a006c0 Delete type=3 #195 -2024/09/16-18:32:36.565621 7fe046a006c0 Delete type=0 #197 -2024/09/16-18:36:53.391303 7fe045a006c0 Level-0 table #202: started -2024/09/16-18:36:53.391343 7fe045a006c0 Level-0 table #202: 0 bytes OK -2024/09/16-18:36:53.399083 7fe045a006c0 Delete type=0 #200 -2024/09/16-18:36:53.399373 7fe045a006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/09/16-18:36:53.399401 7fe045a006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/09/17-15:58:25.923011 7fe0474006c0 Recovering log #201 +2024/09/17-15:58:25.932722 7fe0474006c0 Delete type=3 #199 +2024/09/17-15:58:25.932775 7fe0474006c0 Delete type=0 #201 diff --git a/packs/competences/LOG.old b/packs/competences/LOG.old index 3341886..27f071f 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,8 +1,8 @@ -2024/09/16-18:29:35.753255 7fe04ce006c0 Recovering log #193 -2024/09/16-18:29:35.765013 7fe04ce006c0 Delete type=3 #191 -2024/09/16-18:29:35.765102 7fe04ce006c0 Delete type=0 #193 -2024/09/16-18:32:32.659108 7fe045a006c0 Level-0 table #198: started -2024/09/16-18:32:32.659176 7fe045a006c0 Level-0 table #198: 0 bytes OK -2024/09/16-18:32:32.666135 7fe045a006c0 Delete type=0 #196 -2024/09/16-18:32:32.666413 7fe045a006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/09/16-18:32:32.666456 7fe045a006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/09/16-18:32:36.554014 7fe046a006c0 Recovering log #197 +2024/09/16-18:32:36.565518 7fe046a006c0 Delete type=3 #195 +2024/09/16-18:32:36.565621 7fe046a006c0 Delete type=0 #197 +2024/09/16-18:36:53.391303 7fe045a006c0 Level-0 table #202: started +2024/09/16-18:36:53.391343 7fe045a006c0 Level-0 table #202: 0 bytes OK +2024/09/16-18:36:53.399083 7fe045a006c0 Delete type=0 #200 +2024/09/16-18:36:53.399373 7fe045a006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/09/16-18:36:53.399401 7fe045a006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000199 b/packs/competences/MANIFEST-000203 similarity index 71% rename from packs/competences/MANIFEST-000199 rename to packs/competences/MANIFEST-000203 index 8ad74c1cb87fd7b5fc73945d595c02155406f9ad..b2bac9f234c86aa872cc3b55ae7b2b0bd0eefc69 100644 GIT binary patch delta 25 gcmdnQxPWm&pOA8XPd_&UBhwj1P6p<)j4T&f0b&dW!2kdN delta 43 tcmZ3$xQTH>pUS5dOBX=DoErcNaQp~1OPh645|PC diff --git a/packs/equipment/000260.log b/packs/equipment/000263.log similarity index 100% rename from packs/equipment/000260.log rename to packs/equipment/000263.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index 15dad27..6320c6a 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000258 +MANIFEST-000262 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index c793503..0287186 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,3 @@ -2024/09/16-18:32:36.539017 7fe047e006c0 Recovering log #256 -2024/09/16-18:32:36.550689 7fe047e006c0 Delete type=3 #254 -2024/09/16-18:32:36.550822 7fe047e006c0 Delete type=0 #256 -2024/09/16-18:36:53.384468 7fe045a006c0 Level-0 table #261: started -2024/09/16-18:36:53.384539 7fe045a006c0 Level-0 table #261: 0 bytes OK -2024/09/16-18:36:53.391130 7fe045a006c0 Delete type=0 #259 -2024/09/16-18:36:53.399352 7fe045a006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/09/17-15:58:25.909589 7fe047e006c0 Recovering log #260 +2024/09/17-15:58:25.921037 7fe047e006c0 Delete type=3 #258 +2024/09/17-15:58:25.921092 7fe047e006c0 Delete type=0 #260 diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index b0c4686..c793503 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2024/09/16-18:29:35.739334 7fe0474006c0 Recovering log #252 -2024/09/16-18:29:35.750383 7fe0474006c0 Delete type=3 #250 -2024/09/16-18:29:35.750482 7fe0474006c0 Delete type=0 #252 -2024/09/16-18:32:32.651901 7fe045a006c0 Level-0 table #257: started -2024/09/16-18:32:32.651978 7fe045a006c0 Level-0 table #257: 0 bytes OK -2024/09/16-18:32:32.658822 7fe045a006c0 Delete type=0 #255 -2024/09/16-18:32:32.666372 7fe045a006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/09/16-18:32:36.539017 7fe047e006c0 Recovering log #256 +2024/09/16-18:32:36.550689 7fe047e006c0 Delete type=3 #254 +2024/09/16-18:32:36.550822 7fe047e006c0 Delete type=0 #256 +2024/09/16-18:36:53.384468 7fe045a006c0 Level-0 table #261: started +2024/09/16-18:36:53.384539 7fe045a006c0 Level-0 table #261: 0 bytes OK +2024/09/16-18:36:53.391130 7fe045a006c0 Delete type=0 #259 +2024/09/16-18:36:53.399352 7fe045a006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000258 b/packs/equipment/MANIFEST-000258 deleted file mode 100644 index d4ff50489d7963d9c43c86d6e6b62be9c3ce3bd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAevxu%%~dW2My6&aP6p-{ TCKd*n)Sw=aKnqBq4JZHrIrS4m diff --git a/packs/equipment/MANIFEST-000262 b/packs/equipment/MANIFEST-000262 new file mode 100644 index 0000000000000000000000000000000000000000..acdc1914eae640e1a03d8c67ffb015496fa2dd39 GIT binary patch literal 52 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAe$fYUi>+J?j7;rJoD9qz HOe_ol17{G- literal 0 HcmV?d00001 diff --git a/system.json b/system.json index d6c165f..2ca2701 100644 --- a/system.json +++ b/system.json @@ -64,8 +64,8 @@ }, "title": "Te Deum pour Un Massacre, le Jeu de Rôles", "url": "https://www.uberwald.me/gitea/public/fvtt-te-deum", - "version": "12.0.5", - "download": "https://www.uberwald.me/gitea/public/fvtt-te-deum/archive/fvtt-te-deum-v12.0.5.zip", + "version": "12.0.6", + "download": "https://www.uberwald.me/gitea/public/fvtt-te-deum/archive/fvtt-te-deum-v12.0.6.zip", "background": "", "flags": { "hotReload": { diff --git a/templates/items/item-education-sheet.hbs b/templates/items/item-education-sheet.hbs index 3be6cb6..390350e 100644 --- a/templates/items/item-education-sheet.hbs +++ b/templates/items/item-education-sheet.hbs @@ -86,7 +86,7 @@ {{/each}} {{else}} - {{selectOptions @root.competences selected=reponse.compName labelAttr="name" blank=""}} {{/if}}