Fixes from 29th of june

This commit is contained in:
2023-06-30 13:14:40 +02:00
parent 0b0b74754f
commit 270c7c4a91
9 changed files with 62 additions and 35 deletions

View File

@@ -323,13 +323,18 @@ export class Hero6Actor extends Actor {
buildContainerTree() {
let equipments = duplicate(this.items.filter(item => item.type == "equipment") || []);
let enc = 0
let value = 0
for (let equip1 of equipments) {
if (Number(equip1.system.weight) && Number(equip1.system.quantity)) {
enc += equip1.system.weight * equip1.system.quantity
}
if (Number(equip1.system.value) && Number(equip1.system.quantity)) {
value += equip1.system.value * equip1.system.quantity
}
}
// Store local values
this.encCurrent = enc
this.totalValue = value
}
/* -------------------------------------------- */
@@ -427,7 +432,7 @@ export class Hero6Actor extends Actor {
/* -------------------------------------------- */
prepareCharacValues(charac) {
charac.total = charac.value
charac.roll = 9 + Math.floor((charac.value) / 5)
charac.roll = 9 + Math.round((charac.value) / 5)
}
prepareCharac() {
let characs = duplicate(this.system.characteristics)
@@ -579,6 +584,7 @@ export class Hero6Actor extends Actor {
let rollData = this.getCommonRollData()
rollData.mode = "damage"
rollData.item = duplicate(item)
rollData.title = item.name
rollData.diceFormula = Hero6Utility.convertRollHeroSyntax(item.system.damage)
let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
@@ -587,9 +593,13 @@ export class Hero6Actor extends Actor {
rollData.result = myRoll.total
rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll)
let msg = await Hero6Utility.createChatWithRollMode(rollData.alias, {
content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData)
let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData)
let msg = await rollData.roll.toMessage({
user: game.user.id,
rollMode: game.settings.get("core", "rollMode"),
flavor: msgFlavor
})
rollData.roll = duplicate(rollData.roll) // Convert to object
msg.setFlag("world", "rolldata", rollData)
console.log("Rolldata result", rollData)
}