cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-12 03:31:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Bugfix] Fix light theme to roll messages (#1066)

Browse source 
* fix light theme to roll messages

* fix light theme issues

* finally fix issues

---------

Co-authored-by: WBHarry <williambjrklund@gmail.com>
This commit is contained in:
Murilo Brito 2025-08-23 21:52:18 -03:00 • committed by GitHub
parent 661808b5f1
commit 2a0d748b5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 523 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

6
module/canvas/placeables/measuredTemplate.mjs
View file

@ -11,19 +11,19 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
if (splitRulerText.length > 0) {
const rulerValue = Number(splitRulerText[0]);
const result = DhMeasuredTemplate.getRangeLabels(rulerValue, rangeMeasurementSettings);
this.ruler.text = result.distance + (result.units ? (' ' + result.units) : '');
this.ruler.text = result.distance + (result.units ? ' ' + result.units : '');
}
}
}
static getRangeLabels(distanceValue, settings) {
let result = { distance: distanceValue, units: '' }
let result = { distance: distanceValue, units: '' };
const rangeMeasurementOverride = canvas.scene.flags.daggerheart?.rangeMeasurementOverride;
if (rangeMeasurementOverride === true) {
result.distance = distanceValue;
result.units = canvas.scene?.grid?.units;
return result
return result;
}
if (distanceValue <= settings.melee) {
result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.melee.name');

20
module/data/fields/action/damageField.mjs
View file

@ -23,14 +23,22 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
multiplier: new fields.StringField({
choices: CONFIG.DH.GENERAL.multiplierTypes,
initial: 'prof',
label: "DAGGERHEART.ACTIONS.Config.damage.multiplier"
label: 'DAGGERHEART.ACTIONS.Config.damage.multiplier'
}),
flatMultiplier: new fields.NumberField({ nullable: true, initial: 1, label: "DAGGERHEART.ACTIONS.Config.damage.flatMultiplier" }),
dice: new fields.StringField({ choices: CONFIG.DH.GENERAL.diceTypes, initial: 'd6', label: "DAGGERHEART.GENERAL.Dice.single" }),
bonus: new fields.NumberField({ nullable: true, initial: null, label: "DAGGERHEART.GENERAL.bonus" }),
flatMultiplier: new fields.NumberField({
nullable: true,
initial: 1,
label: 'DAGGERHEART.ACTIONS.Config.damage.flatMultiplier'
}),
dice: new fields.StringField({
choices: CONFIG.DH.GENERAL.diceTypes,
initial: 'd6',
label: 'DAGGERHEART.GENERAL.Dice.single'
}),
bonus: new fields.NumberField({ nullable: true, initial: null, label: 'DAGGERHEART.GENERAL.bonus' }),
custom: new fields.SchemaField({
enabled: new fields.BooleanField({ label: "DAGGERHEART.ACTIONS.Config.general.customFormula" }),
formula: new FormulaField({ label: "DAGGERHEART.ACTIONS.Config.general.formula", initial: '' })
enabled: new fields.BooleanField({ label: 'DAGGERHEART.ACTIONS.Config.general.customFormula' }),
formula: new FormulaField({ label: 'DAGGERHEART.ACTIONS.Config.general.formula', initial: '' })
})
};
}

2
module/data/item/weapon.mjs
View file

