#2 Fix skill profiency

This commit is contained in:
2023-08-26 20:59:41 +02:00
parent 40ee7c3c40
commit 379b8358ee
44 changed files with 106 additions and 145 deletions

View File

@@ -216,7 +216,6 @@ export class Hero6Actor extends Actor {
skill.roll = charac.roll
}
}
console.log("SILL", skill)
if (skill.system.levels > 0) {
skill.roll += skill.system.levels
}
@@ -225,16 +224,16 @@ export class Hero6Actor extends Actor {
/* -------------------------------------------- */
prepareManeuver(maneuver) {
if (maneuver.system.maneuvertype == "mental") {
maneuver.roll = 11 + this.system.characteristics.omcv.value
maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)
if (Number(maneuver.system.omcv)) {
maneuver.roll += Number(maneuver.system.omcv)
maneuver.roll += (Number(maneuver.system.omcv) || 0)
} else {
maneuver.noOMCV = true
}
} else {
maneuver.roll = 11 + this.system.characteristics.ocv.value
maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0)
if (Number(maneuver.system.ocv)) {
maneuver.roll += Number(maneuver.system.ocv)
maneuver.roll += (Number(maneuver.system.ocv) || 0)
} else {
maneuver.noOCV = true
}
@@ -656,12 +655,10 @@ export class Hero6Actor extends Actor {
const ray = new Ray(token.object?.center || token.center, defenderToken.center)
rollData.tokensDistance = canvas.grid.measureDistances([{ ray }], { gridSpaces: false })[0] / canvas.grid.grid.options.dimensions.distance
} else {
ui.notifications.info("No token connected to this actor, unable to compute distance.")
return
//ui.notifications.info("No token connected to this actor, unable to compute distance.")
//return
}
if (defender) {
rollData.forceAdvantage = defender.isAttackerAdvantage()
rollData.advantageFromTarget = true
}
}
console.log("ROLLDATA", rollData)
@@ -781,7 +778,7 @@ export class Hero6Actor extends Actor {
if (weapon) {
weapon = duplicate(weapon)
let rollData = this.getCommonRollData()
rollData.weaponRoll = 11 + this.system.characteristics.ocv.value + (Number(weapon.system.ocv) || 0)
rollData.weaponRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
rollData.mode = "weapon"
rollData.weapon = weapon
rollData.img = weapon.img
@@ -796,7 +793,7 @@ export class Hero6Actor extends Actor {
if (maneuver) {
maneuver = duplicate(maneuver)
let rollData = this.getCommonRollData()
rollData.maneuverRoll = 11 + this.system.characteristics.omcv.value + (Number(maneuver.system.omcv) || 0)
rollData.maneuverRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0)
rollData.mode = "mentalmaneuver"
rollData.maneuver = maneuver
rollData.img = maneuver.img
@@ -812,9 +809,9 @@ export class Hero6Actor extends Actor {
power = duplicate(power)
let rollData = this.getCommonRollData()
if (power.system.attackvalue == "ocv") {
rollData.powerRoll = 11 + this.system.characteristics.ocv.value + (Number(power.system.ocv) || 0)
rollData.powerRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
} else {
rollData.powerRoll = 11 + this.system.characteristics.omcv.value + (Number(power.system.omcv) || 0)
rollData.powerRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
}
rollData.mode = "powerattack"
rollData.power = power

View File

@@ -147,13 +147,13 @@ export class Hero6ItemSheet extends ItemSheet {
});
html.find('.item-skill-profiency').click(ev => {
this.object.update( {'system.levels': 12, 'system.cost': 2} )
this.object.update( {'system.skillfamiliarity': false, 'system.cost': 2} )
} )
html.find('.item-skill-familiarity').click(ev => {
this.object.update( {'system.levels': 10, 'system.cost': 1} )
this.object.update( {'system.skillprofiency': false, 'system.cost': 1} )
} )
html.find('.item-skill-everyman').click(ev => {
this.object.update( {'system.levels': 8, 'system.cost': 0} )
this.object.update( {'system.cost': 0} )
} )
html.find('.view-subitem').click(ev => {