From c48401a1996c66b4c00e2882f93579b5551bacbb Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 21 Dec 2023 15:41:17 +0100 Subject: [PATCH] CSS+Predilection+Niveau de competence --- modules/mournblade-actor-sheet.js | 1 + modules/mournblade-actor.js | 3 ++ modules/mournblade-item-sheet.js | 10 ++--- modules/mournblade-item.js | 1 + modules/mournblade-utility.js | 10 ++++- packs/armes/{000016.log => 000036.log} | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 16 +++---- packs/armes/LOG.old | 16 +++---- packs/armes/MANIFEST-000014 | Bin 134 -> 0 bytes packs/armes/MANIFEST-000034 | Bin 0 -> 134 bytes packs/dons/{000016.log => 000036.log} | 0 packs/dons/CURRENT | 2 +- packs/dons/LOG | 16 +++---- packs/dons/LOG.old | 16 +++---- packs/dons/MANIFEST-000014 | Bin 134 -> 0 bytes packs/dons/MANIFEST-000034 | Bin 0 -> 134 bytes packs/equipement/{000016.log => 000036.log} | 0 packs/equipement/CURRENT | 2 +- packs/equipement/LOG | 16 +++---- packs/equipement/LOG.old | 16 +++---- packs/equipement/MANIFEST-000014 | Bin 134 -> 0 bytes packs/equipement/MANIFEST-000034 | Bin 0 -> 134 bytes packs/heritages/{000016.log => 000036.log} | 0 packs/heritages/CURRENT | 2 +- packs/heritages/LOG | 16 +++---- packs/heritages/LOG.old | 16 +++---- .../{MANIFEST-000014 => MANIFEST-000034} | Bin 134 -> 134 bytes packs/metiers/{000016.log => 000036.log} | 0 packs/metiers/CURRENT | 2 +- packs/metiers/LOG | 16 +++---- packs/metiers/LOG.old | 16 +++---- packs/metiers/MANIFEST-000014 | Bin 134 -> 0 bytes packs/metiers/MANIFEST-000034 | Bin 0 -> 134 bytes packs/origines/{000016.log => 000036.log} | 0 packs/origines/CURRENT | 2 +- packs/origines/LOG | 16 +++---- packs/origines/LOG.old | 16 +++---- packs/origines/MANIFEST-000014 | Bin 134 -> 0 bytes packs/origines/MANIFEST-000034 | Bin 0 -> 134 bytes packs/protection/{000016.log => 000036.log} | 0 packs/protection/CURRENT | 2 +- packs/protection/LOG | 16 +++---- packs/protection/LOG.old | 16 +++---- packs/protection/MANIFEST-000014 | Bin 134 -> 0 bytes packs/protection/MANIFEST-000034 | Bin 0 -> 134 bytes packs/runes/{000016.log => 000036.log} | 0 packs/runes/CURRENT | 2 +- packs/runes/LOG | 16 +++---- packs/runes/LOG.old | 16 +++---- packs/runes/MANIFEST-000014 | Bin 135 -> 0 bytes packs/runes/MANIFEST-000034 | Bin 0 -> 135 bytes packs/skills/{000016.log => 000036.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 +++---- packs/skills/LOG.old | 16 +++---- packs/skills/MANIFEST-000014 | Bin 134 -> 0 bytes packs/skills/MANIFEST-000034 | Bin 0 -> 134 bytes packs/tables/{000016.log => 000036.log} | 0 packs/tables/CURRENT | 2 +- packs/tables/LOG | 16 +++---- packs/tables/LOG.old | 16 +++---- .../{MANIFEST-000014 => MANIFEST-000034} | Bin 161 -> 161 bytes packs/tendances/{000016.log => 000036.log} | 0 packs/tendances/CURRENT | 2 +- packs/tendances/LOG | 16 +++---- packs/tendances/LOG.old | 16 +++---- packs/tendances/MANIFEST-000014 | Bin 135 -> 0 bytes packs/tendances/MANIFEST-000034 | Bin 0 -> 135 bytes .../{000016.log => 000036.log} | 0 packs/traits-chaotiques/CURRENT | 2 +- packs/traits-chaotiques/LOG | 16 +++---- packs/traits-chaotiques/LOG.old | 16 +++---- packs/traits-chaotiques/MANIFEST-000014 | Bin 134 -> 0 bytes packs/traits-chaotiques/MANIFEST-000034 | Bin 0 -> 134 bytes system.json | 4 +- templates/actor-sheet.html | 40 ++++++++++++++++++ templates/chat-generic-result.html | 13 ++++-- templates/item-competence-sheet.html | 2 +- ...-sheet.html => item-runeeffect-sheet.html} | 2 +- 80 files changed, 277 insertions(+), 217 deletions(-) rename packs/armes/{000016.log => 000036.log} (100%) delete mode 100644 packs/armes/MANIFEST-000014 create mode 100644 packs/armes/MANIFEST-000034 rename packs/dons/{000016.log => 000036.log} (100%) delete mode 100644 packs/dons/MANIFEST-000014 create mode 100644 packs/dons/MANIFEST-000034 rename packs/equipement/{000016.log => 000036.log} (100%) delete mode 100644 packs/equipement/MANIFEST-000014 create mode 100644 packs/equipement/MANIFEST-000034 rename packs/heritages/{000016.log => 000036.log} (100%) rename packs/heritages/{MANIFEST-000014 => MANIFEST-000034} (73%) rename packs/metiers/{000016.log => 000036.log} (100%) delete mode 100644 packs/metiers/MANIFEST-000014 create mode 100644 packs/metiers/MANIFEST-000034 rename packs/origines/{000016.log => 000036.log} (100%) delete mode 100644 packs/origines/MANIFEST-000014 create mode 100644 packs/origines/MANIFEST-000034 rename packs/protection/{000016.log => 000036.log} (100%) delete mode 100644 packs/protection/MANIFEST-000014 create mode 100644 packs/protection/MANIFEST-000034 rename packs/runes/{000016.log => 000036.log} (100%) delete mode 100644 packs/runes/MANIFEST-000014 create mode 100644 packs/runes/MANIFEST-000034 rename packs/skills/{000016.log => 000036.log} (100%) delete mode 100644 packs/skills/MANIFEST-000014 create mode 100644 packs/skills/MANIFEST-000034 rename packs/tables/{000016.log => 000036.log} (100%) rename packs/tables/{MANIFEST-000014 => MANIFEST-000034} (79%) rename packs/tendances/{000016.log => 000036.log} (100%) delete mode 100644 packs/tendances/MANIFEST-000014 create mode 100644 packs/tendances/MANIFEST-000034 rename packs/traits-chaotiques/{000016.log => 000036.log} (100%) delete mode 100644 packs/traits-chaotiques/MANIFEST-000014 create mode 100644 packs/traits-chaotiques/MANIFEST-000034 rename templates/{item-runeeffet-sheet.html => item-runeeffect-sheet.html} (98%) diff --git a/modules/mournblade-actor-sheet.js b/modules/mournblade-actor-sheet.js index 075740b..5a0c9ad 100644 --- a/modules/mournblade-actor-sheet.js +++ b/modules/mournblade-actor-sheet.js @@ -55,6 +55,7 @@ export class MournbladeActorSheet extends ActorSheet { combat: this.actor.getCombatValues(), equipements: duplicate(this.actor.getEquipments()), monnaies: duplicate(this.actor.getMonnaies()), + runeEffects: duplicate(this.actor.getRuneEffects()), description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}), options: this.options, owner: this.document.isOwner, diff --git a/modules/mournblade-actor.js b/modules/mournblade-actor.js index c80a2fc..c1d94f9 100644 --- a/modules/mournblade-actor.js +++ b/modules/mournblade-actor.js @@ -127,6 +127,9 @@ export class MournbladeActor extends Actor { getArmors() { return this.getItemSorted(["protection"]) } + getRuneEffects() { + return this.getItemSorted(["runeeffect"]) + } getOrigine() { return this.items.find(item => item.type == "origine") } diff --git a/modules/mournblade-item-sheet.js b/modules/mournblade-item-sheet.js index 367b00c..617d21b 100644 --- a/modules/mournblade-item-sheet.js +++ b/modules/mournblade-item-sheet.js @@ -135,26 +135,26 @@ export class MournbladeItemSheet extends ItemSheet { let index = li.data("prediction-index") let pred = duplicate(this.object.system.predilections) pred[index].name = ev.currentTarget.value - this.object.update( { 'data.predilections': pred }) + this.object.update( { 'system.predilections': pred }) }) html.find('.delete-prediction').click(ev => { const li = $(ev.currentTarget).parents(".prediction-item") let index = li.data("prediction-index") let pred = duplicate(this.object.system.predilections) pred.splice(index,1) - this.object.update( { 'data.predilections': pred }) + this.object.update( { 'system.predilections': pred }) }) html.find('.use-prediction').change(ev => { const li = $(ev.currentTarget).parents(".prediction-item") let index = li.data("prediction-index") let pred = duplicate(this.object.system.predilections) pred[index].used = ev.currentTarget.checked - this.object.update( { 'data.predilections': pred }) + this.object.update( { 'system.predilections': pred }) }) html.find('#add-predilection').click(ev => { let pred = duplicate(this.object.system.predilections) - pred.push( { name: "Nouvelle prédilection", used: false }) - this.object.update( { 'data.predilections': pred }) + pred.push( { name: "Nouvelle prédilection", id: randomID(), used: false }) + this.object.update( { 'system.predilections': pred }) }) // Update Inventory Item html.find('.item-delete').click(ev => { diff --git a/modules/mournblade-item.js b/modules/mournblade-item.js index 2c875bb..3c5c5ec 100644 --- a/modules/mournblade-item.js +++ b/modules/mournblade-item.js @@ -11,6 +11,7 @@ export const defaultItemImg = { predilection: "systems/fvtt-mournblade/assets/icons/predilection.webp", protection: "systems/fvtt-mournblade/assets/icons/protection.webp", rune: "systems/fvtt-mournblade/assets/icons/rune.webp", + runeeffect: "systems/fvtt-mournblade/assets/icons/rune.webp", tendance: "systems/fvtt-mournblade/assets/icons/tendance.webp", traitchaotique: "systems/fvtt-mournblade/assets/icons/traitchaotique.webp", } diff --git a/modules/mournblade-utility.js b/modules/mournblade-utility.js index 05cdd43..49091af 100644 --- a/modules/mournblade-utility.js +++ b/modules/mournblade-utility.js @@ -118,6 +118,13 @@ export class MournbladeUtility { static getOptionsStatusList() { return this.optionsStatusList; } + + /* -------------------------------------------- */ + static getPredilection(comp, predIdx) { + let pred = duplicate(comp.system.predilections) + return duplicate(pred[predIdx] || {name: "Error!"} ) + } + /* -------------------------------------------- */ static async chatListeners(html) { @@ -129,6 +136,7 @@ export class MournbladeUtility { let actor = MournbladeUtility.getActorFromRollData(rollData) await actor.setPredilectionUsed(rollData.competence._id, predIdx) rollData.competence = duplicate(actor.getCompetence(rollData.competence._id)) + rollData.predilectionUsed = MournbladeUtility.getPredilection(rollData.competence, predIdx) await MournbladeUtility.rollMournblade(rollData) }) } @@ -322,7 +330,7 @@ export class MournbladeUtility { } //console.log("BEFORE COMP", rollData) if (rollData.competence) { - rollData.predilections = duplicate(rollData.competence.system.predilections.filter(pred => !pred.used) || []) + rollData.predilections = duplicate(rollData.competence.system.predilections) let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0 rollData.diceFormula += `+${rollData.attr.value}+${rollData.competence.system.niveau}+${rollData.modificateur}+${compmod}` } else { diff --git a/packs/armes/000016.log b/packs/armes/000036.log similarity index 100% rename from packs/armes/000016.log rename to packs/armes/000036.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index 23b73d9..eea9b0f 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000034 diff --git a/packs/armes/LOG b/packs/armes/LOG index 986644d..1a29936 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/12/19-22:15:44.879816 7f3323fff6c0 Recovering log #12 -2023/12/19-22:15:44.890587 7f3323fff6c0 Delete type=3 #10 -2023/12/19-22:15:44.890683 7f3323fff6c0 Delete type=0 #12 -2023/12/19-22:15:56.534936 7f33223ff6c0 Level-0 table #17: started -2023/12/19-22:15:56.535009 7f33223ff6c0 Level-0 table #17: 0 bytes OK -2023/12/19-22:15:56.541696 7f33223ff6c0 Delete type=0 #15 -2023/12/19-22:15:56.548995 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/19-22:15:56.555645 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/21-15:38:38.681898 7f35b8bfa6c0 Recovering log #32 +2023/12/21-15:38:38.691893 7f35b8bfa6c0 Delete type=3 #30 +2023/12/21-15:38:38.692031 7f35b8bfa6c0 Delete type=0 #32 +2023/12/21-15:39:48.799860 7f33223ff6c0 Level-0 table #37: started +2023/12/21-15:39:48.799891 7f33223ff6c0 Level-0 table #37: 0 bytes OK +2023/12/21-15:39:48.806560 7f33223ff6c0 Delete type=0 #35 +2023/12/21-15:39:48.820290 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/21-15:39:48.828125 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old index 4ca2e6e..732a62c 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/12/19-21:45:05.580403 7f3323fff6c0 Recovering log #8 -2023/12/19-21:45:05.635099 7f3323fff6c0 Delete type=3 #6 -2023/12/19-21:45:05.635255 7f3323fff6c0 Delete type=0 #8 -2023/12/19-21:45:32.368329 7f33223ff6c0 Level-0 table #13: started -2023/12/19-21:45:32.368364 7f33223ff6c0 Level-0 table #13: 0 bytes OK -2023/12/19-21:45:32.374930 7f33223ff6c0 Delete type=0 #11 -2023/12/19-21:45:32.386871 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/19-21:45:32.393727 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/21-07:33:19.642453 7f33237fe6c0 Recovering log #28 +2023/12/21-07:33:19.696755 7f33237fe6c0 Delete type=3 #26 +2023/12/21-07:33:19.696894 7f33237fe6c0 Delete type=0 #28 +2023/12/21-07:58:41.318044 7f33223ff6c0 Level-0 table #33: started +2023/12/21-07:58:41.318080 7f33223ff6c0 Level-0 table #33: 0 bytes OK +2023/12/21-07:58:41.324620 7f33223ff6c0 Delete type=0 #31 +2023/12/21-07:58:41.324837 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/21-07:58:41.324874 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000014 b/packs/armes/MANIFEST-000014 deleted file mode 100644 index 1d6dd955c000e81ee3fb07b28069b8c50f969e40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmXT)Tzf5%fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb!)P`VrEHdZn2_4 zae1bzMYd^GTBv7XZbT^~BLf(~`pgoS$2eSd>_jU&PMDdaF!cF|#B!w^-3M z#XZ6=)5kd6&m`F~+dP7ikpT=~@>Nw;mR?0A;aRReDfy0R-i&e(`Q2+BE^;t1GVyaV UFblBAeOmjl4a5}ya)nsr0JjDt8UO$Q diff --git a/packs/dons/MANIFEST-000034 b/packs/dons/MANIFEST-000034 new file mode 100644 index 0000000000000000000000000000000000000000..835613eb72286fc7d14de14be3e7bdfcfd626489 GIT binary patch literal 134 zcmdPi<64%;z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdaF!cF|#B!w^-3M z#XZ6=)5kd6&m`F~+dP7ikpT=~@>Nw;mR?0A;aRReDfy0R-i&e(`Drn}2RIlQnUpyh Um{nNhn)ka_gSaX{t{RIR0G}5k>;M1& literal 0 HcmV?d00001 diff --git a/packs/equipement/000016.log b/packs/equipement/000036.log similarity index 100% rename from packs/equipement/000016.log rename to packs/equipement/000036.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index 23b73d9..eea9b0f 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000034 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index decd494..226ce6e 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2023/12/19-22:15:44.907560 7f33237fe6c0 Recovering log #12 -2023/12/19-22:15:44.919038 7f33237fe6c0 Delete type=3 #10 -2023/12/19-22:15:44.919177 7f33237fe6c0 Delete type=0 #12 -2023/12/19-22:15:56.527537 7f33223ff6c0 Level-0 table #17: started -2023/12/19-22:15:56.527579 7f33223ff6c0 Level-0 table #17: 0 bytes OK -2023/12/19-22:15:56.534748 7f33223ff6c0 Delete type=0 #15 -2023/12/19-22:15:56.548969 7f33223ff6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/12/19-22:15:56.555629 7f33223ff6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/21-15:38:38.708703 7f33237fe6c0 Recovering log #32 +2023/12/21-15:38:38.718410 7f33237fe6c0 Delete type=3 #30 +2023/12/21-15:38:38.718471 7f33237fe6c0 Delete type=0 #32 +2023/12/21-15:39:48.806833 7f33223ff6c0 Level-0 table #37: started +2023/12/21-15:39:48.806886 7f33223ff6c0 Level-0 table #37: 0 bytes OK +2023/12/21-15:39:48.813500 7f33223ff6c0 Delete type=0 #35 +2023/12/21-15:39:48.828075 7f33223ff6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/21-15:39:48.828188 7f33223ff6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/LOG.old b/packs/equipement/LOG.old index 300770e..0216c9a 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2023/12/19-21:45:05.694845 7f3322ffd6c0 Recovering log #8 -2023/12/19-21:45:05.749080 7f3322ffd6c0 Delete type=3 #6 -2023/12/19-21:45:05.749173 7f3322ffd6c0 Delete type=0 #8 -2023/12/19-21:45:32.393743 7f33223ff6c0 Level-0 table #13: started -2023/12/19-21:45:32.393776 7f33223ff6c0 Level-0 table #13: 0 bytes OK -2023/12/19-21:45:32.401345 7f33223ff6c0 Delete type=0 #11 -2023/12/19-21:45:32.416703 7f33223ff6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/12/19-21:45:32.416767 7f33223ff6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/21-07:33:19.768313 7f35b8bfa6c0 Recovering log #28 +2023/12/21-07:33:19.820531 7f35b8bfa6c0 Delete type=3 #26 +2023/12/21-07:33:19.820709 7f35b8bfa6c0 Delete type=0 #28 +2023/12/21-07:58:41.339937 7f33223ff6c0 Level-0 table #33: started +2023/12/21-07:58:41.339996 7f33223ff6c0 Level-0 table #33: 0 bytes OK +2023/12/21-07:58:41.347737 7f33223ff6c0 Delete type=0 #31 +2023/12/21-07:58:41.354745 7f33223ff6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/21-07:58:41.354836 7f33223ff6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000014 b/packs/equipement/MANIFEST-000014 deleted file mode 100644 index fda8bab806c227e814642d42fdf53f3b3dbcd58c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmbQbcmB6T21Z7yoYb<^oRlOzr^=Gl^338?=ltA)#G=HK{33QH*3Gu^ikT&;xy6cx z$x$gr895QRiS_Wa8&! VU>0C8zZ3iS1BfdCjN)KmWK!m2 UU{+x<@Ac0V1#wk?Ts0PR02p5*0RR91 literal 0 HcmV?d00001 diff --git a/packs/heritages/000016.log b/packs/heritages/000036.log similarity index 100% rename from packs/heritages/000016.log rename to packs/heritages/000036.log diff --git a/packs/heritages/CURRENT b/packs/heritages/CURRENT index 23b73d9..eea9b0f 100644 --- a/packs/heritages/CURRENT +++ b/packs/heritages/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000034 diff --git a/packs/heritages/LOG b/packs/heritages/LOG index 90f7a62..02e59cf 100644 --- a/packs/heritages/LOG +++ b/packs/heritages/LOG @@ -1,8 +1,8 @@ -2023/12/19-22:15:44.951754 7f35b8bfa6c0 Recovering log #12 -2023/12/19-22:15:44.963535 7f35b8bfa6c0 Delete type=3 #10 -2023/12/19-22:15:44.964185 7f35b8bfa6c0 Delete type=0 #12 -2023/12/19-22:15:56.555768 7f33223ff6c0 Level-0 table #17: started -2023/12/19-22:15:56.555799 7f33223ff6c0 Level-0 table #17: 0 bytes OK -2023/12/19-22:15:56.562320 7f33223ff6c0 Delete type=0 #15 -2023/12/19-22:15:56.583577 7f33223ff6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) -2023/12/19-22:15:56.583652 7f33223ff6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/12/21-15:38:38.748077 7f3322ffd6c0 Recovering log #32 +2023/12/21-15:38:38.758754 7f3322ffd6c0 Delete type=3 #30 +2023/12/21-15:38:38.758819 7f3322ffd6c0 Delete type=0 #32 +2023/12/21-15:39:48.828342 7f33223ff6c0 Level-0 table #37: started +2023/12/21-15:39:48.828403 7f33223ff6c0 Level-0 table #37: 0 bytes OK +2023/12/21-15:39:48.834842 7f33223ff6c0 Delete type=0 #35 +2023/12/21-15:39:48.855589 7f33223ff6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/12/21-15:39:48.855668 7f33223ff6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/LOG.old b/packs/heritages/LOG.old index 06ae7bb..be229fd 100644 --- a/packs/heritages/LOG.old +++ b/packs/heritages/LOG.old @@ -1,8 +1,8 @@ -2023/12/19-21:45:05.858392 7f3323fff6c0 Recovering log #8 -2023/12/19-21:45:05.908553 7f3323fff6c0 Delete type=3 #6 -2023/12/19-21:45:05.908991 7f3323fff6c0 Delete type=0 #8 -2023/12/19-21:45:32.431375 7f33223ff6c0 Level-0 table #13: started -2023/12/19-21:45:32.431443 7f33223ff6c0 Level-0 table #13: 0 bytes OK -2023/12/19-21:45:32.438078 7f33223ff6c0 Delete type=0 #11 -2023/12/19-21:45:32.445311 7f33223ff6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) -2023/12/19-21:45:32.445367 7f33223ff6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/12/21-07:33:19.957961 7f3323fff6c0 Recovering log #28 +2023/12/21-07:33:20.013175 7f3323fff6c0 Delete type=3 #26 +2023/12/21-07:33:20.013313 7f3323fff6c0 Delete type=0 #28 +2023/12/21-07:58:41.354980 7f33223ff6c0 Level-0 table #33: started +2023/12/21-07:58:41.355028 7f33223ff6c0 Level-0 table #33: 0 bytes OK +2023/12/21-07:58:41.361922 7f33223ff6c0 Delete type=0 #31 +2023/12/21-07:58:41.383763 7f33223ff6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/12/21-07:58:41.383845 7f33223ff6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/MANIFEST-000014 b/packs/heritages/MANIFEST-000034 similarity index 73% rename from packs/heritages/MANIFEST-000014 rename to packs/heritages/MANIFEST-000034 index 928b8629f4be5eb3a9ad5e7a94a472aeda7cb38b..471f4e7f59c6707cbdf849b4bdb84c891aeb57d6 100644 GIT binary patch delta 37 pcmZo;Y-5~|A;))eT|5T^Ba<>G1G5SX*YDJ2QXsAhkgLYR1puc}2Lu2B delta 37 pcmZo;Y-5~|A?F-%-++UGk%^y^fmwisD=XaTIfyF&`pgoS$2eSd>_jU&PMD`Y%UbF|#B!w^-4@ zve?+T*sV0H)S@aYpwN?%kpT=~@)bFiZq9+uIZjcAe#ZWWPK<&O`MH@DKRFl}nfN&w Um<3n_MY3kvfw%%dt`LhL0Gt0I;s5{u diff --git a/packs/metiers/MANIFEST-000034 b/packs/metiers/MANIFEST-000034 new file mode 100644 index 0000000000000000000000000000000000000000..662df28b177a829809d7af3cdcdce0a13c1b1361 GIT binary patch literal 134 zcmaz%D;l22z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD`Y%UbF|#B!w^-4@ zve?+T*sV0H)S@aYpwN?%kpT=~@)bFiZq9+uIZjcAe#ZWWPK<&O`GOs+92^XcOv;=L U%qlE`slmL?Ag&6KtHvS-0D3YYqW}N^ literal 0 HcmV?d00001 diff --git a/packs/origines/000016.log b/packs/origines/000036.log similarity index 100% rename from packs/origines/000016.log rename to packs/origines/000036.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index 23b73d9..eea9b0f 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000034 diff --git a/packs/origines/LOG b/packs/origines/LOG index b36e013..0672991 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/12/19-22:15:44.936602 7f3323fff6c0 Recovering log #12 -2023/12/19-22:15:44.948721 7f3323fff6c0 Delete type=3 #10 -2023/12/19-22:15:44.948846 7f3323fff6c0 Delete type=0 #12 -2023/12/19-22:15:56.549013 7f33223ff6c0 Level-0 table #17: started -2023/12/19-22:15:56.549045 7f33223ff6c0 Level-0 table #17: 0 bytes OK -2023/12/19-22:15:56.555450 7f33223ff6c0 Delete type=0 #15 -2023/12/19-22:15:56.555659 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) -2023/12/19-22:15:56.555725 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/21-15:38:38.735509 7f35b8bfa6c0 Recovering log #32 +2023/12/21-15:38:38.744908 7f35b8bfa6c0 Delete type=3 #30 +2023/12/21-15:38:38.744979 7f35b8bfa6c0 Delete type=0 #32 +2023/12/21-15:39:48.835017 7f33223ff6c0 Level-0 table #37: started +2023/12/21-15:39:48.835057 7f33223ff6c0 Level-0 table #37: 0 bytes OK +2023/12/21-15:39:48.842344 7f33223ff6c0 Delete type=0 #35 +2023/12/21-15:39:48.855603 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/21-15:39:48.855659 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) diff --git a/packs/origines/LOG.old b/packs/origines/LOG.old index 6193314..da9634b 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/12/19-21:45:05.805812 7f3322ffd6c0 Recovering log #8 -2023/12/19-21:45:05.854930 7f3322ffd6c0 Delete type=3 #6 -2023/12/19-21:45:05.855021 7f3322ffd6c0 Delete type=0 #8 -2023/12/19-21:45:32.408791 7f33223ff6c0 Level-0 table #13: started -2023/12/19-21:45:32.408828 7f33223ff6c0 Level-0 table #13: 0 bytes OK -2023/12/19-21:45:32.416539 7f33223ff6c0 Delete type=0 #11 -2023/12/19-21:45:32.416752 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) -2023/12/19-21:45:32.416795 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/21-07:33:19.886433 7f33237fe6c0 Recovering log #28 +2023/12/21-07:33:19.946793 7f33237fe6c0 Delete type=3 #26 +2023/12/21-07:33:19.946922 7f33237fe6c0 Delete type=0 #28 +2023/12/21-07:58:41.347898 7f33223ff6c0 Level-0 table #33: started +2023/12/21-07:58:41.347947 7f33223ff6c0 Level-0 table #33: 0 bytes OK +2023/12/21-07:58:41.354510 7f33223ff6c0 Delete type=0 #31 +2023/12/21-07:58:41.354765 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/21-07:58:41.354819 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000014 b/packs/origines/MANIFEST-000014 deleted file mode 100644 index 9ed80b2367618b7695eaa1fb33ce2e8f774a873a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmaFnw>mJ9fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb-9zgVrEHdZn2_K ziJ^C{Q)-}JskgUjVU8aoBLf(~mJ9fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb-9zgVrEHdZn2_K ziJ^C{Q)-}JskgUjVU8aoBLf(~fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb%KbzVrEHdZn2_K zhKr#~U|6cNXP{?f&@a)nsf0Yk(g-~a#s diff --git a/packs/protection/MANIFEST-000034 b/packs/protection/MANIFEST-000034 new file mode 100644 index 0000000000000000000000000000000000000000..18275acdadbc97ad37871d34b3e127744649882d GIT binary patch literal 134 zcmdPCG+Qc>fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb%KbzVrEHdZn2_K zhKr#~U|6cNXP{?`pgoS$2eSd>_jU&PMD+WMJMUNN&IHMdyN z(5o;!$u-*}G~YWSsW?54k&yumVDc4t&S^#!o&i-U#i995A(f1}5c!ybU4J+j7@7Dv V8JGoFbVKvQjX_)iAXkV*7XSo!Bd7oX diff --git a/packs/runes/MANIFEST-000034 b/packs/runes/MANIFEST-000034 new file mode 100644 index 0000000000000000000000000000000000000000..e8de6caf0051d04b649c32ed9ee2168e7593924a GIT binary patch literal 135 zcmYedazCHMz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+WMJMUNN&IHMdyN z(5o;!$u-*}G~YWSsW?54k&yumVDc4t&S^#!o&i-U#i995A(f1}5c!RYhq*Zz7@3qg V8JJaAbeGhf_5*QMfLt{eT>$-nBm)2d literal 0 HcmV?d00001 diff --git a/packs/skills/000016.log b/packs/skills/000036.log similarity index 100% rename from packs/skills/000016.log rename to packs/skills/000036.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 23b73d9..eea9b0f 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000034 diff --git a/packs/skills/LOG b/packs/skills/LOG index 3464921..d698cbf 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/12/19-22:15:44.865290 7f3322ffd6c0 Recovering log #12 -2023/12/19-22:15:44.876647 7f3322ffd6c0 Delete type=3 #10 -2023/12/19-22:15:44.876743 7f3322ffd6c0 Delete type=0 #12 -2023/12/19-22:15:56.490933 7f33223ff6c0 Level-0 table #17: started -2023/12/19-22:15:56.490979 7f33223ff6c0 Level-0 table #17: 0 bytes OK -2023/12/19-22:15:56.498758 7f33223ff6c0 Delete type=0 #15 -2023/12/19-22:15:56.517170 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/19-22:15:56.527510 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/21-15:38:38.668335 7f3323fff6c0 Recovering log #32 +2023/12/21-15:38:38.678141 7f3323fff6c0 Delete type=3 #30 +2023/12/21-15:38:38.678186 7f3323fff6c0 Delete type=0 #32 +2023/12/21-15:39:48.782931 7f33223ff6c0 Level-0 table #37: started +2023/12/21-15:39:48.783224 7f33223ff6c0 Level-0 table #37: 0 bytes OK +2023/12/21-15:39:48.789981 7f33223ff6c0 Delete type=0 #35 +2023/12/21-15:39:48.790146 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/21-15:39:48.799834 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 79b2fac..cdbc0b8 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/12/19-21:45:05.522800 7f33237fe6c0 Recovering log #8 -2023/12/19-21:45:05.576713 7f33237fe6c0 Delete type=3 #6 -2023/12/19-21:45:05.576894 7f33237fe6c0 Delete type=0 #8 -2023/12/19-21:45:32.360607 7f33223ff6c0 Level-0 table #13: started -2023/12/19-21:45:32.360665 7f33223ff6c0 Level-0 table #13: 0 bytes OK -2023/12/19-21:45:32.368046 7f33223ff6c0 Delete type=0 #11 -2023/12/19-21:45:32.375090 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/19-21:45:32.386907 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/21-07:33:19.587946 7f3322ffd6c0 Recovering log #28 +2023/12/21-07:33:19.638667 7f3322ffd6c0 Delete type=3 #26 +2023/12/21-07:33:19.638767 7f3322ffd6c0 Delete type=0 #28 +2023/12/21-07:58:41.311048 7f33223ff6c0 Level-0 table #33: started +2023/12/21-07:58:41.311092 7f33223ff6c0 Level-0 table #33: 0 bytes OK +2023/12/21-07:58:41.317814 7f33223ff6c0 Delete type=0 #31 +2023/12/21-07:58:41.324812 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/21-07:58:41.324863 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000014 b/packs/skills/MANIFEST-000014 deleted file mode 100644 index 5c48f18e208e34ec4bd7c76b462bfb52c4aa89db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmb=?Qs11&z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD`pZ&YF|#B!w^-4@ zC#TA#(z&$AD>bDswbGrDkpT=~@+F04xvuFE`RV2vCSjG~*^K-U`NWUUJUAE_nfN&w Um<3q)Jw9>rgSY}ft`G}90Ld33<^TWy diff --git a/packs/skills/MANIFEST-000034 b/packs/skills/MANIFEST-000034 new file mode 100644 index 0000000000000000000000000000000000000000..fc11a9724ce1264ca2b137fcc519463e672291b0 GIT binary patch literal 134 zcmb=?Qs11&z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD`pZ&YF|#B!w^-4@ zC#TA#(z&$AD>bDswbGrDkpT=~@+F04xvuFE`RV2vCSjG~*^K-U`85lsnR75OGAVO1 VFsrce&-^|26Nsw<`pgoS$2eSd>_jU&PMDI)5vpykcfaYHqQj zfpcVlp;tjvsby|)iD`*9BO?PCz~rkk0s@M2LrQ$g%#$nqJiHjqA@WyaWz;zs7@7Dv V8JGoF%`pgoS$2eSd>_jU&PMDI)5vpykcfaYHqQj zfpcVlp;tjvsby|)iD`*9BO?PCz~rkk0s@M2LrQ$g%#$nqJiHjqA@UV#3Zpm}7@3qg V8JJaA%zOPaML}E@AXkmW902P +
+
    +
  • + +

    +     + + + + + + + + + + + + +
     
    +
    +
    +
    • + {{#each runeEffects as |runeEffect key|}} +
  • + + {{runeEffect.name}} + {{runeEffect.system.rune}} + {{upperFirst runeEffect.system.mode}} + {{runeEffect.system.duree}} + {{runeEffect.system.pointame}} +
     
    +
    + + +
    +
    • + {{/each}} +
+
+ diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index 690ef40..3c94b48 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -24,6 +24,10 @@
  • Compétence : {{competence.name}}
    • {{/if}} + {{#if predilectionUsed}} +
  • Predilection utilisée : {{predilectionUsed.name}}
    • + {{/if}} + {{#if rune}}
  • Rune : {{rune.name}}
  • Mode : {{runemode}}
    • @@ -65,9 +69,12 @@ {{/if}} {{#each predilections as |pred key|}} -
  • - -
    • + {{#if (not pred.used)}} +
  • + +
    • + {{/if}} {{/each}} diff --git a/templates/item-competence-sheet.html b/templates/item-competence-sheet.html index 2b2b36a..1a33a9d 100644 --- a/templates/item-competence-sheet.html +++ b/templates/item-competence-sheet.html @@ -12,7 +12,7 @@
    - diff --git a/templates/item-runeeffet-sheet.html b/templates/item-runeeffect-sheet.html similarity index 98% rename from templates/item-runeeffet-sheet.html rename to templates/item-runeeffect-sheet.html index 8e304a6..e670b31 100644 --- a/templates/item-runeeffet-sheet.html +++ b/templates/item-runeeffect-sheet.html @@ -18,7 +18,7 @@