diff --git a/src/module/sheets/character/combat.mjs b/src/module/sheets/character/combat.mjs index c08d58c9..10485d66 100644 --- a/src/module/sheets/character/combat.mjs +++ b/src/module/sheets/character/combat.mjs @@ -30,76 +30,6 @@ export default { context.aupcurrent = actorData.system.aup.aktuell ?? 0 - // const fernkampf = findEquipmentOnSlot("fernkampf", actorData.system.setEquipped, actorData) - //const links = findEquipmentOnSlot("links", actorData.system.setEquipped, actorData) - // const rechts = findEquipmentOnSlot("rechts", actorData.system.setEquipped, actorData) - context.attacks = []; - /* - if (fernkampf) { - const fkitems = fernkampf.system.rangedSkills.map((skillInQuestion) => actorData.items.find(p => p.name === skillInQuestion)) - fkitems.forEach(async skill => { - const obj = await skill - context.attacks.push({ - name: obj.name, - using: fernkampf.name, - atroll: `1d20cs<${object.system.fk.aktuell + obj.system.at}`, - at: `${object.system.fk.aktuell + obj.system.at}`, - tproll: `${fernkampf.system.rangedAttackDamage}`, // TODO consider adding TP/KK mod and Range mod - tp: `${fernkampf.system.rangedAttackDamage}`, - iniroll: `(${context.inidice})d6 + ${context.inivalue + fernkampf.system.iniModifier ?? 0}`, - ini: `${context.inidice}w6 + ${context.inivalue + fernkampf.system.iniModifier ?? 0}`, - }) - }) - } - if (links) { - const meitems = [] - links.system.meleeSkills.forEach((skillInQuestion) => { - const item = actorData.items.find(p => p.name === skillInQuestion) - if (item) { - meitems.push(item) - } - }) - meitems.forEach(skill => { - const obj = skill - context.attacks.push({ - name: obj.name, - using: links.name, - atroll: `1d20cs<${object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`, // TODO consider adding W/M - at: `${object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`, - paroll: `1d20cs<${object.system.pa.links.aktuell + obj.system.pa + links.system.parryModifier}`, // TODO consider adding W/M - pa: `${object.system.pa.links.aktuell + obj.system.pa + links.system.parryModifier}`, - tproll: `${links.system.meleeAttackDamage}`, // TODO consider adding TP/KK mod - tp: `${links.system.meleeAttackDamage}`, - iniroll: `(${context.inidice})d6 + ${context.inivalue + links.system.iniModifier ?? 0}`, - ini: `${context.inidice}w6 + ${context.inivalue + links.system.iniModifier ?? 0}`, - }) - }) - } - if (rechts) { - const meitems = [] - rechts.system.meleeSkills.forEach((skillInQuestion) => { - const item = actorData.items.find(p => p.name === skillInQuestion) - if (item) { - meitems.push(item) - } - }) - meitems.forEach(skill => { - const obj = skill - context.attacks.push({ - name: obj.name, - using: rechts.name, - atroll: `1d20cs<${object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`, // TODO consider adding W/M - at: `${object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`, - paroll: `1d20cs<${object.system.pa.rechts.aktuell + obj.system.pa + rechts.system.parryModifier}`, // TODO consider adding W/M - pa: `${object.system.pa.rechts.aktuell + obj.system.pa + rechts.system.parryModifier}`, - tproll: `${rechts.system.meleeAttackDamage}`, // TODO consider adding TP/KK mod - tp: `${rechts.system.meleeAttackDamage}`, - iniroll: `(${context.inidice})d6 + ${context.inivalue + rechts.system.iniModifier ?? 0}`, - ini: `${context.inidice}w6 + ${context.inivalue + rechts.system.iniModifier ?? 0}`, - }) - }) - }*/ - return context },