Merge branch 'v14update_varius_fixes' into 'dev'

V14 update with various fixes

See merge request teaml5r/l5r5e!66
This commit is contained in:
Litasa
2026-04-12 11:00:49 +00:00
7 changed files with 17 additions and 22 deletions

View File

@@ -73,7 +73,7 @@ export class ActorL5r5e extends Actor {
);
break;
}
await super.create(docData, options);
return super.create(docData, options);
}
/**

View File

@@ -1,3 +1,5 @@
import { HelpersL5r5e } from "../helpers.js";
/**
* L5R Dice Roll n Keep dialog
* @extends {FormApplication}
@@ -651,7 +653,7 @@ export class RollnKeepDialog extends FormApplication {
if (this.roll.l5r5e.isInitiativeRoll) {
let msgOptions = {
rnkRoll: this.roll,
messageMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message),
messageMode: HelpersL5r5e.getMessageMode(this._message),
};
await this.roll.l5r5e.actor.rollInitiative({
@@ -667,7 +669,7 @@ export class RollnKeepDialog extends FormApplication {
// Send it to chat, switch to new message
this.message = await this.roll.toMessage(
{},
{ messageMode: game.l5r5e.HelpersL5r5e.getRollMode(this._message) }
{ messageMode: HelpersL5r5e.getMessageMode(this._message) }
);
}

View File

@@ -352,15 +352,15 @@ export class RollL5r5e extends Roll {
);
messageData.rolls = [this];
// RollMode
const rMode = messageMode || messageData.messageMode || game.settings.get("core", "messageMode");
if (rMode) {
messageData = ChatMessage.applyMode(messageData, rMode);
// Message mode
const mMode = messageMode || messageData.messageMode || game.settings.get("core", "messageMode");
if (mMode) {
messageData = ChatMessage.applyMode(messageData, mMode);
}
// Either create the message or just return the chat data
return ChatMessage.implementation.create(messageData, {
rollMode: rMode,
messageMode: mMode,
});
}

View File

@@ -629,11 +629,11 @@ export class HelpersL5r5e {
}
/**
* Return the RollMode for this ChatData
* Return the MessageMode for this ChatData
* @param {object} chatData
* @return {string}
*/
static getRollMode(chatData) {
static getMessageMode(chatData) {
if (chatData.whisper.length === 1 && chatData.whisper[0] === game.user.id) {
return "self";
}

File diff suppressed because one or more lines are too long

View File

@@ -65,7 +65,8 @@ $l5r5e-custom-icons: (
$selectors: (
"#sidebar-tabs button.l5r5e",
"#sidebar-content .create-button.l5r5e",
"#sidebar-content i.l5r5e"
"#sidebar-content i.l5r5e",
"#context-menu i.l5r5e"
);
@each $selector in $selectors {
@@ -90,8 +91,8 @@ $selectors: (
&.#{$name}::before {
content: "";
position: absolute;
width: 95%;
height: 95%;
width: 85%;
height: 85%;
background-color: currentColor;
mask: url($url) no-repeat center / contain;
-webkit-mask: url($url) no-repeat center / contain;

View File

@@ -111,14 +111,6 @@ button {
}
}
.chat-message {
ul, li {
list-style: none;
margin: unset;
padding: unset;
}
}
#logo {
content: url("../assets/l5r-logo.webp");
height: 80px;