diff --git a/lang/fr.json b/lang/fr.json index 3759df4..66f19f9 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -1,13 +1,15 @@ { - "ACTOR": { - "TypePersonnage": "Personnage" - }, - "ITEM": { - "TypeArme": "Arme", - "TypeEquipement": "Equipement", - "TypeTarot": "Tarot", - "TypeElementbio": "Element Biographique", - "TypeArchetype": "Archetype", - "TypeSortilege": "Sortilège" + "TYPES": { + "Actor": { + "personnage" : "Personnage" + }, + "Item": { + "arme" : "Arme", + "equipement" : "Equipement", + "tarot" : "Tarot", + "elementbio" : "Elément Biographique", + "archetype" : "Archetype", + "sortilege" : "Sortilège" + } } } \ No newline at end of file diff --git a/modules/malefices-actor-sheet.js b/modules/malefices-actor-sheet.js index 4367654..3c009be 100644 --- a/modules/malefices-actor-sheet.js +++ b/modules/malefices-actor-sheet.js @@ -11,7 +11,7 @@ export class MaleficesActorSheet extends ActorSheet { /** @override */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { classes: ["fvtt-malefices", "sheet", "actor", "malefices-actor-sheet"], template: "systems/fvtt-malefices/templates/actors/actor-sheet.hbs", width: 640, @@ -33,14 +33,14 @@ export class MaleficesActorSheet extends ActorSheet { name: this.actor.name, editable: this.isEditable, cssClass: this.isEditable ? "editable" : "locked", - system: duplicate(this.object.system), + system: foundry.utils.duplicate(this.object.system), limited: this.object.limited, - armes: duplicate(this.actor.getArmes()), - tarots: duplicate(this.actor.getTarots()), - tarotsCache: duplicate(this.actor.getHiddenTarots()), - archetype: duplicate(this.actor.getArchetype()), - equipements: duplicate(this.actor.getEquipements()), - subActors: duplicate(this.actor.getSubActors()), + armes: foundry.utils.duplicate(this.actor.getArmes()), + tarots: foundry.utils.duplicate(this.actor.getTarots()), + tarotsCache: foundry.utils.duplicate(this.actor.getHiddenTarots()), + archetype: foundry.utils.duplicate(this.actor.getArchetype()), + equipements: foundry.utils.duplicate(this.actor.getEquipements()), + subActors: foundry.utils.duplicate(this.actor.getSubActors()), phyMalus: this.actor.getPhysiqueMalus(), elementsbio: this.actor.getElementsBio(), sorts: this.actor.getSorts(), diff --git a/modules/malefices-actor.js b/modules/malefices-actor.js index 05cd748..53419e7 100644 --- a/modules/malefices-actor.js +++ b/modules/malefices-actor.js @@ -29,7 +29,7 @@ export class MaleficesActor extends Actor { if (data instanceof Array) { return super.create(data, options); } - // If the created actor has items (only applicable to duplicated actors) bypass the new actor creation logic + // If the created actor has items (only applicable to foundry.utils.duplicated actors) bypass the new actor creation logic if (data.items) { let actor = super.create(data, options); return actor; @@ -92,7 +92,7 @@ export class MaleficesActor extends Actor { return comp; } getArchetype() { - let comp = duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"}) + let comp = foundry.utils.duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"}) if (comp && comp.system) { comp.tarot = MaleficesUtility.getTarot(comp.system.lametutelaire) } @@ -101,25 +101,25 @@ export class MaleficesActor extends Actor { } /* -------------------------------------------- */ getElementsBio() { - let comp = duplicate(this.items.filter(item => item.type == 'elementbio') || []) + let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'elementbio') || []) MaleficesUtility.sortArrayObjectsByName(comp) return comp; } /* -------------------------------------------- */ getTarots() { - let comp = duplicate(this.items.filter(item => item.type == 'tarot' && !item.system.isgm) || []) + let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'tarot' && !item.system.isgm) || []) MaleficesUtility.sortArrayObjectsByName(comp) return comp; } /* -------------------------------------------- */ getHiddenTarots() { - let comp = duplicate(this.items.filter(item => item.type == 'tarot' && item.system.isgm) || []) + let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'tarot' && item.system.isgm) || []) MaleficesUtility.sortArrayObjectsByName(comp) return comp; } /* -------------------------------------------- */ getArmes() { - let comp = duplicate(this.items.filter(item => item.type == 'arme') || []) + let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'arme') || []) MaleficesUtility.sortArrayObjectsByName(comp) return comp; } @@ -127,7 +127,7 @@ export class MaleficesActor extends Actor { getItemById(id) { let item = this.items.find(item => item.id == id); if (item) { - item = duplicate(item) + item = foundry.utils.duplicate(item) } return item; } @@ -173,7 +173,7 @@ export class MaleficesActor extends Actor { /* ------------------------------------------- */ async buildContainerTree() { - let equipments = duplicate(this.items.filter(item => item.type == "equipment") || []) + let equipments = foundry.utils.duplicate(this.items.filter(item => item.type == "equipment") || []) for (let equip1 of equipments) { if (equip1.system.iscontainer) { equip1.system.contents = [] @@ -238,13 +238,13 @@ export class MaleficesActor extends Actor { getSubActors() { let subActors = []; for (let id of this.system.subactors) { - subActors.push(duplicate(game.actors.get(id))) + subActors.push(foundry.utils.duplicate(game.actors.get(id))) } return subActors; } /* -------------------------------------------- */ async addSubActor(subActorId) { - let subActors = duplicate(this.system.subactors); + let subActors = foundry.utils.duplicate(this.system.subactors); subActors.push(subActorId); await this.update({ 'system.subactors': subActors }); } @@ -291,7 +291,7 @@ export class MaleficesActor extends Actor { } /* -------------------------------------------- */ incDecAttr(attrKey, value) { - let attr = duplicate(this.system.attributs[attrKey]) + let attr = foundry.utils.duplicate(this.system.attributs[attrKey]) attr.value += value this.update( { [`system.attributs.${attrKey}`]: attr}) } @@ -341,6 +341,7 @@ export class MaleficesActor extends Actor { rollData.isReroll = false rollData.confrontationDegre = 0 rollData.confrontationModif = 0 + rollData.config = game.system.malefices.config console.log("ROLLDATA", rollData) @@ -358,7 +359,7 @@ export class MaleficesActor extends Actor { rollAttribut(attrKey) { let attr = this.system.attributs[attrKey] let rollData = this.getCommonRollData() - rollData.attr = duplicate(attr) + rollData.attr = foundry.utils.duplicate(attr) rollData.mode = "attribut" rollData.title = attr.label rollData.img = this.getAtttributImage(attrKey) @@ -369,12 +370,12 @@ export class MaleficesActor extends Actor { rollArme(weaponId) { let arme = this.items.get(weaponId) if (arme) { - arme = duplicate(arme) + arme = foundry.utils.duplicate(arme) let rollData = this.getCommonRollData() if (arme.system.armetype == "mainsnues" || arme.system.armetype == "epee") { rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique.value+this.system.attributs.habilite.value) / 2) } } else { - rollData.attr = duplicate(this.system.attributs.habilite) + rollData.attr = foundry.utils.duplicate(this.system.attributs.habilite) } rollData.mode = "arme" rollData.arme = arme diff --git a/modules/malefices-commands.js b/modules/malefices-commands.js index feaf4de..31d482d 100644 --- a/modules/malefices-commands.js +++ b/modules/malefices-commands.js @@ -115,7 +115,7 @@ export class MaleficesCommands { maxPlayerCard: 4, maxSecretCard: 1, cards: [], - players: duplicate(game.users), + players: foundry.utils.duplicate(game.users), secretCards: [], deck: MaleficesUtility.getTarots() } diff --git a/modules/malefices-config.js b/modules/malefices-config.js index 5069318..dbed4fb 100644 --- a/modules/malefices-config.js +++ b/modules/malefices-config.js @@ -27,4 +27,41 @@ export const MALEFICES_CONFIG = { "epee": "Epée, sabre, javelot, etc", "mainsnues": "Mains Nues" }, + + confrontationDegreOptions :{ + "0": "0", + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5" + }, + + confrontationModifOptions: { + "-1": "-1", + "0": "0", + "1": "+1" + }, + + bonusMalusPersoOptions: [ + {value: "-3", label: "-3"}, + {value: "-2", label: "-2"}, + {value: "-1", label: "-1"}, + {value: "0", label: "0"}, + {value: "+1", label: "+1"}, + {value: "+2", label: "+2"}, + {value: "+3", label: "+3"} + ], + bonusMalusDefOptions: [ + {value: "-6", label: "-6 (réussite critique)"}, + {value: "-3", label: "-3 (réussite)"}, + {value: "0", label: "0 (echec ou pas d'esquive)"}, + {value: "+3", label: "+3 (echec critique)"} + ], + bonusMalusPorteeOptions: [ + {value: "1", label: "+1 (Portée courte)"}, + {value: "0", label: "0 (Portée moyenne)"}, + {value: "-1", label: "-1 (Portée longue)"} + ] + } \ No newline at end of file diff --git a/modules/malefices-item-sheet.js b/modules/malefices-item-sheet.js index b5ab8a7..68aaa56 100644 --- a/modules/malefices-item-sheet.js +++ b/modules/malefices-item-sheet.js @@ -9,7 +9,7 @@ export class MaleficesItemSheet extends ItemSheet { /** @override */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { classes: ["fvtt-malefices", "sheet", "item"], template: "systems/fvtt-malefices/templates/item-sheet.hbs", dragDrop: [{ dragSelector: null, dropSelector: null }], @@ -43,8 +43,8 @@ export class MaleficesItemSheet extends ItemSheet { name: this.object.name, editable: this.isEditable, cssClass: this.isEditable ? "editable" : "locked", - system: duplicate(this.object.system), - config: duplicate(game.system.malefices.config), + system: foundry.utils.duplicate(this.object.system), + config: foundry.utils.duplicate(game.system.malefices.config), limited: this.object.limited, options: this.options, owner: this.document.isOwner, @@ -76,7 +76,7 @@ export class MaleficesItemSheet extends ItemSheet { /* -------------------------------------------- */ postItem() { - let chatData = duplicate(this.item) + let chatData = foundry.utils.duplicate(this.item) if (this.actor) { chatData.actor = { id: this.actor.id }; } diff --git a/modules/malefices-npc-sheet.js b/modules/malefices-npc-sheet.js index 8c0718f..d122913 100644 --- a/modules/malefices-npc-sheet.js +++ b/modules/malefices-npc-sheet.js @@ -11,7 +11,7 @@ export class MaleficesNPCSheet extends ActorSheet { /** @override */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { classes: ["Malefices", "sheet", "actor"], template: "systems/fvtt-malefices/templates/npc-sheet.html", width: 640, @@ -25,7 +25,7 @@ export class MaleficesNPCSheet extends ActorSheet { /* -------------------------------------------- */ async getData() { const objectData = this.object.system - let actorData = duplicate(objectData) + let actorData = foundry.utils.duplicate(objectData) let formData = { title: this.title, @@ -38,16 +38,16 @@ export class MaleficesNPCSheet extends ActorSheet { data: actorData, limited: this.object.limited, skills: this.actor.getSkills( ), - weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ), - armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())), - shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())), - spells: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getLore())), - equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ), - equippedWeapons: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquippedWeapons()) ), + weapons: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getWeapons()) ), + armors: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getArmors())), + shields: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getShields())), + spells: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getLore())), + equipments: this.actor.checkAndPrepareEquipments(foundry.utils.duplicate(this.actor.getEquipmentsOnly()) ), + equippedWeapons: this.actor.checkAndPrepareEquipments(foundry.utils.duplicate(this.actor.getEquippedWeapons()) ), equippedArmor: this.actor.getEquippedArmor(), equippedShield: this.actor.getEquippedShield(), - subActors: duplicate(this.actor.getSubActors()), - moneys: duplicate(this.actor.getMoneys()), + subActors: foundry.utils.duplicate(this.actor.getSubActors()), + moneys: foundry.utils.duplicate(this.actor.getMoneys()), encCapacity: this.actor.getEncumbranceCapacity(), saveRolls: this.actor.getSaveRoll(), conditions: this.actor.getConditions(), diff --git a/modules/malefices-summary-app.js b/modules/malefices-summary-app.js index 7e7bf9f..09e6faf 100644 --- a/modules/malefices-summary-app.js +++ b/modules/malefices-summary-app.js @@ -43,7 +43,7 @@ export class MaleficesCharacterSummary extends Application { /* -------------------------------------------- */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { template: "systems/fvtt-malefices/templates/dialogs/character-summary.hbs", popOut: true, resizable: true, diff --git a/modules/malefices-tirage-tarot-dialog.js b/modules/malefices-tirage-tarot-dialog.js index 761af84..d137c9d 100644 --- a/modules/malefices-tirage-tarot-dialog.js +++ b/modules/malefices-tirage-tarot-dialog.js @@ -94,7 +94,7 @@ export class MaleficesTirageTarotDialog extends Dialog { } this.tirageData.secretCards.push(selectedCard) } - this.tirageData.actors = duplicate(game.actors) + this.tirageData.actors = foundry.utils.duplicate(game.actors) this.tirageData.state = 'attribute-to-actor' }else { this.sendCardRequest() diff --git a/modules/malefices-utility.js b/modules/malefices-utility.js index 2492aa6..442075b 100644 --- a/modules/malefices-utility.js +++ b/modules/malefices-utility.js @@ -65,7 +65,7 @@ export class MaleficesUtility { /*-------------------------------------------- */ static getTarots() { - return duplicate(this.tarots) + return foundry.utils.duplicate(this.tarots) } static getTarot(tId) { return this.tarots.find(t => t._id == tId) @@ -196,7 +196,7 @@ export class MaleficesUtility { let id = rollData.rollId let oldRollData = this.rollDataStore[id] || {} - let newRollData = mergeObject(oldRollData, rollData) + let newRollData = foundry.utils.mergeObject(oldRollData, rollData) this.rollDataStore[id] = newRollData } @@ -402,9 +402,9 @@ export class MaleficesUtility { // Performs roll console.log("Roll formula", diceFormula) - let myRoll = new Roll(diceFormula).roll({ async: false }) + let myRoll = await new Roll(diceFormula).roll() await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) - rollData.roll = duplicate(myRoll) + rollData.roll = foundry.utils.duplicate(myRoll) rollData.total = myRoll.total this.computeResults(rollData) @@ -462,7 +462,7 @@ export class MaleficesUtility { /* -------------------------------------------- */ static blindMessageToGM(chatOptions) { - let chatGM = duplicate(chatOptions); + let chatGM = foundry.utils.duplicate(chatOptions); chatGM.whisper = this.getUsers(user => user.isGM); chatGM.content = "Blinde message of " + game.user.name + "
" + chatOptions.content; console.log("blindMessageToGM", chatGM); @@ -512,7 +512,7 @@ export class MaleficesUtility { /* -------------------------------------------- */ static getBasicRollData() { let rollData = { - rollId: randomID(16), + rollId: foundry.utils.randomID(16), bonusMalusPerso: 0, bonusMalusSituation: 0, bonusMalusDef: 0, diff --git a/packs/malefices-archetypes/000016.log b/packs/malefices-archetypes/000020.log similarity index 100% rename from packs/malefices-archetypes/000016.log rename to packs/malefices-archetypes/000020.log diff --git a/packs/malefices-archetypes/000005.ldb b/packs/malefices-archetypes/000022.ldb similarity index 66% rename from packs/malefices-archetypes/000005.ldb rename to packs/malefices-archetypes/000022.ldb index b4cc6d7..1dd3668 100644 Binary files a/packs/malefices-archetypes/000005.ldb and b/packs/malefices-archetypes/000022.ldb differ diff --git a/packs/malefices-archetypes/CURRENT b/packs/malefices-archetypes/CURRENT index 23b73d9..e417a51 100644 --- a/packs/malefices-archetypes/CURRENT +++ b/packs/malefices-archetypes/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000018 diff --git a/packs/malefices-archetypes/LOG b/packs/malefices-archetypes/LOG index 18a76fd..48b7ade 100644 --- a/packs/malefices-archetypes/LOG +++ b/packs/malefices-archetypes/LOG @@ -1,8 +1,15 @@ -2023/10/26-09:14:30.238994 7f5603fff6c0 Recovering log #12 -2023/10/26-09:14:30.250498 7f5603fff6c0 Delete type=3 #10 -2023/10/26-09:14:30.250614 7f5603fff6c0 Delete type=0 #12 -2023/10/26-09:23:17.065670 7f56037fe6c0 Level-0 table #17: started -2023/10/26-09:23:17.065742 7f56037fe6c0 Level-0 table #17: 0 bytes OK -2023/10/26-09:23:17.072462 7f56037fe6c0 Delete type=0 #15 -2023/10/26-09:23:17.079476 7f56037fe6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) -2023/10/26-09:23:17.079561 7f56037fe6c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) +2024/04/26-18:07:32.626395 7efdd82006c0 Recovering log #16 +2024/04/26-18:07:32.637138 7efdd82006c0 Delete type=3 #14 +2024/04/26-18:07:32.637193 7efdd82006c0 Delete type=0 #16 +2024/04/26-18:35:17.538874 7efdd72006c0 Level-0 table #21: started +2024/04/26-18:35:17.542754 7efdd72006c0 Level-0 table #21: 50638 bytes OK +2024/04/26-18:35:17.548838 7efdd72006c0 Delete type=0 #19 +2024/04/26-18:35:17.591000 7efdd72006c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) +2024/04/26-18:35:17.591055 7efdd72006c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at '!items!xtYE2kVIfNtrXSoU' @ 46 : 1 +2024/04/26-18:35:17.591063 7efdd72006c0 Compacting 1@1 + 1@2 files +2024/04/26-18:35:17.595486 7efdd72006c0 Generated table #22@1: 23 keys, 50638 bytes +2024/04/26-18:35:17.595513 7efdd72006c0 Compacted 1@1 + 1@2 files => 50638 bytes +2024/04/26-18:35:17.602259 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/04/26-18:35:17.602378 7efdd72006c0 Delete type=2 #5 +2024/04/26-18:35:17.602577 7efdd72006c0 Delete type=2 #21 +2024/04/26-18:35:17.632494 7efdd72006c0 Manual compaction at level-1 from '!items!xtYE2kVIfNtrXSoU' @ 46 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-archetypes/LOG.old b/packs/malefices-archetypes/LOG.old index bce0157..18a76fd 100644 --- a/packs/malefices-archetypes/LOG.old +++ b/packs/malefices-archetypes/LOG.old @@ -1,8 +1,8 @@ -2023/10/26-09:13:41.637133 7f5603fff6c0 Recovering log #8 -2023/10/26-09:13:41.648494 7f5603fff6c0 Delete type=3 #6 -2023/10/26-09:13:41.648626 7f5603fff6c0 Delete type=0 #8 -2023/10/26-09:13:55.694567 7f56037fe6c0 Level-0 table #13: started -2023/10/26-09:13:55.694619 7f56037fe6c0 Level-0 table #13: 0 bytes OK -2023/10/26-09:13:55.701338 7f56037fe6c0 Delete type=0 #11 -2023/10/26-09:13:55.715996 7f56037fe6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) -2023/10/26-09:13:55.716063 7f56037fe6c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) +2023/10/26-09:14:30.238994 7f5603fff6c0 Recovering log #12 +2023/10/26-09:14:30.250498 7f5603fff6c0 Delete type=3 #10 +2023/10/26-09:14:30.250614 7f5603fff6c0 Delete type=0 #12 +2023/10/26-09:23:17.065670 7f56037fe6c0 Level-0 table #17: started +2023/10/26-09:23:17.065742 7f56037fe6c0 Level-0 table #17: 0 bytes OK +2023/10/26-09:23:17.072462 7f56037fe6c0 Delete type=0 #15 +2023/10/26-09:23:17.079476 7f56037fe6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) +2023/10/26-09:23:17.079561 7f56037fe6c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-archetypes/MANIFEST-000014 b/packs/malefices-archetypes/MANIFEST-000014 deleted file mode 100644 index a9b9030..0000000 Binary files a/packs/malefices-archetypes/MANIFEST-000014 and /dev/null differ diff --git a/packs/malefices-archetypes/MANIFEST-000018 b/packs/malefices-archetypes/MANIFEST-000018 new file mode 100644 index 0000000..fd82523 Binary files /dev/null and b/packs/malefices-archetypes/MANIFEST-000018 differ diff --git a/packs/malefices-armes/000005.ldb b/packs/malefices-armes/000005.ldb deleted file mode 100644 index 9ed8d68..0000000 Binary files a/packs/malefices-armes/000005.ldb and /dev/null differ diff --git a/packs/malefices-armes/000016.log b/packs/malefices-armes/000020.log similarity index 100% rename from packs/malefices-armes/000016.log rename to packs/malefices-armes/000020.log diff --git a/packs/malefices-armes/000022.ldb b/packs/malefices-armes/000022.ldb new file mode 100644 index 0000000..588f24d Binary files /dev/null and b/packs/malefices-armes/000022.ldb differ diff --git a/packs/malefices-armes/CURRENT b/packs/malefices-armes/CURRENT index 23b73d9..e417a51 100644 --- a/packs/malefices-armes/CURRENT +++ b/packs/malefices-armes/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000018 diff --git a/packs/malefices-armes/LOG b/packs/malefices-armes/LOG index a82f6e1..1614a35 100644 --- a/packs/malefices-armes/LOG +++ b/packs/malefices-armes/LOG @@ -1,8 +1,15 @@ -2023/10/26-09:14:30.225660 7f56117fa6c0 Recovering log #12 -2023/10/26-09:14:30.236009 7f56117fa6c0 Delete type=3 #10 -2023/10/26-09:14:30.236095 7f56117fa6c0 Delete type=0 #12 -2023/10/26-09:23:17.051895 7f56037fe6c0 Level-0 table #17: started -2023/10/26-09:23:17.051934 7f56037fe6c0 Level-0 table #17: 0 bytes OK -2023/10/26-09:23:17.058810 7f56037fe6c0 Delete type=0 #15 -2023/10/26-09:23:17.072664 7f56037fe6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) -2023/10/26-09:23:17.079499 7f56037fe6c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) +2024/04/26-18:07:32.613484 7efdd96006c0 Recovering log #16 +2024/04/26-18:07:32.623734 7efdd96006c0 Delete type=3 #14 +2024/04/26-18:07:32.623791 7efdd96006c0 Delete type=0 #16 +2024/04/26-18:35:17.569282 7efdd72006c0 Level-0 table #21: started +2024/04/26-18:35:17.582262 7efdd72006c0 Level-0 table #21: 2093 bytes OK +2024/04/26-18:35:17.590842 7efdd72006c0 Delete type=0 #19 +2024/04/26-18:35:17.591036 7efdd72006c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) +2024/04/26-18:35:17.612788 7efdd72006c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at '!items!nkRQU81L1gWOfaeo' @ 18 : 1 +2024/04/26-18:35:17.612797 7efdd72006c0 Compacting 1@1 + 1@2 files +2024/04/26-18:35:17.615928 7efdd72006c0 Generated table #22@1: 9 keys, 2093 bytes +2024/04/26-18:35:17.615956 7efdd72006c0 Compacted 1@1 + 1@2 files => 2093 bytes +2024/04/26-18:35:17.622427 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/04/26-18:35:17.622520 7efdd72006c0 Delete type=2 #5 +2024/04/26-18:35:17.622620 7efdd72006c0 Delete type=2 #21 +2024/04/26-18:35:17.632530 7efdd72006c0 Manual compaction at level-1 from '!items!nkRQU81L1gWOfaeo' @ 18 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-armes/LOG.old b/packs/malefices-armes/LOG.old index 0191208..a82f6e1 100644 --- a/packs/malefices-armes/LOG.old +++ b/packs/malefices-armes/LOG.old @@ -1,8 +1,8 @@ -2023/10/26-09:13:41.623945 7f5610ff96c0 Recovering log #8 -2023/10/26-09:13:41.634738 7f5610ff96c0 Delete type=3 #6 -2023/10/26-09:13:41.634829 7f5610ff96c0 Delete type=0 #8 -2023/10/26-09:13:55.687144 7f56037fe6c0 Level-0 table #13: started -2023/10/26-09:13:55.687180 7f56037fe6c0 Level-0 table #13: 0 bytes OK -2023/10/26-09:13:55.694295 7f56037fe6c0 Delete type=0 #11 -2023/10/26-09:13:55.701584 7f56037fe6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) -2023/10/26-09:13:55.716019 7f56037fe6c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) +2023/10/26-09:14:30.225660 7f56117fa6c0 Recovering log #12 +2023/10/26-09:14:30.236009 7f56117fa6c0 Delete type=3 #10 +2023/10/26-09:14:30.236095 7f56117fa6c0 Delete type=0 #12 +2023/10/26-09:23:17.051895 7f56037fe6c0 Level-0 table #17: started +2023/10/26-09:23:17.051934 7f56037fe6c0 Level-0 table #17: 0 bytes OK +2023/10/26-09:23:17.058810 7f56037fe6c0 Delete type=0 #15 +2023/10/26-09:23:17.072664 7f56037fe6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) +2023/10/26-09:23:17.079499 7f56037fe6c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-armes/MANIFEST-000014 b/packs/malefices-armes/MANIFEST-000014 deleted file mode 100644 index 684326f..0000000 Binary files a/packs/malefices-armes/MANIFEST-000014 and /dev/null differ diff --git a/packs/malefices-armes/MANIFEST-000018 b/packs/malefices-armes/MANIFEST-000018 new file mode 100644 index 0000000..d7db64d Binary files /dev/null and b/packs/malefices-armes/MANIFEST-000018 differ diff --git a/packs/malefices-macros/000005.ldb b/packs/malefices-macros/000005.ldb deleted file mode 100644 index 213bf4d..0000000 Binary files a/packs/malefices-macros/000005.ldb and /dev/null differ diff --git a/packs/malefices-macros/000016.log b/packs/malefices-macros/000020.log similarity index 100% rename from packs/malefices-macros/000016.log rename to packs/malefices-macros/000020.log diff --git a/packs/malefices-macros/000022.ldb b/packs/malefices-macros/000022.ldb new file mode 100644 index 0000000..cdf1cef Binary files /dev/null and b/packs/malefices-macros/000022.ldb differ diff --git a/packs/malefices-macros/CURRENT b/packs/malefices-macros/CURRENT index 23b73d9..e417a51 100644 --- a/packs/malefices-macros/CURRENT +++ b/packs/malefices-macros/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000018 diff --git a/packs/malefices-macros/LOG b/packs/malefices-macros/LOG index 2f2531f..960b27f 100644 --- a/packs/malefices-macros/LOG +++ b/packs/malefices-macros/LOG @@ -1,8 +1,15 @@ -2023/10/26-09:14:30.253493 7f5610ff96c0 Recovering log #12 -2023/10/26-09:14:30.264581 7f5610ff96c0 Delete type=3 #10 -2023/10/26-09:14:30.264682 7f5610ff96c0 Delete type=0 #12 -2023/10/26-09:23:17.058988 7f56037fe6c0 Level-0 table #17: started -2023/10/26-09:23:17.059024 7f56037fe6c0 Level-0 table #17: 0 bytes OK -2023/10/26-09:23:17.065403 7f56037fe6c0 Delete type=0 #15 -2023/10/26-09:23:17.079441 7f56037fe6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) -2023/10/26-09:23:17.079539 7f56037fe6c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) +2024/04/26-18:07:32.640485 7efdd8c006c0 Recovering log #16 +2024/04/26-18:07:32.650356 7efdd8c006c0 Delete type=3 #14 +2024/04/26-18:07:32.650410 7efdd8c006c0 Delete type=0 #16 +2024/04/26-18:35:17.622677 7efdd72006c0 Level-0 table #21: started +2024/04/26-18:35:17.625968 7efdd72006c0 Level-0 table #21: 855 bytes OK +2024/04/26-18:35:17.632284 7efdd72006c0 Delete type=0 #19 +2024/04/26-18:35:17.632542 7efdd72006c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) +2024/04/26-18:35:17.632580 7efdd72006c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at '!macros!zDPgmHiwNxBWhoYz' @ 6 : 1 +2024/04/26-18:35:17.632588 7efdd72006c0 Compacting 1@1 + 1@2 files +2024/04/26-18:35:17.635838 7efdd72006c0 Generated table #22@1: 3 keys, 855 bytes +2024/04/26-18:35:17.635878 7efdd72006c0 Compacted 1@1 + 1@2 files => 855 bytes +2024/04/26-18:35:17.642105 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/04/26-18:35:17.642236 7efdd72006c0 Delete type=2 #5 +2024/04/26-18:35:17.642702 7efdd72006c0 Delete type=2 #21 +2024/04/26-18:35:17.667688 7efdd72006c0 Manual compaction at level-1 from '!macros!zDPgmHiwNxBWhoYz' @ 6 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-macros/LOG.old b/packs/malefices-macros/LOG.old index 9235061..2f2531f 100644 --- a/packs/malefices-macros/LOG.old +++ b/packs/malefices-macros/LOG.old @@ -1,8 +1,8 @@ -2023/10/26-09:13:41.652680 7f5611ffb6c0 Recovering log #8 -2023/10/26-09:13:41.662766 7f5611ffb6c0 Delete type=3 #6 -2023/10/26-09:13:41.662869 7f5611ffb6c0 Delete type=0 #8 -2023/10/26-09:13:55.701609 7f56037fe6c0 Level-0 table #13: started -2023/10/26-09:13:55.701657 7f56037fe6c0 Level-0 table #13: 0 bytes OK -2023/10/26-09:13:55.708471 7f56037fe6c0 Delete type=0 #11 -2023/10/26-09:13:55.716035 7f56037fe6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) -2023/10/26-09:13:55.716078 7f56037fe6c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) +2023/10/26-09:14:30.253493 7f5610ff96c0 Recovering log #12 +2023/10/26-09:14:30.264581 7f5610ff96c0 Delete type=3 #10 +2023/10/26-09:14:30.264682 7f5610ff96c0 Delete type=0 #12 +2023/10/26-09:23:17.058988 7f56037fe6c0 Level-0 table #17: started +2023/10/26-09:23:17.059024 7f56037fe6c0 Level-0 table #17: 0 bytes OK +2023/10/26-09:23:17.065403 7f56037fe6c0 Delete type=0 #15 +2023/10/26-09:23:17.079441 7f56037fe6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) +2023/10/26-09:23:17.079539 7f56037fe6c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-macros/MANIFEST-000014 b/packs/malefices-macros/MANIFEST-000014 deleted file mode 100644 index 6c2f1e3..0000000 Binary files a/packs/malefices-macros/MANIFEST-000014 and /dev/null differ diff --git a/packs/malefices-macros/MANIFEST-000018 b/packs/malefices-macros/MANIFEST-000018 new file mode 100644 index 0000000..c3bc3e2 Binary files /dev/null and b/packs/malefices-macros/MANIFEST-000018 differ diff --git a/packs/malefices-tarots/000005.ldb b/packs/malefices-tarots/000005.ldb deleted file mode 100644 index 0017619..0000000 Binary files a/packs/malefices-tarots/000005.ldb and /dev/null differ diff --git a/packs/malefices-tarots/000016.log b/packs/malefices-tarots/000020.log similarity index 100% rename from packs/malefices-tarots/000016.log rename to packs/malefices-tarots/000020.log diff --git a/packs/malefices-tarots/000022.ldb b/packs/malefices-tarots/000022.ldb new file mode 100644 index 0000000..bee091e Binary files /dev/null and b/packs/malefices-tarots/000022.ldb differ diff --git a/packs/malefices-tarots/CURRENT b/packs/malefices-tarots/CURRENT index 23b73d9..e417a51 100644 --- a/packs/malefices-tarots/CURRENT +++ b/packs/malefices-tarots/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000018 diff --git a/packs/malefices-tarots/LOG b/packs/malefices-tarots/LOG index b2e284d..6a266b3 100644 --- a/packs/malefices-tarots/LOG +++ b/packs/malefices-tarots/LOG @@ -1,8 +1,15 @@ -2023/10/26-09:14:30.211232 7f5611ffb6c0 Recovering log #12 -2023/10/26-09:14:30.222971 7f5611ffb6c0 Delete type=3 #10 -2023/10/26-09:14:30.223076 7f5611ffb6c0 Delete type=0 #12 -2023/10/26-09:23:17.024333 7f56037fe6c0 Level-0 table #17: started -2023/10/26-09:23:17.024403 7f56037fe6c0 Level-0 table #17: 0 bytes OK -2023/10/26-09:23:17.030633 7f56037fe6c0 Delete type=0 #15 -2023/10/26-09:23:17.041759 7f56037fe6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) -2023/10/26-09:23:17.051874 7f56037fe6c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) +2024/04/26-18:07:32.598967 7efdda0006c0 Recovering log #16 +2024/04/26-18:07:32.609105 7efdda0006c0 Delete type=3 #14 +2024/04/26-18:07:32.609187 7efdda0006c0 Delete type=0 #16 +2024/04/26-18:35:17.558727 7efdd72006c0 Level-0 table #21: started +2024/04/26-18:35:17.562742 7efdd72006c0 Level-0 table #21: 3999 bytes OK +2024/04/26-18:35:17.569132 7efdd72006c0 Delete type=0 #19 +2024/04/26-18:35:17.591025 7efdd72006c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) +2024/04/26-18:35:17.602706 7efdd72006c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at '!items!zbGGMEQFdwVdlKAf' @ 44 : 1 +2024/04/26-18:35:17.602723 7efdd72006c0 Compacting 1@1 + 1@2 files +2024/04/26-18:35:17.606397 7efdd72006c0 Generated table #22@1: 22 keys, 3999 bytes +2024/04/26-18:35:17.606426 7efdd72006c0 Compacted 1@1 + 1@2 files => 3999 bytes +2024/04/26-18:35:17.612531 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/04/26-18:35:17.612635 7efdd72006c0 Delete type=2 #5 +2024/04/26-18:35:17.612730 7efdd72006c0 Delete type=2 #21 +2024/04/26-18:35:17.632514 7efdd72006c0 Manual compaction at level-1 from '!items!zbGGMEQFdwVdlKAf' @ 44 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-tarots/LOG.old b/packs/malefices-tarots/LOG.old index e5e0a46..b2e284d 100644 --- a/packs/malefices-tarots/LOG.old +++ b/packs/malefices-tarots/LOG.old @@ -1,8 +1,8 @@ -2023/10/26-09:13:41.610590 7f56117fa6c0 Recovering log #8 -2023/10/26-09:13:41.620893 7f56117fa6c0 Delete type=3 #6 -2023/10/26-09:13:41.620978 7f56117fa6c0 Delete type=0 #8 -2023/10/26-09:13:55.669182 7f56037fe6c0 Level-0 table #13: started -2023/10/26-09:13:55.669226 7f56037fe6c0 Level-0 table #13: 0 bytes OK -2023/10/26-09:13:55.676595 7f56037fe6c0 Delete type=0 #11 -2023/10/26-09:13:55.687107 7f56037fe6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) -2023/10/26-09:13:55.694543 7f56037fe6c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) +2023/10/26-09:14:30.211232 7f5611ffb6c0 Recovering log #12 +2023/10/26-09:14:30.222971 7f5611ffb6c0 Delete type=3 #10 +2023/10/26-09:14:30.223076 7f5611ffb6c0 Delete type=0 #12 +2023/10/26-09:23:17.024333 7f56037fe6c0 Level-0 table #17: started +2023/10/26-09:23:17.024403 7f56037fe6c0 Level-0 table #17: 0 bytes OK +2023/10/26-09:23:17.030633 7f56037fe6c0 Delete type=0 #15 +2023/10/26-09:23:17.041759 7f56037fe6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) +2023/10/26-09:23:17.051874 7f56037fe6c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end) diff --git a/packs/malefices-tarots/MANIFEST-000014 b/packs/malefices-tarots/MANIFEST-000014 deleted file mode 100644 index 8c36209..0000000 Binary files a/packs/malefices-tarots/MANIFEST-000014 and /dev/null differ diff --git a/packs/malefices-tarots/MANIFEST-000018 b/packs/malefices-tarots/MANIFEST-000018 new file mode 100644 index 0000000..f72b68e Binary files /dev/null and b/packs/malefices-tarots/MANIFEST-000018 differ diff --git a/system.json b/system.json index 39304f8..434fcc1 100644 --- a/system.json +++ b/system.json @@ -60,9 +60,8 @@ "license": "LICENSE.txt", "manifest": "https://www.uberwald.me/gitea/public/fvtt-malefices/raw/branch/master/system.json", "compatibility": { - "minimum": "10", - "verified": "11", - "maximum": "11" + "minimum": "11", + "verified": "12" }, "id": "fvtt-malefices", "primaryTokenAttribute": "secondary.health", @@ -73,7 +72,7 @@ ], "title": "Maléfices, le Jeu de Rôle", "url": "https://www.uberwald.me/gitea/public/fvtt-malefices", - "version": "11.0.2", - "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v11.0.2.zip", + "version": "12.0.0", + "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v12.0.0.zip", "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp" } \ No newline at end of file diff --git a/templates/dialogs/confrontation-dialog.hbs b/templates/dialogs/confrontation-dialog.hbs index 9f24310..6aec826 100644 --- a/templates/dialogs/confrontation-dialog.hbs +++ b/templates/dialogs/confrontation-dialog.hbs @@ -18,25 +18,14 @@
Degré de la confrontation :
Modificateur de confrontation :
diff --git a/templates/dialogs/roll-dialog-generic.hbs b/templates/dialogs/roll-dialog-generic.hbs index f735431..55796ea 100644 --- a/templates/dialogs/roll-dialog-generic.hbs +++ b/templates/dialogs/roll-dialog-generic.hbs @@ -36,30 +36,14 @@
Bonus/Malus biographique :
Bonus/Malus de situation :
@@ -67,23 +51,14 @@
Défense :
Portée :
{{/if}} diff --git a/templates/items/item-archetype-sheet.hbs b/templates/items/item-archetype-sheet.hbs index 7d763a5..4d738fc 100644 --- a/templates/items/item-archetype-sheet.hbs +++ b/templates/items/item-archetype-sheet.hbs @@ -20,12 +20,8 @@