diff --git a/module/actor.js b/module/actor.js index 5b554778..d4d3d0fb 100644 --- a/module/actor.js +++ b/module/actor.js @@ -29,6 +29,7 @@ import { RdDCarac } from "./rdd-carac.js"; import { Monnaie } from "./item-monnaie.js"; import { RdDHerbes } from "./rdd-herbes.js"; import { DialogConsommer } from "./dialog-consommer.js"; +import { RdDItem } from "./item.js"; /* -------------------------------------------- */ @@ -2264,7 +2265,12 @@ export class RdDActor extends Actor { /* -------------------------------------------- */ async rollRecetteCuisine(id) { - const artData = { art: 'cuisine', verbe: 'Cuisiner' }; + const artData = { + art: 'cuisine', + verbe: 'Cuisiner', + proportions: 1, + ajouterEquipement: false + }; const oeuvre = duplicate(this.getRecetteCuisine(id)); await this._rollArt(artData, 'odoratgout', oeuvre, r => this._resultRecetteCuisine(r)); } @@ -2272,9 +2278,28 @@ export class RdDActor extends Actor { /* -------------------------------------------- */ async _resultRecetteCuisine(artData) { const baseQualite = (artData.rolled.isSuccess ? artData.oeuvre.data.niveau : artData.competence.data.niveau); + const sust = artData.oeuvre.data.sust * artData.proportions; artData.qualiteFinale = Math.min(baseQualite, artData.oeuvre.data.niveau) + artData.rolled.ptQualite; artData.exotismeFinal = Math.min(Math.min(artData.qualiteFinale, -Math.abs(artData.oeuvre.data.exotisme ?? 0)), 0); console.log("OEUVRE", artData.art, artData) + const platCuisine = { + name: artData.oeuvre.name, + type: 'nourritureboisson', + img: 'systems/foundryvtt-reve-de-dragon/icons/objets/provision_cuite.webp', + data: { + "description": artData.oeuvre.data.description, + "sust": Math.min(sust, 1), + "qualite": artData.exotismeFinal < 0 ? artData.exotismeFinal : artData.qualiteFinale, + "encombrement": 0.1, + "quantite": Math.max(1, Math.floor(sust)), + "cout": artData.exotismeFinal < 0 ? 0 : artData.qualiteFinale * 0.01 + } + }; + if (artData.ajouterEquipement){ + await this.createEmbeddedDocuments('Item', [platCuisine]); + ui.notifications.info(`${platCuisine.data.quantite} rations de ${platCuisine.name} ont été ajoutés à votre équipement`); + } + artData.platCuisine = platCuisine; RdDResolutionTable.displayRollData(artData, this.name, `chat-resultat-${artData.art}.html`); } diff --git a/module/item.js b/module/item.js index 5bf3e624..5c94099f 100644 --- a/module/item.js +++ b/module/item.js @@ -1,7 +1,7 @@ import { Misc } from "./misc.js"; import { RdDUtility } from "./rdd-utility.js"; -const typesObjetsEquipement = ["objet", "arme", "armure", "conteneur", "herbe", "ingredient", "livre", "potion", "munition", "nourritureboisson"]; +const typesObjetsEquipement = ["objet", "arme", "armure", "conteneur", "herbe", "ingredient", "livre", "potion", "munition", "nourritureboisson", "monnaie"]; const typesObjetsOeuvres = ["oeuvre", "recettecuisine", "musique", "chant", "danse", "jeu"]; /* -------------------------------------------- */ export class RdDItem extends Item { @@ -15,15 +15,19 @@ export class RdDItem extends Item { prepareDerivedData() { super.prepareDerivedData(); const itemData = this.data; - const tplData = itemData.data; if (RdDItem.getTypeObjetsEquipement().includes(itemData.type)) { - const quantite = itemData.type == 'conteneur' ? 1 : (tplData.quantite ?? 0); - if (tplData.encombrement != undefined) { - tplData.encTotal = Math.max(tplData.encombrement, 0) * quantite; - } - if (tplData.cout != undefined) { - tplData.prixTotal = Math.max(tplData.cout, 0) * quantite; - } + this._calculsEquipement(itemData); + } + } + + _calculsEquipement(itemData) { + const tplData = itemData.data; + const quantite = itemData.type == 'conteneur' ? 1 : (tplData.quantite ?? 0); + if (tplData.encombrement != undefined) { + tplData.encTotal = Math.max(tplData.encombrement, 0) * quantite; + } + if (tplData.cout != undefined) { + tplData.prixTotal = Math.max(tplData.cout, 0) * quantite; } } diff --git a/module/rdd-roll.js b/module/rdd-roll.js index cbdad129..cbc8f5cd 100644 --- a/module/rdd-roll.js +++ b/module/rdd-roll.js @@ -223,12 +223,13 @@ export class RdDRoll extends Dialog { this.rollData.tactique = event.currentTarget.value; this.updateRollResult(); }); - html.find('#useMalusSurenc').change((event) => { - this.rollData.useMalusSurenc = event.currentTarget.checked; + html.find('.cuisine-proportions').change((event) => { + this.rollData.proportions = Number(event.currentTarget.value); this.updateRollResult(); }); - html.find('#useMalusEncTotal').change((event) => { - this.rollData.useMalusEncTotal = event.currentTarget.checked; + html.find('.checkbox-by-name').change((event) => { + const attribute = event.currentTarget.attributes['name'].value; + this.rollData[attribute] = event.currentTarget.checked; this.updateRollResult(); }); html.find('.imgAppelAuMoral').click((event) => { /* l'appel au moral, qui donne un bonus de +1 */ diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index fe460e2a..916dd344 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -745,7 +745,7 @@