Various fixes - WIP

This commit is contained in:
2022-05-01 00:38:09 +02:00
parent 5214b036d3
commit 580fdb996b
8 changed files with 74 additions and 72 deletions

View File

@ -168,9 +168,9 @@ export class RdDItemArme extends Item {
}
static ajoutCorpsACorps(armes, competences, carac) {
let corpsACorps = competences.find(it => it.name == 'Corps à corps') ?? { data: { niveau: -6 } };
let init = RdDCombatManager.calculInitiative(corpsACorps.data.niveau, carac['melee'].value);
armes.push(RdDItemArme.mainsNues({ niveau: corpsACorps.data.niveau, initiative: init }));
let corpsACorps = competences.find(it => it.name == 'Corps à corps') ?? { data: { niveau: -6 } }
let init = RdDCombatManager.calculInitiative(corpsACorps.system.niveau, carac['melee'].value)
armes.push(RdDItemArme.mainsNues({ niveau: corpsACorps.system.niveau, initiative: init }))
//armes.push(RdDItemArme.empoignade({ niveau: corpsACorps.data.niveau, initiative: init }));
}
@ -178,7 +178,7 @@ export class RdDItemArme extends Item {
const corpsACorps = {
name: 'Corps à corps',
img: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp',
data: {
system: {
equipe: true,
rapide: true,
force: 0,
@ -189,24 +189,24 @@ export class RdDItemArme extends Item {
categorie_parade: 'sans-armes'
}
};
mergeObject(corpsACorps.data, actorData ??{}, { overwrite: false });
mergeObject(corpsACorps.system, actorData ??{}, { overwrite: false });
return corpsACorps;
}
static mainsNues(actorData) {
const mainsNues = RdDItemArme.corpsACorps(actorData);
mainsNues.name = 'Mains nues';
mainsNues.data.cac = 'pugilat';
mainsNues.data.baseInit = 4;
mainsNues.system.cac = 'pugilat';
mainsNues.system.baseInit = 4;
return mainsNues;
}
static empoignade(actorData) {
const empoignade = RdDItemArme.corpsACorps(actorData);
empoignade.name = 'Empoignade';
empoignade.data.cac = 'empoignade';
empoignade.data.baseInit = 3;
empoignade.data.mortalite = 'empoignade';
empoignade.system.cac = 'empoignade';
empoignade.system.baseInit = 3;
empoignade.system.mortalite = 'empoignade';
return empoignade;
}
}