diff --git a/modules/wasteland-actor-sheet.js b/modules/wasteland-actor-sheet.js index a512658..c6fd12b 100644 --- a/modules/wasteland-actor-sheet.js +++ b/modules/wasteland-actor-sheet.js @@ -42,13 +42,7 @@ export class WastelandActorSheet extends ActorSheet { skills: this.actor.getSkills(), armes: duplicate(this.actor.getWeapons()), protections: duplicate(this.actor.getArmors()), - dons: duplicate(this.actor.getDons()), - alignement: this.actor.getAlignement(), - aspect: this.actor.getAspect(), - marge: this.actor.getMarge(), - tendances:duplicate(this.actor.getTendances()), - runes:duplicate(this.actor.getRunes()), - traitsChaotiques:duplicate(this.actor.getTraitsChaotiques()), + pouvoirs:duplicate(this.actor.getPouvoirs()), origine: duplicate(this.actor.getOrigine() || {}), heritage: duplicate(this.actor.getHeritage() || {}), metier: duplicate(this.actor.getMetier() || {}), @@ -118,10 +112,10 @@ export class WastelandActorSheet extends ActorSheet { let compId = li.data("item-id") this.actor.rollCompetence(attrKey, compId) }) - html.find('.roll-rune').click((event) => { + html.find('.roll-pouvoir').click((event) => { const li = $(event.currentTarget).parents(".item") - let runeId = li.data("item-id") - this.actor.rollRune(runeId) + let pouvoirId = li.data("item-id") + this.actor.rollPouvoir(pouvoirId) }) html.find('.roll-arme-offensif').click((event) => { const li = $(event.currentTarget).parents(".item") diff --git a/modules/wasteland-actor.js b/modules/wasteland-actor.js index 7ee615f..7c7785d 100644 --- a/modules/wasteland-actor.js +++ b/modules/wasteland-actor.js @@ -106,21 +106,12 @@ export class WastelandActor extends Actor { WastelandUtility.sortArrayObjectsByName(items) return items } - getDons() { - return this.getItemSorted(["don"]) - } - getTendances() { - return this.getItemSorted(["tendance"]) - } - getRunes() { - return this.getItemSorted(["rune"]) + getPouvoirs() { + return this.getItemSorted(["pouvoir"]) } getEquipments() { return this.getItemSorted(["equipement"]) } - getTraitsChaotiques() { - return this.getItemSorted(["traitchaotique"]) - } getMonnaies() { return this.getItemSorted(["monnaie"]) } @@ -160,17 +151,6 @@ export class WastelandActor extends Actor { return comp } - /* -------------------------------------------- */ - getAspect() { - 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) - } - getAlignement() { - return (this.system.balance.loi > this.system.balance.chaos) ? "loyal" : "chaotique" - } - /* -------------------------------------------- */ getDefenseBase() { return this.system.attributs.tre.value + 5 @@ -213,9 +193,9 @@ export class WastelandActor extends Actor { if (this.system.sante.base != newSante) { this.update({ 'system.sante.base': newSante }) } - let newAme = (this.system.attributs.cla.value + this.system.attributs.tre.value) * this.system.biodata.amemultiplier + 5 - if (this.system.ame.fullmax != newAme) { - this.update({ 'system.ame.fullmax': newAme }) + let newPsyche = (this.system.attributs.cla.value + this.system.attributs.tre.value) * this.system.biodata.psychemultiplier + 5 + if (this.system.psyche.fullmax != newPsyche) { + this.update({ 'system.psyche.fullmax': newPsyche }) } } @@ -240,7 +220,7 @@ export class WastelandActor 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 } @@ -286,18 +266,10 @@ export class WastelandActor extends Actor { } /* -------------------------------------------- */ - canEclatDoubleD20() { - return (this.getAlignement() == "loyal" && this.system.eclat.value > 0) - } - /* -------------------------------------------- */ - subPointsAme(runeMode, value) { - let ame = duplicate(this.system.ame) - if(runeMode == "prononcer") { - ame.value -= value - } else { - ame.currentmax -= value - } - this.update( {'system.ame': ame}) + subPointsPsyche(value) { + let psyche = duplicate(this.system.psyche) + psyche.currentmax -= value + this.update( {'system.psyche': psyche}) } /* -------------------------------------------- */ @@ -324,7 +296,7 @@ export class WastelandActor extends Actor { /* -------------------------------------------- */ async equipGear(equipmentId) { let item = this.items.find(item => item.id == equipmentId); - if (item && item.system.data) { + if (item?.system) { let update = { _id: item.id, "system.equipped": !item.system.equipped }; await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity } @@ -360,7 +332,7 @@ export class WastelandActor extends Actor { let objetQ = this.items.get(objetId) if (objetQ) { let newQ = objetQ.system.quantite + incDec; - const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity + await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity } } /* -------------------------------------------- */ @@ -408,7 +380,7 @@ export class WastelandActor extends Actor { rollData.actorId = this.id rollData.tokenId = this.token?.id rollData.img = this.img - rollData.canEclatDoubleD20 = this.canEclatDoubleD20() + rollData.canEclatDoubleD20 = true // Always true in Wastelan rollData.doubleD20 = false rollData.attributs = WastelandUtility.getAttributs() @@ -446,7 +418,7 @@ export class WastelandActor extends Actor { } /* -------------------------------------------- */ - async rollRune(runeId) { + async rollPouvoir(pouvoirId) { let comp = this.items.find(comp => comp.type == "competence" && comp.name.toLowerCase() == "savoir : runes") if ( !comp) { ui.notifications.warn("La compétence Savoirs : Runes n'a pas été trouvée, abandon.") diff --git a/modules/wasteland-main.js b/modules/wasteland-main.js index 0baf961..0284be5 100644 --- a/modules/wasteland-main.js +++ b/modules/wasteland-main.js @@ -36,7 +36,7 @@ Hooks.once("init", async function () { }; /* -------------------------------------------- */ - game.socket.on("system.fvtt-wasteland-rpg", data => { + game.socket.on("system.fvtt-wasteland", data => { WastelandUtility.onSocketMesssage(data); }); @@ -114,11 +114,6 @@ Hooks.once("ready", function () { }); } - // CSS patch for v9 - if (game.version) { - let sidebar = document.getElementById("sidebar"); - sidebar.style.width = "min-content"; - } registerUsageCount('fvtt-wasteland') welcomeMessage(); }); diff --git a/modules/wasteland-utility.js b/modules/wasteland-utility.js index 8aef60f..53c0ef4 100644 --- a/modules/wasteland-utility.js +++ b/modules/wasteland-utility.js @@ -536,40 +536,49 @@ export class WastelandUtility { /* -------------------------------------------- */ static chatRollMenu(html, options) { let canApply = li => canvas.tokens.controlled.length && li.find(".wasteland-roll").length - let canApplyBALoyal = function (li) { + let hasBA = function (li) { let message = game.messages.get(li.attr("data-message-id")) let rollData = message.getFlag("world", "wasteland-roll") - let actor = WastelandUtility.getActorFromRollData(rollData) - return (!rollData.isReroll && actor.getBonneAventure() > 0 && actor.getAlignement() == "loyal") + if (rollData?.actorId) { + let actor = game.actors.get(rollData.actorId) + return actor.getBonneAventure() > 0 + + } + return false } - let canApplyPELoyal = function (li) { + let hasBA2 = function (li) { let message = game.messages.get(li.attr("data-message-id")) let rollData = message.getFlag("world", "wasteland-roll") - let actor = WastelandUtility.getActorFromRollData(rollData) - return (!rollData.isReroll && actor.getEclat() > 0 && actor.getAlignement() == "loyal") + if (rollData?.actorId) { + let actor = game.actors.get(rollData.actorId) + return actor.getBonneAventure() >= 2 + + } + return false } - let canApplyBAChaotique = function (li) { + let hasBA3 = function (li) { let message = game.messages.get(li.attr("data-message-id")) let rollData = message.getFlag("world", "wasteland-roll") - let actor = WastelandUtility.getActorFromRollData(rollData) - return (!rollData.isReroll && actor.getBonneAventure() > 0 && actor.getAlignement() == "chaotique") + if (rollData?.actorId) { + let actor = game.actors.get(rollData.actorId) + return actor.getBonneAventure() >= 3 + + } + return false } - let canApplyBAChaotique3 = function (li) { + let hasPE = function (li) { let message = game.messages.get(li.attr("data-message-id")) let rollData = message.getFlag("world", "wasteland-roll") - let actor = WastelandUtility.getActorFromRollData(rollData) - return (!rollData.isReroll && actor.getBonneAventure() > 2 && actor.getAlignement() == "chaotique") - } - let canApplyPEChaotique = function (li) { - let message = game.messages.get(li.attr("data-message-id")) - let rollData = message.getFlag("world", "wasteland-roll") - let actor = WastelandUtility.getActorFromRollData(rollData) - return (!rollData.isReroll && actor.getEclat() > 0 && actor.getAlignement() == "chaotique") + if (rollData?.actorId) { + let actor = game.actors.get(rollData.actorId) + return actor.getEclat() >= 1 + + } + return false } let hasPredilection = function (li) { let message = game.messages.get(li.attr("data-message-id")) let rollData = message.getFlag("world", "wasteland-roll") - let actor = WastelandUtility.getActorFromRollData(rollData) if (rollData.competence) { let nbPred = rollData.competence.data.predilections.filter(pred => !pred.used).length return (!rollData.isReroll && rollData.competence && nbPred > 0) @@ -579,7 +588,6 @@ export class WastelandUtility { let canCompetenceDouble = function (li) { let message = game.messages.get(li.attr("data-message-id")) let rollData = message.getFlag("world", "wasteland-roll") - let actor = WastelandUtility.getActorFromRollData(rollData) if (rollData.competence) { return rollData.competence.data.doublebonus } @@ -587,58 +595,74 @@ export class WastelandUtility { } options.push( { - name: "Ajouer +3 (1 point de Bonne Aventure)", + name: "Ajouter +3 (1 point de Bonne Aventure)", icon: "", - condition: canApply && canApplyBALoyal, + condition: canApply && hasBA, callback: li => WastelandUtility.applyBonneAventureRoll(li, -1, "+3") } ) options.push( { - name: "Ajouer +6 (1 point de Bonne Aventure)", + name: "Gain de 1 Point de Santé / 24 heure (1 point de Bonne Aventure)", icon: "", - condition: canApply && canApplyBALoyal && canCompetenceDouble, - callback: li => WastelandUtility.applyBonneAventureRoll(li, -1, "+6") + condition: canApply && hasBA, + callback: li => WastelandUtility.incDecSante(1) } ) options.push( { - name: "Ajouer +1d6 (1 point de Bonne Aventure)", + name: "Gain de 2 Points de Santé / 24 heure (2 points de Bonne Aventure)", icon: "", - condition: canApply && canApplyBAChaotique, - callback: li => WastelandUtility.applyBonneAventureRoll(li, -1, "+1d6") + condition: canApply && hasBA2, + callback: li => WastelandUtility.incDecSante(2) } ) options.push( { - name: "Ajouer +2d6 (1 point de Bonne Aventure)", + name: "Relancer le jet (3 points de Bonne Aventure)", icon: "", - condition: canApply && canApplyBAChaotique && canCompetenceDouble, - callback: li => WastelandUtility.applyBonneAventureRoll(li, -1, "+2d6") - } - ) - options.push( - { - name: "Relancer le dé (3 points de Bonne Aventure)", - icon: "", - condition: canApply && canApplyBAChaotique3, + condition: canApply && hasBA3, callback: li => WastelandUtility.applyBonneAventureRoll(li, -3, "reroll") } ) + options.push( + { + name: "Bénéficier d'1 action supplémentaire (3 points de Bonne Aventure)", + icon: "", + condition: canApply && hasBA3, + callback: li => WastelandUtility.applyBonneAventureRoll(li, -3, "newaction") + } + ) options.push( { name: "Ajouter +10 (1 Point d'Eclat)", icon: "", - condition: canApply && canApplyPELoyal, + condition: canApply && hasPE, callback: li => WastelandUtility.applyEclatRoll(li, -1, "+10") } ) options.push( { - name: "Ajouter +20 (1 Point d'Eclat)", + name: "Double le résultat du d20 (1 Point d'Eclat)", icon: "", - condition: canApply && canApplyPELoyal && canCompetenceDouble, - callback: li => WastelandUtility.applyEclatRoll(li, -1, "+20") + condition: canApply && hasPE, + callback: li => WastelandUtility.applyEclatRoll(li, -1, "double20") + } + ) + options.push( + { + name: "Annuler une blessure (1 Point d'Eclat)", + icon: "", + condition: canApply && hasPE, + callback: li => WastelandUtility.cancelBlessure(li) + } + ) + options.push( + { + name: "Recharger ses points de BA (1 Point d'Eclat)", + icon: "", + condition: canApply && hasPE, + callback: li => WastelandUtility.reloadBA(li) } ) return options diff --git a/packs/armes/000005.ldb b/packs/armes/000005.ldb new file mode 100644 index 0000000..065208a Binary files /dev/null and b/packs/armes/000005.ldb differ diff --git a/packs/armes/000024.log b/packs/armes/000024.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT new file mode 100644 index 0000000..5af92b2 --- /dev/null +++ b/packs/armes/CURRENT @@ -0,0 +1 @@ +MANIFEST-000022 diff --git a/packs/armes/LOCK b/packs/armes/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/armes/LOG b/packs/armes/LOG new file mode 100644 index 0000000..24e024d --- /dev/null +++ b/packs/armes/LOG @@ -0,0 +1,8 @@ +2023/11/26-16:59:00.074060 7febeeffd6c0 Recovering log #20 +2023/11/26-16:59:00.128979 7febeeffd6c0 Delete type=3 #18 +2023/11/26-16:59:00.129101 7febeeffd6c0 Delete type=0 #20 +2023/11/26-16:59:11.254462 7febed7fa6c0 Level-0 table #25: started +2023/11/26-16:59:11.254498 7febed7fa6c0 Level-0 table #25: 0 bytes OK +2023/11/26-16:59:11.329898 7febed7fa6c0 Delete type=0 #23 +2023/11/26-16:59:11.360691 7febed7fa6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/26-16:59:11.360720 7febed7fa6c0 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 new file mode 100644 index 0000000..7b90382 --- /dev/null +++ b/packs/armes/LOG.old @@ -0,0 +1,8 @@ +2023/11/26-16:57:58.289912 7febee7fc6c0 Recovering log #16 +2023/11/26-16:57:58.299955 7febee7fc6c0 Delete type=3 #14 +2023/11/26-16:57:58.300027 7febee7fc6c0 Delete type=0 #16 +2023/11/26-16:58:15.047722 7febed7fa6c0 Level-0 table #21: started +2023/11/26-16:58:15.047769 7febed7fa6c0 Level-0 table #21: 0 bytes OK +2023/11/26-16:58:15.079091 7febed7fa6c0 Delete type=0 #19 +2023/11/26-16:58:15.079265 7febed7fa6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/26-16:58:15.079292 7febed7fa6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000022 b/packs/armes/MANIFEST-000022 new file mode 100644 index 0000000..bd58ab7 Binary files /dev/null and b/packs/armes/MANIFEST-000022 differ diff --git a/packs/equipement/000005.ldb b/packs/equipement/000005.ldb new file mode 100644 index 0000000..9a15f17 Binary files /dev/null and b/packs/equipement/000005.ldb differ diff --git a/packs/equipement/000024.log b/packs/equipement/000024.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT new file mode 100644 index 0000000..5af92b2 --- /dev/null +++ b/packs/equipement/CURRENT @@ -0,0 +1 @@ +MANIFEST-000022 diff --git a/packs/equipement/LOCK b/packs/equipement/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/equipement/LOG b/packs/equipement/LOG new file mode 100644 index 0000000..7353363 --- /dev/null +++ b/packs/equipement/LOG @@ -0,0 +1,8 @@ +2023/11/26-16:59:00.192091 7febee7fc6c0 Recovering log #20 +2023/11/26-16:59:00.259152 7febee7fc6c0 Delete type=3 #18 +2023/11/26-16:59:00.259616 7febee7fc6c0 Delete type=0 #20 +2023/11/26-16:59:11.433282 7febed7fa6c0 Level-0 table #25: started +2023/11/26-16:59:11.433334 7febed7fa6c0 Level-0 table #25: 0 bytes OK +2023/11/26-16:59:11.472654 7febed7fa6c0 Delete type=0 #23 +2023/11/26-16:59:11.472910 7febed7fa6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/26-16:59:11.472962 7febed7fa6c0 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 new file mode 100644 index 0000000..fcdb025 --- /dev/null +++ b/packs/equipement/LOG.old @@ -0,0 +1,8 @@ +2023/11/26-16:57:58.314487 7febeeffd6c0 Recovering log #16 +2023/11/26-16:57:58.323985 7febeeffd6c0 Delete type=3 #14 +2023/11/26-16:57:58.324037 7febeeffd6c0 Delete type=0 #16 +2023/11/26-16:58:14.933638 7febed7fa6c0 Level-0 table #21: started +2023/11/26-16:58:14.933667 7febed7fa6c0 Level-0 table #21: 0 bytes OK +2023/11/26-16:58:14.968287 7febed7fa6c0 Delete type=0 #19 +2023/11/26-16:58:15.079226 7febed7fa6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/26-16:58:15.079273 7febed7fa6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000022 b/packs/equipement/MANIFEST-000022 new file mode 100644 index 0000000..2ee12b4 Binary files /dev/null and b/packs/equipement/MANIFEST-000022 differ diff --git a/packs/heritages/000005.ldb b/packs/heritages/000005.ldb new file mode 100644 index 0000000..3696f6c Binary files /dev/null and b/packs/heritages/000005.ldb differ diff --git a/packs/heritages/000024.log b/packs/heritages/000024.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/heritages/CURRENT b/packs/heritages/CURRENT new file mode 100644 index 0000000..5af92b2 --- /dev/null +++ b/packs/heritages/CURRENT @@ -0,0 +1 @@ +MANIFEST-000022 diff --git a/packs/heritages/LOCK b/packs/heritages/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/heritages/LOG b/packs/heritages/LOG new file mode 100644 index 0000000..5d0c9da --- /dev/null +++ b/packs/heritages/LOG @@ -0,0 +1,8 @@ +2023/11/26-16:58:59.957599 7febedffb6c0 Recovering log #20 +2023/11/26-16:59:00.011696 7febedffb6c0 Delete type=3 #18 +2023/11/26-16:59:00.011770 7febedffb6c0 Delete type=0 #20 +2023/11/26-16:59:11.330033 7febed7fa6c0 Level-0 table #25: started +2023/11/26-16:59:11.330062 7febed7fa6c0 Level-0 table #25: 0 bytes OK +2023/11/26-16:59:11.360485 7febed7fa6c0 Delete type=0 #23 +2023/11/26-16:59:11.360699 7febed7fa6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/11/26-16:59:11.360729 7febed7fa6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/LOG.old b/packs/heritages/LOG.old new file mode 100644 index 0000000..e1d9f08 --- /dev/null +++ b/packs/heritages/LOG.old @@ -0,0 +1,8 @@ +2023/11/26-16:57:58.266172 7febeeffd6c0 Recovering log #16 +2023/11/26-16:57:58.276790 7febeeffd6c0 Delete type=3 #14 +2023/11/26-16:57:58.276855 7febeeffd6c0 Delete type=0 #16 +2023/11/26-16:58:14.842991 7febed7fa6c0 Level-0 table #21: started +2023/11/26-16:58:14.843042 7febed7fa6c0 Level-0 table #21: 0 bytes OK +2023/11/26-16:58:14.873989 7febed7fa6c0 Delete type=0 #19 +2023/11/26-16:58:14.874322 7febed7fa6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/11/26-16:58:14.933524 7febed7fa6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/MANIFEST-000022 b/packs/heritages/MANIFEST-000022 new file mode 100644 index 0000000..a649ed5 Binary files /dev/null and b/packs/heritages/MANIFEST-000022 differ diff --git a/packs/metiers/000005.ldb b/packs/metiers/000005.ldb new file mode 100644 index 0000000..c820e89 Binary files /dev/null and b/packs/metiers/000005.ldb differ diff --git a/packs/metiers/000024.log b/packs/metiers/000024.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/metiers/CURRENT b/packs/metiers/CURRENT new file mode 100644 index 0000000..5af92b2 --- /dev/null +++ b/packs/metiers/CURRENT @@ -0,0 +1 @@ +MANIFEST-000022 diff --git a/packs/metiers/LOCK b/packs/metiers/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/metiers/LOG b/packs/metiers/LOG new file mode 100644 index 0000000..ae62cb8 --- /dev/null +++ b/packs/metiers/LOG @@ -0,0 +1,8 @@ +2023/11/26-16:59:00.015081 7febef7fe6c0 Recovering log #20 +2023/11/26-16:59:00.072531 7febef7fe6c0 Delete type=3 #18 +2023/11/26-16:59:00.072599 7febef7fe6c0 Delete type=0 #20 +2023/11/26-16:59:11.155193 7febed7fa6c0 Level-0 table #25: started +2023/11/26-16:59:11.155216 7febed7fa6c0 Level-0 table #25: 0 bytes OK +2023/11/26-16:59:11.187066 7febed7fa6c0 Delete type=0 #23 +2023/11/26-16:59:11.360663 7febed7fa6c0 Manual compaction at level-0 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) +2023/11/26-16:59:11.360706 7febed7fa6c0 Manual compaction at level-1 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/LOG.old b/packs/metiers/LOG.old new file mode 100644 index 0000000..adb7f2a --- /dev/null +++ b/packs/metiers/LOG.old @@ -0,0 +1,8 @@ +2023/11/26-16:57:58.278277 7febef7fe6c0 Recovering log #16 +2023/11/26-16:57:58.287591 7febef7fe6c0 Delete type=3 #14 +2023/11/26-16:57:58.287644 7febef7fe6c0 Delete type=0 #16 +2023/11/26-16:58:15.011131 7febed7fa6c0 Level-0 table #21: started +2023/11/26-16:58:15.011169 7febed7fa6c0 Level-0 table #21: 0 bytes OK +2023/11/26-16:58:15.047562 7febed7fa6c0 Delete type=0 #19 +2023/11/26-16:58:15.079249 7febed7fa6c0 Manual compaction at level-0 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) +2023/11/26-16:58:15.079285 7febed7fa6c0 Manual compaction at level-1 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/MANIFEST-000022 b/packs/metiers/MANIFEST-000022 new file mode 100644 index 0000000..305d661 Binary files /dev/null and b/packs/metiers/MANIFEST-000022 differ diff --git a/packs/origines/000005.ldb b/packs/origines/000005.ldb new file mode 100644 index 0000000..3b79b4b Binary files /dev/null and b/packs/origines/000005.ldb differ diff --git a/packs/origines/000024.log b/packs/origines/000024.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT new file mode 100644 index 0000000..5af92b2 --- /dev/null +++ b/packs/origines/CURRENT @@ -0,0 +1 @@ +MANIFEST-000022 diff --git a/packs/origines/LOCK b/packs/origines/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/origines/LOG b/packs/origines/LOG new file mode 100644 index 0000000..18c2f48 --- /dev/null +++ b/packs/origines/LOG @@ -0,0 +1,8 @@ +2023/11/26-16:58:59.895973 7febee7fc6c0 Recovering log #20 +2023/11/26-16:58:59.955338 7febee7fc6c0 Delete type=3 #18 +2023/11/26-16:58:59.955412 7febee7fc6c0 Delete type=0 #20 +2023/11/26-16:59:11.187425 7febed7fa6c0 Level-0 table #25: started +2023/11/26-16:59:11.187456 7febed7fa6c0 Level-0 table #25: 0 bytes OK +2023/11/26-16:59:11.254291 7febed7fa6c0 Delete type=0 #23 +2023/11/26-16:59:11.360680 7febed7fa6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/11/26-16:59:11.360714 7febed7fa6c0 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 new file mode 100644 index 0000000..69e1fc1 --- /dev/null +++ b/packs/origines/LOG.old @@ -0,0 +1,8 @@ +2023/11/26-16:57:58.253620 7febedffb6c0 Recovering log #16 +2023/11/26-16:57:58.263635 7febedffb6c0 Delete type=3 #14 +2023/11/26-16:57:58.263713 7febedffb6c0 Delete type=0 #16 +2023/11/26-16:58:14.805438 7febed7fa6c0 Level-0 table #21: started +2023/11/26-16:58:14.805466 7febed7fa6c0 Level-0 table #21: 0 bytes OK +2023/11/26-16:58:14.842792 7febed7fa6c0 Delete type=0 #19 +2023/11/26-16:58:14.874303 7febed7fa6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/11/26-16:58:14.933512 7febed7fa6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000022 b/packs/origines/MANIFEST-000022 new file mode 100644 index 0000000..80be9b3 Binary files /dev/null and b/packs/origines/MANIFEST-000022 differ diff --git a/packs/protection/000005.ldb b/packs/protection/000005.ldb new file mode 100644 index 0000000..26a6204 Binary files /dev/null and b/packs/protection/000005.ldb differ diff --git a/packs/protection/000024.log b/packs/protection/000024.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT new file mode 100644 index 0000000..5af92b2 --- /dev/null +++ b/packs/protection/CURRENT @@ -0,0 +1 @@ +MANIFEST-000022 diff --git a/packs/protection/LOCK b/packs/protection/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/protection/LOG b/packs/protection/LOG new file mode 100644 index 0000000..c5e8159 --- /dev/null +++ b/packs/protection/LOG @@ -0,0 +1,8 @@ +2023/11/26-16:59:00.132044 7febef7fe6c0 Recovering log #20 +2023/11/26-16:59:00.189663 7febef7fe6c0 Delete type=3 #18 +2023/11/26-16:59:00.189721 7febef7fe6c0 Delete type=0 #20 +2023/11/26-16:59:11.403052 7febed7fa6c0 Level-0 table #25: started +2023/11/26-16:59:11.403090 7febed7fa6c0 Level-0 table #25: 0 bytes OK +2023/11/26-16:59:11.432989 7febed7fa6c0 Delete type=0 #23 +2023/11/26-16:59:11.472890 7febed7fa6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/26-16:59:11.472945 7febed7fa6c0 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 new file mode 100644 index 0000000..4009a53 --- /dev/null +++ b/packs/protection/LOG.old @@ -0,0 +1,8 @@ +2023/11/26-16:57:58.301703 7febedffb6c0 Recovering log #16 +2023/11/26-16:57:58.312384 7febedffb6c0 Delete type=3 #14 +2023/11/26-16:57:58.312445 7febedffb6c0 Delete type=0 #16 +2023/11/26-16:58:14.968436 7febed7fa6c0 Level-0 table #21: started +2023/11/26-16:58:14.968486 7febed7fa6c0 Level-0 table #21: 0 bytes OK +2023/11/26-16:58:15.010611 7febed7fa6c0 Delete type=0 #19 +2023/11/26-16:58:15.079239 7febed7fa6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/26-16:58:15.079279 7febed7fa6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/MANIFEST-000022 b/packs/protection/MANIFEST-000022 new file mode 100644 index 0000000..649934f Binary files /dev/null and b/packs/protection/MANIFEST-000022 differ diff --git a/packs/skills/000005.ldb b/packs/skills/000005.ldb new file mode 100644 index 0000000..0e2fcef Binary files /dev/null and b/packs/skills/000005.ldb differ diff --git a/packs/skills/000024.log b/packs/skills/000024.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT new file mode 100644 index 0000000..5af92b2 --- /dev/null +++ b/packs/skills/CURRENT @@ -0,0 +1 @@ +MANIFEST-000022 diff --git a/packs/skills/LOCK b/packs/skills/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/skills/LOG b/packs/skills/LOG new file mode 100644 index 0000000..fdcd7de --- /dev/null +++ b/packs/skills/LOG @@ -0,0 +1,8 @@ +2023/11/26-16:58:59.840214 7febeeffd6c0 Recovering log #20 +2023/11/26-16:58:59.893683 7febeeffd6c0 Delete type=3 #18 +2023/11/26-16:58:59.893735 7febeeffd6c0 Delete type=0 #20 +2023/11/26-16:59:11.066212 7febed7fa6c0 Level-0 table #25: started +2023/11/26-16:59:11.066239 7febed7fa6c0 Level-0 table #25: 0 bytes OK +2023/11/26-16:59:11.097666 7febed7fa6c0 Delete type=0 #23 +2023/11/26-16:59:11.155079 7febed7fa6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/26-16:59:11.155120 7febed7fa6c0 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 new file mode 100644 index 0000000..a728da4 --- /dev/null +++ b/packs/skills/LOG.old @@ -0,0 +1,8 @@ +2023/11/26-16:57:58.242617 7febee7fc6c0 Recovering log #16 +2023/11/26-16:57:58.251815 7febee7fc6c0 Delete type=3 #14 +2023/11/26-16:57:58.251900 7febee7fc6c0 Delete type=0 #16 +2023/11/26-16:58:14.769885 7febed7fa6c0 Level-0 table #21: started +2023/11/26-16:58:14.769916 7febed7fa6c0 Level-0 table #21: 0 bytes OK +2023/11/26-16:58:14.805310 7febed7fa6c0 Delete type=0 #19 +2023/11/26-16:58:14.874278 7febed7fa6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/26-16:58:14.933491 7febed7fa6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000022 b/packs/skills/MANIFEST-000022 new file mode 100644 index 0000000..8182b24 Binary files /dev/null and b/packs/skills/MANIFEST-000022 differ diff --git a/packs/tables/000005.ldb b/packs/tables/000005.ldb new file mode 100644 index 0000000..977e25a Binary files /dev/null and b/packs/tables/000005.ldb differ diff --git a/packs/tables/000024.log b/packs/tables/000024.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT new file mode 100644 index 0000000..5af92b2 --- /dev/null +++ b/packs/tables/CURRENT @@ -0,0 +1 @@ +MANIFEST-000022 diff --git a/packs/tables/LOCK b/packs/tables/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/tables/LOG b/packs/tables/LOG new file mode 100644 index 0000000..952d45d --- /dev/null +++ b/packs/tables/LOG @@ -0,0 +1,8 @@ +2023/11/26-16:59:00.262098 7febedffb6c0 Recovering log #20 +2023/11/26-16:59:00.320224 7febedffb6c0 Delete type=3 #18 +2023/11/26-16:59:00.320291 7febedffb6c0 Delete type=0 #20 +2023/11/26-16:59:11.360831 7febed7fa6c0 Level-0 table #25: started +2023/11/26-16:59:11.360854 7febed7fa6c0 Level-0 table #25: 0 bytes OK +2023/11/26-16:59:11.402896 7febed7fa6c0 Delete type=0 #23 +2023/11/26-16:59:11.472863 7febed7fa6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/26-16:59:11.472927 7febed7fa6c0 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 new file mode 100644 index 0000000..fe10a79 --- /dev/null +++ b/packs/tables/LOG.old @@ -0,0 +1,8 @@ +2023/11/26-16:57:58.325858 7febef7fe6c0 Recovering log #16 +2023/11/26-16:57:58.336821 7febef7fe6c0 Delete type=3 #14 +2023/11/26-16:57:58.336880 7febef7fe6c0 Delete type=0 #16 +2023/11/26-16:58:15.079379 7febed7fa6c0 Level-0 table #21: started +2023/11/26-16:58:15.079411 7febed7fa6c0 Level-0 table #21: 0 bytes OK +2023/11/26-16:58:15.123208 7febed7fa6c0 Delete type=0 #19 +2023/11/26-16:58:15.123344 7febed7fa6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/26-16:58:15.123365 7febed7fa6c0 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-000022 b/packs/tables/MANIFEST-000022 new file mode 100644 index 0000000..61fc3af Binary files /dev/null and b/packs/tables/MANIFEST-000022 differ diff --git a/styles/wasteland.css b/styles/wasteland.css index ae80d11..79c5dfa 100644 --- a/styles/wasteland.css +++ b/styles/wasteland.css @@ -59,7 +59,7 @@ font-family: "Charlemagne"; font-size: 0.8rem; } /* For nav and title */ -.window-app input, .fvtt-mournblade .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle { +.window-app input, .fvtt-wasteland .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle { font-size: 0.8rem; } @@ -204,7 +204,7 @@ table {border: 1px solid #7a7971;} /* Styles limited to foundryvtt-vadentis sheets */ -.fvtt-mournblade .sheet-header { +.fvtt-wasteland .sheet-header { -webkit-box-flex: 0; -ms-flex: 0 0 210px; flex: 0 0 210px; @@ -224,7 +224,7 @@ table {border: 1px solid #7a7971;} margin-bottom: 10px; } -.fvtt-mournblade .sheet-header .profile-img { +.fvtt-wasteland .sheet-header .profile-img { -webkit-box-flex: 0; -ms-flex: 0 0 128px; flex: 0 0 128px; @@ -264,13 +264,13 @@ table {border: 1px solid #7a7971;} vertical-align: bottom; } -.fvtt-mournblade .sheet-header .header-fields { +.fvtt-wasteland .sheet-header .header-fields { -webkit-box-flex: 1; -ms-flex: 1; flex: 1; } -.fvtt-mournblade .sheet-header h1.charname { +.fvtt-wasteland .sheet-header h1.charname { height: 50px; padding: 0px; margin: 5px 0; @@ -280,7 +280,7 @@ table {border: 1px solid #7a7971;} font-family: "Charlemagne"; } -.fvtt-mournblade .sheet-header h1.charname input { +.fvtt-wasteland .sheet-header h1.charname input { width: 100%; height: 100%; margin: 0; @@ -289,15 +289,15 @@ table {border: 1px solid #7a7971;} font-size: 2rem; } -.fvtt-mournblade .sheet-tabs { +.fvtt-wasteland .sheet-tabs { -webkit-box-flex: 0; -ms-flex: 0; flex: 0; } -.fvtt-mournblade .sheet-body, -.fvtt-mournblade .sheet-body .tab, -.fvtt-mournblade .sheet-body .tab .editor { +.fvtt-wasteland .sheet-body, +.fvtt-wasteland .sheet-body .tab, +.fvtt-wasteland .sheet-body .tab .editor { height: 100%; font-size: 0.8rem; } @@ -320,70 +320,70 @@ table {border: 1px solid #7a7971;} padding: 0 3px; } -.fvtt-mournblade .tox .tox-editor-container { +.fvtt-wasteland .tox .tox-editor-container { background: #fff; } -.fvtt-mournblade .tox .tox-edit-area { +.fvtt-wasteland .tox .tox-edit-area { padding: 0 8px; } -.fvtt-mournblade .resource-label { +.fvtt-wasteland .resource-label { font-weight: bold; text-transform: uppercase; } -.fvtt-mournblade .tabs { +.fvtt-wasteland .tabs { height: 40px; border-top: 1px solid #AAA; border-bottom: 1px solid #AAA; color: #000000; } -.fvtt-mournblade .tabs .item { +.fvtt-wasteland .tabs .item { line-height: 40px; font-weight: bold; } -.fvtt-mournblade .tabs .item.active { +.fvtt-wasteland .tabs .item.active { text-decoration: underline; text-shadow: none; } -.fvtt-mournblade .items-list { +.fvtt-wasteland .items-list { list-style: none; margin: 1px 0; padding: 0; overflow-y: auto; } -.fvtt-mournblade .items-list .item-header { +.fvtt-wasteland .items-list .item-header { font-weight: bold; } -.fvtt-mournblade .items-list .item { +.fvtt-wasteland .items-list .item { height: 30px; line-height: 24px; padding: 1px 0; border-bottom: 1px solid #BBB; } -.fvtt-mournblade .items-list .item .item-image { +.fvtt-wasteland .items-list .item .item-image { -webkit-box-flex: 0; -ms-flex: 0 0 24px; flex: 0 0 24px; margin-right: 5px; } -.fvtt-mournblade .items-list .item img { +.fvtt-wasteland .items-list .item img { display: block; } -.fvtt-mournblade .items-list .item-name { +.fvtt-wasteland .items-list .item-name { margin: 0; } -.fvtt-mournblade .items-list .item-controls { +.fvtt-wasteland .items-list .item-controls { -webkit-box-flex: 0; -ms-flex: 0 0 86px; flex: 0 0 86px; @@ -924,8 +924,6 @@ ul, li { } #sidebar #sidebar-tabs i{ - width: 25px; - height: 25px; display: inline-block; background-position:center; background-size:cover; @@ -1299,7 +1297,7 @@ ul, li { color: #CCC } #pause > img { - content: url(../assets/logos/mournblade_logo_chaos.webp); + content: url(../assets/logos/wasteland_logo_chaos.webp); height: 256px; width: 256px; top: -80px; @@ -1307,7 +1305,7 @@ ul, li { } #logo { - content : url(../assets/logos/mournblade_logo_texte.webp); + content : url(../assets/logos/wasteland_logo_texte.webp); width: 120px; height: 40px; } diff --git a/system.json b/system.json index 4ea302c..edc97ad 100644 --- a/system.json +++ b/system.json @@ -109,6 +109,6 @@ "background": "systems/fvtt-wasteland/assets/ui/fond_wasteland.webp", "compatibility": { "minimum": "11", - "maximum": "11" + "verified": "11" } } \ No newline at end of file diff --git a/template.json b/template.json index 0b1709e..f0cbde8 100644 --- a/template.json +++ b/template.json @@ -15,7 +15,7 @@ "sexe": "", "yeux": "", "description": "", - "amemultiplier": 2, + "psychemultiplier": 1, "notes": "", "gmnotes": "" } @@ -82,14 +82,6 @@ "vitessebonus": 0, "bonusdegats": 0, "defensebonus": 0 - }, - "balance": { - "loi": 0, - "chaos": 0, - "aspect": 0, - "marge": 0, - "pointschaos": 0, - "pointsloi": 0 } }, "npccore": { diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 9475a61..ef90e5a 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -9,39 +9,7 @@

-
{{!-- Dons/Pactes Tab --}} -
+
@@ -247,7 +215,7 @@
  • -

    +

    @@ -256,11 +224,11 @@
    • - {{#each dons as |don key|}} -
  • - - {{don.name}} - {{don.system.allegeance}} + {{#each pouvoirs as |pouvoir key|}} +
  • + + {{pouvoir.name}} + {{pouvoir.system.allegeance}}
     
    @@ -275,7 +243,7 @@
    • -

      +

      @@ -287,65 +255,12 @@
      • - {{#each runes as |rune key|}} -
    • - - {{rune.name}} - {{rune.system.formule}} - {{rune.system.seuil}} -
       
      -
      - - -
      -
      • - {{/each}} -
    -
    - - -
    -
      -
    • - -

      -       - - - -
       
      -
      -
      -
      • - {{#each tendances as |tendance key|}} -
    • - - {{tendance.name}} - {{tendance.system.allegeance}} -
       
      -
      - - -
      -
      • - {{/each}} -
    -
    - -
    -
      -
    • - -

      -       -
       
      -
      -
      -
      • - {{#each traitsChaotiques as |trait key|}} -
    • - - {{trait.name}} + {{#each mutations as |mutation key|}} +
    • + + {{mutation.name}} + {{mutation.system.formule}} + {{mutation.system.seuil}}
       
      @@ -555,11 +470,6 @@
      • -
    • - - -