ENH: Reroll initiative

master
U~man 2020-07-10 13:25:08 +02:00
parent 987f2e228e
commit e985472a31
1 changed files with 10 additions and 2 deletions

View File

@ -1,7 +1,7 @@
import { OseDice } from "./dice.js"; import { OseDice } from "./dice.js";
export class OseCombat { export class OseCombat {
static rollInitiative(combat, data, diff, id) { static rollInitiative(combat, data) {
// Check groups // Check groups
data.combatants = []; data.combatants = [];
let groups = {}; let groups = {};
@ -19,7 +19,6 @@ export class OseCombat {
// Set init // Set init
for (let i = 0; i < data.combatants.length; ++i) { for (let i = 0; i < data.combatants.length; ++i) {
console.log(data.combatants[i]);
if (data.combatants[i].actor.data.data.isSlow) { if (data.combatants[i].actor.data.data.isSlow) {
data.combatants[i].initiative = -1; data.combatants[i].initiative = -1;
} else { } else {
@ -31,6 +30,9 @@ export class OseCombat {
static format(object, html, user) { static format(object, html, user) {
html.find('.combat-control[data-control="rollNPC"]').remove(); html.find('.combat-control[data-control="rollNPC"]').remove();
html.find('.combat-control[data-control="rollAll"]').remove(); html.find('.combat-control[data-control="rollAll"]').remove();
let trash = html.find('.encounters .combat-control[data-control="endCombat"]');
$('<a class="combat-control" data-control="reroll"><i class="fas fa-dice"></i></a>').insertBefore(trash);
html.find(".combatant").each((_, ct) => { html.find(".combatant").each((_, ct) => {
// Can't roll individual inits // Can't roll individual inits
$(ct).find(".roll").remove(); $(ct).find(".roll").remove();
@ -65,6 +67,12 @@ export class OseCombat {
flags: { ose: { group: colors[index] } }, flags: { ose: { group: colors[index] } },
}); });
}); });
html.find('.combat-control[data-control="reroll"]').click(ev => {
let data = {};
OseCombat.rollInitiative(game.combat, data);
game.combat.update({data: data});
});
} }
static addCombatant(combat, data, options, id) { static addCombatant(combat, data, options, id) {