${game.i18n.localize('SETTINGS.ReloadPromptBody')}
` - }); - - if (reload) { - await game.socket.emit('reload'); - foundry.utils.debouncedReload(); - } */ - document.body.classList.toggle('theme-colorful', game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).dualityColorScheme === DualityRollColor.colorful.value); + document.body.classList.toggle( + 'theme-colorful', + game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).dualityColorScheme === + DualityRollColor.colorful.value + ); this.close(); } diff --git a/module/applications/settings/automationSettings.mjs b/module/applications/settings/automationSettings.mjs new file mode 100644 index 00000000..6de21efd --- /dev/null +++ b/module/applications/settings/automationSettings.mjs @@ -0,0 +1,59 @@ +import { DhAutomation } from '../../data/settings/_module.mjs'; + +const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; + +export default class DhAutomationSettings extends HandlebarsApplicationMixin(ApplicationV2) { + constructor() { + super({}); + + this.settings = new DhAutomation( + game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Automation).toObject() + ); + } + + get title() { + return game.i18n.localize('DAGGERHEART.Settings.Menu.Automation.Name'); + } + + static DEFAULT_OPTIONS = { + tag: 'form', + id: 'daggerheart-automation-settings', + classes: ['daggerheart', 'setting', 'dh-style'], + position: { width: '600', height: 'auto' }, + actions: { + reset: this.reset, + save: this.save + }, + form: { handler: this.updateData, submitOnChange: true } + }; + + static PARTS = { + main: { + template: 'systems/daggerheart/templates/settings/automation-settings.hbs' + } + }; + + async _prepareContext(_options) { + const context = await super._prepareContext(_options); + context.settingFields = this.settings; + + return context; + } + + static async updateData(event, element, formData) { + const updatedSettings = foundry.utils.expandObject(formData.object); + + await this.settings.updateSource(updatedSettings); + this.render(); + } + + static async reset() { + this.settings = new DhAutomation(); + this.render(); + } + + static async save() { + await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Automation, this.settings.toObject()); + this.close(); + } +} diff --git a/module/applications/settings/homebrewSettings.mjs b/module/applications/settings/homebrewSettings.mjs new file mode 100644 index 00000000..e1b60726 --- /dev/null +++ b/module/applications/settings/homebrewSettings.mjs @@ -0,0 +1,60 @@ +import { DhHomebrew } from '../../data/settings/_module.mjs'; + +const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; + +export default class DhAutomationSettings extends HandlebarsApplicationMixin(ApplicationV2) { + constructor() { + super({}); + + this.settings = new DhHomebrew(game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew).toObject()); + } + + get title() { + return game.i18n.localize('DAGGERHEART.Settings.Menu.Homebrew.Name'); + } + + static DEFAULT_OPTIONS = { + tag: 'form', + id: 'daggerheart-homebrew-settings', + classes: ['daggerheart', 'setting', 'dh-style'], + position: { width: '600', height: 'auto' }, + actions: { + reset: this.reset, + save: this.save + }, + form: { handler: this.updateData, submitOnChange: true } + }; + + static PARTS = { + main: { + template: 'systems/daggerheart/templates/settings/homebrew-settings.hbs' + } + }; + + async _prepareContext(_options) { + const context = await super._prepareContext(_options); + context.settingFields = this.settings; + + return context; + } + + static async updateData(event, element, formData) { + const updatedSettings = foundry.utils.expandObject(formData.object); + + await this.settings.updateSource({ + ...updatedSettings, + traitArray: Object.values(updatedSettings.traitArray) + }); + this.render(); + } + + static async reset() { + this.settings = new DhHomebrew(); + this.render(); + } + + static async save() { + await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew, this.settings.toObject()); + this.close(); + } +} diff --git a/module/applications/settings/rangeMeasurementSettings.mjs b/module/applications/settings/rangeMeasurementSettings.mjs new file mode 100644 index 00000000..8e90b462 --- /dev/null +++ b/module/applications/settings/rangeMeasurementSettings.mjs @@ -0,0 +1,59 @@ +import { DhRangeMeasurement } from '../../data/settings/_module.mjs'; + +const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; + +export default class DhRangeMeasurementSettings extends HandlebarsApplicationMixin(ApplicationV2) { + constructor() { + super({}); + + this.settings = new DhRangeMeasurement( + game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement).toObject() + ); + } + + get title() { + return game.i18n.localize('DAGGERHEART.Settings.Menu.Automation.Name'); + } + + static DEFAULT_OPTIONS = { + tag: 'form', + id: 'daggerheart-automation-settings', + classes: ['daggerheart', 'setting', 'dh-style'], + position: { width: '600', height: 'auto' }, + actions: { + reset: this.reset, + save: this.save + }, + form: { handler: this.updateData, submitOnChange: true } + }; + + static PARTS = { + main: { + template: 'systems/daggerheart/templates/settings/range-measurement-settings.hbs' + } + }; + + async _prepareContext(_options) { + const context = await super._prepareContext(_options); + context.settingFields = this.settings; + + return context; + } + + static async updateData(event, element, formData) { + const updatedSettings = foundry.utils.expandObject(formData.object); + + await this.settings.updateSource(updatedSettings); + this.render(); + } + + static async reset() { + this.settings = new DhRangeMeasurement(); + this.render(); + } + + static async save() { + await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement, this.settings.toObject()); + this.close(); + } +} diff --git a/module/applications/sheets/character.mjs b/module/applications/sheets/character.mjs index bea918e6..fe0beec9 100644 --- a/module/applications/sheets/character.mjs +++ b/module/applications/sheets/character.mjs @@ -165,18 +165,18 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) { context.config = SYSTEM; const selectedAttributes = Object.values(this.document.system.traits).map(x => x.base); - context.abilityScoreArray = JSON.parse( - await game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.General.AbilityArray) - ).reduce((acc, x) => { - const selectedIndex = selectedAttributes.indexOf(x); - if (selectedIndex !== -1) { - selectedAttributes.splice(selectedIndex, 1); - } else { - acc.push({ name: x, value: x }); - } + context.abilityScoreArray = await game.settings + .get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew) + .traitArray.reduce((acc, x) => { + const selectedIndex = selectedAttributes.indexOf(x); + if (selectedIndex !== -1) { + selectedAttributes.splice(selectedIndex, 1); + } else { + acc.push({ name: x, value: x }); + } - return acc; - }, []); + return acc; + }, []); if (!context.abilityScoreArray.includes(0)) context.abilityScoreArray.push({ name: 0, value: 0 }); context.abilityScoresFinished = context.abilityScoreArray.every(x => x.value === 0); diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs index 978e32cb..76fd12a0 100644 --- a/module/config/generalConfig.mjs +++ b/module/config/generalConfig.mjs @@ -337,3 +337,9 @@ export const rollTypes = { label: 'DAGGERHEART.RollTypes.ability.name' } }; + +export const fearDisplay = { + token: { value: 'token', label: 'DAGGERHEART.Settings.Appearance.FearDisplay.Token' }, + bar: { value: 'bar', label: 'DAGGERHEART.Settings.Appearance.FearDisplay.Bar' }, + hide: { value: 'hide', label: 'DAGGERHEART.Settings.Appearance.FearDisplay.Hide' } +}; diff --git a/module/config/settingsConfig.mjs b/module/config/settingsConfig.mjs index 3a33e61b..be793199 100644 --- a/module/config/settingsConfig.mjs +++ b/module/config/settingsConfig.mjs @@ -18,23 +18,15 @@ export const menu = { }; export const gameSettings = { - Automation: { - Hope: 'AutomationHope', - ActionPoints: 'AutomationActionPoints' - }, - Resources: { - Fear: 'ResourcesFear', - MaxFear: 'ResourcesMaxFear', - DisplayFear: 'DisplayFear' - }, - General: { - AbilityArray: 'AbilityArray', - RangeMeasurement: 'RangeMeasurement' - }, - DualityRollColor: 'DualityRollColor', - LevelTiers: 'LevelTiers', + Automation: 'Automation', + Homebrew: 'Homebrew', + RangeMeasurement: 'RangeMeasurement', appearance: 'Appearance', - variantRules: 'VariantRules' + variantRules: 'VariantRules', + Resources: { + Fear: 'ResourcesFear' + }, + LevelTiers: 'LevelTiers' }; export const DualityRollColor = { diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs index fdbd925c..6382b613 100644 --- a/module/data/settings/Appearance.mjs +++ b/module/data/settings/Appearance.mjs @@ -1,7 +1,15 @@ +import { fearDisplay } from '../../config/generalConfig.mjs'; + export default class DhAppearance extends foundry.abstract.DataModel { static defineSchema() { const fields = foundry.data.fields; return { + displayFear: new fields.StringField({ + required: true, + choices: fearDisplay, + initial: fearDisplay.token.value, + label: 'DAGGERHEART.Settings.Appearance.FIELDS.displayFear.label' + }), dualityColorScheme: new fields.StringField({ required: true, choices: DualityRollColor, @@ -35,8 +43,6 @@ export default class DhAppearance extends foundry.abstract.DataModel { }) }; } - - static defaultSchema = {}; } export const DualityRollColor = { diff --git a/module/data/settings/Automation.mjs b/module/data/settings/Automation.mjs new file mode 100644 index 00000000..85ed8bd4 --- /dev/null +++ b/module/data/settings/Automation.mjs @@ -0,0 +1,11 @@ +export default class DhAutomation extends foundry.abstract.DataModel { + static LOCALIZATION_PREFIXES = ['DAGGERHEART.Settings.Automation']; // Doesn't work for some reason + + static defineSchema() { + const fields = foundry.data.fields; + return { + hope: new fields.BooleanField({ required: true, initial: false }), + actionPoints: new fields.BooleanField({ required: true, initial: false }) + }; + } +} diff --git a/module/data/settings/Homebrew.mjs b/module/data/settings/Homebrew.mjs new file mode 100644 index 00000000..92999c1a --- /dev/null +++ b/module/data/settings/Homebrew.mjs @@ -0,0 +1,19 @@ +export default class DhHomebrew extends foundry.abstract.DataModel { + static LOCALIZATION_PREFIXES = ['DAGGERHEART.Settings.Homebrew']; // Doesn't work for some reason + + static defineSchema() { + const fields = foundry.data.fields; + return { + maxFear: new fields.NumberField({ + required: true, + integer: true, + min: 0, + initial: 12, + label: 'DAGGERHEART.Settings.Homebrew.FIELDS.maxFear.label' + }), + traitArray: new fields.ArrayField(new fields.NumberField({ required: true, integer: true }), { + initial: () => [2, 1, 1, 0, 0, -1] + }) + }; + } +} diff --git a/module/data/settings/RangeMeasurement.mjs b/module/data/settings/RangeMeasurement.mjs new file mode 100644 index 00000000..5d3e1125 --- /dev/null +++ b/module/data/settings/RangeMeasurement.mjs @@ -0,0 +1,17 @@ +export default class DhRangeMeasurement extends foundry.abstract.DataModel { + static defineSchema() { + const fields = foundry.data.fields; + return { + enabled: new fields.BooleanField({ required: true, initial: false, label: 'DAGGERHEART.General.Enabled' }), + melee: new fields.NumberField({ required: true, initial: 5, label: 'DAGGERHEART.Range.melee.name' }), + veryClose: new fields.NumberField({ + required: true, + initial: 15, + label: 'DAGGERHEART.Range.veryClose.name' + }), + close: new fields.NumberField({ required: true, initial: 30, label: 'DAGGERHEART.Range.close.name' }), + far: new fields.NumberField({ required: true, initial: 60, label: 'DAGGERHEART.Range.far.name' }), + veryFar: new fields.NumberField({ required: true, initial: 120, label: 'DAGGERHEART.Range.veryFar.name' }) + }; + } +} diff --git a/module/data/settings/VariantRules.mjs b/module/data/settings/VariantRules.mjs index 7d28a1d7..25e012bc 100644 --- a/module/data/settings/VariantRules.mjs +++ b/module/data/settings/VariantRules.mjs @@ -5,12 +5,22 @@ export default class DhVariantRules extends foundry.abstract.DataModel { const fields = foundry.data.fields; return { actionTokens: new fields.SchemaField({ - enabled: new fields.BooleanField({ required: true, initial: false }), - tokens: new fields.NumberField({ required: true, integer: true, initial: 3 }) + enabled: new fields.BooleanField({ + required: true, + initial: false, + label: 'DAGGERHEART.Settings.VariantRules.FIELDS.actionTokens.enabled.label' + }), + tokens: new fields.NumberField({ + required: true, + integer: true, + initial: 3, + label: 'DAGGERHEART.Settings.VariantRules.FIELDS.actionTokens.tokens.label' + }) }), - useCoins: new fields.BooleanField({ initial: false }) + useCoins: new fields.BooleanField({ + initial: false, + label: 'DAGGERHEART.Settings.VariantRules.FIELDS.useCoins.label' + }) }; } - - static defaultSchema = {}; } diff --git a/module/data/settings/_module.mjs b/module/data/settings/_module.mjs new file mode 100644 index 00000000..dc99ed36 --- /dev/null +++ b/module/data/settings/_module.mjs @@ -0,0 +1,7 @@ +import DhAppearance from './Appearance.mjs'; +import DhAutomation from './Automation.mjs'; +import DhHomebrew from './Homebrew.mjs'; +import DhRangeMeasurement from './RangeMeasurement.mjs'; +import DhVariantRules from './VariantRules.mjs'; + +export { DhAppearance, DhAutomation, DhHomebrew, DhRangeMeasurement, DhVariantRules }; diff --git a/module/ui/ruler.mjs b/module/ui/ruler.mjs index 2c6848d2..71588c81 100644 --- a/module/ui/ruler.mjs +++ b/module/ui/ruler.mjs @@ -3,7 +3,7 @@ export default class DhpRuler extends foundry.canvas.interaction.Ruler { const context = super._getWaypointLabelContext(waypoint, state); if (!context) return; - const range = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.General.RangeMeasurement); + const range = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement); if (range.enabled) { const distance = this.#getRangeLabel(waypoint.measurement.distance.toNearest(0.01), range); diff --git a/module/ui/tokenRuler.mjs b/module/ui/tokenRuler.mjs index 4faa516e..fd7e9036 100644 --- a/module/ui/tokenRuler.mjs +++ b/module/ui/tokenRuler.mjs @@ -3,7 +3,7 @@ export default class DhpTokenRuler extends foundry.canvas.placeables.tokens.Toke const context = super._getWaypointLabelContext(waypoint, state); if (!context) return; - const range = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.General.RangeMeasurement); + const range = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement); if (range.enabled) { const distance = this.#getRangeLabel(waypoint.measurement.distance.toNearest(0.01), range); diff --git a/styles/daggerheart.css b/styles/daggerheart.css index e5d27cb5..fee3a88b 100755 --- a/styles/daggerheart.css +++ b/styles/daggerheart.css @@ -2816,6 +2816,31 @@ div.daggerheart.views.multiclass { #resources:has(.fear-bar) { min-width: 200px; } +.daggerheart.dh-style.setting .settings-col { + display: flex; + flex-direction: column; + gap: 4px; +} +.daggerheart.dh-style.setting .trait-array-container { + display: flex; + justify-content: space-evenly; + gap: 8px; + margin-bottom: 16px; +} +.daggerheart.dh-style.setting .trait-array-container .trait-array-item { + position: relative; + display: flex; + justify-content: center; +} +.daggerheart.dh-style.setting .trait-array-container .trait-array-item label { + position: absolute; + top: -7px; + font-size: 12px; + font-variant: petite-caps; +} +.daggerheart.dh-style.setting .trait-array-container .trait-array-item input { + text-align: center; +} .application.sheet.daggerheart.actor.dh-style.adversary .window-content { overflow: auto; } diff --git a/styles/daggerheart.less b/styles/daggerheart.less index 0b0f3926..9965015b 100755 --- a/styles/daggerheart.less +++ b/styles/daggerheart.less @@ -11,6 +11,7 @@ @import './levelup.less'; @import '../node_modules/@yaireo/tagify/dist/tagify.css'; @import './resources.less'; +@import './settings.less'; // new styles imports @import './less/actors/character.less'; diff --git a/styles/settings.less b/styles/settings.less new file mode 100644 index 00000000..e37f9891 --- /dev/null +++ b/styles/settings.less @@ -0,0 +1,31 @@ +.daggerheart.dh-style.setting { + .settings-col { + display: flex; + flex-direction: column; + gap: 4px; + } + + .trait-array-container { + display: flex; + justify-content: space-evenly; + gap: 8px; + margin-bottom: 16px; + + .trait-array-item { + position: relative; + display: flex; + justify-content: center; + + label { + position: absolute; + top: -7px; + font-size: 12px; + font-variant: petite-caps; + } + + input { + text-align: center; + } + } + } +} diff --git a/templates/settings/appearance-settings.hbs b/templates/settings/appearance-settings.hbs index e0a16235..6464f9c9 100644 --- a/templates/settings/appearance-settings.hbs +++ b/templates/settings/appearance-settings.hbs @@ -1,4 +1,6 @@