public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Actions Projects Releases 163 Wiki Activity

fit-content pour toutes les fenêtres roll

Browse Source 
C'est le comportement par défaut, donc enlever les surcharges
Corrections pour les fenêtres de combat
This commit is contained in:
Vincent Vandemeulebrouck 2022-11-23 22:41:49 +01:00
parent e78ae3b292
commit 5e7fcf3c9b
3 changed files with 67 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
module/actor.js
View File

@ -779,10 +779,7 @@ export class RdDActor extends Actor {
rollData.competence.system.defaut_carac = 'reve-actuel'; rollData.competence.system.defaut_carac = 'reve-actuel';
const dialog = await RdDRoll.create(this, rollData, const dialog = await RdDRoll.create(this, rollData,
{ { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-reve-de-dragon.html' },
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-reve-de-dragon.html',
options: { height: 'fit-content' }
},
{ {
name: 'maitrise', name: 'maitrise',
label: 'Maîtriser le Rêve de Dragon', label: 'Maîtriser le Rêve de Dragon',
@ -2360,7 +2357,6 @@ export class RdDActor extends Actor {
const dialog = await RdDRoll.create(this, rollData, const dialog = await RdDRoll.create(this, rollData,
{ {
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html', html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html',
options: { height: 'fit-content' },
close: html => { this.currentTMR.maximize() } // Re-display TMR close: html => { this.currentTMR.maximize() } // Re-display TMR
}, },
{ {
@ -2565,15 +2561,17 @@ export class RdDActor extends Actor {
RdDItemCompetenceCreature.setRollDataCreature(rollData) RdDItemCompetenceCreature.setRollDataCreature(rollData)
} }
console.log("rollCompetence !!!", rollData); console.log("rollCompetence !!!", rollData);
const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, { const dialog = await RdDRoll.create(this, rollData,
name: 'jet-competence', { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' },
label: 'Jet ' + Grammar.apostrophe('de', rollData.competence.name), {
callbacks: [ name: 'jet-competence',
this.createCallbackExperience(), label: 'Jet ' + Grammar.apostrophe('de', rollData.competence.name),
this.createCallbackAppelAuMoral(), callbacks: [
{ action: r => this.$onRollCompetence(r) } this.createCallbackExperience(),
] this.createCallbackAppelAuMoral(),
}); { action: r => this.$onRollCompetence(r) }
]
});
dialog.render(true); dialog.render(true);
} }
@ -2625,15 +2623,17 @@ export class RdDActor extends Actor {
console.log("rollTache !!!", rollData); console.log("rollTache !!!", rollData);
const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, { const dialog = await RdDRoll.create(this, rollData,
name: 'jet-competence', { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' },
label: 'Jet de Tâche ' + tacheData.name, {
callbacks: [ name: 'jet-competence',
this.createCallbackExperience(), label: 'Jet de Tâche ' + tacheData.name,
this.createCallbackAppelAuMoral(), callbacks: [
{ action: r => this._tacheResult(r) } this.createCallbackExperience(),
] this.createCallbackAppelAuMoral(),
}); { action: r => this._tacheResult(r) }
]
});
dialog.render(true); dialog.render(true);
} }
@ -2680,10 +2680,7 @@ export class RdDActor extends Actor {
console.log("rollArt !!!", artData); console.log("rollArt !!!", artData);
const dialog = await RdDRoll.create(this, artData, const dialog = await RdDRoll.create(this, artData,
{ { html: `systems/foundryvtt-reve-de-dragon/templates/dialog-roll-${oeuvre.type}.html` },
html: `systems/foundryvtt-reve-de-dragon/templates/dialog-roll-${oeuvre.type}.html`,
options: { height: 'fit-content', }
},
{ {
name: `jet-${artData.art}`, name: `jet-${artData.art}`,
label: `${artData.verbe} ${oeuvre.name}`, label: `${artData.verbe} ${oeuvre.name}`,
@ -2820,10 +2817,7 @@ export class RdDActor extends Actor {
}; };
const dialog = await RdDRoll.create(this, meditationData, const dialog = await RdDRoll.create(this, meditationData,
{ { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-meditation.html' },
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-meditation.html',
options: { height: 'fit-content', }
},
{ {
name: 'jet-meditation', name: 'jet-meditation',
label: "Jet de méditation", label: "Jet de méditation",
@ -2899,7 +2893,6 @@ export class RdDActor extends Actor {
const dialog = await RdDRoll.create(this, rollData, const dialog = await RdDRoll.create(this, rollData,
{ {
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-signedraconique.html', html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-signedraconique.html',
options: { height: 'fit-content' },
close: html => { this.currentTMR.maximize() } // Re-display TMR close: html => { this.currentTMR.maximize() } // Re-display TMR
}, },
{ {
@ -3783,9 +3776,7 @@ export class RdDActor extends Actor {
rollData.competence.system.defaut_carac = caracTache; rollData.competence.system.defaut_carac = caracTache;
const dialog = await RdDRoll.create(this, rollData, const dialog = await RdDRoll.create(this, rollData,
{ { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-alchimie.html' },
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-alchimie.html',
},
{ {
name: 'tache-alchimique', name: 'tache-alchimique',
label: 'Tache Alchimique', label: 'Tache Alchimique',

85
module/rdd-combat.js
View File

@ -791,23 +791,21 @@ export class RdDCombat {
await this.proposerAjustementTirLancer(rollData) await this.proposerAjustementTirLancer(rollData)
const dialog = await RdDRoll.create(this.attacker, rollData, const dialog = await RdDRoll.create(this.attacker, rollData,
{ html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' },
{ {
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html', name: 'jet-attaque',
options: { height: 540 } label: 'Attaque: ' + (arme?.name ?? competence.name),
}, { callbacks: [
name: 'jet-attaque', this.attacker.createCallbackExperience(),
label: 'Attaque: ' + (arme?.name ?? competence.name), this.attacker.createCallbackAppelAuMoral(),
callbacks: [ { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
this.attacker.createCallbackExperience(), { condition: r => arme && !RdDCombat.isParticuliere(r), action: r => this.attacker.incDecItemUse(arme._id) },
this.attacker.createCallbackAppelAuMoral(), { condition: r => (RdDCombat.isReussite(r) && !RdDCombat.isParticuliere(r)), action: r => this._onAttaqueNormale(r) },
{ action: r => this.removeChatMessageActionsPasseArme(r.passeArme) }, { condition: RdDCombat.isParticuliere, action: r => this._onAttaqueParticuliere(r) },
{ condition: r => arme && !RdDCombat.isParticuliere(r), action: r => this.attacker.incDecItemUse(arme._id) }, { condition: RdDCombat.isEchec, action: r => this._onAttaqueEchec(r) },
{ condition: r => (RdDCombat.isReussite(r) && !RdDCombat.isParticuliere(r)), action: r => this._onAttaqueNormale(r) }, { condition: RdDCombat.isEchecTotal, action: r => this._onAttaqueEchecTotal(r) },
{ condition: RdDCombat.isParticuliere, action: r => this._onAttaqueParticuliere(r) }, ]
{ condition: RdDCombat.isEchec, action: r => this._onAttaqueEchec(r) }, });
{ condition: RdDCombat.isEchecTotal, action: r => this._onAttaqueEchecTotal(r) },
]
});
dialog.render(true); dialog.render(true);
} }
@ -1050,22 +1048,20 @@ export class RdDCombat {
let rollData = this._prepareParade(attackerRoll, arme, competence); let rollData = this._prepareParade(attackerRoll, arme, competence);
const dialog = await RdDRoll.create(this.defender, rollData, const dialog = await RdDRoll.create(this.defender, rollData,
{ html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' },
{ {
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html', name: 'jet-parade',
options: { height: 540 } label: 'Parade: ' + (arme ? arme.name : rollData.competence.name),
}, { callbacks: [
name: 'jet-parade', this.defender.createCallbackExperience(),
label: 'Parade: ' + (arme ? arme.name : rollData.competence.name), this.defender.createCallbackAppelAuMoral(),
callbacks: [ { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
this.defender.createCallbackExperience(), { condition: r => !RdDCombat.isParticuliere(r), action: r => this.defender.incDecItemUse(armeParadeId) },
this.defender.createCallbackAppelAuMoral(), { condition: RdDCombat.isReussite, action: r => this._onParadeNormale(r) },
{ action: r => this.removeChatMessageActionsPasseArme(r.passeArme) }, { condition: RdDCombat.isParticuliere, action: r => this._onParadeParticuliere(r) },
{ condition: r => !RdDCombat.isParticuliere(r), action: r => this.defender.incDecItemUse(armeParadeId) }, { condition: RdDCombat.isEchec, action: r => this._onParadeEchec(r) },
{ condition: RdDCombat.isReussite, action: r => this._onParadeNormale(r) }, ]
{ condition: RdDCombat.isParticuliere, action: r => this._onParadeParticuliere(r) }, });
{ condition: RdDCombat.isEchec, action: r => this._onParadeEchec(r) },
]
});
dialog.render(true); dialog.render(true);
} }
@ -1133,19 +1129,20 @@ export class RdDCombat {
let rollData = this._prepareEsquive(attackerRoll, esquive); let rollData = this._prepareEsquive(attackerRoll, esquive);
const dialog = await RdDRoll.create(this.defender, rollData, const dialog = await RdDRoll.create(this.defender, rollData,
{ html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, { { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' },
name: 'jet-esquive', {
label: 'Esquiver', name: 'jet-esquive',
callbacks: [ label: 'Esquiver',
this.defender.createCallbackExperience(), callbacks: [
this.defender.createCallbackAppelAuMoral(), this.defender.createCallbackExperience(),
{ condition: r => !RdDCombat.isParticuliere(r), action: r => this.defender.incDecItemUse(esquive._id) }, this.defender.createCallbackAppelAuMoral(),
{ action: r => this.removeChatMessageActionsPasseArme(r.passeArme) }, { condition: r => !RdDCombat.isParticuliere(r), action: r => this.defender.incDecItemUse(esquive._id) },
{ condition: RdDCombat.isReussite, action: r => this._onEsquiveNormale(r) }, { action: r => this.removeChatMessageActionsPasseArme(r.passeArme) },
{ condition: RdDCombat.isParticuliere, action: r => this._onEsquiveParticuliere(r) }, { condition: RdDCombat.isReussite, action: r => this._onEsquiveNormale(r) },
{ condition: RdDCombat.isEchec, action: r => this._onEsquiveEchec(r) }, { condition: RdDCombat.isParticuliere, action: r => this._onEsquiveParticuliere(r) },
] { condition: RdDCombat.isEchec, action: r => this._onEsquiveEchec(r) },
}); ]
});
dialog.render(true); dialog.render(true);
} }

1
module/rdd-tmr-dialog.js
View File

@ -775,7 +775,6 @@ export class RdDTMRDialog extends Dialog {
const dialog = await RdDRoll.create(this.actor, rollData, const dialog = await RdDRoll.create(this.actor, rollData,
{ {
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-maitrise-tmr.html', html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-maitrise-tmr.html',
options: { height: 'fit-content' },
close: html => { this.maximize(); } // Re-display TMR close: html => { this.maximize(); } // Re-display TMR
}, },
{ {