From 4e7b8b9a7840be5344d29856a6168e5558fdf1ea Mon Sep 17 00:00:00 2001 From: sladecraven Date: Mon, 17 Jan 2022 23:50:57 +0100 Subject: [PATCH] Review combat mode --- css/bol.css | 4 + module/controllers/bol-rolls.js | 150 ++++++++++++-------- module/system/bol-utility.js | 69 ++++----- module/system/templates.js | 1 + system.json | 2 +- templates/chat/rolls/attack-damage-card.hbs | 7 + templates/chat/rolls/attack-heroic-card.hbs | 6 - templates/chat/rolls/damage-roll-card.hbs | 13 +- templates/chat/rolls/default-roll-card.hbs | 20 +-- 9 files changed, 149 insertions(+), 123 deletions(-) create mode 100644 templates/chat/rolls/attack-damage-card.hbs delete mode 100644 templates/chat/rolls/attack-heroic-card.hbs diff --git a/css/bol.css b/css/bol.css index fd34d57..740771e 100644 --- a/css/bol.css +++ b/css/bol.css @@ -267,6 +267,10 @@ a:hover { .bol button { background: rgba(0, 0, 0, 0.1); } +.chat-button { + font-size: 0.8rem; +} + .bol select { box-shadow: none; font-size: 14px; diff --git a/module/controllers/bol-rolls.js b/module/controllers/bol-rolls.js index 384d3b5..cdbe917 100644 --- a/module/controllers/bol-rolls.js +++ b/module/controllers/bol-rolls.js @@ -1,18 +1,18 @@ import { BoLUtility } from "../system/bol-utility.js"; -const __adv2dice = { ["1B"]: 3, ["2B"]: 4, ["2"]: 2, ["1M"]: 3, ["2M"]: 4} -const _apt2attr = {init: "mind", melee: "agility", ranged: "agility", def: "vigor"} +const __adv2dice = { ["1B"]: 3, ["2B"]: 4, ["2"]: 2, ["1M"]: 3, ["2M"]: 4 } +const _apt2attr = { init: "mind", melee: "agility", ranged: "agility", def: "vigor" } export class BoLRoll { static options() { return { classes: ["bol", "dialog"] }; } - static convertToAdv( adv) { + static convertToAdv(adv) { if (adv == 0) return "2" - return Math.abs(adv) + (adv < 0)?'M':'B'; + return Math.abs(adv) + (adv < 0) ? 'M' : 'B'; } - static getDefaultAttribute( key ) { + static getDefaultAttribute(key) { return _apt2attr[key] } static attributeCheck(actor, actorData, dataset, event) { @@ -25,7 +25,7 @@ export class BoLRoll { let description = actor.name + " - " + game.i18n.localize('BOL.ui.attributeCheck') + " - " + game.i18n.localize(attribute.label); return this.displayRollDialog( { - mode: "attribute", + mode: "attribute", actor: actor, actorData: actorData, attribute: attribute, @@ -50,7 +50,7 @@ export class BoLRoll { let description = actor.name + " - " + game.i18n.localize('BOL.ui.aptitudeCheck') + " - " + game.i18n.localize(aptitude.label); return this.displayRollDialog( { - mode: "aptitude", + mode: "aptitude", actor: actor, actorData: actorData, attribute: attribute, @@ -108,7 +108,7 @@ export class BoLRoll { if (rollData.mode == "weapon") { if (rollData.defender) { // If target is selected rollData.defence = rollData.defender.defenseValue, - rollData.shieldBlock = 'none' + rollData.shieldBlock = 'none' let shields = rollData.defender.shields for (let shield of shields) { rollData.shieldBlock = (shield.data.properties.blocking.blockingAll) ? 'blockall' : 'blockone'; @@ -143,10 +143,10 @@ export class BoLRoll { rollData.mod = html.find('#mod').val() || 0; let careers = html.find('#career').val(); rollData.career = (!careers || careers.length == 0) ? 0 : Math.max(...careers.map(i => parseInt(i))); - rollData.registerInit = (rollData.aptKey == 'init') ? $('#register-init').is(":checked") : false; - + rollData.registerInit = (rollData.aptKey == 'init') ? $('#register-init').is(":checked") : false; + let shieldMalus = 0; - if ( rollData.mode == "weapon") { + if (rollData.mode == "weapon") { const applyShieldMalus = html.find('#applyShieldMalus').val() || false; if (applyShieldMalus || rollData.shieldBlock == 'blockall') { shieldMalus = rollData.shieldAttackMalus; @@ -158,10 +158,11 @@ export class BoLRoll { //// const dicePool = (isMalus) ? 2 - parseInt(rollData.adv) : 2 + parseInt(rollData.adv); const attrValue = (rollData.attrKey) && eval(`rollData.actor.data.data.attributes.${rollData.attrKey}.value`) || 0; const aptValue = (rollData.aptKey) && eval(`rollData.actor.data.data.aptitudes.${rollData.aptKey}.value`) || 0 - + const modifiers = parseInt(attrValue) + parseInt(aptValue) + parseInt(rollData.mod) + parseInt(rollData.career) - rollData.defence - shieldMalus; const formula = (isMalus) ? dicePool + "d6kl2 + " + modifiers : dicePool + "d6kh2 + " + modifiers; rollData.formula = formula; + rollData.modifiers = modifiers let r = new BoLDefaultRoll(rollData); r.roll(); @@ -177,84 +178,115 @@ export class BoLRoll { export class BoLDefaultRoll { constructor(rollData) { - BoLUtility.storeRoll(rollData); + BoLUtility.storeRoll(rollData) this.rollData = rollData - this.rollData.isSuccess = false; - this.rollData.isCritical = false; - this.rollData.isFumble = false; + if ( this.rollData.isSuccess == undefined ) { // First init + this.rollData.isSuccess = false; + this.rollData.isCritical = false; + this.rollData.isFumble = false; + } + if ( this.rollData.optionsId) { + $(`#${this.rollData.optionsId}`).hide() // Hide the options roll buttons + } + if ( this.rollData.applyId) { + $(`#${this.rollData.applyId}`).hide() // Hide the options roll buttons + } + this.rollData.optionsId = randomID(16) + this.rollData.applyId = randomID(16) } async roll() { - console.log("ROLL", this.rollData) const r = new Roll(this.rollData.formula); await r.roll({ "async": false }); - //await BoLUtility.showDiceSoNice(r); const activeDice = r.terms[0].results.filter(r => r.active); const diceTotal = activeDice.map(r => r.result).reduce((a, b) => a + b); + this.rollData.roll = r this.rollData.isSuccess = (r.total >= 9); - this.rollData.isCritical = (diceTotal === 12); + this.rollData.isCritical = (diceTotal === 12) + this.rollData.isRealCritical = (diceTotal === 12) this.rollData.isFumble = (diceTotal === 2); this.rollData.isFailure = !this.rollData.isSuccess - this.rollData.reroll = this.rollData.actor.heroReroll() - - if (this.rollData.registerInit) { - this.rollData.actor.registerInit( r.total, this.rollData.isCritical); + if (this.rollData.reroll == undefined) { + this.rollData.reroll = this.rollData.actor.heroReroll() } + if (this.rollData.registerInit) { + this.rollData.actor.registerInit(r.total, this.rollData.isCritical); + } + + console.log("ROLL", this.rollData) + await this.sendChatMessage() + + } + + async sendChatMessage() { this._buildChatMessage(this.rollData).then(msgFlavor => { - r.toMessage({ + this.rollData.roll.toMessage({ user: game.user.id, flavor: msgFlavor, speaker: ChatMessage.getSpeaker({ actor: this.rollData.actor }), flags: { msgType: "default" } - }).then(this.processResult()); + }) }); } - async processDefense() { - if (this.rollData.isCritical) { - ChatMessage.create({ - alias: this.rollData.actor.name, - whisper: BoLUtility.getWhisperRecipientsAndGMs(this.rollData.actor.name), - content: await renderTemplate('systems/bol/templates/chat/rolls/attack-heroic-card.hbs', this.rollData ) - }) - } else { - BoLUtility.sendAttackSuccess(this.rollData); - } + upgradeToCritical() { + // Force to Critical roll + this.rollData.isCritical = true + this.rollData.isRealCritical = false + this.rollData.isSuccess = true + this.rollData.isFailure = false + this.rollData.reroll = false + this.rollData.roll = new Roll("12+" + this.rollData.modifiers) + this.rollData.reroll = false + this.sendChatMessage() } - - setSuccess( flag) { + + setSuccess(flag) { this.rollData.isSuccess = flag } - async processResult() { - if ( this.rollData.mode != "weapon") { // Only specific process in Weapon mode + async sendDamageMessage() { + this._buildDamageChatMessage(this.rollData).then(msgFlavor => { + this.rollData.damageRoll.toMessage({ + user: game.user.id, + flavor: msgFlavor, + speaker: ChatMessage.getSpeaker({ actor: this.rollData.actor }), + flags: { msgType: "default" } + }) + }); + } + + async rollDamage() { + if (this.rollData.mode != "weapon") { // Only specific process in Weapon mode return; } if (this.rollData.isSuccess) { - let attrDamage = this.rollData.weapon.data.data.properties.damageAttribute; - let weaponFormula = BoLUtility.getDamageFormula(this.rollData.weapon.data.data.properties.damage, - this.rollData.weapon.data.data.properties.damageModifiers, - this.rollData.weapon.data.data.properties.damageMultiplier) - let damageFormula = weaponFormula + ((attrDamage) ? "+" + this.rollData.actor.data.data.attributes[attrDamage].value : "+0"); + if ( !this.rollData.damageRoll) { + let bonusDmg = 0 + if ( this.rollData.damageMode == 'damage-plus-6') { + bonusDmg = 6 + } + if ( this.rollData.damageMode == 'damage-plus-12') { + bonusDmg = 12 + } + console.log("DAMAGE !!!") + let attrDamage = this.rollData.weapon.data.data.properties.damageAttribute; + let weaponFormula = BoLUtility.getDamageFormula(this.rollData.weapon.data.data.properties.damage, + this.rollData.weapon.data.data.properties.damageModifiers, + this.rollData.weapon.data.data.properties.damageMultiplier) + let damageFormula = weaponFormula + "+" + bonusDmg + ((attrDamage) ? "+" + this.rollData.actor.data.data.attributes[attrDamage].value : "+0"); - //console.log("Formula", weaponFormula, damageFormula, this.rollData.weapon.data.data.properties.damage) - this.rollData.damageRoll = new Roll(damageFormula); - await this.rollData.damageRoll.roll({ "async": false }); - await BoLUtility.showDiceSoNice(this.rollData.damageRoll); - // Update rollData object - this.rollData.damageFormula = damageFormula; - - this._buildDamageChatMessage( this.rollData ).then(msgFlavor => { - this.rollData.damageRoll.toMessage({ - user: game.user.id, - flavor: msgFlavor, - speaker: ChatMessage.getSpeaker({ actor: this.rollData.actor }), - flags: { msgType: "default" } - }).then(this.processDefense()); - }); + //console.log("Formula", weaponFormula, damageFormula, this.rollData.weapon.data.data.properties.damage) + this.rollData.damageFormula = damageFormula + this.rollData.damageRoll = new Roll(damageFormula) + this.rollData.damageTotal = this.rollData.damageRoll.total + await this.rollData.damageRoll.roll({ "async": false }) + } + $(`#${this.rollData.optionsId}`).hide() // Hide the options roll buttons + this.sendDamageMessage() } } diff --git a/module/system/bol-utility.js b/module/system/bol-utility.js index 3932411..f847c9c 100644 --- a/module/system/bol-utility.js +++ b/module/system/bol-utility.js @@ -114,29 +114,41 @@ export class BoLUtility { } else { BoLUtility.processAttackSuccess(attackDef); } - } + } } - + /* -------------------------------------------- */ static async chatListeners(html) { + // Damage handling - html.on("click", '.damage-increase', event => { - event.preventDefault(); - let attackId = event.currentTarget.attributes['data-attack-id'].value; - let damageMode = event.currentTarget.attributes['data-damage-mode'].value; - if ( game.user.isGM) { - BoLUtility.processDamageIncrease(event, attackId, damageMode) - } else { - game.socket.emit("system.bol", { msg: "msg_damage_increase", data: {event: event, attackId: attackId, damageMode: damageMode} }); - } + html.on("click", '.chat-damage-apply', event => { + let rollData = BoLUtility.getLastRoll() + $(`#${rollData.applyId}`).hide() + BoLUtility.sendAttackSuccess(rollData) }); - html.on("click", '.hero-reroll', event => { + html.on("click", '.chat-damage-roll', event => { + event.preventDefault(); + let rollData = BoLUtility.getLastRoll() + rollData.damageMode = event.currentTarget.attributes['data-damage-mode'].value; + let bolRoll = new BoLDefaultRoll(rollData) + bolRoll.rollDamage() + }); + + html.on("click", '.transform-heroic-roll', event => { event.preventDefault(); - let rollData = BoLUtility.getLastRoll() rollData.actor.subHeroPoints(1) let r = new BoLDefaultRoll( rollData ) + r.upgradeToCritical(); + } ); + + html.on("click", '.hero-reroll', event => { + event.preventDefault(); + let rollData = BoLUtility.getLastRoll() + rollData.actor.subHeroPoints(1) + rollData.reroll = false // Disable reroll option for second roll + let r = new BoLDefaultRoll( rollData ) r.roll(); } ); @@ -145,7 +157,6 @@ export class BoLUtility { let attackId = event.currentTarget.attributes['data-attack-id'].value; let defenseMode = event.currentTarget.attributes['data-defense-mode'].value; let weaponId = (event.currentTarget.attributes['data-weapon-id']) ? event.currentTarget.attributes['data-weapon-id'].value : -1 - console.log("DEFENSE1", event.currentTarget, attackId, defenseMode, weaponId); if ( game.user.isGM) { BoLUtility.processDamageHandling(event, attackId, defenseMode, weaponId) } else { @@ -154,31 +165,6 @@ export class BoLUtility { }); } - /* -------------------------------------------- */ - static async processDamageIncrease(event, attackId, damageMode ) { - if ( !game.user.isGM) { - return; - } - BoLUtility.removeChatMessageId(BoLUtility.findChatMessageId(event.currentTarget)); - - // Only GM process this - let attackDef = this.attackStore[attackId]; - if (attackDef) { - attackDef.damageMode = damageMode; - if (defenseMode == 'damage-plus-6') { - attackDef.damageRoll.total += 6; - } - if (defenseMode == 'damage-plus-12') { - attackDef.damageRoll.total += 12; - attackDef.defender.subHeroPoints(1); - } - if (defenseMode == 'damage-normal') { - // Do nothing ! - } - BoLUtility.sendAttackSuccess( this.attackDef); - } - } - /* -------------------------------------------- */ static async processDamageHandling(event, attackId, defenseMode, weaponId=-1) { if ( !game.user.isGM) { @@ -188,7 +174,7 @@ export class BoLUtility { //console.log("Damage Handling", event, attackId, defenseMode, weaponId) // Only GM process this - let attackDef = this.attackStore[attackId]; + let attackDef = this.attackStore[attackId] if (attackDef) { if (attackDef.defenseDone) return; // ?? Why ??? attackDef.defenseDone = true @@ -389,9 +375,6 @@ export class BoLUtility { if (sockmsg.name == "msg_damage_handling") { BoLUtility.processDamageHandling(sockmsg.data.event, sockmsg.data.attackId, sockmsg.data.defenseMode) } - if (sockmsg.name == "msg_damage_increase") { - BoLUtility.processDamageIncrease(sockmsg.data.event, sockmsg.data.attackId, sockmsg.data.damageMode) - } } /* -------------------------------------------- */ diff --git a/module/system/templates.js b/module/system/templates.js index afea3a2..58872c9 100644 --- a/module/system/templates.js +++ b/module/system/templates.js @@ -32,6 +32,7 @@ export const preloadHandlebarsTemplates = async function () { "systems/bol/templates/item/parts/properties/feature/race-properties.hbs", // DIALOGS + "systems/bol/templates/chat/rolls/attack-damage-card.hbs", "systems/bol/templates/roll/parts/roll-dialog-modifiers.hbs", "systems/bol/templates/roll/parts/roll-dialog-attribute.hbs", "systems/bol/templates/dialogs/aptitude-roll-part.hbs", diff --git a/system.json b/system.json index c1b135e..622872a 100644 --- a/system.json +++ b/system.json @@ -7,7 +7,7 @@ "url": "https://github.com/ZigmundKreud/bol", "license": "LICENSE.txt", "flags": {}, - "version": "0.8.9.9", + "version": "0.9.0.0", "templateVersion": 16, "minimumCoreVersion": "0.8.6", "compatibleCoreVersion": "9", diff --git a/templates/chat/rolls/attack-damage-card.hbs b/templates/chat/rolls/attack-damage-card.hbs new file mode 100644 index 0000000..280e2ad --- /dev/null +++ b/templates/chat/rolls/attack-damage-card.hbs @@ -0,0 +1,7 @@ + + + + {{#if isCritical}} + + + {{/if}} diff --git a/templates/chat/rolls/attack-heroic-card.hbs b/templates/chat/rolls/attack-heroic-card.hbs deleted file mode 100644 index a950afc..0000000 --- a/templates/chat/rolls/attack-heroic-card.hbs +++ /dev/null @@ -1,6 +0,0 @@ -{{actor.name}} -Jet Héroïque ! - - - - diff --git a/templates/chat/rolls/damage-roll-card.hbs b/templates/chat/rolls/damage-roll-card.hbs index 4d6cb4c..66a90a2 100644 --- a/templates/chat/rolls/damage-roll-card.hbs +++ b/templates/chat/rolls/damage-roll-card.hbs @@ -1,7 +1,8 @@ {{weapon.name}} -

Dommages de l'arme : {{damage}} -{{!#if hasDescription}} - - - -{{!/if}} \ No newline at end of file +

Dommages de {{weapon.name}} : {{damageRoll.total}} + +{{#if target}} +
+ +
+{{/if}} diff --git a/templates/chat/rolls/default-roll-card.hbs b/templates/chat/rolls/default-roll-card.hbs index 88d98e7..388fe2b 100644 --- a/templates/chat/rolls/default-roll-card.hbs +++ b/templates/chat/rolls/default-roll-card.hbs @@ -16,11 +16,15 @@

{{description}}

-{{#if reroll}} -Relancer! -{{/if}} -{{!#if hasDescription}} - - - -{{!/if}} \ No newline at end of file +
+ {{#if (and isSuccess weapon)}} + {{> "systems/bol/templates/chat/rolls/attack-damage-card.hbs"}} + {{/if}} + + {{#if reroll}} + + {{/if}} + {{#if isRealCritical}} + + {{/if}} +
\ No newline at end of file -- 2.35.3