From 2a8617d78120550394f985973807bb24860a6d6a Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sun, 24 Dec 2023 12:38:02 +0100 Subject: [PATCH] Automatisations de combats, WIP --- lang/fr.json | 3 +- modules/mournblade-actor-sheet.js | 3 + modules/mournblade-actor.js | 79 ++++++++++- modules/mournblade-config.js | 8 ++ modules/mournblade-roll-dialog.js | 8 +- modules/mournblade-utility.js | 126 ++++++++++++++---- packs/armes/{000048.log => 000072.log} | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 16 +-- packs/armes/LOG.old | 16 +-- packs/armes/MANIFEST-000046 | Bin 134 -> 0 bytes packs/armes/MANIFEST-000070 | Bin 0 -> 134 bytes packs/dons/{000048.log => 000072.log} | 0 packs/dons/CURRENT | 2 +- packs/dons/LOG | 16 +-- packs/dons/LOG.old | 16 +-- packs/dons/MANIFEST-000046 | Bin 134 -> 0 bytes packs/dons/MANIFEST-000070 | Bin 0 -> 134 bytes packs/equipement/{000048.log => 000072.log} | 0 packs/equipement/CURRENT | 2 +- packs/equipement/LOG | 16 +-- packs/equipement/LOG.old | 16 +-- packs/equipement/MANIFEST-000046 | Bin 134 -> 0 bytes packs/equipement/MANIFEST-000070 | Bin 0 -> 134 bytes packs/heritages/{000048.log => 000072.log} | 0 packs/heritages/CURRENT | 2 +- packs/heritages/LOG | 16 +-- packs/heritages/LOG.old | 16 +-- .../{MANIFEST-000046 => MANIFEST-000070} | Bin 134 -> 134 bytes packs/metiers/{000048.log => 000072.log} | 0 packs/metiers/CURRENT | 2 +- packs/metiers/LOG | 16 +-- packs/metiers/LOG.old | 16 +-- packs/metiers/MANIFEST-000046 | Bin 134 -> 0 bytes packs/metiers/MANIFEST-000070 | Bin 0 -> 134 bytes packs/origines/{000048.log => 000072.log} | 0 packs/origines/CURRENT | 2 +- packs/origines/LOG | 16 +-- packs/origines/LOG.old | 16 +-- packs/origines/MANIFEST-000046 | Bin 134 -> 0 bytes packs/origines/MANIFEST-000070 | Bin 0 -> 134 bytes packs/protection/{000048.log => 000072.log} | 0 packs/protection/CURRENT | 2 +- packs/protection/LOG | 16 +-- packs/protection/LOG.old | 16 +-- packs/protection/MANIFEST-000046 | Bin 134 -> 0 bytes packs/protection/MANIFEST-000070 | Bin 0 -> 134 bytes packs/runes/{000048.log => 000072.log} | 0 packs/runes/CURRENT | 2 +- packs/runes/LOG | 16 +-- packs/runes/LOG.old | 16 +-- packs/runes/MANIFEST-000046 | Bin 135 -> 0 bytes packs/runes/MANIFEST-000070 | Bin 0 -> 135 bytes packs/skills/{000048.log => 000072.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 +-- packs/skills/LOG.old | 16 +-- packs/skills/MANIFEST-000046 | Bin 134 -> 0 bytes packs/skills/MANIFEST-000070 | Bin 0 -> 134 bytes packs/tables/{000048.log => 000072.log} | 0 packs/tables/CURRENT | 2 +- packs/tables/LOG | 16 +-- packs/tables/LOG.old | 16 +-- .../{MANIFEST-000046 => MANIFEST-000070} | Bin 161 -> 161 bytes packs/tendances/{000048.log => 000072.log} | 0 packs/tendances/CURRENT | 2 +- packs/tendances/LOG | 16 +-- packs/tendances/LOG.old | 16 +-- packs/tendances/MANIFEST-000046 | Bin 135 -> 0 bytes packs/tendances/MANIFEST-000070 | Bin 0 -> 135 bytes .../{000048.log => 000072.log} | 0 packs/traits-chaotiques/CURRENT | 2 +- packs/traits-chaotiques/LOG | 16 +-- packs/traits-chaotiques/LOG.old | 16 +-- packs/traits-chaotiques/MANIFEST-000046 | Bin 134 -> 0 bytes packs/traits-chaotiques/MANIFEST-000070 | Bin 0 -> 134 bytes system.json | 4 +- template.json | 14 ++ templates/actor-sheet.html | 51 ++++++- templates/chat-degats-result.html | 11 +- templates/chat-generic-result.html | 24 ++-- templates/item-modifier-sheet.html | 35 +++++ templates/roll-dialog-generic.html | 18 +++ 83 files changed, 543 insertions(+), 249 deletions(-) rename packs/armes/{000048.log => 000072.log} (100%) delete mode 100644 packs/armes/MANIFEST-000046 create mode 100644 packs/armes/MANIFEST-000070 rename packs/dons/{000048.log => 000072.log} (100%) delete mode 100644 packs/dons/MANIFEST-000046 create mode 100644 packs/dons/MANIFEST-000070 rename packs/equipement/{000048.log => 000072.log} (100%) delete mode 100644 packs/equipement/MANIFEST-000046 create mode 100644 packs/equipement/MANIFEST-000070 rename packs/heritages/{000048.log => 000072.log} (100%) rename packs/heritages/{MANIFEST-000046 => MANIFEST-000070} (73%) rename packs/metiers/{000048.log => 000072.log} (100%) delete mode 100644 packs/metiers/MANIFEST-000046 create mode 100644 packs/metiers/MANIFEST-000070 rename packs/origines/{000048.log => 000072.log} (100%) delete mode 100644 packs/origines/MANIFEST-000046 create mode 100644 packs/origines/MANIFEST-000070 rename packs/protection/{000048.log => 000072.log} (100%) delete mode 100644 packs/protection/MANIFEST-000046 create mode 100644 packs/protection/MANIFEST-000070 rename packs/runes/{000048.log => 000072.log} (100%) delete mode 100644 packs/runes/MANIFEST-000046 create mode 100644 packs/runes/MANIFEST-000070 rename packs/skills/{000048.log => 000072.log} (100%) delete mode 100644 packs/skills/MANIFEST-000046 create mode 100644 packs/skills/MANIFEST-000070 rename packs/tables/{000048.log => 000072.log} (100%) rename packs/tables/{MANIFEST-000046 => MANIFEST-000070} (79%) rename packs/tendances/{000048.log => 000072.log} (100%) delete mode 100644 packs/tendances/MANIFEST-000046 create mode 100644 packs/tendances/MANIFEST-000070 rename packs/traits-chaotiques/{000048.log => 000072.log} (100%) delete mode 100644 packs/traits-chaotiques/MANIFEST-000046 create mode 100644 packs/traits-chaotiques/MANIFEST-000070 create mode 100644 templates/item-modifier-sheet.html diff --git a/lang/fr.json b/lang/fr.json index b692cee..b7bb229 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -20,7 +20,8 @@ "heritage": "Héritage", "metier": "Métier", "runeeffect": "Effet de Rune", - "bouclier": "Bouclier" + "bouclier": "Bouclier", + "modifier": "Modificateur" } } } \ No newline at end of file diff --git a/modules/mournblade-actor-sheet.js b/modules/mournblade-actor-sheet.js index a9d5418..4bae1c6 100644 --- a/modules/mournblade-actor-sheet.js +++ b/modules/mournblade-actor-sheet.js @@ -54,9 +54,12 @@ export class MournbladeActorSheet extends ActorSheet { metier: duplicate(this.actor.getMetier() || {}), combat: this.actor.getCombatValues(), equipements: duplicate(this.actor.getEquipments()), + modifiers: duplicate(this.actor.getModifiers()), monnaies: duplicate(this.actor.getMonnaies()), runeEffects: duplicate(this.actor.getRuneEffects()), config: game.system.mournblade.config, + protectionTotal: this.actor.getProtectionTotal(), + santeMalus: this.actor.getStatusMalus(), 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 0ac7a66..f01639c 100644 --- a/modules/mournblade-actor.js +++ b/modules/mournblade-actor.js @@ -47,6 +47,12 @@ export class MournbladeActor extends Actor { return super.create(data, options); } + /* -------------------------------------------- */ + setModifier(name, type, value) { + this.createEmbeddedDocuments("Item", [{ type: "modifier", name: name, system: { modifiertype: type, value: value } }]) + ui.notifications.info("Le modificateur " + name + " a été ajouté à " + this.name + ".") + } + /* -------------------------------------------- */ prepareArme(arme) { arme = duplicate(arme) @@ -102,6 +108,20 @@ export class MournbladeActor extends Actor { return armes } + /* -------------------------------------------- */ + getModifiersForRoll() { + let modifiers = [] + 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 ) + } + } + MournbladeUtility.sortArrayObjectsByName(modifiers) + return modifiers + } + /* -------------------------------------------- */ getItemSorted( types) { let items = this.items.filter(item => types.includes(item.type )) || [] @@ -120,6 +140,9 @@ export class MournbladeActor extends Actor { getEquipments() { return this.getItemSorted(["equipement"]) } + getModifiers() { + return this.getItemSorted(["modifier"]) + } getTraitsChaotiques() { return this.getItemSorted(["traitchaotique"]) } @@ -165,6 +188,17 @@ export class MournbladeActor extends Actor { return comp } + /* -------------------------------------------- */ + getProtectionTotal() { + let protection = 0 + for (let item of this.items) { + if (item.type == "protection" && item.system.equipped) { + protection += item.system.protection + } + } + return protection + } + /* -------------------------------------------- */ getAspect() { return (this.system.balance.loi > this.system.balance.chaos) ? this.system.balance.loi : this.system.balance.chaos @@ -245,12 +279,31 @@ export class MournbladeActor extends Actor { /* -------------------------------------------- */ async equipItem(itemId) { let item = this.items.find(item => item.id == itemId) - if (item && item.system) { + if (item?.system) { let update = { _id: item.id, "system.equipped": !item.system.equipped } await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity } } + /* -------------------------------------------- */ + getStatusMalus() { + let malusL = 0 + let malusNL = 0 + if (this.system.sante.base-this.system.sante.letaux < 10) { + malusL = -2 + } + if (this.system.sante.base-this.system.sante.letaux < 5) { + malusL = -5 + } + if (this.system.sante.base-this.system.sante.nonletaux < 10) { + malusNL = -2 + } + if (this.system.sante.base-this.system.sante.nonletaux < 5) { + malusNL = -5 + } + return Math.min(malusL, malusNL) + } + /* -------------------------------------------- */ editItemField(itemId, itemType, itemField, dataType, value) { let item = this.items.find(item => item.id == itemId) @@ -266,6 +319,28 @@ export class MournbladeActor extends Actor { } } + /* -------------------------------------------- */ + incDecSante(type, value, applyArmure=true) { + if (applyArmure) { + let protection = this.getProtectionTotal() + value -= protection + value = Math.max(0, value) + } + if (value) { + let newSante = duplicate(this.system.sante) + newSante[type] += value + if (newSante[type] > this.system.sante.base) { + value -= this.system.sante.base - newSante[type] + newSante[type] = this.system.sante.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 + ".") + } + } + /* -------------------------------------------- */ getBonneAventure() { return this.system.bonneaventure.actuelle @@ -417,6 +492,8 @@ export class MournbladeActor extends Actor { rollData.doubleD20 = false rollData.attributs = MournbladeUtility.getAttributs() rollData.selectDifficulte = true + rollData.malusSante = this.getStatusMalus() + this.system.sante.malusmanuel + rollData.modifiers = this.getModifiersForRoll() if (attrKey) { rollData.attrKey = attrKey diff --git a/modules/mournblade-config.js b/modules/mournblade-config.js index 9234347..44bd36a 100644 --- a/modules/mournblade-config.js +++ b/modules/mournblade-config.js @@ -5,11 +5,19 @@ export const MOURNBLADE_CONFIG = { precise: "Attaque Précise", feinte: "Feinte", coupbas: "Coup Bas", + charger: "Charger", + contenir: "Contenir l'adversaire", + desarmer: "Désarmer", }, couverts:{ aucun: {name: "Aucun", value: 0}, rondache: {name: "Rondache ou léger (-2)", value: -2}, pavois: { name: "Pavois ou à moitié (-5)", value: -5}, complet: {name:"Quasi complet (-10)", value: -10}, + }, + modifierTypes: { + aucun: {name: "Aucun", value: 0}, + roll: {name: "Jet", value: 0}, + degats: {name: "Dégats", value: 0}, } }; \ No newline at end of file diff --git a/modules/mournblade-roll-dialog.js b/modules/mournblade-roll-dialog.js index d76804a..a94c280 100644 --- a/modules/mournblade-roll-dialog.js +++ b/modules/mournblade-roll-dialog.js @@ -55,7 +55,13 @@ export class MournbladeRollDialog extends Dialog { function onLoad() { } $(function () { onLoad(); }); - + + html.find('.apply-modifier').change(async (event) => { + let modifierIdx = $(event.currentTarget).data("modifier-idx") + let modifier = this.rollData.modifiers[modifierIdx] + modifier.system.apply = event.currentTarget.checked + }) + html.find('#modificateur').change(async (event) => { this.rollData.modificateur = Number(event.currentTarget.value) }) diff --git a/modules/mournblade-utility.js b/modules/mournblade-utility.js index 326c941..2247b54 100644 --- a/modules/mournblade-utility.js +++ b/modules/mournblade-utility.js @@ -10,6 +10,7 @@ export class MournbladeUtility { static async init() { Hooks.on('renderChatLog', (log, html, data) => MournbladeUtility.chatListeners(html)) Hooks.on("getChatLogEntryContext", (html, options) => MournbladeUtility.chatRollMenu(html, options)) + Hooks.on('renderChatMessage', (message, html, data) => MournbladeUtility.chatMessageHandler(message, html, data)) Hooks.on("getCombatTrackerEntryContext", (html, options) => { MournbladeUtility.pushInitiativeOptions(html, options); @@ -125,6 +126,20 @@ export class MournbladeUtility { return duplicate(pred[predIdx] || { name: "Error!" }) } + /* -------------------------------------------- */ + static async chatMessageHandler(message, html, data) { + const chatCard = html.find('.action-section') + if (chatCard.length > 0) { + // If the user is the message author or the actor owner, proceed + const actor = game.actors.get(data.message.speaker.actor) + // DEBUG : console.log("FOUND 1!!! ", actor, data.message) + if (actor?.isOwner || game.user.isGM) { + return + } + chatCard.hide() + } + } + /* -------------------------------------------- */ static async chatListeners(html) { @@ -145,6 +160,18 @@ export class MournbladeUtility { let message = game.messages.get(messageId) let rollData = message.getFlag("world", "mournblade-roll") MournbladeUtility.rollDegatsFromAttaque(rollData) + + }) + + html.on("click", '.arme-apply-degats', async event => { + let messageId = MournbladeUtility.findChatMessageId(event.currentTarget) + let message = game.messages.get(messageId) + let rollData = message.getFlag("world", "mournblade-roll") + if (game.user.isGM) { + MournbladeUtility.applyDegatsFromAttaque(rollData) + } else { + game.socket.emit("system.fvtt-mournblade", { name: "msg_apply_damage", data: { rolLData: rollData } }) + } }) } @@ -216,22 +243,6 @@ export class MournbladeUtility { return undefined; } - /* -------------------------------------------- */ - static updateRollData(rollData) { - - let id = rollData.rollId; - let oldRollData = this.rollDataStore[id] || {}; - let newRollData = mergeObject(oldRollData, rollData); - this.rollDataStore[id] = newRollData; - } - /* -------------------------------------------- */ - static saveRollData(rollData) { - game.socket.emit("system.fvtt-mournblade", { - name: "msg_update_roll", data: rollData - }); // Notify all other clients of the roll - this.updateRollData(rollData); - } - /* -------------------------------------------- */ static getRollData(id) { return this.rollDataStore[id]; @@ -239,11 +250,10 @@ export class MournbladeUtility { /* -------------------------------------------- */ static onSocketMesssage(msg) { - if (msg.name == "msg_update_defense_state") { - this.updateDefenseState(msg.data.defenderId, msg.data.rollId); - } - if (msg.name == "msg_update_roll") { - this.updateRollData(msg.data); + if (msg.name == "msg_apply_damage") { + if (game.user.isGM) { + this.applyDegatsFromAttaque(msg.data.rollData); + } } } @@ -343,11 +353,19 @@ export class MournbladeUtility { } else { rollData.diceFormula += `+${rollData.attr.value}*2+${rollData.modificateur}` } + rollData.diceFormula += `+${rollData.malusSante}` if (rollData.arme?.type == "arme") { rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}` } + // Apply modifiers + for (let modifier of rollData.modifiers) { + if (modifier.system.modifiertype == "roll" && modifier.system.apply) { + rollData.diceFormula += `+${modifier.system.value}` + } + } + // Specific modifier for distance if (rollData.arme?.system?.isDistance) { if (rollData.visee) { @@ -410,15 +428,19 @@ export class MournbladeUtility { if (rollData.typeAttaque == "assaut") { rollData.degatsFormula = rollData.arme.system.totalDegats if (rollData.isHeroique) { // Deux fois les dés de dégats - rollData.degatsFormula += " + " + rollData.arme.system.totalDegats + rollData.degatsFormula += " + " + rollData.arme.system.totalDegats degatsMessage = "Dégats doublés" } } + if (rollData.typeAttaque == "charger") { + rollData.degatsFormula += "+2" + } + if (rollData.typeAttaque == "precise") { - let degatsMessage = "Degats normaux" + degatsMessage = "Degats normaux" if (rollData.isHeroique) { // Degats max maximize = true - degatsMessage = "Dégats maximaux, ignore l'armure du défenseur" + degatsMessage = "Dégats maximaux, ignore l'armure du défenseur"; rollData.ignoreDefenseArmor = true } } @@ -439,12 +461,35 @@ export class MournbladeUtility { rollData.nextMalus = -15 } } + if (rollData.typeAttaque == "contenir") { + degatsMessage = "Pas de dégats, mais l'adversaire ne peut pas vous attaquer pour le reste du tour" + rollData.degatsFormula = false + if (rollData.isHeroique) { // Malus pour prochaine action + degatsMessage = "Pas de dégats, mais tout les adversaires avec une défense inférieure ou égale à " + rollData.finalResult-10 + + " ne peuvent pas vous attaquer pour le reste du tour" + } + } + if (rollData.typeAttaque == "desarmer") { + degatsMessage = "Pas de dégats, mais l'adversaire reçoit un malus de -5 pour sa prochaine action" + rollData.degatsFormula = false + if (rollData.isHeroique) { // Malus pour prochaine action + rollData.defenderDesarme = true + degatsMessage = "Pas de dégats, mais l'arme de votre adversaire est arrachée de ses mains" + } + } } else { // Armes à distance rollData.degatsFormula = rollData.arme.system.totalDegats if (rollData.isHeroique) { // Deux fois les dés de dégats - rollData.degatsFormula += " + " + rollData.arme.system.totalDegats + rollData.degatsFormula += " + " + rollData.arme.system.totalDegats } } + + for(let mod of rollData.modifiers) { + if (mod.system.modifiertype == "degats") { + rollData.degatsFormula += `+${mod.system.value}` + } + } + // Perform the roll, show the dice rollData.finalResult = 0 rollData.degatsMessage = degatsMessage @@ -461,6 +506,34 @@ export class MournbladeUtility { } + /* -------------------------------------------- */ + static applyDegatsFromAttaque(rollData) { + let defender = game.canvas.tokens.get(rollData?.defenderTokenId)?.actor + if (defender && rollData.arme) { + let actor = MournbladeUtility.getActorFromRollData(rollData) + if (rollData.typeAttaque == "desarmer" && !rollData.isHeroique) { + defender.setModifier("Malus suite à désarmement", "roll", -5) + } + if (rollData.typeAttaque == "charger") { + actor.setModifier("Défense suite à charge", "roll", -5) + } + if (rollData.nextBonus) { + actor.setModifier("Prochaine attaque", "roll", rollData.nextBonus) + if (rollData.nextDegatsBonus) { + actor.setModifier("Prochaine attaque", "degats", rollData.nextDegatsBonus) + } + } + if (rollData.nextMalus) { + defender.setModifier("Prochaine action complexe", "roll", -rollData.nextMalus) + } + if (rollData.defenderDesarme) { + 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) + } + } + /* -------------------------------------------- */ static async bonusRollMournblade(rollData) { rollData.bonusFormula = rollData.addedBonus @@ -554,7 +627,8 @@ export class MournbladeUtility { chatOptions.whisper = this.getWhisperRecipients(rollMode, name); break; } - chatOptions.alias = chatOptions.alias || name + chatOptions.alias = chatOptions.alias || name; + chatOptions.speaker = ChatMessage.getSpeaker(); let msg = await ChatMessage.create(chatOptions) console.log("=======>", rollData) msg.setFlag("world", "mournblade-roll", rollData) diff --git a/packs/armes/000048.log b/packs/armes/000072.log similarity index 100% rename from packs/armes/000048.log rename to packs/armes/000072.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index a6d5883..bcf1079 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000070 diff --git a/packs/armes/LOG b/packs/armes/LOG index a13213d..dcf6a40 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/12/22-07:52:34.496801 7f3322ffd6c0 Recovering log #44 -2023/12/22-07:52:34.507416 7f3322ffd6c0 Delete type=3 #42 -2023/12/22-07:52:34.507504 7f3322ffd6c0 Delete type=0 #44 -2023/12/22-09:30:01.987558 7f33223ff6c0 Level-0 table #49: started -2023/12/22-09:30:01.987624 7f33223ff6c0 Level-0 table #49: 0 bytes OK -2023/12/22-09:30:01.997520 7f33223ff6c0 Delete type=0 #47 -2023/12/22-09:30:02.010634 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/22-09:30:02.017412 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +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) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old index 264cce0..141069a 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-20:53:10.652760 7f3322ffd6c0 Recovering log #40 -2023/12/21-20:53:10.664177 7f3322ffd6c0 Delete type=3 #38 -2023/12/21-20:53:10.664308 7f3322ffd6c0 Delete type=0 #40 -2023/12/21-20:54:12.924325 7f33223ff6c0 Level-0 table #45: started -2023/12/21-20:54:12.924370 7f33223ff6c0 Level-0 table #45: 0 bytes OK -2023/12/21-20:54:12.931190 7f33223ff6c0 Delete type=0 #43 -2023/12/21-20:54:12.938479 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/21-20:54:12.945078 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +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) diff --git a/packs/armes/MANIFEST-000046 b/packs/armes/MANIFEST-000046 deleted file mode 100644 index 64a9bcba82aa2861a348f637ff70fd3829428051..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 literal 0 HcmV?d00001 diff --git a/packs/dons/000048.log b/packs/dons/000072.log similarity index 100% rename from packs/dons/000048.log rename to packs/dons/000072.log diff --git a/packs/dons/CURRENT b/packs/dons/CURRENT index a6d5883..bcf1079 100644 --- a/packs/dons/CURRENT +++ b/packs/dons/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000070 diff --git a/packs/dons/LOG b/packs/dons/LOG index f303e8a..e7778b5 100644 --- a/packs/dons/LOG +++ b/packs/dons/LOG @@ -1,8 +1,8 @@ -2023/12/22-07:52:34.533537 7f33237fe6c0 Recovering log #44 -2023/12/22-07:52:34.544730 7f33237fe6c0 Delete type=3 #42 -2023/12/22-07:52:34.544954 7f33237fe6c0 Delete type=0 #44 -2023/12/22-09:30:02.010655 7f33223ff6c0 Level-0 table #49: started -2023/12/22-09:30:02.010677 7f33223ff6c0 Level-0 table #49: 0 bytes OK -2023/12/22-09:30:02.017303 7f33223ff6c0 Delete type=0 #47 -2023/12/22-09:30:02.017454 7f33223ff6c0 Manual compaction at level-0 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) -2023/12/22-09:30:02.017502 7f33223ff6c0 Manual compaction at level-1 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) +2023/12/24-12:34:00.290195 7f83a0ff96c0 Recovering log #68 +2023/12/24-12:34:00.300801 7f83a0ff96c0 Delete type=3 #66 +2023/12/24-12:34:00.300889 7f83a0ff96c0 Delete type=0 #68 +2023/12/24-12:37:21.720129 7f83937fe6c0 Level-0 table #73: started +2023/12/24-12:37:21.720181 7f83937fe6c0 Level-0 table #73: 0 bytes OK +2023/12/24-12:37:21.726326 7f83937fe6c0 Delete type=0 #71 +2023/12/24-12:37:21.726457 7f83937fe6c0 Manual compaction at level-0 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) +2023/12/24-12:37:21.726475 7f83937fe6c0 Manual compaction at level-1 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) diff --git a/packs/dons/LOG.old b/packs/dons/LOG.old index 1feff11..b60d640 100644 --- a/packs/dons/LOG.old +++ b/packs/dons/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-20:53:10.696297 7f3323fff6c0 Recovering log #40 -2023/12/21-20:53:10.707682 7f3323fff6c0 Delete type=3 #38 -2023/12/21-20:53:10.707772 7f3323fff6c0 Delete type=0 #40 -2023/12/21-20:54:12.945355 7f33223ff6c0 Level-0 table #45: started -2023/12/21-20:54:12.945427 7f33223ff6c0 Level-0 table #45: 0 bytes OK -2023/12/21-20:54:12.952599 7f33223ff6c0 Delete type=0 #43 -2023/12/21-20:54:12.973349 7f33223ff6c0 Manual compaction at level-0 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) -2023/12/21-20:54:12.973423 7f33223ff6c0 Manual compaction at level-1 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) +2023/12/24-10:16:21.308457 7f83a0ff96c0 Recovering log #64 +2023/12/24-10:16:21.320693 7f83a0ff96c0 Delete type=3 #62 +2023/12/24-10:16:21.320808 7f83a0ff96c0 Delete type=0 #64 +2023/12/24-12:20:18.768640 7f83937fe6c0 Level-0 table #69: started +2023/12/24-12:20:18.768688 7f83937fe6c0 Level-0 table #69: 0 bytes OK +2023/12/24-12:20:18.776307 7f83937fe6c0 Delete type=0 #67 +2023/12/24-12:20:18.783712 7f83937fe6c0 Manual compaction at level-0 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) +2023/12/24-12:20:18.791457 7f83937fe6c0 Manual compaction at level-1 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) diff --git a/packs/dons/MANIFEST-000046 b/packs/dons/MANIFEST-000046 deleted file mode 100644 index ca8d9c195359d7492cf0c4f11a4c38d577c1b6de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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(`K_siO&ko2O!}M* U%myrSe^MuG2XPI6Tq71a0IWtM&;S4c diff --git a/packs/dons/MANIFEST-000070 b/packs/dons/MANIFEST-000070 new file mode 100644 index 0000000000000000000000000000000000000000..a9b00620651a757f59f7bc12e7da5b0076565dce 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(`OEWN88{dincO)U Um_1nJdMn`pgoS$2eSd>_jU&PMD`Y%UbF|#B!w^-4@ zve?+T*sV0H)S@aYpwN?%kpT=~@)bFiZq9+uIZjcAe#ZWWPK<&O`O6zMy*L;cne;gs Um`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 literal 0 HcmV?d00001 diff --git a/packs/origines/000048.log b/packs/origines/000072.log similarity index 100% rename from packs/origines/000048.log rename to packs/origines/000072.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index a6d5883..bcf1079 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000070 diff --git a/packs/origines/LOG b/packs/origines/LOG index 4fdefc4..4e17656 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/12/22-07:52:34.546476 7f3322ffd6c0 Recovering log #44 -2023/12/22-07:52:34.557106 7f3322ffd6c0 Delete type=3 #42 -2023/12/22-07:52:34.557177 7f3322ffd6c0 Delete type=0 #44 -2023/12/22-09:30:02.017538 7f33223ff6c0 Level-0 table #49: started -2023/12/22-09:30:02.017564 7f33223ff6c0 Level-0 table #49: 0 bytes OK -2023/12/22-09:30:02.024036 7f33223ff6c0 Delete type=0 #47 -2023/12/22-09:30:02.044238 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) -2023/12/22-09:30:02.044286 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +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) diff --git a/packs/origines/LOG.old b/packs/origines/LOG.old index 6e3bfdb..d105fe2 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-20:53:10.710662 7f3322ffd6c0 Recovering log #40 -2023/12/21-20:53:10.720767 7f3322ffd6c0 Delete type=3 #38 -2023/12/21-20:53:10.720852 7f3322ffd6c0 Delete type=0 #40 -2023/12/21-20:54:12.959603 7f33223ff6c0 Level-0 table #45: started -2023/12/21-20:54:12.959656 7f33223ff6c0 Level-0 table #45: 0 bytes OK -2023/12/21-20:54:12.966466 7f33223ff6c0 Delete type=0 #43 -2023/12/21-20:54:12.973382 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) -2023/12/21-20:54:12.973447 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +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) diff --git a/packs/origines/MANIFEST-000046 b/packs/origines/MANIFEST-000046 deleted file mode 100644 index 76d7a6a439144d09882cf654a3cd55219acbd32b..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(~m`{a*bF-0Jvl#!2kdN diff --git a/packs/origines/MANIFEST-000070 b/packs/origines/MANIFEST-000070 new file mode 100644 index 0000000000000000000000000000000000000000..0277e8431a2bff880bf12925180f7e655743eb24 GIT binary patch literal 134 zcmaFnw>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{?fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQb%KbzVrEHdZn2_K zhKr#~U|6cNXP{?(ncO)U Um_1n7UESCI1#vxqTrU=O04_KoRsaA1 literal 0 HcmV?d00001 diff --git a/packs/runes/000048.log b/packs/runes/000072.log similarity index 100% rename from packs/runes/000048.log rename to packs/runes/000072.log diff --git a/packs/runes/CURRENT b/packs/runes/CURRENT index a6d5883..bcf1079 100644 --- a/packs/runes/CURRENT +++ b/packs/runes/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000070 diff --git a/packs/runes/LOG b/packs/runes/LOG index a4675b4..0e9b610 100644 --- a/packs/runes/LOG +++ b/packs/runes/LOG @@ -1,8 +1,8 @@ -2023/12/22-07:52:34.607651 7f3323fff6c0 Recovering log #44 -2023/12/22-07:52:34.618669 7f3323fff6c0 Delete type=3 #42 -2023/12/22-07:52:34.618763 7f3323fff6c0 Delete type=0 #44 -2023/12/22-09:30:02.050897 7f33223ff6c0 Level-0 table #49: started -2023/12/22-09:30:02.050932 7f33223ff6c0 Level-0 table #49: 0 bytes OK -2023/12/22-09:30:02.057930 7f33223ff6c0 Delete type=0 #47 -2023/12/22-09:30:02.064390 7f33223ff6c0 Manual compaction at level-0 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) -2023/12/22-09:30:02.064434 7f33223ff6c0 Manual compaction at level-1 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) +2023/12/24-12:34:00.373049 7f83a1ffb6c0 Recovering log #68 +2023/12/24-12:34:00.383735 7f83a1ffb6c0 Delete type=3 #66 +2023/12/24-12:34:00.383841 7f83a1ffb6c0 Delete type=0 #68 +2023/12/24-12:37:21.760456 7f83937fe6c0 Level-0 table #73: started +2023/12/24-12:37:21.760489 7f83937fe6c0 Level-0 table #73: 0 bytes OK +2023/12/24-12:37:21.766845 7f83937fe6c0 Delete type=0 #71 +2023/12/24-12:37:21.773984 7f83937fe6c0 Manual compaction at level-0 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) +2023/12/24-12:37:21.774012 7f83937fe6c0 Manual compaction at level-1 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) diff --git a/packs/runes/LOG.old b/packs/runes/LOG.old index 7f17d57..984f175 100644 --- a/packs/runes/LOG.old +++ b/packs/runes/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-20:53:10.783266 7f33237fe6c0 Recovering log #40 -2023/12/21-20:53:10.795055 7f33237fe6c0 Delete type=3 #38 -2023/12/21-20:53:10.795163 7f33237fe6c0 Delete type=0 #40 -2023/12/21-20:54:12.973622 7f33223ff6c0 Level-0 table #45: started -2023/12/21-20:54:12.973662 7f33223ff6c0 Level-0 table #45: 0 bytes OK -2023/12/21-20:54:12.980149 7f33223ff6c0 Delete type=0 #43 -2023/12/21-20:54:13.002436 7f33223ff6c0 Manual compaction at level-0 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) -2023/12/21-20:54:13.002526 7f33223ff6c0 Manual compaction at level-1 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) +2023/12/24-10:16:21.395156 7f8393fff6c0 Recovering log #64 +2023/12/24-10:16:21.406418 7f8393fff6c0 Delete type=3 #62 +2023/12/24-10:16:21.406910 7f8393fff6c0 Delete type=0 #64 +2023/12/24-12:20:18.813028 7f83937fe6c0 Level-0 table #69: started +2023/12/24-12:20:18.813071 7f83937fe6c0 Level-0 table #69: 0 bytes OK +2023/12/24-12:20:18.819811 7f83937fe6c0 Delete type=0 #67 +2023/12/24-12:20:18.827987 7f83937fe6c0 Manual compaction at level-0 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) +2023/12/24-12:20:18.828164 7f83937fe6c0 Manual compaction at level-1 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) diff --git a/packs/runes/MANIFEST-000046 b/packs/runes/MANIFEST-000046 deleted file mode 100644 index 3f2fae368baf3c08cf26a49df55bfd2b31352f7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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}5cx?O&wV)<7@71r V8JG=Nbfwj~SU_9@AlHaR7Xa`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- literal 0 HcmV?d00001 diff --git a/packs/skills/000048.log b/packs/skills/000072.log similarity index 100% rename from packs/skills/000048.log rename to packs/skills/000072.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index a6d5883..bcf1079 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000070 diff --git a/packs/skills/LOG b/packs/skills/LOG index e053233..5eeb71f 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/12/22-07:52:34.484917 7f33237fe6c0 Recovering log #44 -2023/12/22-07:52:34.495134 7f33237fe6c0 Delete type=3 #42 -2023/12/22-07:52:34.495237 7f33237fe6c0 Delete type=0 #44 -2023/12/22-09:30:01.953868 7f33223ff6c0 Level-0 table #49: started -2023/12/22-09:30:01.953936 7f33223ff6c0 Level-0 table #49: 0 bytes OK -2023/12/22-09:30:01.960462 7f33223ff6c0 Delete type=0 #47 -2023/12/22-09:30:01.977006 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/22-09:30:01.977080 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +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) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 5e2da2d..8f7229b 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-20:53:10.639268 7f3323fff6c0 Recovering log #40 -2023/12/21-20:53:10.650093 7f3323fff6c0 Delete type=3 #38 -2023/12/21-20:53:10.650190 7f3323fff6c0 Delete type=0 #40 -2023/12/21-20:54:12.899494 7f33223ff6c0 Level-0 table #45: started -2023/12/21-20:54:12.899538 7f33223ff6c0 Level-0 table #45: 0 bytes OK -2023/12/21-20:54:12.905877 7f33223ff6c0 Delete type=0 #43 -2023/12/21-20:54:12.906076 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/21-20:54:12.917606 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +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) diff --git a/packs/skills/MANIFEST-000046 b/packs/skills/MANIFEST-000046 deleted file mode 100644 index 9942f3a11e55c6fb906de49d118b1e3c9c1698ca..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`Tmu=esVA{GU;`pgoS$2eSd>_jU&PMD`pZ&YF|#B!w^-4@ zC#TA#(z&$AD>bDswbGrDkpT=~@+F04xvuFE`RV2vCSjG~*^K-U`ON5f`pgoS$2eSd>_jU&PMDI)5vpykcfaYHqQj zfpcVlp;tjvsby|)iD`*9BO?PCz~rkk0s@M2LrQ$g%#$nqJiHjqA@Z}g`buyxFf!?L VGB6vkm`pgoS$2eSd>_jU&PMDI)5vpykcfaYHqQj zfpcVlp;tjvsby|)iD`*9BO?PCz~rkk0s@M2LrQ$g%#$nqJiHjqA@Y0QXUyVYU}SRV VWMKASF>ls5odx200J&Z)<^T={B>w;a literal 0 HcmV?d00001 diff --git a/packs/traits-chaotiques/000048.log b/packs/traits-chaotiques/000072.log similarity index 100% rename from packs/traits-chaotiques/000048.log rename to packs/traits-chaotiques/000072.log diff --git a/packs/traits-chaotiques/CURRENT b/packs/traits-chaotiques/CURRENT index a6d5883..bcf1079 100644 --- a/packs/traits-chaotiques/CURRENT +++ b/packs/traits-chaotiques/CURRENT @@ -1 +1 @@ -MANIFEST-000046 +MANIFEST-000070 diff --git a/packs/traits-chaotiques/LOG b/packs/traits-chaotiques/LOG index 0950efc..41d3fd8 100644 --- a/packs/traits-chaotiques/LOG +++ b/packs/traits-chaotiques/LOG @@ -1,8 +1,8 @@ -2023/12/22-07:52:34.595239 7f3322ffd6c0 Recovering log #44 -2023/12/22-07:52:34.606082 7f3322ffd6c0 Delete type=3 #42 -2023/12/22-07:52:34.606189 7f3322ffd6c0 Delete type=0 #44 -2023/12/22-09:30:02.037908 7f33223ff6c0 Level-0 table #49: started -2023/12/22-09:30:02.037952 7f33223ff6c0 Level-0 table #49: 0 bytes OK -2023/12/22-09:30:02.044100 7f33223ff6c0 Delete type=0 #47 -2023/12/22-09:30:02.044279 7f33223ff6c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) -2023/12/22-09:30:02.044319 7f33223ff6c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +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) diff --git a/packs/traits-chaotiques/LOG.old b/packs/traits-chaotiques/LOG.old index 5cbece0..22a6d1b 100644 --- a/packs/traits-chaotiques/LOG.old +++ b/packs/traits-chaotiques/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-20:53:10.768462 7f3322ffd6c0 Recovering log #40 -2023/12/21-20:53:10.779653 7f3322ffd6c0 Delete type=3 #38 -2023/12/21-20:53:10.779757 7f3322ffd6c0 Delete type=0 #40 -2023/12/21-20:54:12.980375 7f33223ff6c0 Level-0 table #45: started -2023/12/21-20:54:12.980428 7f33223ff6c0 Level-0 table #45: 0 bytes OK -2023/12/21-20:54:12.988146 7f33223ff6c0 Delete type=0 #43 -2023/12/21-20:54:13.002466 7f33223ff6c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) -2023/12/21-20:54:13.002544 7f33223ff6c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +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) diff --git a/packs/traits-chaotiques/MANIFEST-000046 b/packs/traits-chaotiques/MANIFEST-000046 deleted file mode 100644 index 07be60e97fd8f2a7a79770186733d83ff045c777..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(~m`{a*bF-0DhAq$N&HU diff --git a/packs/traits-chaotiques/MANIFEST-000070 b/packs/traits-chaotiques/MANIFEST-000070 new file mode 100644 index 0000000000000000000000000000000000000000..b1ae37a0cccef1ff5c04e97c3d50f0ecd16bab3e GIT binary patch literal 134 zcmbQgmc=TOfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^`f7=VrEHdZn2`V zmw|_OR&rR0Q;4ypQ)Un&BLf(~ {{/each}} - -

Santé

  • @@ -123,8 +121,19 @@
    • +
  • + + + + +
+
+ +
+

Ame

  • @@ -170,11 +179,47 @@ value="{{data.combat.defensebonus}}" data-dtype="Number" />
    • +
  • + + +
+
+
    +
  • + +

    +     + + + + + + +
     
    +
    +
    +
    • + {{#each modifiers as |modifier key|}} +
  • + + {{modifier.name}} + {{upperFirst modifier.system.modifiertype}} + {{modifier.system.value}} +
     
    +
    + + +
    +
    • + {{/each}} +
+
+ {{!-- Competence Tab --}} @@ -536,6 +581,8 @@
 
+ {{#if protection.system.equipped}}{{else}}{{/if}}
diff --git a/templates/chat-degats-result.html b/templates/chat-degats-result.html index 355d2bd..bd41dde 100644 --- a/templates/chat-degats-result.html +++ b/templates/chat-degats-result.html @@ -13,12 +13,12 @@ {{/if}} -
+
ntfabr
    -
  • Arme : {{arme.name}} (+{{degatsFormula}})
    • +
  • Arme : {{arme.name}} {{#if degatsFormula}} (+{{degatsFormula}}) {{/if}}
  • Information : {{degatsMessage}}
  • Dégats : {{finalResult}} {{#if arme.system.nonletaux}}(Non létaux){{else}}(Létaux){{/if}}
    • {{#if nextBonus}} @@ -27,6 +27,13 @@ {{#if nextMalus}}
  • Malus au défenseur pour prochaine action : {{nextMalus}}
    • {{/if}} + + + +
+
diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index 8f3c1fd..dd1046a 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -78,20 +78,24 @@
  • Echec Dramatique!!!
    • {{/if}} - {{#each predilections as |pred key|}} - {{#if (not pred.used)}} +
    + + {{#each predilections as |pred key|}} + {{#if (not pred.used)}} +
  • + +
    • + {{/if}} + {{/each}} + + {{#if (and arme isSuccess)}}
  • - +
    • {{/if}} - {{/each}} - {{#if (and arme isSuccess)}} -
  • - -
    • - {{/if}} +
    diff --git a/templates/item-modifier-sheet.html b/templates/item-modifier-sheet.html new file mode 100644 index 0000000..f7bd453 --- /dev/null +++ b/templates/item-modifier-sheet.html @@ -0,0 +1,35 @@ +
    +
    + +
    +

    +
    +
    + + {{!-- Sheet Body --}} +
    + + + + + + + + + + + +
    + {{> systems/fvtt-mournblade/templates/partial-item-description.html}} + +
    + +
    +
    diff --git a/templates/roll-dialog-generic.html b/templates/roll-dialog-generic.html index 453a365..0182f09 100644 --- a/templates/roll-dialog-generic.html +++ b/templates/roll-dialog-generic.html @@ -132,6 +132,24 @@ {{/if}} {{/if}} +
    + Malus de santé : + {{malusSante}} +
    + + {{#if (count modifiers)}} +
    + Modificateurs enregistrés : +
    + {{#each modifiers as |modifier idx|}} +
    + {{modifier.name}} : + {{modifier.system.value}} + +
    + {{/each}} + {{/if}} +
    Modificateur :