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

Merge branch 'v1.4-fix-humanoides' into 'v1.4'

Browse Source 
Fix Chèvre-pieds et autres

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!265
This commit is contained in:
Leratier Bretonnien 2021-06-03 06:53:35 +00:00
commit 403d94a57f
8 changed files with 106 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/actor.js
View File

@ -109,7 +109,7 @@ export class RdDActor extends Actor {
const isPersonnage = actorData.type == "personnage";
// If the created actor has items (only applicable to duplicated actors) bypass the new actor creation logic
if (actorData.items) {
let actor = super.create(actorData, options);
let actor = await super.create(actorData, options);
if (isPersonnage) {
await actor.checkMonnaiePresence(actorData.items);
}

12
module/item.js
View File

@ -195,9 +195,15 @@ export class RdDItem extends Item {
if (itemData.name != otherData.name) return false;
if (tplData.quantite == undefined) return false;
for (const [key, value] of Object.entries(tplData)) {
if (['quantite', 'encTotal', 'prixTotal', 'cout'].includes(key)) continue;
if (value != otherTplData[key]) return false;
const differences = Object.entries(tplData).filter(([key, value]) => !['quantite', 'encTotal', 'prixTotal', 'cout'].includes(key))
.filter(([key, value]) => value != otherTplData[key]);
if (differences.length > 0) {
let message = `Impossible de regrouper les ${itemData.type} ${itemData.name}: `;
for (const [key, value] of differences){
message += `<br>${key}: ${value} vs ${otherTplData[key]}`;
}
ui.notifications.info(message)
return false;
}
return true;
}

18
module/rdd-dice.js
View File

@ -46,11 +46,11 @@ export class De7 extends Die {
return this.values.filter(it => it != 8).reduce(Misc.sum(), 0);
}
getResultLabel(result) {
switch (result) {
getResultLabel(diceTerm) {
switch (diceTerm.result) {
case 7: return imgSigneDragon;
}
return result;
return diceTerm.result.toString();
}
}
@ -83,12 +83,12 @@ export class DeDraconique extends Die {
return this.values.filter(it => it != 8).reduce(Misc.sum(), 0);
}
static getResultLabel(result) {
switch (result) {
getResultLabel(diceTerm) {
switch (diceTerm.result) {
case 7: return imgSigneDragon;
case 8: return 0;
case 8: return '0';
}
return result;
return diceTerm.result.toString();
}
}
@ -112,8 +112,8 @@ export class DeHeure extends Die {
super(termData);
}
getResultLabel(result) {
return img(imagesHeures[result - 1]);
getResultLabel(diceTerm) {
return img(imagesHeures[diceTerm.result - 1]);
}
}

74
packs/animaux.db
View File

File diff suppressed because one or more lines are too long

42
packs/competences-humanoides.db
View File

@ -1,42 +0,0 @@
{"name":"Esquive","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_esquive.png","effects":[],"_id":"0Ms9iKxqigNNpZEx"}
{"name":"Cuisine","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_cuisine.png","effects":[],"_id":"18wcei5hlEInsBFO"}
{"name":"Danse","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_danse.png","effects":[],"_id":"3Crwg8cx2JOb697T"}
{"name":"Survie en Montagne","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_survie_montagne.png","effects":[],"_id":"5c0hWcQJxb4Q21Mk"}
{"name":"Charpenterie","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_charpenterie.png","effects":[],"_id":"8wsg6Tea9uq4LIRR"}
{"name":"Natation","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_natation.png","effects":[],"_id":"9lapnIQBcoM2UbYx"}
{"name":"Equitation","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_equitation.png","effects":[],"_id":"Aea8wM5efy5gxjDj"}
{"name":"Survie en Extérieur","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_survie_exterieur.png","effects":[],"_id":"EAxj4uUREHbqwC9L"}
{"name":"Discrétion","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_discretion.png","effects":[],"_id":"HXUreQ9H5s3scKck"}
{"name":"Sagouine","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_grouine.png","effects":[],"_id":"I36ZBkdWbs46iMDy"}
{"name":"Fronde","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_fronde.png","effects":[],"_id":"K9AS7zs5uGkfiz2L"}
{"name":"Survie en Forêt","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_survie_foret.png","effects":[],"_id":"KAsU7UwtWjJ1pBYU"}
{"name":"Survie en Cité","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_survie_cite.png","effects":[],"_id":"MIo5O1rO0Rcougfs"}
{"name":"Javelot","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_lance.png","effects":[],"_id":"MSeP6k2QB3rGCJfd"}
{"name":"Bricolage","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_bricolage.png","effects":[],"_id":"MfIb6SBRQFytI7HC"}
{"name":"Petite Lance","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_lance.png","effects":[],"_id":"MmRwM7caZRkKKWpP"}
{"name":"Bouclier Moyen","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_bouclier.png","effects":[],"_id":"QGULMUoC9JXFze0r"}
{"name":"Chant","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_chant.png","effects":[],"_id":"TSYUgkeNySPebL6y"}
{"name":"Bouclier Léger","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_bouclier.png","effects":[],"_id":"UBMG769xfkd9wb6t"}
{"name":"Grouine","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_grouine.png","effects":[],"_id":"Uivn4w7d4JNdSIRb"}
{"name":"Légendes","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_legendes.png","effects":[],"_id":"UqZivWKal2hvRdcO"}
{"name":"Course","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_course.png","effects":[],"_id":"WsYnwR8GcOxfuCI0"}
{"name":"Epée Sorde","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_epee_1_main.png","effects":[],"_id":"YTKld5ggDsHqwYoR"}
{"name":"Masse Lourde","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_masse_1_main.png","effects":[],"_id":"bgzOT9PYCOsrm8FS"}
{"name":"Lance Courte","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_lance.png","effects":[],"_id":"btSxLWYSisFvbcRd"}
{"name":"Corps à Corps","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.png","effects":[],"_id":"c0I93Q53i4ZmxpyT"}
{"name":"Lance Courte (Lancer)","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_lance.png","effects":[],"_id":"dO72mix9tGUHiqmG"}
{"name":"Comédie","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_comedie.png","effects":[],"_id":"e74yfvlcv41oM1Td"}
{"name":"Petit Arc","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_arc.png","effects":[],"_id":"ezKaZNCSQMtr4LeB"}
{"name":"Empoignade","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature_empoignade.png","effects":[],"_id":"gAfrxCyNGA37mtLk"}
{"name":"Maroquinerie","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_maroquinerie.png","effects":[],"_id":"gXv03Rn71K3qXpGf"}
{"name":"Epée Gnome","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_epee_1_main.png","effects":[],"_id":"gfDCgPJjeVg8tSul"}
{"name":"Morsure","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/compcreature-morsure.png","effects":[],"_id":"j1xHCzfIeYKgXxoH"}
{"name":"Arc","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_arc.png","effects":[],"_id":"lLJGyPzbDIAHuWs1"}
{"name":"Vigilance","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_vigilance.png","effects":[],"_id":"o3wwhOPjdGxRR19r"}
{"name":"Hache de Bataille","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_hache_a_1_main.png","effects":[],"_id":"oSSUSL9EHCrTkIVw"}
{"name":"Survie en Marais","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_survie_marais.png","effects":[],"_id":"pIi0hHqJvQ36h6JI"}
{"name":"Epée Cyane","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":true,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_epee_1_main.png","effects":[],"_id":"qT4pYktoaiWO0VFO"}
{"name":"Commerce","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/comptence-commerce.png","effects":[],"_id":"qcVZMYfF7w0mIFs5"}
{"name":"Survie en Sous-Sol","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_survie_sous_sol.png","effects":[],"_id":"rZIg94PO3TgoCwgh"}
{"name":"Ecriture","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_ecriture.png","effects":[],"_id":"w7w6YsXVjFh9BnvU"}
{"name":"Escalade","permission":{"default":0,"Q4cUvqxCxMoTJXDL":3},"type":"competencecreature","data":{"niveau":0,"carac_value":0,"iscombat":false,"dommages":0,"description":""},"flags":{},"img":"systems/foundryvtt-reve-de-dragon/icons/competence_escalade.png","effects":[],"_id":"wnrc1X4pAVHOEjt4"}

28
packs/humanoides.db
View File

File diff suppressed because one or more lines are too long

2
system.json
View File

@ -5,7 +5,7 @@
"version": "1.4.22",
"manifestPlusVersion": "1.0.0",
"minimumCoreVersion": "0.8.0",
"compatibleCoreVersion": "0.8.5",
"compatibleCoreVersion": "0.8.99",
"templateVersion": 115,
"author": "LeRatierBretonnien",
"authors": [

55
templates/actor-creature-sheet.html
View File

@ -54,7 +54,7 @@
<div class="flex-group-left flexcol">
<ol class="carac-list alterne-list">
{{#each data.carac as |carac key|}}
<li class="competence flexrow list-item" data-attribute="{{key}}">
<li class="flexrow list-item" data-attribute="{{key}}">
{{#if (eq key 'taille')}}
<span class="carac-label flexrow" name="data.carac.{{key}}.label">{{carac.label}}</span>
{{else}}
@ -65,43 +65,42 @@
value="{{carac.value}}" data-dtype="{{carac.type}}" />
</li>
{{/each}}
<li class="competence flexrow">
<span class="carac-label flexrow" name="carac-total">Total Caractéristiques</span>
<span class="competence-value flexrow" name="carac-total-value">{{data.caracSum}}</span>
<li class="flexrow">
<span class="carac-label" name="carac-total">Total Caractéristiques</span>
{{log 'data-actor-creature' this}}
<span class="competence-value" name="carac-total-value">{{calc.caracTotal}}</span>
</li>
</ol>
</div>
<div class="flex-group-left flexcol">
<ol class="carac-list alterne-list">
{{#each data.attributs as |attr key|}}
<li class="competence flexrow list-item" data-attribute="{{key}}">
<span class="carac-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} : </span>
<span><input class="attribut-value flexrow" type="text" name="data.attributs.{{key}}.value"
value="{{attr.value}}" data-dtype="{{attr.type}}" /></span>
<li class="flexrow list-item" data-attribute="{{key}}">
<span class="carac-label" name="data.attributs.{{key}}.label">{{attr.label}}</span>
<input type="text" name="data.attributs.{{key}}.value" value="{{attr.value}}" data-dtype="{{attr.type}}" />
</li>
{{/each}}
<li class="competence flexrow list-item" data-attribute="vie">
<span class="competence-label flexrow" name="data.sante.vie.label">Vie : </span>
<span><input class="sante-value flexrow" type="text" name="data.sante.vie.value"
value="{{data.sante.vie.value}}" data-dtype="Number" /></span><span>/ </span>
<span><input class="sante-value flexrow" type="text" name="data.sante.vie.max"
value="{{data.sante.vie.max}}" data-dtype="Number" /></span>
<li class="flexrow list-item" data-attribute="vie">
<span class="competence-label" name="data.sante.vie.label">Vie</span>
<span class="flexrow" >
<input type="text" name="data.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number" /> /
<input type="text" name="data.sante.vie.max" value="{{data.sante.vie.max}}" data-dtype="Number" />
</span>
</li>
<li class="competence flexrow list-item" data-attribute="endurance">
<span class="competence-label flexrow" name="data.sante.endurance.label">Endurance : </span>
<span><input class="sante-value flexrow" type="text" name="data.sante.endurance.value"
value="{{data.sante.endurance.value}}" data-dtype="Number" /></span><span>/ </span>
<span><input class="sante-value flexrow" type="text" name="data.sante.endurance.max"
value="{{data.sante.endurance.max}}" data-dtype="Number" /></span>
<li class="flexrow list-item" data-attribute="endurance">
<span class="competence-label" name="data.sante.endurance.label">Endurance</span>
<span class="flexrow" >
<input type="text" name="data.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number" /> /
<input type="text" name="data.sante.endurance.max" value="{{data.sante.endurance.max}}" data-dtype="Number" />
</span>
</li>
<li class="competence flexrow list-item" data-attribute="sonne">
<span class="competence-label flexrow" name="data.sante.sonne.label">Sonné : </span>
<input class="resource-content" type="checkbox" name="data.sante.sonne.value"
value="{{data.sante.sonne.value}}" {{#if data.sante.sonne.value}}checked{{/if}} />
<li class="flexrow list-item" data-attribute="sonne">
<span class="competence-label" name="data.sante.sonne.label">Sonné</span>
<input type="checkbox" name="data.sante.sonne.value" value="{{data.sante.sonne.value}}" {{#if data.sante.sonne.value}}checked{{/if}} />
</li>
<li class="competence flexrow list-item" data-attribute="etat">
<span class="competence-label flexrow" name="data.compteurs.etat.label">Etat Général : </span>
<span>{{data.compteurs.etat.value}}</span>
<li class="flexrow list-item" data-attribute="etat">
<span class="competence-label" name="data.compteurs.etat.label">Etat Général</span>
<input type="text" value="{{data.compteurs.etat.value}}" disabled />
</li>
</ol>
</div>
@ -181,7 +180,5 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
</div>
</div>
</section>
</form>