public
/
foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Projects Releases 138 Wiki Activity

Amélioration de recherches

This commit is contained in:
Vincent Vandemeulebrouck 2023-01-15 15:54:40 +01:00
parent 0aba6d2f0a
commit 0d5c8e5304
8 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/actor.js
View File

@ -1617,7 +1617,7 @@ export class RdDActor extends RdDBaseActor {
}
async actionNourritureboisson(item, onActionItem) {
switch (item.isComestible()) {
switch (item.getUtilisationCuisine()) {
case 'brut': {
let d = new Dialog({
title: "Nourriture brute",
@ -1678,7 +1678,7 @@ export class RdDActor extends RdDBaseActor {
return;
}
const item = this.getItem(itemId)
if (!item.isComestible()) {
if (!item.getUtilisationCuisine()) {
return;
}
if (choix.doses > item.system.quantite) {
@ -2502,7 +2502,7 @@ export class RdDActor extends RdDBaseActor {
}
async preparerNourriture(item) {
if (item.isComestible() == 'brut') {
if (item.getUtilisationCuisine() == 'brut') {
const nourriture = {
name: 'Plat de ' + item.name,
type: 'recettecuisine',

4
module/environnement.js
View File

@ -21,9 +21,11 @@ const ITEM_ENVIRONNEMENT_TYPES = [
]
export class Environnement {
static typesEnvironnement(){
static typesEnvironnement() {
return ITEM_ENVIRONNEMENT_TYPES
}
static init() {
game.settings.register(SYSTEM_RDD, SETTINGS_LISTE_MILIEUX, {
name: "Liste des milieux proposés",

2
module/item-sheet.js
View File

@ -101,7 +101,7 @@ export class RdDItemSheet extends ItemSheet {
isSoins: false,
description: await TextEditor.enrichHTML(this.item.system.description, { async: true }),
descriptionmj: await TextEditor.enrichHTML(this.item.system.descriptionmj, { async: true }),
isComestible: this.item.isComestible()
isComestible: this.item.getUtilisationCuisine()
}
const competences = await SystemCompendiums.getCompetences(this.actor?.type);

40
module/item.js
View File

@ -258,14 +258,36 @@ export class RdDItem extends Item {
console.log(`${this.actor.name}: l'objet ${this.name} a expiré et été supprimé`);
await this.actor?.deleteEmbeddedDocuments('Item', [this.id]);
}
isComestible() {
getUtilisation() {
switch (this.type) {
case 'nourritureboisson': return 'pret';
case 'nourritureboisson':
return 'cuisine';
case 'herbe':
return this.system.categorie == 'Cuisine' && this.system.sust > 0 ? 'brut' : '';
case 'faune':
return this.system.sust > 0 ? 'brut' : '';
case 'ingredient':
case 'plante':
switch (this.system.categorie) {
case 'Cuisine': return 'cuisine';
case 'Toxique':
case 'Poison': return 'poison';
case 'Alchimie': return 'alchimie'
case 'Soin': case 'Repos': return 'soins'
}
return this.system.sust > 0 ? 'cuisine' : '';
}
return '';
}
getUtilisationCuisine() {
if (this.getUtilisation() == 'cuisine') {
switch (this.type) {
case 'nourritureboisson':
return 'pret';
case 'herbe':
case 'faune':
case 'ingredient':
case 'plante':
return 'brut';
}
}
return '';
}
@ -355,7 +377,7 @@ export class RdDItem extends Item {
}
if (this.actor?.isPersonnage()) {
const warn = options.warnIfNot;
if (this.isComestible() == 'brut') {
if (this.getUtilisationCuisine() == 'brut') {
return 'Utiliser';
}
switch (this.type) {
@ -404,7 +426,7 @@ export class RdDItem extends Item {
}
async onCreateDecoupeComestible(actor) {
if (actor && this.isComestible() == 'brut' && this.system.sust != 1) {
if (actor && this.getUtilisationCuisine() == 'brut' && this.system.sust != 1) {
if (this.system.sust < 1) {
await actor.updateEmbeddedDocuments('Item', [{
_id: this.id,
@ -425,7 +447,7 @@ export class RdDItem extends Item {
}
async empiler(item) {
if (this.isComestible() == 'brut') {
if (this.getUtilisationCuisine() == 'brut') {
const sust = this.system.sust + item.system.sust;
const encombrement = this.system.encombrement + item.system.encombrement;
await this.update({
@ -477,7 +499,7 @@ export class RdDItem extends Item {
}
else {
const excludedProperties = ['quantite', 'cout', 'encTotal', 'environnement'];
if (this.isComestible()) {
if (this.getUtilisationCuisine()) {
excludedProperties.push('sust', 'encombrement');
}
let differences = Object.entries(this.system)

20
module/tirage/fenetre-recherche-tirage.js
View File

@ -16,18 +16,18 @@ const FILTER_GROUPS = [
]
const FILTERS = [
{ group: 'comestible', code: 'pret', label: 'Comestible', check: item => item.isComestible() == 'pret' },
{ group: 'comestible', code: 'alcool', label: 'Alcool', check: item => item.isAlcool() },
{ group: 'comestible', code: 'pret', label: 'Préparé', check: item => item.getUtilisationCuisine() == 'pret' },
{ group: 'comestible', code: 'comestible', label: 'Comestible', check: item => item.getUtilisation() == 'cuisine' },
{ group: 'comestible', code: 'boisson', label: 'Boisson', check: item => item.isNourritureBoisson() && item.system.boisson },
{ group: 'comestible', code: 'brut', label: 'A préparer', check: item => item.isComestible() == 'brut' },
{ group: 'comestible', code: 'poison', label: 'Toxique', check: item => item.isComestible() == 'poison' },
{ group: 'comestible', code: 'non', label: 'Immangeable', check: item => !item.isComestible() || item.isComestible() == '' },
{ group: 'comestible', code: 'alcool', label: 'Alcool', check: item => item.isAlcool() },
{ group: 'comestible', code: 'brut', label: 'A préparer', check: item => item.getUtilisationCuisine() == 'brut' },
{ group: 'comestible', code: 'non', label: 'Immangeable', check: item => item.isEnvironnement() && !item.getUtilisationCuisine() },
{ group: 'categorie', code: 'alchimie', label: 'Alchimique', check: item => item.isEnvironnement() && item.system.categorie == 'Alchimie' },
{ group: 'categorie', code: 'cuisine', label: 'Cuisine', check: item => item.isEnvironnement() && item.system.categorie == 'Cuisine' },
{ group: 'categorie', code: 'repos', label: 'Repos', check: item => item.isEnvironnement() && item.system.categorie == 'Repos' },
{ group: 'categorie', code: 'soins', label: 'Soins', check: item => item.isEnvironnement() && item.system.categorie == 'Soin' },
{ group: 'categorie', code: 'autres', label: 'Autres', check: item => !item.isEnvironnement() || ['', 'Autre'].includes(item.system.categorie) },
{ group: 'categorie', code: 'alchimie', label: 'Alchimique', check: item => item.isEnvironnement() && item.getUtilisation() == 'alchimie' },
{ group: 'categorie', code: 'cuisine', label: 'Cuisine', check: item => item.isEnvironnement() && item.getUtilisation() == 'cuisine' },
{ group: 'categorie', code: 'soins', label: 'Médical', check: item => item.isEnvironnement() && item.getUtilisation() == 'soins' },
{ group: 'categorie', code: 'cpoison', label: 'Toxique', check: item => item.isEnvironnement() && item.getUtilisation() == 'poison' },
{ group: 'categorie', code: 'autres', label: 'Autres', check: item => !item.isEnvironnement() || item.getUtilisation() == '' },
{ group: "qualite", code: "mauvaise", label: "Mauvaise (négative)", check: item => item.isInventaire() && item.system.qualite < 0 },
{ group: "qualite", code: "quelconque", label: "Quelconque (0)", check: item => item.isInventaire() && item.system.qualite == 0 },

2
templates/enum-categorie-ingredient.html
View File

@ -3,4 +3,6 @@
<option value="Cuisine">Cuisine</option>
<option value="Repos">Repos</option>
<option value="Soin">Soin</option>
<option value="Poison">Poison/Vénéneux</option>
<option value="Toxique">Urticant/Venimeux</option>
<option value="Autre">Autre</option>

2
templates/item-herbe-sheet.html
View File

@ -33,12 +33,10 @@
<label for="system.sust">Sustentation</label>
<input class="attribute-value" type="number" name="system.sust" value="{{system.sust}}" data-dtype="Number" min="0"/>
</div>
{{#if (gt system.sust 0)}}
<div class="form-group">
<label for="system.exotisme">Exotisme</label>
<input class="attribute-value" type="number" name="system.exotisme" value="{{system.exotisme}}" data-dtype="Number" min="-10" max="0"/>
</div>
{{/if}}
{{else}}
<div class="form-group">
<label>Niveau (si applicable)</label>

2
templates/item-plante-sheet.html
View File

@ -33,12 +33,10 @@
<label for="system.sust">Sustentation</label>
<input class="attribute-value" type="number" name="system.sust" value="{{system.sust}}" data-dtype="Number" min="0"/>
</div>
{{#if (gt system.sust 0)}}
<div class="form-group">
<label for="system.exotisme">Exotisme</label>
<input class="attribute-value" type="number" name="system.exotisme" value="{{system.exotisme}}" data-dtype="Number" min="-10" max="0"/>
</div>
{{/if}}
{{else}}
<div class="form-group">
<label>Niveau (si applicable)</label>