From 9c20f277eafefdc0299618e77d5b60a51ccbde31 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Fri, 29 Dec 2023 18:36:37 +0100 Subject: [PATCH] Gestion plus fine ame+sante --- modules/mournblade-actor-sheet.js | 10 + modules/mournblade-actor.js | 95 +++++++--- modules/mournblade-utility.js | 7 +- packs/armes/{000072.log => 000084.log} | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 16 +- packs/armes/LOG.old | 16 +- packs/armes/MANIFEST-000070 | Bin 134 -> 0 bytes packs/armes/MANIFEST-000082 | Bin 0 -> 134 bytes packs/dons/{000072.log => 000084.log} | 0 packs/dons/CURRENT | 2 +- packs/dons/LOG | 16 +- packs/dons/LOG.old | 16 +- packs/dons/MANIFEST-000070 | Bin 134 -> 0 bytes packs/dons/MANIFEST-000082 | Bin 0 -> 134 bytes packs/equipement/{000072.log => 000084.log} | 0 packs/equipement/CURRENT | 2 +- packs/equipement/LOG | 16 +- packs/equipement/LOG.old | 16 +- packs/equipement/MANIFEST-000070 | Bin 134 -> 0 bytes packs/equipement/MANIFEST-000082 | Bin 0 -> 134 bytes packs/heritages/{000072.log => 000084.log} | 0 packs/heritages/CURRENT | 2 +- packs/heritages/LOG | 16 +- packs/heritages/LOG.old | 16 +- .../{MANIFEST-000070 => MANIFEST-000082} | Bin 134 -> 134 bytes packs/metiers/{000072.log => 000084.log} | 0 packs/metiers/CURRENT | 2 +- packs/metiers/LOG | 16 +- packs/metiers/LOG.old | 16 +- packs/metiers/MANIFEST-000070 | Bin 134 -> 0 bytes packs/metiers/MANIFEST-000082 | Bin 0 -> 134 bytes packs/origines/{000072.log => 000084.log} | 0 packs/origines/CURRENT | 2 +- packs/origines/LOG | 16 +- packs/origines/LOG.old | 16 +- packs/origines/MANIFEST-000070 | Bin 134 -> 0 bytes packs/origines/MANIFEST-000082 | Bin 0 -> 134 bytes packs/protection/{000072.log => 000084.log} | 0 packs/protection/CURRENT | 2 +- packs/protection/LOG | 16 +- packs/protection/LOG.old | 16 +- packs/protection/MANIFEST-000070 | Bin 134 -> 0 bytes packs/protection/MANIFEST-000082 | Bin 0 -> 134 bytes packs/runes/{000072.log => 000084.log} | 0 packs/runes/CURRENT | 2 +- packs/runes/LOG | 16 +- packs/runes/LOG.old | 16 +- packs/runes/MANIFEST-000070 | Bin 135 -> 0 bytes packs/runes/MANIFEST-000082 | Bin 0 -> 135 bytes packs/skills/{000072.log => 000084.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 +- packs/skills/LOG.old | 16 +- packs/skills/MANIFEST-000070 | Bin 134 -> 0 bytes packs/skills/MANIFEST-000082 | Bin 0 -> 134 bytes packs/tables/{000072.log => 000084.log} | 0 packs/tables/CURRENT | 2 +- packs/tables/LOG | 16 +- packs/tables/LOG.old | 16 +- .../{MANIFEST-000070 => MANIFEST-000082} | Bin 161 -> 161 bytes packs/tendances/{000072.log => 000084.log} | 0 packs/tendances/CURRENT | 2 +- packs/tendances/LOG | 16 +- packs/tendances/LOG.old | 16 +- packs/tendances/MANIFEST-000070 | Bin 135 -> 0 bytes packs/tendances/MANIFEST-000082 | Bin 0 -> 135 bytes .../{000072.log => 000084.log} | 0 packs/traits-chaotiques/CURRENT | 2 +- packs/traits-chaotiques/LOG | 16 +- packs/traits-chaotiques/LOG.old | 16 +- packs/traits-chaotiques/MANIFEST-000070 | Bin 134 -> 0 bytes packs/traits-chaotiques/MANIFEST-000082 | Bin 0 -> 134 bytes styles/simple.css | 1 + system.json | 4 +- template.json | 2 + templates/actor-sheet.html | 178 +++++++++++------- templates/roll-dialog-generic.html | 7 +- 78 files changed, 407 insertions(+), 305 deletions(-) rename packs/armes/{000072.log => 000084.log} (100%) delete mode 100644 packs/armes/MANIFEST-000070 create mode 100644 packs/armes/MANIFEST-000082 rename packs/dons/{000072.log => 000084.log} (100%) delete mode 100644 packs/dons/MANIFEST-000070 create mode 100644 packs/dons/MANIFEST-000082 rename packs/equipement/{000072.log => 000084.log} (100%) delete mode 100644 packs/equipement/MANIFEST-000070 create mode 100644 packs/equipement/MANIFEST-000082 rename packs/heritages/{000072.log => 000084.log} (100%) rename packs/heritages/{MANIFEST-000070 => MANIFEST-000082} (73%) rename packs/metiers/{000072.log => 000084.log} (100%) delete mode 100644 packs/metiers/MANIFEST-000070 create mode 100644 packs/metiers/MANIFEST-000082 rename packs/origines/{000072.log => 000084.log} (100%) delete mode 100644 packs/origines/MANIFEST-000070 create mode 100644 packs/origines/MANIFEST-000082 rename packs/protection/{000072.log => 000084.log} (100%) delete mode 100644 packs/protection/MANIFEST-000070 create mode 100644 packs/protection/MANIFEST-000082 rename packs/runes/{000072.log => 000084.log} (100%) delete mode 100644 packs/runes/MANIFEST-000070 create mode 100644 packs/runes/MANIFEST-000082 rename packs/skills/{000072.log => 000084.log} (100%) delete mode 100644 packs/skills/MANIFEST-000070 create mode 100644 packs/skills/MANIFEST-000082 rename packs/tables/{000072.log => 000084.log} (100%) rename packs/tables/{MANIFEST-000070 => MANIFEST-000082} (79%) rename packs/tendances/{000072.log => 000084.log} (100%) delete mode 100644 packs/tendances/MANIFEST-000070 create mode 100644 packs/tendances/MANIFEST-000082 rename packs/traits-chaotiques/{000072.log => 000084.log} (100%) delete mode 100644 packs/traits-chaotiques/MANIFEST-000070 create mode 100644 packs/traits-chaotiques/MANIFEST-000082 diff --git a/modules/mournblade-actor-sheet.js b/modules/mournblade-actor-sheet.js index 4bae1c6..608197b 100644 --- a/modules/mournblade-actor-sheet.js +++ b/modules/mournblade-actor-sheet.js @@ -60,6 +60,7 @@ export class MournbladeActorSheet extends ActorSheet { config: game.system.mournblade.config, protectionTotal: this.actor.getProtectionTotal(), santeMalus: this.actor.getStatusMalus(), + ameMalus: this.actor.getAmeMalus(), description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}), options: this.options, owner: this.document.isOwner, @@ -147,6 +148,15 @@ export class MournbladeActorSheet extends ActorSheet { const itemType = $(event.currentTarget).data("type") this.actor.createEmbeddedDocuments('Item', [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true }) }) + html.find('.sante-modify').click((event) => { + const santeType = $(event.currentTarget).data("type") + const value = $(event.currentTarget).data("value") + this.actor.incDecSante(santeType, value, false) + }) + html.find('.ame-modify').click((event) => { + const value = $(event.currentTarget).data("value") + this.actor.incDecAme(value) + }) html.find('.lock-unlock-sheet').click((event) => { diff --git a/modules/mournblade-actor.js b/modules/mournblade-actor.js index f01639c..54f6b4b 100644 --- a/modules/mournblade-actor.js +++ b/modules/mournblade-actor.js @@ -114,8 +114,8 @@ export class MournbladeActor extends Actor { for (let mod of this.items) { if (mod.type == "modifier" && mod.system.modifiertype == "roll") { let modObj = mod.toObject() - modObj .system.apply = true - modifiers.push( modObj ) + modObj.system.apply = true + modifiers.push(modObj) } } MournbladeUtility.sortArrayObjectsByName(modifiers) @@ -123,8 +123,8 @@ export class MournbladeActor extends Actor { } /* -------------------------------------------- */ - getItemSorted( types) { - let items = this.items.filter(item => types.includes(item.type )) || [] + getItemSorted(types) { + let items = this.items.filter(item => types.includes(item.type)) || [] MournbladeUtility.sortArrayObjectsByName(items) return items } @@ -201,10 +201,10 @@ export class MournbladeActor extends Actor { /* -------------------------------------------- */ getAspect() { - return (this.system.balance.loi > this.system.balance.chaos) ? this.system.balance.loi : this.system.balance.chaos + return (this.system.balance.loi > this.system.balance.chaos) ? this.system.balance.loi : this.system.balance.chaos } getMarge() { - return Math.abs( this.system.balance.loi - this.system.balance.chaos) + return Math.abs(this.system.balance.loi - this.system.balance.chaos) } getAlignement() { return (this.system.balance.loi > this.system.balance.chaos) ? "loyal" : "chaotique" @@ -287,22 +287,40 @@ export class MournbladeActor extends Actor { /* -------------------------------------------- */ getStatusMalus() { + if (this.system.biodata.ignoresantemalus) { + return 0 + } + let malusL = 0 let malusNL = 0 - if (this.system.sante.base-this.system.sante.letaux < 10) { + if (this.system.sante.base - this.system.sante.letaux < 10) { malusL = -2 } - if (this.system.sante.base-this.system.sante.letaux < 5) { + if (this.system.sante.base - this.system.sante.letaux < 5) { malusL = -5 } - if (this.system.sante.base-this.system.sante.nonletaux < 10) { + if (this.system.sante.base - this.system.sante.nonletaux < 10) { malusNL = -2 } - if (this.system.sante.base-this.system.sante.nonletaux < 5) { + if (this.system.sante.base - this.system.sante.nonletaux < 5) { malusNL = -5 } return Math.min(malusL, malusNL) } + /* -------------------------------------------- */ + getAmeMalus() { + if (this.system.biodata.ignoreamemalus) { + return 0 + } + let malusA = 0 + if (this.system.ame.currentmax - this.system.ame.value < 10) { + malusA = -2 + } + if (this.system.ame.currentmax - this.system.ame.value < 5) { + malusA = -5 + } + return malusA + } /* -------------------------------------------- */ editItemField(itemId, itemType, itemField, dataType, value) { @@ -320,27 +338,43 @@ export class MournbladeActor extends Actor { } /* -------------------------------------------- */ - incDecSante(type, value, applyArmure=true) { - if (applyArmure) { + incDecSante(type, value, applyArmure = true) { + value = Number(value) + if (value && applyArmure) { let protection = this.getProtectionTotal() value -= protection - value = Math.max(0, value) + value = Math.max(0, Number(value)) } if (value) { let newSante = duplicate(this.system.sante) - newSante[type] += value + newSante[type] += Number(value) + newSante[type] = Math.max(0, newSante[type]) if (newSante[type] > this.system.sante.base) { value -= this.system.sante.base - newSante[type] newSante[type] = this.system.sante.base + } else { + value = 0 } + newSante[type] = Math.min(newSante[type], newSante.base) if (value && type == "nonletaux") { newSante["letaux"] += value } this.update({ 'system.sante': newSante }) - ui.notifications.info(this.name + "a subi " + value + " points de santé " + type + ".") } } - + + /* -------------------------------------------- */ + incDecAme(value) { + value = Number(value) + if (value) { + let newAme = duplicate(this.system.ame) + newAme.value += Number(value) + newAme.value = Math.max(0, newAme.value) + newAme.value = Math.min(newAme.value, newAme.currentmax) + this.update({ 'system.ame': newAme }) + } + } + /* -------------------------------------------- */ getBonneAventure() { return this.system.bonneaventure.actuelle @@ -372,12 +406,12 @@ export class MournbladeActor extends Actor { /* -------------------------------------------- */ subPointsAme(runeMode, value) { let ame = duplicate(this.system.ame) - if(runeMode == "prononcer") { - ame.value -= value + if (runeMode == "prononcer") { + ame.value += value } else { ame.currentmax -= value } - this.update( {'system.ame': ame}) + this.update({ 'system.ame': ame }) } /* -------------------------------------------- */ @@ -457,22 +491,22 @@ export class MournbladeActor extends Actor { } /* -------------------------------------------- */ - getInitiativeScore( ) { + getInitiativeScore() { return Number(this.system.attributs.adr.value) + Number(this.system.combat.initbonus) } /* -------------------------------------------- */ getBestDefenseValue() { - let defenseList = this.items.filter(item => (item.type =="arme" || item.type == "bouclier") && item.system.equipped) + let defenseList = this.items.filter(item => (item.type == "arme" || item.type == "bouclier") && item.system.equipped) let maxDef = 0 let bestArme - for(let arme of defenseList) { + for (let arme of defenseList) { if (arme.type == "arme" && arme.system.isdefense) { arme = this.prepareArme(arme) } - if (arme.type == "bouclier" ) { + if (arme.type == "bouclier") { arme = this.prepareBouclier(arme) } - if ( arme.system.totalDefensif > maxDef) { + if (arme.system.totalDefensif > maxDef) { maxDef = arme.system.totalDefensif bestArme = duplicate(arme) } @@ -493,6 +527,7 @@ export class MournbladeActor extends Actor { rollData.attributs = MournbladeUtility.getAttributs() rollData.selectDifficulte = true rollData.malusSante = this.getStatusMalus() + this.system.sante.malusmanuel + rollData.malusAme = this.getAmeMalus() rollData.modifiers = this.getModifiersForRoll() if (attrKey) { @@ -507,7 +542,7 @@ export class MournbladeActor extends Actor { rollData.actionImg = rollData.competence?.img } if (compName) { - rollData.competence = duplicate(this.items.find( item => item.name.toLowerCase() == compName.toLowerCase()) || {}) + rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {}) rollData.actionImg = rollData.competence?.img } return rollData @@ -529,22 +564,22 @@ export class MournbladeActor extends Actor { } /* -------------------------------------------- */ - async rollRune(runeId) { + async rollRune(runeId) { let comp = this.items.find(comp => comp.type == "competence" && comp.name.toLowerCase() == "savoir : runes") - if ( !comp) { + if (!comp) { ui.notifications.warn("La compétence Savoirs : Runes n'a pas été trouvée, abandon.") return } let rollData = this.getCommonRollData("cla", undefined, "Savoir : Runes") - rollData.rune = duplicate(this.items.get(runeId) || {}) + rollData.rune = duplicate(this.items.get(runeId) || {}) rollData.difficulte = rollData.rune?.system?.seuil || 0 rollData.runemode = "prononcer" - rollData.runeame = 1 + rollData.runeame = 1 console.log("runeData", rollData) let rollDialog = await MournbladeRollDialog.create(this, rollData) rollDialog.render(true) } - + /* -------------------------------------------- */ async rollArmeOffensif(armeId) { let arme = this.items.get(armeId) diff --git a/modules/mournblade-utility.js b/modules/mournblade-utility.js index 2247b54..88c5d01 100644 --- a/modules/mournblade-utility.js +++ b/modules/mournblade-utility.js @@ -353,7 +353,7 @@ export class MournbladeUtility { } else { rollData.diceFormula += `+${rollData.attr.value}*2+${rollData.modificateur}` } - rollData.diceFormula += `+${rollData.malusSante}` + rollData.diceFormula += `+${rollData.malusSante}+${rollData.malusAme}` if (rollData.arme?.type == "arme") { rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}` @@ -530,7 +530,10 @@ export class MournbladeUtility { ui.notifications.info("L'arme de " + defender.name + " est arrachée de ses mains (à gérer manuellement)" ) } let degats = rollData.finalResult - defender.incDecSante((rollData.arme.system.nonletaux) ? "nonletaux" : "letaux", +degats, rollData.ignoreDefenseArmor) + + let type = (rollData.arme.system.nonletaux) ? "nonletaux" : "letaux" + defender.incDecSante(type, +degats, rollData.ignoreDefenseArmor) + ui.notifications.info(defender.name + "a subi " + degats + " points de santé " + type + ".") } } diff --git a/packs/armes/000072.log b/packs/armes/000084.log similarity index 100% rename from packs/armes/000072.log rename to packs/armes/000084.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index bcf1079..d4b9a0f 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000082 diff --git a/packs/armes/LOG b/packs/armes/LOG index dcf6a40..0a14648 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/12/24-12:34:00.246595 7f83a17fa6c0 Recovering log #68 -2023/12/24-12:34:00.257620 7f83a17fa6c0 Delete type=3 #66 -2023/12/24-12:34:00.257707 7f83a17fa6c0 Delete type=0 #68 -2023/12/24-12:37:21.706460 7f83937fe6c0 Level-0 table #73: started -2023/12/24-12:37:21.706493 7f83937fe6c0 Level-0 table #73: 0 bytes OK -2023/12/24-12:37:21.712455 7f83937fe6c0 Delete type=0 #71 -2023/12/24-12:37:21.726437 7f83937fe6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/24-12:37:21.726469 7f83937fe6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/29-18:08:02.895542 7ff8897fa6c0 Recovering log #80 +2023/12/29-18:08:02.906834 7ff8897fa6c0 Delete type=3 #78 +2023/12/29-18:08:02.906922 7ff8897fa6c0 Delete type=0 #80 +2023/12/29-18:35:10.992944 7ff888ff96c0 Level-0 table #85: started +2023/12/29-18:35:10.992987 7ff888ff96c0 Level-0 table #85: 0 bytes OK +2023/12/29-18:35:11.000315 7ff888ff96c0 Delete type=0 #83 +2023/12/29-18:35:11.000621 7ff888ff96c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/29-18:35:11.000680 7ff888ff96c0 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 141069a..007f2a7 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/12/24-10:16:21.267441 7f83a17fa6c0 Recovering log #64 -2023/12/24-10:16:21.277442 7f83a17fa6c0 Delete type=3 #62 -2023/12/24-10:16:21.277525 7f83a17fa6c0 Delete type=0 #64 -2023/12/24-12:20:18.746298 7f83937fe6c0 Level-0 table #69: started -2023/12/24-12:20:18.746346 7f83937fe6c0 Level-0 table #69: 0 bytes OK -2023/12/24-12:20:18.754266 7f83937fe6c0 Delete type=0 #67 -2023/12/24-12:20:18.761595 7f83937fe6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/24-12:20:18.768615 7f83937fe6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/29-18:01:15.193477 7ff88affd6c0 Recovering log #76 +2023/12/29-18:01:15.204268 7ff88affd6c0 Delete type=3 #74 +2023/12/29-18:01:15.204515 7ff88affd6c0 Delete type=0 #76 +2023/12/29-18:06:09.125188 7ff888ff96c0 Level-0 table #81: started +2023/12/29-18:06:09.125260 7ff888ff96c0 Level-0 table #81: 0 bytes OK +2023/12/29-18:06:09.131577 7ff888ff96c0 Delete type=0 #79 +2023/12/29-18:06:09.138438 7ff888ff96c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/29-18:06:09.138539 7ff888ff96c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000070 b/packs/armes/MANIFEST-000070 deleted file mode 100644 index b41c13261159e62a8c1041c46ea91e04ce614f36..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(~V!Z diff --git a/packs/armes/MANIFEST-000082 b/packs/armes/MANIFEST-000082 new file mode 100644 index 0000000000000000000000000000000000000000..9a0243dc09452adba373545898f0b059b86fbd05 GIT binary patch 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(`OEWN88{dincO)U Um_1nJdMn`pgoS$2eSd>_jU&PMDdaF!cF|#B!w^-3M z#XZ6=)5kd6&m`F~+dP7ikpT=~@>Nw;mR?0A;aRReDfy0R-i&e(`E_Aj6F3+cnSwbP Um_u0PX73a_4dR9XxnV4F0HAUsdH?_b literal 0 HcmV?d00001 diff --git a/packs/equipement/000072.log b/packs/equipement/000084.log similarity index 100% rename from packs/equipement/000072.log rename to packs/equipement/000084.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index bcf1079..d4b9a0f 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000082 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index 1ab1c53..3563f12 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2023/12/24-12:34:00.275379 7f8393fff6c0 Recovering log #68 -2023/12/24-12:34:00.286070 7f8393fff6c0 Delete type=3 #66 -2023/12/24-12:34:00.286179 7f8393fff6c0 Delete type=0 #68 -2023/12/24-12:37:21.712724 7f83937fe6c0 Level-0 table #73: started -2023/12/24-12:37:21.712753 7f83937fe6c0 Level-0 table #73: 0 bytes OK -2023/12/24-12:37:21.719948 7f83937fe6c0 Delete type=0 #71 -2023/12/24-12:37:21.726447 7f83937fe6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/12/24-12:37:21.726492 7f83937fe6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/29-18:08:02.922917 7ff889ffb6c0 Recovering log #80 +2023/12/29-18:08:02.933943 7ff889ffb6c0 Delete type=3 #78 +2023/12/29-18:08:02.934135 7ff889ffb6c0 Delete type=0 #80 +2023/12/29-18:35:11.021264 7ff888ff96c0 Level-0 table #85: started +2023/12/29-18:35:11.021301 7ff888ff96c0 Level-0 table #85: 0 bytes OK +2023/12/29-18:35:11.027524 7ff888ff96c0 Delete type=0 #83 +2023/12/29-18:35:11.027727 7ff888ff96c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/29-18:35:11.027763 7ff888ff96c0 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 5934e44..4d4e236 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2023/12/24-10:16:21.294166 7f83a1ffb6c0 Recovering log #64 -2023/12/24-10:16:21.304260 7f83a1ffb6c0 Delete type=3 #62 -2023/12/24-10:16:21.304374 7f83a1ffb6c0 Delete type=0 #64 -2023/12/24-12:20:18.761629 7f83937fe6c0 Level-0 table #69: started -2023/12/24-12:20:18.761667 7f83937fe6c0 Level-0 table #69: 0 bytes OK -2023/12/24-12:20:18.768357 7f83937fe6c0 Delete type=0 #67 -2023/12/24-12:20:18.776812 7f83937fe6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/12/24-12:20:18.783744 7f83937fe6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/29-18:01:15.220038 7ff88a7fc6c0 Recovering log #76 +2023/12/29-18:01:15.230568 7ff88a7fc6c0 Delete type=3 #74 +2023/12/29-18:01:15.230651 7ff88a7fc6c0 Delete type=0 #76 +2023/12/29-18:06:09.146122 7ff888ff96c0 Level-0 table #81: started +2023/12/29-18:06:09.146158 7ff888ff96c0 Level-0 table #81: 0 bytes OK +2023/12/29-18:06:09.152621 7ff888ff96c0 Delete type=0 #79 +2023/12/29-18:06:09.166813 7ff888ff96c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/29-18:06:09.166865 7ff888ff96c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000070 b/packs/equipement/MANIFEST-000070 deleted file mode 100644 index b00c0c3c670136d5e2dbfbf9cd5a8cf16f3ed851..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmbQbcmB6T21Z7yoYb<^oRlOzr^=Gl^338?=ltA)#G=HK{33QH*3Gu^ikT&;xy6cx z$x$gr895Ir1pvOB2nPTF delta 37 pcmZo;Y-5~|A?MAuY(57ABa=HP1G5JUmng45Dv0X=`pgoS$2eSd>_jU&PMD`Y%UbF|#B!w^-4@ zve?+T*sV0H)S@aYpwN?%kpT=~@)bFiZq9+uIZjcAe#ZWWPK<&O`K_OMPH-?VGP!dy UFnh2FX3H$!1LArBxn3-S0I%62TmS$7 diff --git a/packs/metiers/MANIFEST-000082 b/packs/metiers/MANIFEST-000082 new file mode 100644 index 0000000000000000000000000000000000000000..5a80d9cfb6b921191cecc4373098b72029204b0b 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`4fkNEI1e#nSwbP Um_t|u_r`jC2601x+%OhF0IiK9kpKVy literal 0 HcmV?d00001 diff --git a/packs/origines/000072.log b/packs/origines/000084.log similarity index 100% rename from packs/origines/000072.log rename to packs/origines/000084.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index bcf1079..d4b9a0f 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000082 diff --git a/packs/origines/LOG b/packs/origines/LOG index 4e17656..32034be 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/12/24-12:34:00.304162 7f83a17fa6c0 Recovering log #68 -2023/12/24-12:34:00.315560 7f83a17fa6c0 Delete type=3 #66 -2023/12/24-12:34:00.315745 7f83a17fa6c0 Delete type=0 #68 -2023/12/24-12:37:21.726546 7f83937fe6c0 Level-0 table #73: started -2023/12/24-12:37:21.726570 7f83937fe6c0 Level-0 table #73: 0 bytes OK -2023/12/24-12:37:21.733055 7f83937fe6c0 Delete type=0 #71 -2023/12/24-12:37:21.753606 7f83937fe6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) -2023/12/24-12:37:21.753886 7f83937fe6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/29-18:08:02.951461 7ff8897fa6c0 Recovering log #80 +2023/12/29-18:08:02.961670 7ff8897fa6c0 Delete type=3 #78 +2023/12/29-18:08:02.961810 7ff8897fa6c0 Delete type=0 #80 +2023/12/29-18:35:11.007596 7ff888ff96c0 Level-0 table #85: started +2023/12/29-18:35:11.007633 7ff888ff96c0 Level-0 table #85: 0 bytes OK +2023/12/29-18:35:11.014447 7ff888ff96c0 Delete type=0 #83 +2023/12/29-18:35:11.027700 7ff888ff96c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/29-18:35:11.027751 7ff888ff96c0 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 d105fe2..26648da 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/12/24-10:16:21.323806 7f83a17fa6c0 Recovering log #64 -2023/12/24-10:16:21.333877 7f83a17fa6c0 Delete type=3 #62 -2023/12/24-10:16:21.333966 7f83a17fa6c0 Delete type=0 #64 -2023/12/24-12:20:18.776871 7f83937fe6c0 Level-0 table #69: started -2023/12/24-12:20:18.776925 7f83937fe6c0 Level-0 table #69: 0 bytes OK -2023/12/24-12:20:18.783560 7f83937fe6c0 Delete type=0 #67 -2023/12/24-12:20:18.791429 7f83937fe6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) -2023/12/24-12:20:18.798479 7f83937fe6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/29-18:01:15.247529 7ff88affd6c0 Recovering log #76 +2023/12/29-18:01:15.257831 7ff88affd6c0 Delete type=3 #74 +2023/12/29-18:01:15.257933 7ff88affd6c0 Delete type=0 #76 +2023/12/29-18:06:09.160510 7ff888ff96c0 Level-0 table #81: started +2023/12/29-18:06:09.160545 7ff888ff96c0 Level-0 table #81: 0 bytes OK +2023/12/29-18:06:09.166661 7ff888ff96c0 Delete type=0 #79 +2023/12/29-18:06:09.166853 7ff888ff96c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/29-18:06:09.166887 7ff888ff96c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000070 b/packs/origines/MANIFEST-000070 deleted file mode 100644 index 0277e8431a2bff880bf12925180f7e655743eb24..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(~G6i!o UFo&>++-Gi*2601x+%Ogq0LBs{C;$Ke literal 0 HcmV?d00001 diff --git a/packs/protection/000072.log b/packs/protection/000084.log similarity index 100% rename from packs/protection/000072.log rename to packs/protection/000084.log diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT index bcf1079..d4b9a0f 100644 --- a/packs/protection/CURRENT +++ b/packs/protection/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000082 diff --git a/packs/protection/LOG b/packs/protection/LOG index c650f9f..3a48ebf 100644 --- a/packs/protection/LOG +++ b/packs/protection/LOG @@ -1,8 +1,8 @@ -2023/12/24-12:34:00.260773 7f83a1ffb6c0 Recovering log #68 -2023/12/24-12:34:00.272894 7f83a1ffb6c0 Delete type=3 #66 -2023/12/24-12:34:00.273030 7f83a1ffb6c0 Delete type=0 #68 -2023/12/24-12:37:21.699002 7f83937fe6c0 Level-0 table #73: started -2023/12/24-12:37:21.699041 7f83937fe6c0 Level-0 table #73: 0 bytes OK -2023/12/24-12:37:21.706302 7f83937fe6c0 Delete type=0 #71 -2023/12/24-12:37:21.726427 7f83937fe6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/12/24-12:37:21.726463 7f83937fe6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/29-18:08:02.909881 7ff88affd6c0 Recovering log #80 +2023/12/29-18:08:02.919868 7ff88affd6c0 Delete type=3 #78 +2023/12/29-18:08:02.919957 7ff88affd6c0 Delete type=0 #80 +2023/12/29-18:35:11.000815 7ff888ff96c0 Level-0 table #85: started +2023/12/29-18:35:11.000912 7ff888ff96c0 Level-0 table #85: 0 bytes OK +2023/12/29-18:35:11.007463 7ff888ff96c0 Delete type=0 #83 +2023/12/29-18:35:11.027682 7ff888ff96c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/29-18:35:11.027739 7ff888ff96c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/LOG.old b/packs/protection/LOG.old index a3b3d93..f70ad4e 100644 --- a/packs/protection/LOG.old +++ b/packs/protection/LOG.old @@ -1,8 +1,8 @@ -2023/12/24-10:16:21.280418 7f8393fff6c0 Recovering log #64 -2023/12/24-10:16:21.291443 7f8393fff6c0 Delete type=3 #62 -2023/12/24-10:16:21.291522 7f8393fff6c0 Delete type=0 #64 -2023/12/24-12:20:18.754630 7f83937fe6c0 Level-0 table #69: started -2023/12/24-12:20:18.754699 7f83937fe6c0 Level-0 table #69: 0 bytes OK -2023/12/24-12:20:18.761432 7f83937fe6c0 Delete type=0 #67 -2023/12/24-12:20:18.768575 7f83937fe6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/12/24-12:20:18.776849 7f83937fe6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/29-18:01:15.207121 7ff889ffb6c0 Recovering log #76 +2023/12/29-18:01:15.217340 7ff889ffb6c0 Delete type=3 #74 +2023/12/29-18:01:15.217456 7ff889ffb6c0 Delete type=0 #76 +2023/12/29-18:06:09.138617 7ff888ff96c0 Level-0 table #81: started +2023/12/29-18:06:09.138720 7ff888ff96c0 Level-0 table #81: 0 bytes OK +2023/12/29-18:06:09.145987 7ff888ff96c0 Delete type=0 #79 +2023/12/29-18:06:09.166796 7ff888ff96c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/29-18:06:09.166840 7ff888ff96c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/MANIFEST-000070 b/packs/protection/MANIFEST-000070 deleted file mode 100644 index ab8855d2ba808dc8a1777dadf6b0d2141ff9c7dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmdPCG+Qc>fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb%KbzVrEHdZn2_K zhKr#~U|6cNXP{?(ncO)U Um_1n7UESCI1#vxqTrU=O04_KoRsaA1 diff --git a/packs/protection/MANIFEST-000082 b/packs/protection/MANIFEST-000082 new file mode 100644 index 0000000000000000000000000000000000000000..93813b5ec6c14d7e97b8d5672d1d6ecb836f5a6a 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!gOr%!V*FfzGw VGBA6v=&stDxf8_o0CK%pbO9@1CLsU- diff --git a/packs/runes/MANIFEST-000082 b/packs/runes/MANIFEST-000082 new file mode 100644 index 0000000000000000000000000000000000000000..3fc8d75d3d064b4a69a715a390ae00c2be27ae37 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}5cy8=3Dz78j7-6t V49p=cx-}&o|3KUjAUBLf7XSi|B*_2( literal 0 HcmV?d00001 diff --git a/packs/skills/000072.log b/packs/skills/000084.log similarity index 100% rename from packs/skills/000072.log rename to packs/skills/000084.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index bcf1079..d4b9a0f 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000082 diff --git a/packs/skills/LOG b/packs/skills/LOG index 5eeb71f..87a4a0b 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/12/24-12:34:00.233009 7f83a0ff96c0 Recovering log #68 -2023/12/24-12:34:00.243210 7f83a0ff96c0 Delete type=3 #66 -2023/12/24-12:34:00.243313 7f83a0ff96c0 Delete type=0 #68 -2023/12/24-12:37:21.681649 7f83937fe6c0 Level-0 table #73: started -2023/12/24-12:37:21.681715 7f83937fe6c0 Level-0 table #73: 0 bytes OK -2023/12/24-12:37:21.688622 7f83937fe6c0 Delete type=0 #71 -2023/12/24-12:37:21.698852 7f83937fe6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/24-12:37:21.698896 7f83937fe6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/29-18:08:02.881442 7ff88a7fc6c0 Recovering log #80 +2023/12/29-18:08:02.892226 7ff88a7fc6c0 Delete type=3 #78 +2023/12/29-18:08:02.892313 7ff88a7fc6c0 Delete type=0 #80 +2023/12/29-18:35:10.986477 7ff888ff96c0 Level-0 table #85: started +2023/12/29-18:35:10.986527 7ff888ff96c0 Level-0 table #85: 0 bytes OK +2023/12/29-18:35:10.992779 7ff888ff96c0 Delete type=0 #83 +2023/12/29-18:35:11.000602 7ff888ff96c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/29-18:35:11.000659 7ff888ff96c0 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 8f7229b..a2c46ef 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/12/24-10:16:21.253365 7f83a0ff96c0 Recovering log #64 -2023/12/24-10:16:21.264287 7f83a0ff96c0 Delete type=3 #62 -2023/12/24-10:16:21.264453 7f83a0ff96c0 Delete type=0 #64 -2023/12/24-12:20:18.739525 7f83937fe6c0 Level-0 table #69: started -2023/12/24-12:20:18.739573 7f83937fe6c0 Level-0 table #69: 0 bytes OK -2023/12/24-12:20:18.746086 7f83937fe6c0 Delete type=0 #67 -2023/12/24-12:20:18.754603 7f83937fe6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/24-12:20:18.761616 7f83937fe6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/29-18:01:15.179316 7ff8897fa6c0 Recovering log #76 +2023/12/29-18:01:15.190214 7ff8897fa6c0 Delete type=3 #74 +2023/12/29-18:01:15.190647 7ff8897fa6c0 Delete type=0 #76 +2023/12/29-18:06:09.131724 7ff888ff96c0 Level-0 table #81: started +2023/12/29-18:06:09.131761 7ff888ff96c0 Level-0 table #81: 0 bytes OK +2023/12/29-18:06:09.138231 7ff888ff96c0 Delete type=0 #79 +2023/12/29-18:06:09.138457 7ff888ff96c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/29-18:06:09.138516 7ff888ff96c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000070 b/packs/skills/MANIFEST-000070 deleted file mode 100644 index 91b7dc7f4c712ecdff8b12363c92dfb969a69efc..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`ON5f`pgoS$2eSd>_jU&PMD`pZ&YF|#B!w^-4@ zC#TA#(z&$AD>bDswbGrDkpT=~@+F04xvuFE`RV2vCSjG~*^K-U`6;s=vU4ynG6i!o UFo&@4H-5e01mcDOxnV5)0NZ~g$^ZZW literal 0 HcmV?d00001 diff --git a/packs/tables/000072.log b/packs/tables/000084.log similarity index 100% rename from packs/tables/000072.log rename to packs/tables/000084.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index bcf1079..d4b9a0f 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000082 diff --git a/packs/tables/LOG b/packs/tables/LOG index 1a4952e..bbbf711 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,8 +1,8 @@ -2023/12/24-12:34:00.387165 7f8393fff6c0 Recovering log #68 -2023/12/24-12:34:00.397632 7f8393fff6c0 Delete type=3 #66 -2023/12/24-12:34:00.397757 7f8393fff6c0 Delete type=0 #68 -2023/12/24-12:37:21.766971 7f83937fe6c0 Level-0 table #73: started -2023/12/24-12:37:21.766999 7f83937fe6c0 Level-0 table #73: 0 bytes OK -2023/12/24-12:37:21.773828 7f83937fe6c0 Delete type=0 #71 -2023/12/24-12:37:21.773996 7f83937fe6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/12/24-12:37:21.774034 7f83937fe6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/29-18:08:03.034276 7ff889ffb6c0 Recovering log #80 +2023/12/29-18:08:03.045380 7ff889ffb6c0 Delete type=3 #78 +2023/12/29-18:08:03.045487 7ff889ffb6c0 Delete type=0 #80 +2023/12/29-18:35:11.062976 7ff888ff96c0 Level-0 table #85: started +2023/12/29-18:35:11.063014 7ff888ff96c0 Level-0 table #85: 0 bytes OK +2023/12/29-18:35:11.070439 7ff888ff96c0 Delete type=0 #83 +2023/12/29-18:35:11.070825 7ff888ff96c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/29-18:35:11.070866 7ff888ff96c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/LOG.old b/packs/tables/LOG.old index a93f6a7..9d04da1 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,8 +1,8 @@ -2023/12/24-10:16:21.410709 7f83a1ffb6c0 Recovering log #64 -2023/12/24-10:16:21.421159 7f83a1ffb6c0 Delete type=3 #62 -2023/12/24-10:16:21.421267 7f83a1ffb6c0 Delete type=0 #64 -2023/12/24-12:20:18.820018 7f83937fe6c0 Level-0 table #69: started -2023/12/24-12:20:18.820065 7f83937fe6c0 Level-0 table #69: 0 bytes OK -2023/12/24-12:20:18.827818 7f83937fe6c0 Delete type=0 #67 -2023/12/24-12:20:18.828022 7f83937fe6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/12/24-12:20:18.828066 7f83937fe6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/29-18:01:15.331719 7ff88a7fc6c0 Recovering log #76 +2023/12/29-18:01:15.342998 7ff88a7fc6c0 Delete type=3 #74 +2023/12/29-18:01:15.343131 7ff88a7fc6c0 Delete type=0 #76 +2023/12/29-18:06:09.195798 7ff888ff96c0 Level-0 table #81: started +2023/12/29-18:06:09.195853 7ff888ff96c0 Level-0 table #81: 0 bytes OK +2023/12/29-18:06:09.202274 7ff888ff96c0 Delete type=0 #79 +2023/12/29-18:06:09.209111 7ff888ff96c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/29-18:06:09.209183 7ff888ff96c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/MANIFEST-000070 b/packs/tables/MANIFEST-000082 similarity index 79% rename from packs/tables/MANIFEST-000070 rename to packs/tables/MANIFEST-000082 index 21ee7fb0ccf897ebb73c64859415e50dd36b62e2..2e428d77e9707efb45d266b7867a73f6827069b8 100644 GIT binary patch delta 37 pcmZ3;xR7x|v)o+g;y4ZlMy6m+2IdeJ(G@SM6+zq(AUBLf6acr|2m}BC delta 37 pcmZ3;xR7x|v)q9qi*+0fj7;vF49p%ZqIE0hT?27FfLt#YQ2@n92&w=8 diff --git a/packs/tendances/000072.log b/packs/tendances/000084.log similarity index 100% rename from packs/tendances/000072.log rename to packs/tendances/000084.log diff --git a/packs/tendances/CURRENT b/packs/tendances/CURRENT index bcf1079..d4b9a0f 100644 --- a/packs/tendances/CURRENT +++ b/packs/tendances/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000082 diff --git a/packs/tendances/LOG b/packs/tendances/LOG index b1e0450..6de5c21 100644 --- a/packs/tendances/LOG +++ b/packs/tendances/LOG @@ -1,8 +1,8 @@ -2023/12/24-12:34:00.345728 7f83a0ff96c0 Recovering log #68 -2023/12/24-12:34:00.357028 7f83a0ff96c0 Delete type=3 #66 -2023/12/24-12:34:00.357111 7f83a0ff96c0 Delete type=0 #68 -2023/12/24-12:37:21.740063 7f83937fe6c0 Level-0 table #73: started -2023/12/24-12:37:21.740090 7f83937fe6c0 Level-0 table #73: 0 bytes OK -2023/12/24-12:37:21.746108 7f83937fe6c0 Delete type=0 #71 -2023/12/24-12:37:21.753857 7f83937fe6c0 Manual compaction at level-0 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) -2023/12/24-12:37:21.753915 7f83937fe6c0 Manual compaction at level-1 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) +2023/12/29-18:08:02.991191 7ff88a7fc6c0 Recovering log #80 +2023/12/29-18:08:03.003992 7ff88a7fc6c0 Delete type=3 #78 +2023/12/29-18:08:03.004105 7ff88a7fc6c0 Delete type=0 #80 +2023/12/29-18:35:11.041721 7ff888ff96c0 Level-0 table #85: started +2023/12/29-18:35:11.042031 7ff888ff96c0 Level-0 table #85: 0 bytes OK +2023/12/29-18:35:11.048701 7ff888ff96c0 Delete type=0 #83 +2023/12/29-18:35:11.056331 7ff888ff96c0 Manual compaction at level-0 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) +2023/12/29-18:35:11.056401 7ff888ff96c0 Manual compaction at level-1 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) diff --git a/packs/tendances/LOG.old b/packs/tendances/LOG.old index b2bf270..de02605 100644 --- a/packs/tendances/LOG.old +++ b/packs/tendances/LOG.old @@ -1,8 +1,8 @@ -2023/12/24-10:16:21.366368 7f83a0ff96c0 Recovering log #64 -2023/12/24-10:16:21.376791 7f83a0ff96c0 Delete type=3 #62 -2023/12/24-10:16:21.376899 7f83a0ff96c0 Delete type=0 #64 -2023/12/24-12:20:18.798500 7f83937fe6c0 Level-0 table #69: started -2023/12/24-12:20:18.798585 7f83937fe6c0 Level-0 table #69: 0 bytes OK -2023/12/24-12:20:18.805680 7f83937fe6c0 Delete type=0 #67 -2023/12/24-12:20:18.812980 7f83937fe6c0 Manual compaction at level-0 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) -2023/12/24-12:20:18.819992 7f83937fe6c0 Manual compaction at level-1 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) +2023/12/29-18:01:15.288482 7ff8897fa6c0 Recovering log #76 +2023/12/29-18:01:15.299452 7ff8897fa6c0 Delete type=3 #74 +2023/12/29-18:01:15.299587 7ff8897fa6c0 Delete type=0 #76 +2023/12/29-18:06:09.181175 7ff888ff96c0 Level-0 table #81: started +2023/12/29-18:06:09.181260 7ff888ff96c0 Level-0 table #81: 0 bytes OK +2023/12/29-18:06:09.187495 7ff888ff96c0 Delete type=0 #79 +2023/12/29-18:06:09.195574 7ff888ff96c0 Manual compaction at level-0 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) +2023/12/29-18:06:09.195657 7ff888ff96c0 Manual compaction at level-1 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) diff --git a/packs/tendances/MANIFEST-000070 b/packs/tendances/MANIFEST-000070 deleted file mode 100644 index cfac2ac046146337b107355149a034e9ebbfeaca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmaE7@0pjxz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDI)5vpykcfaYHqQj zfpcVlp;tjvsby|)iD`*9BO?PCz~rkk0s@M2LrQ$g%#$nqJiHjqA@Y0QXUyVYU}SRV VWMKASF>ls5odx200J&Z)<^T={B>w;a diff --git a/packs/tendances/MANIFEST-000082 b/packs/tendances/MANIFEST-000082 new file mode 100644 index 0000000000000000000000000000000000000000..ad83411d3c974ed7d909c2d86ce97fd1e42f24f3 GIT binary patch literal 135 zcmaE7@0pjxz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDI)5vpykcfaYHqQj zfpcVlp;tjvsby|)iD`*9BO?PCz~rkk0s@M2LrQ$g%#$nqJiHjqA@U23slDQ0U}OsB VWMB?qG2fc0rwZbR0J&i-<^TlKB!~b2 literal 0 HcmV?d00001 diff --git a/packs/traits-chaotiques/000072.log b/packs/traits-chaotiques/000084.log similarity index 100% rename from packs/traits-chaotiques/000072.log rename to packs/traits-chaotiques/000084.log diff --git a/packs/traits-chaotiques/CURRENT b/packs/traits-chaotiques/CURRENT index bcf1079..d4b9a0f 100644 --- a/packs/traits-chaotiques/CURRENT +++ b/packs/traits-chaotiques/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000082 diff --git a/packs/traits-chaotiques/LOG b/packs/traits-chaotiques/LOG index 41d3fd8..91d1017 100644 --- a/packs/traits-chaotiques/LOG +++ b/packs/traits-chaotiques/LOG @@ -1,8 +1,8 @@ -2023/12/24-12:34:00.360101 7f83a17fa6c0 Recovering log #68 -2023/12/24-12:34:00.370467 7f83a17fa6c0 Delete type=3 #66 -2023/12/24-12:34:00.370588 7f83a17fa6c0 Delete type=0 #68 -2023/12/24-12:37:21.754080 7f83937fe6c0 Level-0 table #73: started -2023/12/24-12:37:21.754134 7f83937fe6c0 Level-0 table #73: 0 bytes OK -2023/12/24-12:37:21.760321 7f83937fe6c0 Delete type=0 #71 -2023/12/24-12:37:21.773967 7f83937fe6c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) -2023/12/24-12:37:21.774005 7f83937fe6c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +2023/12/29-18:08:03.007421 7ff8897fa6c0 Recovering log #80 +2023/12/29-18:08:03.018383 7ff8897fa6c0 Delete type=3 #78 +2023/12/29-18:08:03.018699 7ff8897fa6c0 Delete type=0 #80 +2023/12/29-18:35:11.048862 7ff888ff96c0 Level-0 table #85: started +2023/12/29-18:35:11.048905 7ff888ff96c0 Level-0 table #85: 0 bytes OK +2023/12/29-18:35:11.056168 7ff888ff96c0 Delete type=0 #83 +2023/12/29-18:35:11.056357 7ff888ff96c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +2023/12/29-18:35:11.056416 7ff888ff96c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) diff --git a/packs/traits-chaotiques/LOG.old b/packs/traits-chaotiques/LOG.old index 22a6d1b..d963433 100644 --- a/packs/traits-chaotiques/LOG.old +++ b/packs/traits-chaotiques/LOG.old @@ -1,8 +1,8 @@ -2023/12/24-10:16:21.380463 7f83a17fa6c0 Recovering log #64 -2023/12/24-10:16:21.391794 7f83a17fa6c0 Delete type=3 #62 -2023/12/24-10:16:21.391904 7f83a17fa6c0 Delete type=0 #64 -2023/12/24-12:20:18.805961 7f83937fe6c0 Level-0 table #69: started -2023/12/24-12:20:18.806018 7f83937fe6c0 Level-0 table #69: 0 bytes OK -2023/12/24-12:20:18.812794 7f83937fe6c0 Delete type=0 #67 -2023/12/24-12:20:18.819974 7f83937fe6c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) -2023/12/24-12:20:18.828005 7f83937fe6c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +2023/12/29-18:01:15.303780 7ff88affd6c0 Recovering log #76 +2023/12/29-18:01:15.314481 7ff88affd6c0 Delete type=3 #74 +2023/12/29-18:01:15.314586 7ff88affd6c0 Delete type=0 #76 +2023/12/29-18:06:09.187696 7ff888ff96c0 Level-0 table #81: started +2023/12/29-18:06:09.187753 7ff888ff96c0 Level-0 table #81: 0 bytes OK +2023/12/29-18:06:09.195332 7ff888ff96c0 Delete type=0 #79 +2023/12/29-18:06:09.195597 7ff888ff96c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +2023/12/29-18:06:09.195677 7ff888ff96c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) diff --git a/packs/traits-chaotiques/MANIFEST-000070 b/packs/traits-chaotiques/MANIFEST-000070 deleted file mode 100644 index b1ae37a0cccef1ff5c04e97c3d50f0ecd16bab3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmbQgmc=TOfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^`f7=VrEHdZn2`V zmw|_OR&rR0Q;4ypQ)Un&BLf(~G6i!o UFo&>++-Gi*2601x+%Ogq0E|H+F8}}l literal 0 HcmV?d00001 diff --git a/styles/simple.css b/styles/simple.css index b59bd39..5dd6072 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1186,6 +1186,7 @@ ul, li { text-shadow: 0px 1px 0px #4d3534; position: relative; margin:3px; + max-width: 1.2rem; } .river-button:hover, diff --git a/system.json b/system.json index 3643527..4f77f09 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-mournblade", "description": "Mournblade RPG for FoundryVTT", - "version": "11.1.0", + "version": "11.1.1", "authors": [ { "name": "Uberwald/LeRatierBretonnien", @@ -23,7 +23,7 @@ "gridUnits": "m", "license": "LICENSE.txt", "manifest": "https://www.uberwald.me/gitea/public/fvtt-mournblade/raw/branch/v10/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-mournblade/archive/fvtt-mournblade-11.1.0.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-mournblade/archive/fvtt-mournblade-11.1.1.zip", "packs": [ { "type": "Item", diff --git a/template.json b/template.json index 87607b0..93d4131 100644 --- a/template.json +++ b/template.json @@ -16,6 +16,8 @@ "yeux": "", "description": "", "amemultiplier": 2, + "ignoreamemalus": false, + "ignoresantemalus": false, "notes": "", "gmnotes": "" } diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index f238a78..08d7e96 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -12,10 +12,11 @@
  • - - - + + + - - + +
    • - +

  • Bonne Aventure

    @@ -57,12 +60,12 @@

    Eclat

    - +

    Expérience

    -
    • +
@@ -115,19 +118,25 @@
  • + - + + +
    • +
  • + - + +
  • - - - -
    • + + + + @@ -140,13 +149,22 @@ - - - + + +
  • + + - -
    • + data-dtype="Number" /> + + + + +
  • + + + +

    • Combat

    @@ -219,7 +237,7 @@ {{/each}} - + {{!-- Competence Tab --}} @@ -246,11 +264,11 @@ {{skill.name}} - - {{#each skill.system.predilections as |pred key|}} - {{pred.name}}, - {{/each}} - + + {{#each skill.system.predilections as |pred key|}} + {{pred.name}}, + {{/each}} + + + +
    -
      -
    • - - -
      • +
      • - +
      • - +
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    + {{#if isGM}} +
    +
    +
      +
    • + + +
      • +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    +
    +
    + {{/if}} +

    Description

     diff --git a/templates/roll-dialog-generic.html b/templates/roll-dialog-generic.html index 0182f09..342a07e 100644 --- a/templates/roll-dialog-generic.html +++ b/templates/roll-dialog-generic.html @@ -133,10 +133,15 @@ {{/if}}
    - Malus de santé : + Malus de Santé : {{malusSante}}
    +
    + Malus d'Ame : + {{malusAme}} +
    + {{#if (count modifiers)}}
    Modificateurs enregistrés :