Scriptarium/foundryvtt-reve-de-dragon
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 23 Wiki Activity

Correction message init & pugilat

Browse Source
This commit is contained in:
Vincent Vandemeulebrouck
2025-10-03 01:41:30 +02:00
parent 54f470d531
commit 6a987086f8
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/actor.js
View File

@@ -220,7 +220,7 @@ export class RdDActor extends RdDBaseActorSang {
if (arme.system.tir) { addAttaque(arme, ATTAQUE_TYPE.TIR) } if (arme.system.tir) { addAttaque(arme, ATTAQUE_TYPE.TIR) }
}) })
addAttaque(RdDItemArme.corpsACorps(this), ATTAQUE_TYPE.CORPS_A_CORPS) addAttaque(RdDItemArme.pugilat(this), ATTAQUE_TYPE.CORPS_A_CORPS)
addAttaque(RdDItemArme.empoignade(this), ATTAQUE_TYPE.CORPS_A_CORPS, 'empoignade') addAttaque(RdDItemArme.empoignade(this), ATTAQUE_TYPE.CORPS_A_CORPS, 'empoignade')
return actions return actions

4
module/item/arme.js
View File

@@ -276,8 +276,8 @@ export class RdDItemArme extends RdDItem {
static pugilat(actor) { static pugilat(actor) {
const pugilat = RdDItemArme.corpsACorps(actor) const pugilat = RdDItemArme.corpsACorps(actor)
pugilat.name = 'Mains nues' pugilat.name = 'Pugilat'
return pugilat; return pugilat
} }
static empoignade(actor) { static empoignade(actor) {

8
module/rdd-combat.js
View File

@@ -116,7 +116,9 @@ export class RdDCombatManager extends Combat {
} }
/************************************************************************************/ /** ***********************************************************************************
* @override lance l'initiative de plusieurs combattants (tous/ous les PNJs) en une fois
*/
async rollInitiative(ids, messageOptions = {}) { async rollInitiative(ids, messageOptions = {}) {
console.log(`${game.system.title} | Combat.rollInitiative()`, ids, messageOptions) console.log(`${game.system.title} | Combat.rollInitiative()`, ids, messageOptions)
ids = typeof ids === "string" ? [ids] : ids ids = typeof ids === "string" ? [ids] : ids
@@ -146,7 +148,7 @@ export class RdDCombatManager extends Combat {
alias: combatant.token?.name, alias: combatant.token?.name,
sound: CONFIG.sounds.dice, sound: CONFIG.sounds.dice,
}, },
flavor: `${combatant.token?.name} a fait son jet d'Initiative (${messageOptions.info})<br>` flavor: `${combatant.token?.name} a une initiatyive de ${init.value} : ${messageOptions.info}<br>`
}, },
messageOptions); messageOptions);
init.roll.toMessage(messageData, { rollMode, create: true }); init.roll.toMessage(messageData, { rollMode, create: true });
@@ -263,7 +265,7 @@ export class RdDCombatManager extends Combat {
const comp = action.comp const comp = action.comp
return { return {
phase: RdDInitiative.phaseArme(comp?.system.categorie, action.arme), phase: RdDInitiative.phaseArme(comp?.system.categorie, action.arme),
info: action.name + " / " + comp.name, info: action.label,
carac: actor.getCaracInit(comp), carac: actor.getCaracInit(comp),
niveau: comp?.system.niveau ?? (['(lancer)', '(tir)'].includes(action.main) ? -8 : -6) niveau: comp?.system.niveau ?? (['(lancer)', '(tir)'].includes(action.main) ? -8 : -6)
} }