Merge branch 'master' of gitlab.com:LeRatierBretonnien/foundryvtt-reve-de-dragon

This commit is contained in:
sladecraven 2021-04-03 18:53:21 +02:00
commit 0d7ba3be69

View File

@ -19,11 +19,10 @@ export class RdDItemCompetenceCreature extends Item {
/* -------------------------------------------- */ /* -------------------------------------------- */
static toArme(itemData) { static toArme(itemData) {
if (RdDItemCompetenceCreature.isCompetenceAttaque(itemData)) { if (RdDItemCompetenceCreature.isCompetenceAttaque(itemData)) {
itemData = Misc.data(itemData); let arme = duplicate(Misc.data(itemData));
let arme = { name: itemData.name, data: duplicate(itemData) };
mergeObject(arme.data, mergeObject(arme.data,
{ {
competence: itemData.name, competence: arme.name,
resistance: 100, resistance: 100,
equipe: true, equipe: true,
penetration: 0, penetration: 0,