diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index 6feabe1..a0a5362 100644 --- a/modules/hero6-actor.js +++ b/modules/hero6-actor.js @@ -612,12 +612,15 @@ export class Hero6Actor extends Actor { let myRoll = new Roll(rollData.diceFormula).roll({ async: false }) await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) - rollData.roll = duplicate(myRoll) rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll) rollData.result = myRoll.total + rollData.roll = duplicate(myRoll) - let msg = await Hero6Utility.createChatWithRollMode(rollData.alias, { - content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-lift-dice-result.hbs`, rollData) + let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-lift-dice-result.hbs`, rollData) + let msg = await myRoll.toMessage({ + user: game.user.id, + rollMode: game.settings.get("core", "rollMode"), + flavor: msgFlavor }) msg.setFlag("world", "rolldata", rollData) console.log("Rolldata result", rollData) diff --git a/modules/hero6-combat.js b/modules/hero6-combat.js index 2c076aa..337a60b 100644 --- a/modules/hero6-combat.js +++ b/modules/hero6-combat.js @@ -5,7 +5,7 @@ export class Hero6CombatTracker extends CombatTracker { /* -------------------------------------------- */ static get defaultOptions() { - var path = "systems/fvtt-hero-system-6/templates/apps/combat-tracker.hbs"; + let path = "systems/fvtt-hero-system-6/templates/apps/combat-tracker.hbs"; return foundry.utils.mergeObject(super.defaultOptions, { template: path, }); @@ -21,6 +21,7 @@ export class Hero6Combat extends Combat { } /* -------------------------------------------- */ static pushMenuOptions(html, options) { + console.log(">>>>>>>>>>>>>>>>>>>>>>>< MENU OPTIONS!!!!!") let newOpt for (let i = 0; i < options.length; i++) { let option = options[i]; @@ -62,7 +63,7 @@ export class Hero6Combat extends Combat { constructor(data, context) { super(data, context); - this.turnNumber = 1; + this.turnNumber = 0; this.segmentNumber = 12; } @@ -104,13 +105,13 @@ export class Hero6Combat extends Combat { let turnData = this.getFlag("world", "hero6-turn-data") if (!turnData) { - turnData = { turnNumber: 1, segmentNumber: 12 } + turnData = { turnNumber: 0, segmentNumber: 12 } this.setFlag("world", "hero6-turn-data", turnData) } turnData = duplicate(turnData) - turnData.segmentNumber -= 1 - if (turnData.segmentNumber <= 0) { - turnData.segmentNumber = 12 + turnData.segmentNumber += 1 + if (turnData.segmentNumber > 12) { + turnData.segmentNumber = 1 turnData.turnNumber++ } this.setFlag("world", "hero6-turn-data", turnData) diff --git a/modules/hero6-main.js b/modules/hero6-main.js index bba3928..09d57d9 100644 --- a/modules/hero6-main.js +++ b/modules/hero6-main.js @@ -96,6 +96,8 @@ Hooks.once("ready", function () { welcomeMessage(); Hero6Utility.ready() Hero6Commands.ready() + Hero6Combat.init() + }) /* -------------------------------------------- */ diff --git a/modules/hero6-utility.js b/modules/hero6-utility.js index f24dbf1..2858b28 100644 --- a/modules/hero6-utility.js +++ b/modules/hero6-utility.js @@ -388,18 +388,22 @@ export class Hero6Utility { // Ensure we have no space at all //hero6Formula = hero6Formula.replace(/\s/g, '') let hasHalfDice = "" - if (hero6Formula.match("1/2d6")) { - hero6Formula = hero6Formula.replace("1/2d6", "d6") - hasHalfDice = "+round(1d6/2)" + let newFormula = hero6Formula + + let form1 = hero6Formula.match(/\s*(\d*)\s*1\/2d6/) + if ( form1 ) { + let nbDice = form1[1] || 0 + newFormula = nbDice+"d6+round(1d6/2)" } - if (hero6Formula.match(".5")) { - hero6Formula = hero6Formula.replace(".5", "") - hasHalfDice = "+round(1d6/2)" + + let form3 = hero6Formula.match(/\s*(\d*)\.5d6/) + if ( form3 ) { + let nbDice = form3[1] || 0 + newFormula = nbDice+"d6+round(1d6/2)" } - let foundryFormula = hero6Formula + hasHalfDice - foundryFormula = foundryFormula.replace(' ', '') - console.log("Parsed formula : ", hero6Formula, foundryFormula) - return foundryFormula + + console.log("Parsed formula : ", hero6Formula, newFormula) + return newFormula } /* -------------- ----------------------------- */ diff --git a/styles/simple.css b/styles/simple.css index 03e37ec..3c2bd68 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1309,6 +1309,11 @@ Focus FOC: #ff0084 max-width: 9rem; min-width: 9rem; } +.item-field-label-very-short { + flex-grow:1; + max-width: 2.5rem; + min-width: 2.5rem; +} .item-field-label-short { flex-grow:1; max-width: 4rem; diff --git a/system.json b/system.json index 9d140a8..6ffd4e5 100644 --- a/system.json +++ b/system.json @@ -91,7 +91,7 @@ "styles": [ "styles/simple.css" ], - "version": "10.0.41", + "version": "10.0.42", "compatibility": { "minimum": "10", "verified": "10", @@ -99,7 +99,7 @@ }, "title": "Hero System v6 for FoundrtVTT (Official)", "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json", - "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.41.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.42.zip", "url": "https://www.uberwald.me/gitea/uberwald/", "background": "images/ui/hro6_welcome_page.webp", "id": "fvtt-hero-system-6" diff --git a/template.json b/template.json index 093b99c..a0d34be 100644 --- a/template.json +++ b/template.json @@ -351,8 +351,8 @@ ], "maneuvertype": "general", "pha": "", - "ocv": 0, - "dcv" : 0, + "ocv": "", + "dcv" : "", "isstock": false, "active": false }, diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 964f6ab..7f84f60 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -139,18 +139,18 @@ diff --git a/templates/chat/chat-request-defense.hbs b/templates/chat/chat-request-defense.hbs deleted file mode 100644 index f5bda4d..0000000 --- a/templates/chat/chat-request-defense.hbs +++ /dev/null @@ -1,46 +0,0 @@ -
- {{#if actorImg}} - {{alias}} - {{/if}} -

{{alias}}

-
- -
- -{{#if img}} -
- {{name}} -
-{{/if}} - -
-
- -
- - {{#if isRangedAttack}} -
{{defender.name}} is under Ranged attack. He must roll a Target Roll to defend himself.
- {{else}} -
{{defender.name}} is under Melee attack. He must roll a Defense Roll to defend himself.
- {{/if}} - - - - - -
- - \ No newline at end of file diff --git a/templates/items/item-maneuver-sheet.hbs b/templates/items/item-maneuver-sheet.hbs index 02d7e2b..eebef8f 100644 --- a/templates/items/item-maneuver-sheet.hbs +++ b/templates/items/item-maneuver-sheet.hbs @@ -38,11 +38,11 @@
  • - +
  • - +