` }, messageOptions); - roll.toMessage(messageData, { rollMode, create: true }); + init.roll.toMessage(messageData, { rollMode, create: true }); RdDCombatManager.processPremierRoundInit(); } @@ -159,16 +161,11 @@ export class RdDCombatManager extends Combat { if (actions.length > 0) { const action = actions[0] const init = RdDCombatManager.getInitData(actor, action) - const ajustement = RdDCombatManager.calculAjustementInit(actor, action) - return RdDCombatManager.formuleInitiative(init.offset, init.carac, init.niveau, ajustement); + const ajustement = RdDCombatManager.bonusArme(action.arme) + RdDCombatManager.etatGeneral(actor) + return RdDInitiative.formule(init.phase, init.carac, init.niveau, ajustement); } - let ajustement = RdDCombatManager.calculAjustementInit(actor, undefined); - return RdDCombatManager.formuleInitiative(2, 10, 0, ajustement); - } - - static formuleInitiative(rang, carac, niveau, bonusMalus) { - return `${rang} +( (${RdDInitiative.calculInitiative(niveau, carac, bonusMalus)} )/100)`; + return RdDInitiative.formule(MAP_PHASE['autre'], 10, 0, actor.getEtatGeneral() ?? 0); } /* -------------------------------------------- */ @@ -180,7 +177,6 @@ export class RdDCombatManager extends Combat { for (let combatant of game.combat.combatants) { if (combatant.initiativeData?.arme?.type == "arme") { // TODO: get init data premier round - const initiativeData = combatant.initiativeData; const action = combatant.initiativeData.arme; const fromArme = Grammar.toLowerCaseNoAccentNoSpace(action.system.initpremierround) const initData = premierRoundInit.find(it => fromArme.includes(initData.pattern)) @@ -200,10 +196,27 @@ export class RdDCombatManager extends Combat { } /* -------------------------------------------- */ - static incDecInit(combatantId, incDecValue) { - const combatant = game.combat.combatants.get(combatantId); - let initValue = combatant.initiative + incDecValue; - game.combat.setInitiative(combatantId, initValue); + + static applyInitiativeCommand(combatantId, command, commandValue) { + switch (command) { + case 'delta': return RdDCombatManager.incDecInit(combatantId, commandValue); + case 'autre': return RdDCombatManager.rollInitiativeAction(combatantId, + { name: "Autre action", action: 'autre', system: { initOnly: true, competence: "Autre action" } }); + } + } + + static async incDecInit(combatantId, incDecValue) { + const combatant = game.combat.combatants.get(combatantId) + if (combatant?.initiative && incDecValue != 0) { + const value = combatant.system.init.value + incDecValue + const newInit = combatant.initiative + incDecValue / 100; + await game.combat.updateEmbeddedDocuments("Combatant", [{ + _id: combatantId, + initiative: newInit, + 'system.init.value': value, + 'system.init.init': newInit, + }]) + } } /* -------------------------------------------- */ @@ -220,56 +233,42 @@ export class RdDCombatManager extends Combat { } } options = [ - { name: "Incrémenter initiative", condition: true, icon: '', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), +0.01); } }, - { name: "Décrémenter initiative", condition: true, icon: '', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), -0.01); } } + { name: "Incrémenter initiative", condition: true, icon: '', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), +1); } }, + { name: "Décrémenter initiative", condition: true, icon: '', callback: target => { RdDCombatManager.incDecInit(target.data('combatant-id'), -1); } } ].concat(options); } + /* -------------------------------------------- */ static async rollInitiativeAction(combatantId, action) { const combatant = game.combat.combatants.get(combatantId) const actor = RdDCombatManager.getActorCombatant(combatant) - if (actor == undefined) { return [] } - combatant.initiativeData = { arme: action } // pour reclasser l'init au round 0 + if (actor == undefined) { return } const init = RdDCombatManager.getInitData(actor, action) - const ajustement = RdDCombatManager.calculAjustementInit(actor, action.arme) - const rollFormula = RdDCombatManager.formuleInitiative(init.offset, init.carac, init.niveau, ajustement); + const ajustement = RdDCombatManager.bonusArme(actor, action.arme) + RdDCombatManager.etatGeneral(actor) + const formule = RdDInitiative.formule(init.phase, init.carac, init.niveau, ajustement); - await game.combat.rollInitRdD(combatantId, rollFormula, init); - combatant.initiativeData + await game.combat.rollInitRdD(combatantId, formule, init); + combatant.initiativeData = { action, formule } // pour reclasser l'init au round 0 } static getInitData(actor, action) { - if (actor.getSurprise() == "totale") { return { offset: -1, info: "Surprise Totale", carac: 0, niveau: 0 } } - if (actor.getSurprise() == "demi") { return { offset: 0, info: "Demi Surprise", carac: 0, niveau: 0 } } - if (action.action == 'autre') { return { offset: 2, info: "Autre Action", carac: 0, niveau: 0 } } - if (action.action == 'possession') { return { offset: 10, info: "Possession", carac: actor.getReveActuel(), niveau: 0 } } - if (action.action == 'haut-reve') { return { offset: 9, info: "Draconic", carac: actor.getReveActuel(), niveau: 0 } } + if (actor.getSurprise() == "totale") { return { phase: MAP_PHASE['totale'], info: "Surprise Totale", carac: 0, niveau: 0 } } + if (actor.getSurprise() == "demi") { return { phase: MAP_PHASE['demi'], info: "Demi Surprise", carac: 0, niveau: 0 } } + if (action.action == 'autre') { return { phase: MAP_PHASE['autre'], info: "Autre Action", carac: 0, niveau: 0 } } + if (action.action == 'possession') { return { phase: MAP_PHASE['possession'], info: "Possession", carac: actor.getReveActuel(), niveau: 0 } } + if (action.action == 'haut-reve') { return { phase: MAP_PHASE['draconic'], info: "Draconic", carac: actor.getReveActuel(), niveau: 0 } } const comp = action.comp return { - offset: RdDCombatManager.initOffset(comp?.system.categorie, action.arme), + phase: RdDInitiative.phaseArme(comp?.system.categorie, action.arme), info: action.name + " / " + comp.name, carac: actor.getCaracInit(comp), niveau: comp?.system.niveau ?? (['(lancer)', '(tir)'].includes(action.main) ? -8 : -6) } } - static initOffset(categorie, arme) { - switch (categorie) { - case "tir": return 8 - case "lancer": return 7 - default: - switch (arme.system.cac) { - case "empoignade": return 3 - case "pugilat": return 4 - case "naturelle": return 4 - default: return 5 - } - } - } - /* -------------------------------------------- */ static displayInitiativeMenu(html, combatantId) { const combatant = game.combat.combatants.get(combatantId) @@ -297,13 +296,8 @@ export class RdDCombatManager extends Combat { ? possessions : actor.listActions({ isEquipe: true }) - for (let index = 0; index < actions.length; index++) { - actions[index].index = index - } - return actions + return Misc.indexed(actions) } - - } /* -------------------------------------------- */ @@ -383,8 +377,13 @@ export class RdDCombat { let defenderToken = canvas.tokens.get(msg.defenderToken.id) if (defenderToken && Misc.isFirstConnectedGM()) { const rddCombat = RdDCombat.rddCombatForAttackerAndDefender(msg.attackerId, msg.attackerToken.id, msg.defenderToken.id) - rddCombat?.removeChatMessageActionsPasseArme(msg.defenderRoll.passeArme) - rddCombat?._chatMessageDefense(msg.paramChatDefense, msg.defenderRoll) + rddCombat?.removeChatMessageActionsPasseArme(msg.paramChatDefense.attackerRoll.passeArme) + if (msg.defenderRoll.ids) {/* TODO: delete roll V1 */ + RollDialog.loadRollData(msg.paramChatDefense) + rddCombat?._chatMessageDefenseV2(msg.paramChatDefense) + } else { + rddCombat?._chatMessageDefense(msg.paramChatDefense, msg.defenderRoll) + } } } @@ -464,8 +463,8 @@ export class RdDCombat { /* -------------------------------------------- */ async onEvent(button, event) { const chatMessage = ChatUtility.getChatMessage(event); - const defenderRoll = ChatUtility.getMessageData(chatMessage, 'defender-roll'); - const attackerRoll = defenderRoll?.attackerRoll ?? ChatUtility.getMessageData(chatMessage, 'attacker-roll'); + const defenderRoll = ChatUtility.getMessageData(chatMessage, 'rollData'); + const attackerRoll = defenderRoll?.attackerRoll ?? ChatUtility.getMessageData(chatMessage, 'rollData'); console.log('RdDCombat', attackerRoll, defenderRoll); const armeParadeId = event.currentTarget.attributes['data-armeid']?.value; @@ -665,6 +664,92 @@ export class RdDCombat { return { msg: "à déterminer (0 immobile, -3 actif, -4 en mouvement, -5 en zig-zag)", diff: -3 }; } + + async attaqueV2() { + if (!await this.attacker.accorder(this.defender, 'avant-attaque')) { + return + } + await this.doRollAttaque({ + ids: { + actorId: this.attackerId, + actorTokenId: this.attackerTokenId, + opponentId: this.defender.id, + opponentTokenId: this.defenderTokenId, + }, + type: { allowed: ['attaque'], current: 'attaque' }, + passeArme: foundry.utils.randomID(16), + }) + } + + async doRollAttaque(rollData, callbacks = []) { + // TODO V2 await this.proposerAjustementTirLancer(rollData) + await RollDialog.create(rollData, { + onRollDone: (dialog) => { + if (!OptionsAvancees.isUsing(ROLL_DIALOG_V2_TEST)) + dialog.close() + }, + customChatMessage: true, + callbacks: [ + async (roll) => await this.onAttaqueV2(roll), + ...callbacks + ] + }) + } + + async onAttaqueV2(attackerRoll) { + if (!this.defender || !attackerRoll.rolled.isSuccess || attackerRoll.particulieres?.length > 1) { + return + } + if (!await this.attacker.accorder(this.defender, 'avant-defense')) { + return; + } + + RollDialog.loadRollData(attackerRoll) + + const surpriseDefender = this.defender.getSurprise(true); + const paramChatDefense = { + attackerRoll: attackerRoll, + isPossession: this.isPossession(attackerRoll), + defender: this.defender, + attacker: this.attacker, + attackerId: this.attackerId, + attackerToken: this.attackerToken, + defenderToken: this.defenderToken, + surprise: surpriseDefender, + } + + if (Misc.isFirstConnectedGM()) { + await this._chatMessageDefenseV2(paramChatDefense); + } + else { + this._socketSendMessageDefense(paramChatDefense, {}); + } + } + async _chatMessageDefenseV2(paramDemandeDefense) { + const attackerRoll = paramDemandeDefense.attackerRoll; + RollBasicParts.loadSurprises(attackerRoll) + attackerRoll.passeArme = attackerRoll.passeArme ?? foundry.utils.randomID(16) + attackerRoll.dmg = RdDBonus.dmgRollV2(attackerRoll, attackerRoll.current.attaque) + // attackerRoll.current.attaque.dmg = attackerRoll.dmg + // attaque.dmg = attackerRoll.current.attaque.dmg + const attaque = RollDialog.saveParts(attackerRoll) + const defense = { + attackerRoll: attaque, + ids: RollBasicParts.reverseIds(attaque), + passeArme: attaque.passeArme ?? foundry.utils.randomID(16) + } + + const choixDefense = await ChatMessage.create({ + // message privé: du défenseur à lui même (et aux GMs) + speaker: ChatMessage.getSpeaker(this.defender, canvas.tokens.get(this.defenderTokenId)), + alias: this.attacker?.getAlias(), + whisper: ChatUtility.getOwners(this.defender), + content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-defense.hbs', attackerRoll) + }); + // flag pour garder les jets d'attaque/defense + ChatUtility.setMessageData(choixDefense, 'rollData', defense) + } + /* -------------------------------------------- */ async attaque(competence, arme) { if (!await this.attacker.accorder(this.defender, 'avant-attaque')) { @@ -725,7 +810,7 @@ export class RdDCombat { // sans armes: à mains nues rollData.arme = RdDItemArme.corpsACorps(this.attacker) rollData.arme.system.niveau = competence.system.niveau - rollData.arme.system.initiative = RdDInitiative.calculInitiative(competence.system.niveau, this.attacker.system.carac['melee'].value); + rollData.arme.system.initiative = RdDInitiative.getRollInitiative(this.attacker.system.carac['melee'].value, competence.system.niveau); } return rollData; } @@ -776,7 +861,7 @@ export class RdDCombat { passeArme: rollData.passeArme }) }); - ChatUtility.setMessageData(choixParticuliere, 'attacker-roll', rollData); + ChatUtility.setMessageData(choixParticuliere, 'rollData', rollData); } /* -------------------------------------------- */ @@ -852,10 +937,10 @@ export class RdDCombat { speaker: ChatMessage.getSpeaker(this.defender, canvas.tokens.get(this.defenderTokenId)), alias: this.attacker?.getAlias(), whisper: ChatUtility.getOwners(this.defender), - content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-defense.hbs', paramDemandeDefense), + content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-demande-defense-v1.hbs', paramDemandeDefense), }); // flag pour garder les jets d'attaque/defense - ChatUtility.setMessageData(choixDefense, 'defender-roll', defenderRoll); + ChatUtility.setMessageData(choixDefense, 'rollData', defenderRoll); } /* -------------------------------------------- */ @@ -869,7 +954,7 @@ export class RdDCombat { defenderToken: this.defenderToken, defenderRoll: defenderRoll, paramChatDefense: paramChatDefense, - rollMode: true + rollMode: true, } }); } @@ -906,7 +991,7 @@ export class RdDCombat { essais: attackerRoll.essais }) }); - ChatUtility.setMessageData(choixEchecTotal, 'attacker-roll', attackerRoll); + ChatUtility.setMessageData(choixEchecTotal, 'rollData', attackerRoll); } /* -------------------------------------------- */ @@ -968,6 +1053,7 @@ export class RdDCombat { async defenseV2(attackerRoll) { // this._prepareParade(attackerRoll, arme, competence); + RollDialog.loadRollData(attackerRoll) await this.doRollDefense({ ids: { actorId: this.defender.id, @@ -1034,22 +1120,17 @@ export class RdDCombat { if (RdDCombat.isReussite(rollData)) { if (isParade) { await this.computeDeteriorationArme(rollData) + if (RdDCombat.isParticuliere(rollData)) { + await this.infoAttaquantDesarme(rollData) + } } - if (RdDCombat.isParticuliere(rollData)) { - await this._onDefenseParticuliere(rollData, isEsquive) - } } this.removeChatMessageActionsPasseArme(rollData.passeArme) } - async _onDefenseParticuliere(rollData, isEsquive) { - if (isEsquive) { - ChatUtility.createChatWithRollMode( - { content: "Vous pouvez esquiver une deuxième fois!" }, - this.defender) - } - else if (/*TODO: parade?*/!rollData.attackerRoll?.particuliere) { + async infoAttaquantDesarme(rollData) { + if (/*TODO: parade?*/!rollData.attackerRoll?.particuliere) { // TODO: attaquant doit jouer résistance et peut être désarmé p132 ChatUtility.createChatWithRollMode( { content: `(à gérer) L'attaquant doit jouer résistance et peut être désarmé (p132)` }, diff --git a/module/rdd-resolution-table.js b/module/rdd-resolution-table.js index 896b41b0..18c7545f 100644 --- a/module/rdd-resolution-table.js +++ b/module/rdd-resolution-table.js @@ -67,9 +67,9 @@ export class RdDResolutionTable { } /* -------------------------------------------- */ - static _computeCell(niveau, percentage) { + static _computeCell(level, percentage) { return { - niveau: niveau, + level: level, score: percentage, norm: Math.min(99, percentage), sign: this._reussiteSignificative(percentage), @@ -189,7 +189,7 @@ export class RdDResolutionTable { static computeReussite(chances, roll, diviseur) { const reussite = reussites.find(x => x.condition(chances, roll)) if (diviseur > 1 && reussite.isSuccess) { - if (chances > roll * diviseur) { + if (chances.norm < roll * diviseur) { return reussiteInsuffisante } } diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js index d6c77a4a..fbc88b7f 100644 --- a/module/rdd-tmr-dialog.js +++ b/module/rdd-tmr-dialog.js @@ -1,5 +1,5 @@ import { renderTemplate, SHOW_DICE, SYSTEM_RDD } from "./constants.js"; -import { RollDataAjustements } from "./rolldata-ajustements.js"; +import { RollDataAjustements } from "./rolldata-ajustements-v1.js"; import { RdDUtility } from "./rdd-utility.js"; import { COORD_TMR_INCONNU, TMRUtility } from "./tmr-utility.js"; import { RdDResolutionTable } from "./rdd-resolution-table.js"; diff --git a/module/rdd-token-hud.js b/module/rdd-token-hud.js index 9fa182b3..f9612726 100644 --- a/module/rdd-token-hud.js +++ b/module/rdd-token-hud.js @@ -1,7 +1,9 @@ /* -------------------------------------------- */ import { renderTemplate } from "./constants.js"; import { HtmlUtility } from "./html-utility.js"; +import { Misc } from "./misc.js"; import { RdDCombatManager } from "./rdd-combat.js"; +import { OptionsAvancees, ROLL_DIALOG_V2 } from "./settings/options-avancees.js"; import { Targets } from "./targets.js"; /* -------------------------------------------- */ @@ -31,43 +33,86 @@ export class RdDTokenHud { const combatant = game.combat.combatants.find(c => c.tokenId == tokenId) const actor = RdDCombatManager.getActorCombatant(combatant, { warning: false }) if (actor) { - const actions = RdDCombatManager.listActionsActorCombatant(actor) - // initiative - await RdDTokenHud.addExtensionHudInit(html, combatant, actions) - // combat - await RdDTokenHud.addExtensionHudCombat(html, combatant, token, actions.filter(it => !it.initOnly)) + if (OptionsAvancees.isUsing(ROLL_DIALOG_V2)) { + await RdDTokenHud.addExtensionHudCombat(html, combatant, actor, token) + } + else { + const actions = RdDCombatManager.listActionsActorCombatant(actor) + // initiative + await RdDTokenHud.addExtensionHudInit(html, combatant, actions) + // combat + await RdDTokenHud.addExtensionHudAttaques(html, combatant, token, actions.filter(it => !it.initOnly)) + } } } + } + static async addExtensionHudCombat(html, combatant, actor, token) { + const actionsActor = actor.listActionsCombat(); + const ajustements = combatant?.initiative ? + [ + { label: 'Initiative +1', action: 'delta', value: 1 }, + { label: 'Initiative -1', action: 'delta', value: -1 } + ] : [] + const autres = [{ label: "Autre action", action: 'autre' }] + const actions = Misc.indexed(actionsActor.concat(ajustements).concat(autres)) + const hudData = { combatant, token, actions }; + const hud = $(await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/hud-actor-combat.hbs', hudData)) + $(html).find('div.col.left').append(hud) + + const list = hud.find('div.rdd-hud-list') + RdDTokenHud.setupHudToggle(hud, list) + + const selectInitiative = list.find('select[name="initiative"]'); + selectInitiative.change(event => { + const action = actions.find(it => it.index == event.currentTarget.value) + console.log('select initiative', combatant.id, action) + if (action) { + switch (action.action) { + case 'delta': + RdDCombatManager.incDecInit(combatant.id, action.value); + break + case 'autre': + RdDCombatManager.rollInitiativeAction(combatant.id, + { label: "Autre action", action: 'autre', system: { initOnly: true, competence: "Autre action" } }); + break + default: + RdDCombatManager.rollInitiativeAction(combatant.id, action) + } + selectInitiative.select("") + } + }) + list.find('.rdd-attaque-v2').click(event => combatant.actor.rollAttaque(token)) } static async addExtensionHudInit(html, combatant, actions) { const hudData = { combatant, actions, commandes: [ - { name: "Autre action", command: 'autre' }, - { name: 'Initiative +1', command: 'inc', value: 0.01 }, - { name: 'Initiative -1', command: 'dec', value: -0.01 }] + { label: "Autre action", command: 'autre' }, + { label: 'Initiative +1', command: 'delta', value: 1 }, + { label: 'Initiative -1', command: 'deltac', value: -1 }] }; const controlIconCombat = $(html).find('.control-icon[data-action=combat]'); await RdDTokenHud._configureSubMenu(it => controlIconCombat.after(it), 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-init.hbs', hudData, (event) => { - let initCommand = event.currentTarget.attributes['data-command']?.value; - let combatantId = event.currentTarget.attributes['data-combatant-id']?.value; + let initCommand = event.currentTarget.attributes['data-command']?.value + let initCommandValue = Number(event.currentTarget.attributes['data-command-value']?.value ?? 0) + let combatantId = event.currentTarget.attributes['data-combatant-id']?.value if (initCommand) { - RdDTokenHud._initiativeCommand(initCommand, combatantId); + RdDCombatManager.applyInitiativeCommand(combatantId, initCommand, initCommandValue) } else { - let index = event.currentTarget.attributes['data-action-index'].value; - let action = hudData.actions[index]; - RdDCombatManager.rollInitiativeAction(combatantId, action); + let index = event.currentTarget.attributes['data-action-index'].value + let action = hudData.actions[index] + RdDCombatManager.rollInitiativeAction(combatantId, action) } - }); + }) } - static async addExtensionHudCombat(html, combatant, token, actions) { + static async addExtensionHudAttaques(html, combatant, token, actions) { const hudData = { combatant, token, actions, commandes: [] }; const divColLeft = $(html).find('div.col.left'); @@ -104,15 +149,6 @@ export class RdDTokenHud { } } - static _initiativeCommand(initCommand, combatantId) { - switch (initCommand) { - case 'inc': return RdDCombatManager.incDecInit(combatantId, 0.01); - case 'dec': return RdDCombatManager.incDecInit(combatantId, -0.01); - case 'autre': return RdDCombatManager.rollInitiativeAction(combatantId, - { name: "Autre action", action: 'autre', system: { initOnly: true, competence: "Autre action" } }); - } - } - /* -------------------------------------------- */ static async addTokenHudExtensions(app, html, tokenId) { console.log(`Adding token HUD extensions for token ${tokenId}`); @@ -132,20 +168,24 @@ export class RdDTokenHud { } /* -------------------------------------------- */ - static async _configureSubMenu(insertMethod, template, hudData, onMenuItem) { + static async _configureSubMenu(callInsertion, template, hudData, onMenuItem) { const hud = $(await renderTemplate(template, hudData)); const list = hud.find('div.rdd-hud-list'); - RdDTokenHud._toggleHudListActive(hud, list); + RdDTokenHud.setupHudToggle(hud, list) - hud.find('img.rdd-hud-togglebutton').click(event => RdDTokenHud._toggleHudListActive(hud, list)); list.find('.rdd-hud-menu').click(onMenuItem); - insertMethod(hud); + callInsertion(hud); } - static _toggleHudListActive(hud, list) { - hud.toggleClass('active'); - HtmlUtility.showControlWhen(list, hud.hasClass('active')); + static setupHudToggle(hud, list) { + function toggleHudList(hud, list) { + hud.toggleClass('active') + HtmlUtility.showControlWhen(list, hud.hasClass('active')) + } + toggleHudList(hud, list) + $(hud).find('img.rdd-hud-togglebutton').click(event => toggleHudList(hud, list)) } + } \ No newline at end of file diff --git a/module/roll/chat-roll-result.mjs b/module/roll/chat-roll-result.mjs index e30f1e72..8ac1c26b 100644 --- a/module/roll/chat-roll-result.mjs +++ b/module/roll/chat-roll-result.mjs @@ -16,10 +16,11 @@ export default class ChatRollResult { static onReady() { foundry.applications.handlebars.loadTemplates({ 'partial-appel-chance': 'systems/foundryvtt-reve-de-dragon/templates/roll/result/partial-appel-chance.hbs', + 'partial-attaque-particuliere': 'systems/foundryvtt-reve-de-dragon/templates/roll/result/partial-attaque-particuliere.hbs', 'partial-encaissement': 'systems/foundryvtt-reve-de-dragon/templates/roll/result/partial-encaissement.hbs', 'partial-recul-choc': 'systems/foundryvtt-reve-de-dragon/templates/roll/result/partial-recul-choc.hbs', 'partial-info-appel-moral': 'systems/foundryvtt-reve-de-dragon/templates/roll/result/partial-info-appel-moral.hbs', - }) + }) } async display(roll) { @@ -38,12 +39,12 @@ export default class ChatRollResult { } prepareDisplay(roll) { - roll.done = roll.done || {} - roll.show = roll.show || {} + roll.done = roll.done ?? {} + roll.show = roll.show ?? {} roll.show.chance = this.isAppelChancePossible(roll) roll.show.encaissement = this.isShowEncaissement(roll) - roll.show.recul = this.getReculChoc(roll) - + roll.show.recul = this.getRecul(roll) + roll.show.particuliere = roll.show.particuliere ?? [] } isAppelChancePossible(roll) { @@ -57,20 +58,36 @@ export default class ChatRollResult { roll.attackerRoll?.dmg.mortalite != 'empoignade' } - getReculChoc(roll, defender = roll.active.actor, attacker = roll.opponent.actor) { - const attaque = roll.attackerRoll - if (attaque && - (roll.rolled.isEchec || !roll.current.defense.isEsquive) && - (attaque.particuliere == 'force' || 'charge' == attaque.tactique?.key)) { - const taille = defender.system.carac.taille.value - const impact = attacker.system.carac.force.value + roll.attackerRoll?.dmg.dmgArme - return { - raison: 'charge' == attaque.tactique?.key ? 'charge' : 'particulière en force', - taille: taille, - impact: impact, - chances: RdDResolutionTable.computeChances(10, taille-impact).norm, - diff: taille - impact - } + + getRecul(roll, defender = roll.active.actor, attacker = roll.opponent.actor) { + switch (roll.type.current) { + case ROLL_TYPE_DEFENSE: + { + const attaque = roll.attackerRoll + if (attaque && + (roll.rolled.isEchec || !roll.current.defense.isEsquive) && + (attaque.particuliere == 'force' || 'charge' == attaque.tactique?.key)) { + const taille = defender.system.carac.taille.value + const impact = attacker.system.carac.force.value + roll.attackerRoll?.dmg.dmgArme + return { + raison: 'charge' == attaque.tactique?.key ? 'charge' : 'particulière en force', + taille: taille, + impact: impact, + chances: RdDResolutionTable.computeChances(10, taille - impact).norm, + diff: taille - impact + } + } + break + } + case ROLL_TYPE_ATTAQUE: + { + const attaque = roll + if (attaque.particuliere == 'force' || 'charge' == attaque.tactique?.key) { + return { + raison: 'charge' == attaque.tactique?.key ? 'charge' : 'particulière en force', + } + } + } } return undefined } @@ -85,6 +102,7 @@ export default class ChatRollResult { $(html).on("click", '.appel-destinee', event => this.onClickAppelDestinee(event)) $(html).on("click", '.encaissement', event => this.onClickEncaissement(event)) $(html).on("click", '.resister-recul', event => this.onClickRecul(event)) + $(html).on("click", '.choix-particuliere', event => this.onClickChoixParticuliere(event)) } @@ -178,4 +196,13 @@ export default class ChatRollResult { await this.updateChatMessage(chatMessage, savedRoll) } + async onClickChoixParticuliere(event) { + const choix = event.currentTarget.attributes['data-particuliere'].value + const chatMessage = ChatUtility.getChatMessage(event) + const savedRoll = ChatUtility.getMessageData(chatMessage, 'rollData') + savedRoll.particuliere = choix + savedRoll.particulieres = [RDD_CONFIG.particuliere[choix]] + await this.updateChatMessage(chatMessage, savedRoll) + await this.getCombat(savedRoll)?.onAttaqueV2(savedRoll, callbacks) + } } \ No newline at end of file diff --git a/module/roll/roll-basic-parts.mjs b/module/roll/roll-basic-parts.mjs index 3a1c5746..8a6fc14d 100644 --- a/module/roll/roll-basic-parts.mjs +++ b/module/roll/roll-basic-parts.mjs @@ -4,9 +4,10 @@ import { ROLL_TYPE_ATTAQUE, ROLL_TYPE_DEFENSE } from "./roll-constants.mjs" import { PART_ATTAQUE } from "./roll-part-attaque.mjs" import { PART_DEFENSE } from "./roll-part-defense.mjs" + export class RollBasicParts { - restore(rollData) { + static restore(rollData) { rollData.ids.sceneId = rollData.ids.sceneId ?? canvas.scene.id rollData.active = RollBasicParts.$getActor(rollData) rollData.opponent = RollBasicParts.$getOpponent(rollData) @@ -15,14 +16,14 @@ export class RollBasicParts { } } - loadSurprises(rollData, type) { + static loadSurprises(rollData, type = rollData.type.current) { if (!rollData.type.passif) { - this.loadSurprise(rollData.active, this.getForceRequiseActiveActor(rollData, type)) - this.loadSurprise(rollData.opponent, 0) + RollBasicParts.loadSurprise(rollData.active, RollBasicParts.getForceRequiseActiveActor(rollData, type)) + RollBasicParts.loadSurprise(rollData.opponent, 0) } } - loadSurprise(who, forceRequise) { + static loadSurprise(who, forceRequise) { if (who?.actor) { foundry.utils.mergeObject(who, StatusEffects.getActorEffetSurprise(who.actor, forceRequise), @@ -30,15 +31,15 @@ export class RollBasicParts { } } - getForceRequiseActiveActor(rollData, type) { + static getForceRequiseActiveActor(rollData, type) { switch (type) { - case ROLL_TYPE_ATTAQUE: return rollData.current[PART_ATTAQUE].attaque.forceRequise + case ROLL_TYPE_ATTAQUE: return rollData.current[PART_ATTAQUE].forceRequise case ROLL_TYPE_DEFENSE: return rollData.current[PART_DEFENSE].forceRequise default: return 0 } } - initFrom(rollData) { + static initFrom(rollData) { return { selected: {}, type: rollData.type, @@ -52,6 +53,16 @@ export class RollBasicParts { } } + static reverseIds(rollData) { + return { + sceneId: rollData.ids.sceneId, + actorId: rollData.ids.opponentId, + actorTokenId: rollData.ids.opponentTokenId, + opponentId: rollData.ids.actorId, + opponentTokenId: rollData.actorTokenId + } + } + static $getActor(rollData) { if (rollData.ids.actorTokenId) { return ActorToken.fromTokenId(rollData.ids.actorTokenId, rollData.ids.sceneId) diff --git a/module/roll/roll-dialog-adapter.mjs b/module/roll/roll-dialog-adapter.mjs index 55beea84..ba3e432f 100644 --- a/module/roll/roll-dialog-adapter.mjs +++ b/module/roll/roll-dialog-adapter.mjs @@ -6,6 +6,10 @@ import { ReglesOptionnelles } from "../settings/regles-optionnelles.js"; import { PART_OEUVRE } from "./roll-part-oeuvre.mjs"; import { RdDItemArme } from "../item/arme.js"; import { RdDBonus } from "../rdd-bonus.js"; +import { ITEM_TYPES, RDD_CONFIG } from "../constants.js"; +import { CARACS } from "../rdd-carac.js"; +import { ROLL_TYPE_ATTAQUE } from "./roll-constants.mjs"; +import { PART_ATTAQUE } from "./roll-part-attaque.mjs"; /* -------------------------------------------- */ export class RollDialogAdapter { @@ -15,21 +19,21 @@ export class RollDialogAdapter { carac: rollData.current.carac.value, diff: rollData.current.totaldiff, bonus: rollData.current.bonus, - sign: rollData.current.sign, showDice: rollData.options.showDice, rollMode: rollData.current.rollmode.key }) const rolled = await RollDialogAdapter.rollChances(rollData, chances) - RollDialogAdapter.adjustRollDataForV1(rollData, rolled, rollTitle) + RollDialogAdapter.setRollDataRolled(rollData, rolled, rollTitle) + RollDialogAdapter.adjustRollDataForV1(rollData) + RollDialogAdapter.adjustAttaqueParticuliere(rollData) return rolled } - static computeChances({ carac, diff, bonus, sign, showDice, rollMode }) { + static computeChances({ carac, diff, bonus, showDice, rollMode }) { const chances = foundry.utils.duplicate(RdDResolutionTable.computeChances(carac, diff)) RdDResolutionTable._updateChancesWithBonus(chances, bonus, diff) - RdDResolutionTable._updateChancesFactor(chances, sign) chances.showDice = showDice chances.rollMode = rollMode return chances @@ -37,7 +41,7 @@ export class RollDialogAdapter { static async rollChances(rollData, chances) { const rolled = await RdDResolutionTable.rollChances(chances, - rollData.current.sign, + rollData.current.sign.diviseur, rollData.current.resultat) rolled.caracValue = rollData.current.carac.value rolled.finalLevel = rollData.current.totaldiff @@ -46,13 +50,20 @@ export class RollDialogAdapter { return rolled } - static adjustRollDataForV1(rollData, rolled, rollTitle) { + static setRollDataRolled(rollData, rolled, rollTitle) { + rollData.rolled = rolled + rollData.choix = rollData.choix ?? {} + rollData.show = rollData.show ?? {} + rollData.show.title = rollTitle + } + + static adjustRollDataForV1(rollData) { + const rolled = rollData.rolled // temporaire pour être homogène roll v1 rollData.alias = rollData.active.actor.getAlias() // pour experience rollData.finalLevel = rollData.current.totaldiff if (rollData.use == undefined) { rollData.use = {} } - if (rollData.show == undefined) { rollData.show = {} } if (rollData.ajustements == undefined) { rollData.ajustements = {} } @@ -75,7 +86,6 @@ export class RollDialogAdapter { if (rollData.current[PART_APPELMORAL]?.checked) { rollData.use.moral = true } - rollData.rolled = rolled if (ReglesOptionnelles.isUsing("afficher-colonnes-reussite")) { rolled.niveauNecessaire = this.findNiveauNecessaire(carac, rolled.roll) rolled.ajustementNecessaire = rolled.niveauNecessaire - diff @@ -88,7 +98,39 @@ export class RollDialogAdapter { descr: aj.diff == undefined ? aj.label : undefined } }) - rollData.show.title = rollTitle + } + + static adjustAttaqueParticuliere(rollData) { + if (rollData.type.current != ROLL_TYPE_ATTAQUE || !rollData.rolled.isPart) { + return + } + + const attaque = rollData.current.attaque; + const choix = [] + const isEmpoignade = attaque.dmg.mortalite == 'empoignade'; + const isCharge = attaque.tactique == 'charge' + /* TODO: cas de créatures faisant des lancers, Glou, Glipzouk */ + const isMeleeDiffNegative = (attaque.comp.type == ITEM_TYPES.competencecreature || rollData.current.carac.key == CARACS.MELEE) + && rollData.current.diff.value < 0 + + // force toujours, sauf empoignade + if (!isEmpoignade) { + choix.push(RDD_CONFIG.particuliere.force) + } + + // finesse seulement en mélée, pour l'empoignade, ou si la difficulté libre est de -1 minimum + if (!isCharge && (isEmpoignade || isMeleeDiffNegative)) { + choix.push(RDD_CONFIG.particuliere.finesse) + } + + // rapidité seulement en mêlée, si l'arme le permet, et si la difficulté libre est de -1 minimum + if (!isCharge && !isEmpoignade && isMeleeDiffNegative && attaque.arme.system.rapide) { + choix.push(RDD_CONFIG.particuliere.rapidite) + } + if (choix.length == 1) { + rollData.particuliere = choix[0].key + } + rollData.particulieres = choix } static mapActionAttaque(attackerRoll) { @@ -99,17 +141,15 @@ export class RollDialogAdapter { return { // correspond à l'attaque de RollPartAttaque (dans rollDta.current.attaque) label: label, - attaque: { - // correspond aux actions d'attaques dans RdDActor.listActionsAttaque - name: label, - // action: 'attaque', - arme: attackerRoll.arme, - comp: attackerRoll.competence, - main: RdDItemArme.getMainAttaque(attackerRoll.competence), - equipe: attackerRoll.arme.system.equipe, - // carac: { key: caracCode, value: caracValue }, - // dommagesArme: dommagesArme, - }, + // correspond aux actions d'attaques dans RdDActor.listActionsAttaque + name: label, + // action: 'attaque', + arme: attackerRoll.arme, + comp: attackerRoll.competence, + main: RdDItemArme.getMainAttaque(attackerRoll.competence), + equipe: attackerRoll.arme.system.equipe, + // carac: { key: caracCode, value: caracValue }, + // dommagesArme: dommagesArme, diff: attackerRoll.diffLibre, particuliere: attackerRoll.particuliere, tactique: RdDBonus.find(attackerRoll.tactique), diff --git a/module/roll/roll-dialog.mjs b/module/roll/roll-dialog.mjs index 6a243ad9..b00c4dae 100644 --- a/module/roll/roll-dialog.mjs +++ b/module/roll/roll-dialog.mjs @@ -37,7 +37,7 @@ import { RollPartAttaque } from "./roll-part-attaque.mjs"; import { RollPartDefense } from "./roll-part-defense.mjs"; import { RollDialogAdapter } from "./roll-dialog-adapter.mjs"; import { ROLLDIALOG_SECTION } from "./roll-part.mjs"; -import { ROLL_TYPE_COMP } from "./roll-constants.mjs"; +import { ROLL_TYPE_ATTAQUE, ROLL_TYPE_COMP } from "./roll-constants.mjs"; import ChatRollResult from "./chat-roll-result.mjs"; import { renderTemplate } from "../constants.js"; @@ -58,8 +58,6 @@ const ALL_ROLL_TYPES = [ // new RollTypeFixedCarac ?? ] -const BASIC_PARTS = new RollBasicParts() - const ROLL_PARTS = [ new RollPartActor(), new RollPartAction(), @@ -257,7 +255,7 @@ export default class RollDialog extends HandlebarsApplicationMixin(ApplicationV2 rollData.selected = rollData.selected ?? {} rollData.type = rollData.type ?? {} rollData.type.retry = rollData.type.retry ?? false - BASIC_PARTS.restore(rollData) + RollBasicParts.restore(rollData) const potential = ALL_ROLL_TYPES.find(m => m.code == rollData.type.current)?.code const allowed = rollData.type.retry && potential @@ -283,13 +281,14 @@ export default class RollDialog extends HandlebarsApplicationMixin(ApplicationV2 } static saveParts(rollData) { - const target = BASIC_PARTS.initFrom(rollData) + const target = RollBasicParts.initFrom(rollData) ROLL_PARTS.filter(p => p.isActive(rollData)) .forEach(p => p.storeClean(rollData, target)) target.attackerRoll = rollData.attackerRoll target.rolled = rollData.rolled target.result = rollData.result - target.done = target.done ?? {} + target.done = rollData.done ?? {} + target.dmg = rollData.dmg return target } @@ -377,7 +376,7 @@ export default class RollDialog extends HandlebarsApplicationMixin(ApplicationV2 const types = ALL_ROLL_TYPES.filter(m => m.isAllowed(rollData) && m.visible(rollData)) .map(m => m.toTypeData(rollData)) - BASIC_PARTS.loadSurprises(rollData, this.getSelectedType().code) + RollBasicParts.loadSurprises(rollData, this.getSelectedType().code) rollData.type.label = this.getSelectedType()?.title(rollData) //TOCHECK: set type.label ? const visibleRollParts = RollDialog.getActiveParts(rollData) @@ -423,18 +422,17 @@ export default class RollDialog extends HandlebarsApplicationMixin(ApplicationV2 } async roll() { - // ROLL_PARTS.filter(p => p.isActive(this.rollData)) - // .forEach(p => p.validate(this.rollData)) const roll = RollDialog.saveParts(this.rollData) RollDialog.loadRollData(roll) roll.current.resultat = this.rollData.current[PART_TRICHER]?.resultat ?? -1 - roll.rolled = await this.$rollDice(roll) + roll.choix = {} + roll.rolled = await RollDialogAdapter.rollDice(roll, this.rollTitle(roll)) roll.result = this.getSelectedType(roll).getResult(roll) - console.info('RollDialog.roll:', roll) - await Promise.all(this.rollOptions.callbacks.map(async callback => await callback(roll))) - await this.chatRollResult.display(roll) + console.info('RollDialog.roll:', roll) + await this.chatRollResult.display(roll) + await Promise.all(this.rollOptions.callbacks.map(async callback => await callback(roll))) this.rollOptions.onRollDone(this) } @@ -444,12 +442,9 @@ export default class RollDialog extends HandlebarsApplicationMixin(ApplicationV2 roll.v2 = true } - async defaultCallback(rollData, rolled) { - await rollData.active.actor.appliquerAjoutExperience(rollData) - await rollData.active.actor.appliquerAppelMoral(rollData) + async defaultCallback(roll, rolled) { + await roll.active.actor.appliquerAjoutExperience(roll) + await roll.active.actor.appliquerAppelMoral(roll) } - async $rollDice(rollData) { - return await RollDialogAdapter.rollDice(rollData, this.rollTitle(rollData)) - } } diff --git a/module/roll/roll-part-attaque.mjs b/module/roll/roll-part-attaque.mjs index ca2f41e5..6b2bc4ad 100644 --- a/module/roll/roll-part-attaque.mjs +++ b/module/roll/roll-part-attaque.mjs @@ -1,5 +1,4 @@ import { RdDBonus } from "../rdd-bonus.js" -import { ReglesOptionnelles } from "../settings/regles-optionnelles.js" import { ROLL_TYPE_ATTAQUE } from "./roll-constants.mjs" import { PART_CARAC } from "./roll-part-carac.mjs" import { PART_COMP } from "./roll-part-comp.mjs" @@ -40,12 +39,12 @@ export class RollPartAttaque extends RollPartSelect { choices(refs) { return refs.attaques } static $extractAttaque(attaque, actor) { - return { - key: `${attaque.action}::${attaque.name}`, - label: attaque.name, - attaque: attaque, - tactique: TACTIQUES[0], - } + return foundry.utils.mergeObject({ + key: `${attaque.action}::${attaque.label}`, + tactique: TACTIQUES[0] + }, + attaque + ) } prepareContext(rollData) { @@ -100,8 +99,8 @@ export class RollPartAttaque extends RollPartSelect { if (this.visible(rollData)) { const current = this.getCurrent(rollData) switch (part.code) { - case PART_CARAC: return part.filterCaracs(rollData, [current.attaque.carac.key]) - case PART_COMP: return part.filterComps(rollData, [current.attaque.comp?.name]) + case PART_CARAC: return part.filterCaracs(rollData, [current.carac.key]) + case PART_COMP: return part.filterComps(rollData, [current.comp.name]) } } return undefined diff --git a/module/roll/roll-part-defense.mjs b/module/roll/roll-part-defense.mjs index 82d33c51..e03dcfb0 100644 --- a/module/roll/roll-part-defense.mjs +++ b/module/roll/roll-part-defense.mjs @@ -34,7 +34,7 @@ export class RollPartDefense extends RollPartSelect { .map(it => RollPartDefense.$extractEsquive(it, defenseur)) const parades = defenseur.items.filter(it => it.isParade() && (!refs.isDistance || it.isBouclier())) - .map(it => RollPartDefense.$extractParade(it, attackerRoll?.attaque.arme, defenseur)) + .map(it => RollPartDefense.$extractParade(it, attackerRoll?.arme, defenseur)) refs.defenses = [...esquives, ...parades].filter(it => it != undefined) this.$selectDefense(rollData) @@ -113,17 +113,16 @@ export class RollPartDefense extends RollPartSelect { isArmeDisparate(rollData) { const armeDefense = this.getCurrent(rollData).arme if (armeDefense) { - const armeAttaque = rollData.attackerRoll?.attaque.arme + const armeAttaque = rollData.attackerRoll?.arme return RdDItemArme.defenseArmeParade(armeAttaque, armeDefense) == 'sign' } return false } getDiffDefense(rollData) { - const current = this.getCurrent(rollData) const refs = this.getRefs(rollData) if (refs.isDistance || !rollData.attackerRoll) { - // Déterminer la difficulté de parade + // TODO: Déterminer la difficulté de parade return { diff: 0, type: DIFF.LIBRE } } else { diff --git a/module/roll/roll-type-attaque.mjs b/module/roll/roll-type-attaque.mjs index 0bf07924..f761e9be 100644 --- a/module/roll/roll-type-attaque.mjs +++ b/module/roll/roll-type-attaque.mjs @@ -1,4 +1,5 @@ import { DIFF, ROLL_TYPE_ATTAQUE } from "./roll-constants.mjs" +import { PART_ATTAQUE } from "./roll-part-attaque.mjs" import { RollType } from "./roll-type.mjs" export class RollTypeAttaque extends RollType { @@ -10,4 +11,5 @@ export class RollTypeAttaque extends RollType { onSelect(rollData) { this.setDiffType(rollData, DIFF.ATTAQUE) } + } \ No newline at end of file diff --git a/module/roll/roll-type.mjs b/module/roll/roll-type.mjs index ef7547bc..4b97f57a 100644 --- a/module/roll/roll-type.mjs +++ b/module/roll/roll-type.mjs @@ -11,7 +11,7 @@ export class RollType { get name() { return this.code } get icon() { return `systems/foundryvtt-reve-de-dragon/assets/actions/${this.code}.svg` } get chatResultTemplate() { return `systems/foundryvtt-reve-de-dragon/templates/roll/result/chat-${this.code}.hbs` } - + toTypeData(rollData) { return { code: this.code, name: this.name, icon: this.icon, section: 'type', template: this.template, selected: this.isSelected(rollData) } } @@ -33,11 +33,10 @@ export class RollType { this.typeFromOpponents(rollData), rollData.selected[PART_DIFF].type ] - const type = possibleTypes.find(m => DEFAULT_DIFF_TYPES.includes(m)) ??DIFF.DEFAUT + const type = possibleTypes.find(m => DEFAULT_DIFF_TYPES.includes(m)) ?? DIFF.DEFAUT this.setDiffType(rollData, type) } - typeFromOpponents(rollData) { if (rollData.type.opposed) { if (rollData.type.resistance) { @@ -53,7 +52,7 @@ export class RollType { this.setRollDataType(rollData) } - getResult(rollData){ + getResult(rollData) { return undefined } } diff --git a/templates/actor/combat.hbs b/templates/actor/combat.hbs index 235327dc..563fc29d 100644 --- a/templates/actor/combat.hbs +++ b/templates/actor/combat.hbs @@ -8,16 +8,16 @@ {{#each combat as |action key|}}
+ {{#if (eq surprise 'totale')}}
+ {{defenderToken.name}} est totalement surpris
+ {{else if essais.defense}}
+ {{defenderToken.name}} doit :
+ {{else}}
+ {{defenderToken.name}} doit se défendre
+ {{~#if (eq surprise 'demi')}} avec une significative {{/if}} d'une attaque
+ {{~#if attaqueParticuliere}} particulière en
+ {{~#if (eq attaqueParticuliere 'finesse')}} finesse
+ {{else if (eq attaqueParticuliere 'force')}} force
+ {{else if (eq attaqueParticuliere 'rapidite')}} rapidité
+ {{/if~}}
+ {{/if}} de {{attackerToken.name}} ({{attaqueArme.name}}):
+
+ {{/if}}
+
+
\ No newline at end of file
diff --git a/templates/chat-demande-defense.hbs b/templates/chat-demande-defense.hbs
index 718e86dc..75d544be 100644
--- a/templates/chat-demande-defense.hbs
+++ b/templates/chat-demande-defense.hbs
@@ -1,103 +1,59 @@
-
- {{#if (eq surprise 'totale')}}
- {{defenderToken.name}} est totalement surpris
- {{else if essais.defense}}
- {{defenderToken.name}} doit :
- {{else}}
- {{defenderToken.name}} doit se défendre
- {{~#if (eq surprise 'demi')}} avec une significative {{/if}} d'une attaque
- {{~#if attaqueParticuliere}} particulière en
- {{~#if (eq attaqueParticuliere 'finesse')}} finesse
- {{else if (eq attaqueParticuliere 'force')}} force
- {{else if (eq attaqueParticuliere 'rapidite')}} rapidité
- {{/if~}}
- {{/if}} de {{attackerToken.name}} ({{attaqueArme.name}}):
-
- {{/if}}
-
-
- {{#unless (eq surprise 'totale')}} - {{#if essais.defense}} - {{#unless essais.defenseChance}} - {{#if (eq defender.type 'personnage')}} - - Faire appel à la chance - -
- {{/if}} - {{#if (and (eq defender.type 'personnage') (gt defender.system.compteurs.destinee.value 0))}} - - Utiliser la destinée - -
- {{/if}} - {{/unless}} - {{else}} - {{#if (settings-get 'rdd-advanced-roll-dialog-v2')}} - +
\ No newline at end of file
diff --git a/templates/chat-infojet.hbs b/templates/chat-infojet.hbs
index 696c607d..bc94b4c1 100644
--- a/templates/chat-infojet.hbs
+++ b/templates/chat-infojet.hbs
@@ -1,13 +1,11 @@
+{{log rolled}}
- {{#unless (eq surprise 'totale')}} - {{#if essais.defense}} - {{#unless essais.defenseChance}} - {{#if (eq defender.type 'personnage')}} - - Faire appel à la chance - -
- {{/if}} - {{#if (and (eq defender.type 'personnage') (gt defender.system.compteurs.destinee.value 0))}} - - Utiliser la destinée - -
- {{/if}} - {{/unless}} - {{else}} - {{#if (settings-get 'rdd-advanced-roll-dialog-v2')}} - +
+ 
+
+
+
+
+
+ Défense de {{opponent.name}}
+
+ {{#if (eq opponent.surprise.key 'totale')}}
+ {{opponent.name}} est totalement surpris
+ {{else}}
+ {{opponent.name}} doit se défendre
+ {{~#if (eq opponent.surprise.key 'demi')}} avec une significative {{/if}} d'une attaque
+ {{~#if particuliere}} particulière en
+ {{~#if (eq particuliere 'finesse')}} finesse
+ {{else if (eq particuliere 'force')}} force
+ {{else if (eq particuliere 'rapidite')}} rapidité
+ {{/if~}}
+ {{/if}} de {{active.name}} ({{current.attaque.label}}):
+
+ {{/if}}
+
+
+
+
+
+
+ {{#unless (eq opponent.surprise.key 'totale')}}
+
+ 
Se défendre
{{#if (or (eq attaqueCategorie 'tir') (eq attaqueCategorie 'lancer'))}}
- (difficulté à déterminer)
+ (difficulté à déterminer)
{{else}}
- à {{diffLibre }}
+ à {{current.diff.value}}
{{/if}}
-
-
- {{else}} - {{#each armes as |arme key|}} - - Parer avec {{arme.name}} - {{#if (or (eq ../attaqueCategorie 'tir') (eq ../attaqueCategorie 'lancer'))}} - (difficulté à déterminer) - {{else}}à {{../diffLibre }} - {{/if}} - {{#if (eq arme.typeParade 'sign')}} - ×½ - {{/if}} - {{#if arme.nbUsage}}(Utilisations : {{arme.nbUsage}}){{/if}} - -
- {{/each}} - {{#if mainsNues}} - - Parer à mains nues à {{diffLibre}}{{#if arme.nbUsage}} (Utilisations : {{arme.nbUsage}}){{/if}} - -
- {{/if}} - {{#if (ne attaqueCategorie 'tir')}} - {{#each esquives as |esquive key|}} - - {{esquive.name}} - {{#if (or (eq ../attaqueCategorie 'tir') (eq ../attaqueCategorie 'lancer'))}} - (difficulté à déterminer) - {{else}}à {{../diffLibre }} - {{/if}} - {{#if esquive.nbUsage}}(Utilisations : {{esquive.nbUsage}}){{/if}} - -
- {{/each}} - {{/if}} - {{/if}} - {{/if}} - {{/unless}} - - Encaisser à {{plusMoins dmg.total}} - {{#if (eq dmg.mortalite 'non-mortel')~}} - (non-mortel) ! - {{/if}} - - + + {{/unless}} + {{#unless (eq dmg.mortalite 'empoignade')}} + +
+ Encaisser à {{plusMoins dmg.total}}
+ {{#if (eq dmg.mortalite 'non-mortel')~}}(non-mortel){{/if}}
+
+ {{/unless}}
+
+
+
Se défendre
{{#if (or (eq attaqueCategorie 'tir') (eq attaqueCategorie 'lancer'))}}
- (difficulté à déterminer)
+ (difficulté à déterminer)
{{else}}
- à {{diffLibre }}
+ à {{current.diff.value}}
{{/if}}
-
- - {{else}} - {{#each armes as |arme key|}} - - Parer avec {{arme.name}} - {{#if (or (eq ../attaqueCategorie 'tir') (eq ../attaqueCategorie 'lancer'))}} - (difficulté à déterminer) - {{else}}à {{../diffLibre }} - {{/if}} - {{#if (eq arme.typeParade 'sign')}} - ×½ - {{/if}} - {{#if arme.nbUsage}}(Utilisations : {{arme.nbUsage}}){{/if}} - -
- {{/each}} - {{#if mainsNues}} - - Parer à mains nues à {{diffLibre}}{{#if arme.nbUsage}} (Utilisations : {{arme.nbUsage}}){{/if}} - -
- {{/if}} - {{#if (ne attaqueCategorie 'tir')}} - {{#each esquives as |esquive key|}} - - {{esquive.name}} - {{#if (or (eq ../attaqueCategorie 'tir') (eq ../attaqueCategorie 'lancer'))}} - (difficulté à déterminer) - {{else}}à {{../diffLibre }} - {{/if}} - {{#if esquive.nbUsage}}(Utilisations : {{esquive.nbUsage}}){{/if}} - -
- {{/each}} - {{/if}} - {{/if}} - {{/if}} - {{/unless}} - - Encaisser à {{plusMoins dmg.total}} - {{#if (eq dmg.mortalite 'non-mortel')~}} - (non-mortel) ! - {{/if}} - - + + {{/unless}} + {{#unless (eq dmg.mortalite 'empoignade')}} + +
+ Encaisser à {{plusMoins dmg.total}}
+ {{#if (eq dmg.mortalite 'non-mortel')~}}(non-mortel){{/if}}
+
+ {{/unless}}
+
{{rolled.caracValue}} à {{plusMoins rolled.finalLevel}}
- {{#if (and rolled.factorHtml (gt rolled.factorHtml 1))}}
- ×{{{rolled.factorHtml}}}
- = {{rolled.score}}%
- ×{{{rolled.factorHtml}}}
- {{else}}
= {{rolled.score}}%
+ {{#if (and rolled.factorHtml (ne rolled.factorHtml 1))}}
+ ×{{{rolled.factorHtml}}}
{{/if}}
+
diff --git a/templates/roll/result/partial-attaque-particuliere.hbs b/templates/roll/result/partial-attaque-particuliere.hbs
new file mode 100644
index 00000000..6a72b10f
--- /dev/null
+++ b/templates/roll/result/partial-attaque-particuliere.hbs
@@ -0,0 +1,16 @@
+{{#if particulieres.length}}
+ {{#if (eq particulieres.length 1)}}
+ {{#each particulieres as |part|}}
+
+ 
Attaque particulière {{part.descr}}
+
+ {{/each}}
+ {{else}}
+ {{#each particulieres as |part|}}
+
+ Choisir une particulière {{part.descr}}
+
+ {{/each}}
+ {{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/templates/roll/roll-part-attaque.hbs b/templates/roll/roll-part-attaque.hbs
index a9a90974..28b6e7dd 100644
--- a/templates/roll/roll-part-attaque.hbs
+++ b/templates/roll/roll-part-attaque.hbs
@@ -4,8 +4,8 @@
- {{#if current.attaque.arme}}
- 
+ {{#if current.arme}}
+ 
{{/if}}
@@ -16,10 +16,10 @@
- {{#if (eq current.attaque.arme.system.mortalite 'empoignade')}}
+ {{#if (eq current.arme.system.mortalite 'empoignade')}}
Empoignade, pas de dommages directs
{{else}}
- {{#if (and (ne current.attaque.arme.system.mortalite 'non-mortel') (eq current.dmg.penetration 0))}}
+ {{#if (and (ne current.arme.system.mortalite 'non-mortel') (eq current.dmg.penetration 0))}}
{{/if}}
diff --git a/templates/hud-actor-attaque.hbs b/templates/hud-actor-attaque.hbs
index 4f841f16..8d650963 100644
--- a/templates/hud-actor-attaque.hbs
+++ b/templates/hud-actor-attaque.hbs
@@ -6,8 +6,8 @@
{{/unless}}
{{/each}}
diff --git a/templates/hud-actor-combat.hbs b/templates/hud-actor-combat.hbs
new file mode 100644
index 00000000..e3e921d4
--- /dev/null
+++ b/templates/hud-actor-combat.hbs
@@ -0,0 +1,34 @@
+{{log this}}
+
diff --git a/templates/roll/result/chat-attaque.hbs b/templates/roll/result/chat-attaque.hbs
index e69de29b..9f7fc372 100644
--- a/templates/roll/result/chat-attaque.hbs
+++ b/templates/roll/result/chat-attaque.hbs
@@ -0,0 +1,75 @@
+
+ 
+
diff --git a/templates/hud-actor-init.hbs b/templates/hud-actor-init.hbs
index a642e265..e4836c77 100644
--- a/templates/hud-actor-init.hbs
+++ b/templates/hud-actor-init.hbs
@@ -5,17 +5,17 @@
{{/each}}
{{#each commandes as |commande key|}}
{{/each}}
+
+
+
+ {{!-- --}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/roll/result/chat-defense.hbs b/templates/roll/result/chat-defense.hbs
index b9c078a1..6ff7c97d 100644
--- a/templates/roll/result/chat-defense.hbs
+++ b/templates/roll/result/chat-defense.hbs
@@ -1,9 +1,8 @@
-
-{{log this}}
+
+
+
+
+
+
+ {{active.name}} attaque {{opponent.name}}: {{current.label}}
+
+
+
+ {{current.carac.label}} / {{current.comp.label}} à {{current.diff.value}}
+
{{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.hbs"}} +
+
+ {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.hbs"}} +
+
+ {{#if rolled.isSuccess}} + + {{opponent.name}} doit se défendre à {{current.diff.value}}, + {{#if (eq current.dmg.mortalite 'empoignade')}} + ou {{active.name}} marquera un point d'empoignade + {{else if (eq current.dmg.mortalite 'non-mortel')}} + ou encaisser à {{plusMoins current.dmg.total}} (non-mortel) + {{else}} + {{!-- {{~#if (eq current.dmg.mortalite 'mortel')}} --}} + ou encaisser à {{plusMoins current.dmg.total}} + {{!-- {{~#if (eq current.dmg.mortalite 'cauchemar')}} --}} + {{!-- {{else}} + {{plusMoins dmg.total}} (entités de cauchemar) --}} + {{/if}} + + + {{#if show.recul}} + +
+ Si votre adversaire n'esquive pas cette {{show.recul.raison}}, il devra résister à l'impact ou reculer sous le choc!
+
+ {{/if}}
+ {{#if (eq particuliere 'rapidite')}}
+
+
Votre attaque rapide vous permet une deuxième attaque, ou une défense supplémentaire! + + {{/if}} + {{else}} + Votre attaque a échoué! + {{/if}} + {{#if (eq current.tactique 'charge')}} + +
+ C'est une charge, vos parades auront un -4 et vous ne pourrez pas esquiver!
+
+ {{/if}}
+ {{#if (and (eq current.tactique 'feinte') rolled.isSuccess)}}
+
+
+ Votre feinte peut faire mouche!
+
+ {{/if}}
+
+
+ + {{#if rolled.isSuccess}} + + {{opponent.name}} doit se défendre à {{current.diff.value}}, + {{#if (eq current.dmg.mortalite 'empoignade')}} + ou {{active.name}} marquera un point d'empoignade + {{else if (eq current.dmg.mortalite 'non-mortel')}} + ou encaisser à {{plusMoins current.dmg.total}} (non-mortel) + {{else}} + {{!-- {{~#if (eq current.dmg.mortalite 'mortel')}} --}} + ou encaisser à {{plusMoins current.dmg.total}} + {{!-- {{~#if (eq current.dmg.mortalite 'cauchemar')}} --}} + {{!-- {{else}} + {{plusMoins dmg.total}} (entités de cauchemar) --}} + {{/if}} + + + {{#if show.recul}} + +
+ Si votre adversaire n'esquive pas cette {{show.recul.raison}}, il devra résister à l'impact ou reculer sous le choc!
+
+ {{/if}}
+ {{#if (eq particuliere 'rapidite')}}
+
+ Votre attaque rapide vous permet une deuxième attaque, ou une défense supplémentaire! + + {{/if}} + {{else}} + Votre attaque a échoué! + {{/if}} + {{#if (eq current.tactique 'charge')}} + +
+ C'est une charge, vos parades auront un -4 et vous ne pourrez pas esquiver!
+
+ {{/if}}
+ {{#if (and (eq current.tactique 'feinte') rolled.isSuccess)}}
+
+
+ Votre feinte peut faire mouche!
+
+ {{/if}}
+ + {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.hbs"}} +
+
+ {{> 'partial-attaque-particuliere'}}
+ {{!-- TODO: maladresses --}}
+
+
+
+
+
@@ -30,20 +29,22 @@
{{!-- {{else}}
{{/if}} --}}
- {{#if attackerRoll.tactique}}
-
- {{#if (eq attackerRoll.tactique.key 'charge')}}
+ {{#if (eq attackerRoll.tactique.key 'charge')}}
+
C'était une charge, les parades de {{opponent.name}} auront un -4 et il ne pourra pas esquiver!
- {{else if (eq attackerRoll.tactique.key 'feinte')}}
+
+ {{/if}}
+ {{#if (eq attackerRoll.tactique.key 'feinte')}}
+
C'était une feinte!
- {{/if}}
-
+ {{!-- TODO: maladresses --}}
{{> 'partial-recul-choc'}}
{{> 'partial-encaissement'}}
diff --git a/templates/roll/result/chat-oeuvre.hbs b/templates/roll/result/chat-oeuvre.hbs
index f1b0b31e..2157d2da 100644
--- a/templates/roll/result/chat-oeuvre.hbs
+++ b/templates/roll/result/chat-oeuvre.hbs
@@ -1,4 +1,3 @@
-{{log this}}