uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v14update_varius_fixes' into 'dev'

Browse Source 
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
parent 48a751b508 b14006a826
commit 8555138366
7 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/scripts/actor.js
View File

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

6
system/scripts/dice/roll-n-keep-dialog.js
View File

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

10
system/scripts/dice/roll.js
View File

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

4
system/scripts/helpers.js
View File

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

2
system/styles/l5r5e.css
View File

File diff suppressed because one or more lines are too long

7
system/styles/scss/global-appv2.scss
View File

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

8
system/styles/scss/ui.scss
View File

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