VincentVk/foundryvtt-reve-de-dragon
0
0
Fork 0
forked from public/foundryvtt-reve-de-dragon
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'v1.5-achat-lot' into 'v1.5'

Browse Source 
Correction achat par lots

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!290
This commit is contained in:
Leratier Bretonnien 2021-10-15 06:13:42 +00:00
commit 891e8393a8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/actor.js
View File

@ -3600,6 +3600,7 @@ export class RdDActor extends Actor {
const buttonAcheter = html.find(".button-acheter")[0]; const buttonAcheter = html.find(".button-acheter")[0];
const vente = DialogItemAchat.prepareVenteData(buttonAcheter, achat.vendeurId, vendeur, acheteur); const vente = DialogItemAchat.prepareVenteData(buttonAcheter, achat.vendeurId, vendeur, acheteur);
const itemId = vente.item._id; const itemId = vente.item._id;
const isItemEmpilable = "quantite" in vente.item.data;
const coutDeniers = Math.floor((achat.prixTotal ?? 0) * 100); const coutDeniers = Math.floor((achat.prixTotal ?? 0) * 100);
achat.quantiteTotal = (achat.choix.nombreLots ?? 1) * (vente.tailleLot); achat.quantiteTotal = (achat.choix.nombreLots ?? 1) * (vente.tailleLot);
@ -3612,7 +3613,7 @@ export class RdDActor extends Actor {
} }
const itemVendu = Misc.data(vendeur?.getObjet(itemId)); const itemVendu = Misc.data(vendeur?.getObjet(itemId));
if (itemVendu) { if (itemVendu) {
if ("quantite" in itemVendu.data ? itemVendu.data.quantite < achat.quantiteTotal : achat.choix.nombreLots != 1) { if (isItemEmpilable ? itemVendu.data.quantite < achat.quantiteTotal : achat.choix.nombreLots != 1) {
await acheteur?.ajouterDeniers(coutDeniers); await acheteur?.ajouterDeniers(coutDeniers);
ChatUtility.notifyUser(achat.userId, 'warn', `Le vendeur n'a plus assez de ${vente.item.name} !`); ChatUtility.notifyUser(achat.userId, 'warn', `Le vendeur n'a plus assez de ${vente.item.name} !`);
return; return;
@ -3631,10 +3632,9 @@ export class RdDActor extends Actor {
type: vente.item.type, type: vente.item.type,
img: vente.item.img, img: vente.item.img,
name: vente.item.name, name: vente.item.name,
data: vente.item.data, data: mergeObject(vente.item.data, {quantite: isItemEmpilable ? achat.quantiteTotal : undefined}),
quantite: "quantite" in vente.item ? achat.quantiteTotal : undefined
} }
let listeAchat = ("quantite" in vente.item) ? [achatData] : Array.from({length: achat.quantiteTotal}, (_, i) => achatData) let listeAchat = isItemEmpilable ? [achatData] : Array.from({length: achat.quantiteTotal}, (_, i) => achatData)
let items = await acheteur.createEmbeddedDocuments("Item", listeAchat) let items = await acheteur.createEmbeddedDocuments("Item", listeAchat)
if (achat.choix.consommer && vente.item.type == 'nourritureboisson') { if (achat.choix.consommer && vente.item.type == 'nourritureboisson') {
achat.choix.doses = achat.choix.nombreLots; achat.choix.doses = achat.choix.nombreLots;