@ -199,7 +199,7 @@ export default class DHWeapon extends AttachableItem {
];
for (const { value, type } of attack.damage.parts) {
const parts = value.custom.enabled ? [game.i18n.localize("DAGGERHEART.GENERAL.custom")] : [value.dice];
const parts = value.custom.enabled ? [game.i18n.localize('DAGGERHEART.GENERAL.custom')] : [value.dice];
if (!value.custom.enabled && value.bonus) parts.push(value.bonus.signedString());
if (type.size > 0) {

2
styles/less/dialog/downtime/downtime-container.less
View file

@ -35,7 +35,7 @@
gap: 4px;
.activity-marker {
font-size: .5rem;
font-size: 0.5rem;
flex: none;
color: light-dark(@dark-blue, @golden);
margin-right: 4px;

2
styles/less/ui/chat/ability-use.less
View file

@ -2,7 +2,7 @@
@import '../../utils/fonts.less';
@import '../../utils/spacing.less';
.theme-light {
#interface.theme-light {
.daggerheart.chat.domain-card {
.domain-card-move .domain-card-header {
border-bottom: 1px solid @dark-blue;

3
styles/less/ui/chat/action.less
View file

@ -2,7 +2,7 @@
@import '../../utils/fonts.less';
@import '../../utils/spacing.less';
.theme-light {
#interface.theme-light {
.daggerheart.chat.action {
.action-move .action-section {
border-bottom: 1px solid @dark-blue;
@ -79,6 +79,7 @@
display: flex;
flex-direction: column;
gap: 5px;
color: @beige;
.title {
font-size: var(--font-size-20);

137
styles/less/ui/chat/chat.less
View file

@ -2,52 +2,137 @@
@import '../../utils/fonts.less';
@import '../../utils/spacing.less';
.theme-light {
.daggerheart,
#chat-notifications {
#interface.theme-light {
.daggerheart.chat-sidebar .chat-log,
#chat-notifications .chat-log {
--text-color: @dark-blue;
--bg-color: @dark-blue-40;
.message-content .chat-roll {
.roll-part-header {
span,
span:before,
span:after {
color: @dark-blue;
}
&:before {
background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, @dark-blue 100%);
color: @dark-blue;
.chat-message {
.roll-formula {
background: @dark-15;
color: @dark;
}
&.duality {
background-image: url(../assets/parchments/dh-parchment-dark.png);
.message-content {
color: @beige;
}
&:after {
background: linear-gradient(90deg, @dark-blue 0%, rgba(0, 0, 0, 0) 100%);
color: @dark-blue;
.roll-formula {
background: @dark-15;
color: @dark;
}
.message-header {
.message-sub-header-container {
color: @beige;
h4 {
color: @golden;
}
}
.message-header-metadata {
.message-metadata {
color: @beige;
}
}
}
&.hope {
--text-color: @golden;
--bg-color: @golden-40;
.message-header,
.message-content {
background-color: @golden-bg;
}
.roll-formula {
background: var(--bg-color);
color: var(--text-color);
}
}
&.fear {
--text-color: @chat-blue;
--bg-color: @chat-blue-40;
.message-header,
.message-content {
background-color: @chat-blue-bg;
}
.roll-formula {
background: var(--bg-color);
color: var(--text-color);
}
}
&.critical {
--text-color: @chat-purple;
--bg-color: @chat-purple-40;
.message-header,
.message-content {
background-color: @chat-purple-bg;
}
.roll-formula {
background: var(--bg-color);
color: var(--text-color);
}
}
}
.roll-section {
.roll-part-content {
.roll-result-value {
&:not(.duality) {
.font-20 {
color: @dark;
}
.roll-die {
color: @beige;
}
fieldset {
color: @dark-blue;
border-color: @dark-blue;
legend {
color: @dark-blue;
}
}
.chat-roll {
.roll-part-header {
color: @dark-blue;
.dice-tooltip .wrapper .roll-die {
color: @beige;
span::before,
span::after {
color: @dark-blue;
}
&:before {
background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, @dark-blue 100%);
}
&:after {
background: linear-gradient(90deg, @dark-blue 0%, rgba(0, 0, 0, 0) 100%);
}
}
.roll-part-content {
&.dice-result {
color: @dark;
}
.roll-result-container {
color: @dark-blue;
}
}
}
}
}
.chat-message .roll-formula {
background: @dark-15;
color: @dark;
}
}
}
.daggerheart.chat {
&.resource-roll {
.reroll-message {
color: @beige;
text-align: center;
font-size: var(--font-size-18);
margin-bottom: 0;

2
styles/less/ui/chat/downtime.less
View file

@ -2,7 +2,7 @@
@import '../../utils/fonts.less';
@import '../../utils/spacing.less';
.theme-light {
#interface.theme-light {
.daggerheart.chat.downtime {
.downtime-moves-list .downtime-move {
&:hover {

14
styles/less/ui/chat/sheet.less
View file

@ -1,8 +1,8 @@
@import '../../utils/colors.less';
@import '../../utils/fonts.less';
.theme-light {
.chat-message .message-content {
#interface.theme-light {
.chat-message:not(.duality) .message-content {
color: @dark;
blockquote {
@ -58,6 +58,12 @@
font-family: @font-body;
font-weight: bold;
}
.dice-roll .dice-formula,
.dice-roll .dice-total {
background: @dark-blue-40;
color: @dark-blue;
}
}
}
@ -158,8 +164,8 @@
.dice-roll .dice-total {
box-shadow: none;
border: none;
background: light-dark(@dark-blue-40, @golden-40);
color: light-dark(@dark-blue, @golden);
background: @golden-10;
color: @golden;
font-weight: 600;
align-content: center;
}

6
templates/ui/chat/resource-roll.hbs
View file

@ -1,3 +1,3 @@
<div class="daggerheart chat resource-roll">
<h5 class="reroll-message">{{localize "DAGGERHEART.UI.Chat.resourceRoll.playerMessage" user=user name=name }}</h5>
</div>
<ul class="daggerheart chat resource-roll">
<li class="reroll-message">{{localize "DAGGERHEART.UI.Chat.resourceRoll.playerMessage" user=user name=name }}</li>
</ul>