Merge branch 'main' into feature/1-Embedding-Rolls

lang/en.json

@@ -998,6 +998,7 @@
                     "Dice": "Dice",
                     "Icon": "Icon"
                 },
+                "Max": "Max",
                 "Tabs": {
                     "Features": "Features",
                     "Effects": "Effects",

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: {

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: {

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,

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: {

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: {

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: {

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: {

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: {

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: {

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: {

module/applications/sheets/feature.mjs

@@ -12,9 +12,9 @@ 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 },
         actions: {
             addEffect: this.addEffect,
             removeEffect: this.removeEffect,

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: {

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: {

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: {

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: {

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;

styles/item.less

@@ -1,6 +1,5 @@
 .daggerheart.sheet {
     &.feature {
-        background-color: red;
         .editable {
             display: flex;
             flex-direction: column;

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 }}
                 <div class="form-group">
-                    <label>{{localize "DAGGERHEART.Sheets.Feature.RefreshType"}}</label>
                     <div class="form-fields">
-                        {{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}}
                             <label>Uses</label>
                             <input type="text" name="system.refreshData.uses" value="{{document.system.refreshData.uses}}" data-dtype="Number" />