Release v1.9.0 (VFTT v10)
This commit is contained in:
|
Before Width: | Height: | Size: 153 KiB After Width: | Height: | Size: 153 KiB |
@@ -283,7 +283,9 @@ export class ActorL5r5e extends Actor {
|
||||
* @returns {boolean}
|
||||
*/
|
||||
get canDoInitiativeRoll() {
|
||||
return game.combat?.combatants.some((c) => c.tokenId === this.token?._id && !c.initiative);
|
||||
return game.combat?.combatants.some(
|
||||
(c) => !c.initiative && (c.tokenId === this.token?._id || (!this.token && c.actorId === this._id))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -538,7 +538,9 @@ export class DicePickerDialog extends FormApplication {
|
||||
}
|
||||
|
||||
if (!this._actor.canDoInitiativeRoll) {
|
||||
ui.notifications.error(game.i18n.localize("l5r5e.conflict.initiative.already_set"));
|
||||
ui.notifications.error(
|
||||
game.i18n.localize("l5r5e.conflict.initiative.already_set") + ` [${this._actor.name}]`
|
||||
);
|
||||
return this.close();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -313,7 +313,7 @@ export default class HooksL5r5e {
|
||||
// In DsN 4.2.1+ the roll is altered in context.
|
||||
// So we need to get the original message instead of "context.roll.l5r5e?.history"
|
||||
const message = game.messages.get(messageId);
|
||||
if (message?._roll?.l5r5e?.history) {
|
||||
if (message?.rolls?.[0]?.l5r5e?.history) {
|
||||
context.blind = true;
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -128,7 +128,7 @@
|
||||
}
|
||||
}
|
||||
fieldset {
|
||||
input[name="data.effects"] {
|
||||
input[name="system.effects"] {
|
||||
text-align: left;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"version": "1.9.0",
|
||||
"compatibility": {
|
||||
"minimum": 10,
|
||||
"verified": "10.277"
|
||||
"verified": "10.283"
|
||||
},
|
||||
"manifestPlusVersion": "1.2.0",
|
||||
"socket": true,
|
||||
@@ -31,7 +31,7 @@
|
||||
"url": "https://fr.tipeee.com/carter-foundryvtt"
|
||||
}
|
||||
],
|
||||
"background": "L5R-Header.webp",
|
||||
"background": "systems/l5r5e/assets/l5r-header.webp",
|
||||
"scripts": [],
|
||||
"esmodules": ["./scripts/main-l5r5e.js"],
|
||||
"styles": ["./styles/l5r5e.css"],
|
||||
|
||||
Reference in New Issue
Block a user