From 98a76aec487e37104a188272eb77904814db5032 Mon Sep 17 00:00:00 2001
From: IrkTheImp <41175833+IrkTheImp@users.noreply.github.com>
Date: Sun, 25 May 2025 05:14:25 -0500
Subject: [PATCH 1/2] fix height issue, missing text, and red color for Feature
(#51)
* fix height issue, missing text, and red color
* Update module/applications/sheets/feature.mjs
Co-authored-by: Emilio Jimenez <19908114+emiliojc@users.noreply.github.com>
---------
Co-authored-by: WBHarry <89362246+WBHarry@users.noreply.github.com>
Co-authored-by: Emilio Jimenez <19908114+emiliojc@users.noreply.github.com>
---
lang/en.json | 1 +
module/applications/sheets/feature.mjs | 1 +
styles/daggerheart.css | 3 ---
styles/item.less | 1 -
templates/sheets/feature.hbs | 3 +--
5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/lang/en.json b/lang/en.json
index a99266ed..10b7a9b0 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -992,6 +992,7 @@
"Dice": "Dice",
"Icon": "Icon"
},
+ "Max": "Max",
"Tabs": {
"Features": "Features",
"Effects": "Effects",
diff --git a/module/applications/sheets/feature.mjs b/module/applications/sheets/feature.mjs
index 03658d4f..894d620e 100644
--- a/module/applications/sheets/feature.mjs
+++ b/module/applications/sheets/feature.mjs
@@ -15,6 +15,7 @@ export default class FeatureSheet extends DaggerheartSheet(ItemSheetV2) {
id: 'daggerheart-feature',
classes: ['daggerheart', 'sheet', 'feature'],
position: { width: 600, height: 600 },
+ window: { resizable: true },
actions: {
addEffect: this.addEffect,
removeEffect: this.removeEffect,
diff --git a/styles/daggerheart.css b/styles/daggerheart.css
index 021b5ce2..e982c973 100644
--- a/styles/daggerheart.css
+++ b/styles/daggerheart.css
@@ -1530,9 +1530,6 @@
.daggerheart.chat.domain-card img {
width: 80px;
}
-.daggerheart.sheet.feature {
- background-color: red;
-}
.daggerheart.sheet.feature .editable {
display: flex;
flex-direction: column;
diff --git a/styles/item.less b/styles/item.less
index f453af8b..a6d16bee 100644
--- a/styles/item.less
+++ b/styles/item.less
@@ -1,6 +1,5 @@
.daggerheart.sheet {
&.feature {
- background-color: red;
.editable {
display: flex;
flex-direction: column;
diff --git a/templates/sheets/feature.hbs b/templates/sheets/feature.hbs
index 5baa9a75..c0e6d9e6 100644
--- a/templates/sheets/feature.hbs
+++ b/templates/sheets/feature.hbs
@@ -22,9 +22,8 @@
{{formField systemFields.type value=source.system.type rootId=partId label="DAGGERHEART.Sheets.Feature.FeatureType" localize=true }}
{{formField systemFields.actionType value=source.system.actionType label="DAGGERHEART.Sheets.Feature.ActionType" rootId=partId localize=true }}
-
- {{formField systemFields.refreshData.fields.type value=source.system.refreshData.type rootId=partId label="Type" localize=true }}
+ {{formField systemFields.refreshData.fields.type value=source.system.refreshData.type rootId=partId label="DAGGERHEART.Sheets.Feature.RefreshType" localize=true }}
{{#if document.system.refreshData.type}}
From 71319f2b7465806a37bd47c3ec139cf4c1fceb21 Mon Sep 17 00:00:00 2001
From: IrkTheImp <41175833+IrkTheImp@users.noreply.github.com>
Date: Sun, 25 May 2025 05:16:01 -0500
Subject: [PATCH 2/2] remove id from sheets to allow multiple instances. Added
id to roller dialog to enforce only one instance. (#50)
---
module/applications/levelup.mjs | 1 -
module/applications/npcRollSelectionDialog.mjs | 1 -
module/applications/rollSelectionDialog.mjs | 1 +
module/applications/sheets/adversary.mjs | 1 -
module/applications/sheets/ancestry.mjs | 1 -
module/applications/sheets/armor.mjs | 1 -
module/applications/sheets/class.mjs | 1 -
module/applications/sheets/community.mjs | 1 -
module/applications/sheets/consumable.mjs | 1 -
module/applications/sheets/domainCard.mjs | 1 -
module/applications/sheets/feature.mjs | 1 -
module/applications/sheets/miscellaneous.mjs | 1 -
module/applications/sheets/pc.mjs | 1 -
module/applications/sheets/subclass.mjs | 1 -
module/applications/sheets/weapon.mjs | 1 -
15 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/module/applications/levelup.mjs b/module/applications/levelup.mjs
index 189fc368..90500e2a 100644
--- a/module/applications/levelup.mjs
+++ b/module/applications/levelup.mjs
@@ -18,7 +18,6 @@ export default class DhpLevelup extends HandlebarsApplicationMixin(ApplicationV2
}
static DEFAULT_OPTIONS = {
- id: 'daggerheart-levelup',
classes: ['daggerheart', 'views', 'levelup'],
position: { width: 1200, height: 'auto' },
window: {
diff --git a/module/applications/npcRollSelectionDialog.mjs b/module/applications/npcRollSelectionDialog.mjs
index ad263fdf..3660edaf 100644
--- a/module/applications/npcRollSelectionDialog.mjs
+++ b/module/applications/npcRollSelectionDialog.mjs
@@ -19,7 +19,6 @@ export default class NpcRollSelectionDialog extends HandlebarsApplicationMixin(A
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'roll-selection',
classes: ['daggerheart', 'views', 'npc-roll-selection'],
position: { width: '500', height: 'auto' },
actions: {
diff --git a/module/applications/rollSelectionDialog.mjs b/module/applications/rollSelectionDialog.mjs
index ed35d710..3230cf72 100644
--- a/module/applications/rollSelectionDialog.mjs
+++ b/module/applications/rollSelectionDialog.mjs
@@ -33,6 +33,7 @@ export default class RollSelectionDialog extends HandlebarsApplicationMixin(Appl
static DEFAULT_OPTIONS = {
tag: 'form',
+ id: 'roll-selection', //Having an id causes a new instance to overwrite previous.
classes: ['daggerheart', 'views', 'roll-selection'],
position: {
width: 400,
diff --git a/module/applications/sheets/adversary.mjs b/module/applications/sheets/adversary.mjs
index 9066e194..54827b84 100644
--- a/module/applications/sheets/adversary.mjs
+++ b/module/applications/sheets/adversary.mjs
@@ -205,7 +205,6 @@ export default class AdversarySheet extends DaggerheartSheet(ActorSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-adversary',
classes: ['daggerheart', 'sheet', 'adversary'],
position: { width: 600 },
actions: {
diff --git a/module/applications/sheets/ancestry.mjs b/module/applications/sheets/ancestry.mjs
index b890f788..51962c9c 100644
--- a/module/applications/sheets/ancestry.mjs
+++ b/module/applications/sheets/ancestry.mjs
@@ -61,7 +61,6 @@ const { ItemSheetV2 } = foundry.applications.sheets;
export default class AncestrySheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-ancestry',
classes: ['daggerheart', 'sheet', 'heritage'],
position: { width: 600 },
actions: {
diff --git a/module/applications/sheets/armor.mjs b/module/applications/sheets/armor.mjs
index 54404804..0c6c933a 100644
--- a/module/applications/sheets/armor.mjs
+++ b/module/applications/sheets/armor.mjs
@@ -31,7 +31,6 @@ const { ItemSheetV2 } = foundry.applications.sheets;
export default class ArmorSheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-armor',
classes: ['daggerheart', 'sheet', 'armor'],
position: { width: 400 },
form: {
diff --git a/module/applications/sheets/class.mjs b/module/applications/sheets/class.mjs
index ea0806d5..e9ec1305 100644
--- a/module/applications/sheets/class.mjs
+++ b/module/applications/sheets/class.mjs
@@ -217,7 +217,6 @@ const { TextEditor } = foundry.applications.ux;
export default class ClassSheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-class',
classes: ['daggerheart', 'sheet', 'class'],
position: { width: 600 },
actions: {
diff --git a/module/applications/sheets/community.mjs b/module/applications/sheets/community.mjs
index 34f9b660..f2bdf1ff 100644
--- a/module/applications/sheets/community.mjs
+++ b/module/applications/sheets/community.mjs
@@ -61,7 +61,6 @@ const { ItemSheetV2 } = foundry.applications.sheets;
export default class CommunitySheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-community',
classes: ['daggerheart', 'sheet', 'heritage'],
position: { width: 600 },
actions: {
diff --git a/module/applications/sheets/consumable.mjs b/module/applications/sheets/consumable.mjs
index 6d1f8da8..d9e25086 100644
--- a/module/applications/sheets/consumable.mjs
+++ b/module/applications/sheets/consumable.mjs
@@ -26,7 +26,6 @@ const { ItemSheetV2 } = foundry.applications.sheets;
export default class ConsumableSheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-consumable',
classes: ['daggerheart', 'sheet', 'consumable'],
position: { width: 480 },
form: {
diff --git a/module/applications/sheets/domainCard.mjs b/module/applications/sheets/domainCard.mjs
index 3b93050d..be9971d5 100644
--- a/module/applications/sheets/domainCard.mjs
+++ b/module/applications/sheets/domainCard.mjs
@@ -38,7 +38,6 @@ const { ItemSheetV2 } = foundry.applications.sheets;
export default class DomainCardSheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-domainCard',
classes: ['daggerheart', 'sheet', 'domain-card'],
position: { width: 600, height: 600 },
actions: {
diff --git a/module/applications/sheets/feature.mjs b/module/applications/sheets/feature.mjs
index 894d620e..f8938fd0 100644
--- a/module/applications/sheets/feature.mjs
+++ b/module/applications/sheets/feature.mjs
@@ -12,7 +12,6 @@ export default class FeatureSheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-feature',
classes: ['daggerheart', 'sheet', 'feature'],
position: { width: 600, height: 600 },
window: { resizable: true },
diff --git a/module/applications/sheets/miscellaneous.mjs b/module/applications/sheets/miscellaneous.mjs
index 1be74016..6d4d2646 100644
--- a/module/applications/sheets/miscellaneous.mjs
+++ b/module/applications/sheets/miscellaneous.mjs
@@ -26,7 +26,6 @@ const { ItemSheetV2 } = foundry.applications.sheets;
export default class MiscellaneousSheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-miscellaneous',
classes: ['daggerheart', 'sheet', 'miscellaneous'],
position: { width: 400 },
form: {
diff --git a/module/applications/sheets/pc.mjs b/module/applications/sheets/pc.mjs
index fe32752b..72fb3fc7 100644
--- a/module/applications/sheets/pc.mjs
+++ b/module/applications/sheets/pc.mjs
@@ -23,7 +23,6 @@ export default class PCSheet extends DaggerheartSheet(ActorSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-pc',
classes: ['daggerheart', 'sheet', 'pc'],
position: { width: 810, height: 1080 },
actions: {
diff --git a/module/applications/sheets/subclass.mjs b/module/applications/sheets/subclass.mjs
index e9df7e1d..6d6df836 100644
--- a/module/applications/sheets/subclass.mjs
+++ b/module/applications/sheets/subclass.mjs
@@ -79,7 +79,6 @@ const { ItemSheetV2 } = foundry.applications.sheets;
export default class SubclassSheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-subclass',
classes: ['daggerheart', 'sheet', 'subclass'],
position: { width: 600 },
actions: {
diff --git a/module/applications/sheets/weapon.mjs b/module/applications/sheets/weapon.mjs
index 15473380..af979c2b 100644
--- a/module/applications/sheets/weapon.mjs
+++ b/module/applications/sheets/weapon.mjs
@@ -32,7 +32,6 @@ const { ItemSheetV2 } = foundry.applications.sheets;
export default class WeaponSheet extends DaggerheartSheet(ItemSheetV2) {
static DEFAULT_OPTIONS = {
tag: 'form',
- id: 'daggerheart-weapon',
classes: ['daggerheart', 'sheet', 'weapon'],
position: { width: 400 },
form: {