public/fvtt-hero-system-6
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 40 Wiki Activity

Fix #25

Browse Source
This commit is contained in:
LeRatierBretonnien
2023-08-30 09:46:43 +02:00
parent 0f4fe253e0
commit ab587740d8
47 changed files with 183 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/hero6-actor.js
View File

@@ -223,8 +223,10 @@ export class Hero6Actor extends Actor {
/* -------------------------------------------- */
prepareManeuver(maneuver) {
let subMode = "normal"
if (maneuver.system.maneuvertype == "mental") {
maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)
maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)
subMode = "omcv"
if (Number(maneuver.system.omcv)) {
maneuver.roll += (Number(maneuver.system.omcv) || 0)
} else {
@@ -232,12 +234,14 @@ export class Hero6Actor extends Actor {
}
} else {
maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0)
subMode = "ocv"
if (Number(maneuver.system.ocv)) {
maneuver.roll += (Number(maneuver.system.ocv) || 0)
} else {
maneuver.noOCV = true
}
}
return subMode
}
/* -------------------------------------------- */
@@ -637,6 +641,9 @@ export class Hero6Actor extends Actor {
rollData.actorImg = this.img
rollData.actorId = this.id
rollData.img = this.img
rollData.title = this.name
rollData.subMode = "normal"
rollData.characteristics = duplicate(this.system.characteristics)
if (chKey) {
rollData.charac = duplicate(this.system.characteristics[chKey])
this.prepareCharacValues(rollData.charac)
@@ -669,6 +676,7 @@ export class Hero6Actor extends Actor {
rollPerception() {
let rollData = this.getCommonRollData("int")
rollData.isPerception = true
rollData.title = "Perception roll"
rollData.charac.roll = Number(rollData.charac.perceptionroll)
rollData.mode = "perception"
if (rollData.target) {
@@ -682,6 +690,7 @@ export class Hero6Actor extends Actor {
rollCharac(chKey) {
let rollData = this.getCommonRollData(chKey)
rollData.mode = "charac"
rollData.title = "Characteristic roll"
if (rollData.target) {
ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
return
@@ -693,12 +702,13 @@ export class Hero6Actor extends Actor {
let item = this.items.get(itemId)
let rollData = this.getCommonRollData()
rollData.mode = "item"
rollData.title = Hero6Utility.upperFirst(item.type) + " - " + item.name
rollData.item = duplicate(item)
if (item.type == "skill") {
this.prepareSkill(rollData.item)
}
if (item.type == "maneuver") {
this.prepareManeuver(rollData.item)
rollData.subMode = this.prepareManeuver(rollData.item)
}
this.startRoll(rollData)
}
@@ -792,9 +802,10 @@ export class Hero6Actor extends Actor {
if (weapon) {
weapon = duplicate(weapon)
let rollData = this.getCommonRollData()
rollData.weaponRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
rollData.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
rollData.subMode = "ocv"
rollData.mode = "weapon"
rollData.weapon = weapon
rollData.item = weapon
rollData.img = weapon.img
this.startRoll(rollData)
} else {
@@ -807,9 +818,9 @@ export class Hero6Actor extends Actor {
if (maneuver) {
maneuver = duplicate(maneuver)
let rollData = this.getCommonRollData()
rollData.maneuverRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0)
rollData.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0)
rollData.mode = "mentalmaneuver"
rollData.maneuver = maneuver
rollData.item = maneuver
rollData.img = maneuver.img
this.startRoll(rollData)
} else {
@@ -823,12 +834,14 @@ export class Hero6Actor extends Actor {
power = duplicate(power)
let rollData = this.getCommonRollData()
if (power.system.attackvalue == "ocv") {
rollData.powerRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
rollData.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
rollData.subMode = "ocv"
} else {
rollData.powerRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
rollData.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
rollData.subMode = "omcv"
}
rollData.mode = "powerattack"
rollData.power = power
rollData.item = power
rollData.img = power.img
this.startRoll(rollData)
} else {

4
modules/hero6-roll-dialog.js
View File

@@ -5,7 +5,7 @@ export class Hero6RollDialog extends Dialog {
/* -------------------------------------------- */
static async create(actor, rollData) {
let options = { classes: ["Hero6Dialog"], width: 460, height: 'fit-content', 'z-index': 99999 };
let options = { classes: ["Hero6Dialog"], width: 320, height: 'fit-content', 'z-index': 99999 };
let html = await renderTemplate('systems/fvtt-hero-system-6/templates/apps/roll-dialog-generic.hbs', rollData);
return new Hero6RollDialog(actor, rollData, html, options);
@@ -14,7 +14,7 @@ export class Hero6RollDialog extends Dialog {
/* -------------------------------------------- */
constructor(actor, rollData, html, options, close = undefined) {
let conf = {
title: (rollData.mode == "skill") ? "Skill" : "Attribute",
title: "Roll window",
content: html,
buttons: {
roll: {

9
modules/hero6-utility.js
View File

@@ -350,15 +350,6 @@ export class Hero6Utility {
let diceFormula = "3d6"
let target = 10
if(rollData.weapon) {
target = rollData.weaponRoll
}
if(rollData.maneuver) {
target = rollData.maneuverRoll
}
if(rollData.power) {
target = rollData.powerRoll
}
if (rollData.charac) {
target = rollData.charac.roll
}