diff --git a/lang/en.json b/lang/en.json
index a2d282b0..6b1ebe28 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2565,6 +2565,9 @@
"label": "Countdown Automation",
"hint": "Automatically progress countdowns based on their progression settings"
},
+ "hideObserverPermissionInChat": {
+ "label": "Hide chat information such as hit/miss for Actors players lack permission on"
+ },
"levelupAuto": {
"label": "Levelup Automation",
"hint": "When you've made your choices and finish levelup, the numerical changes are automatically applied to your character."
@@ -2629,14 +2632,6 @@
"title": "Triggers"
}
},
- "Metagaming": {
- "FIELDS": {
- "hideObserverPermissionInChat": {
- "label": "Hide Chat Info From Players",
- "hint": "Information such as hit/miss on attack rolls against adversaries will be hidden"
- }
- }
- },
"Homebrew": {
"newDowntimeMove": "Downtime Move",
"downtimeMove": "Downtime Move",
@@ -2696,11 +2691,6 @@
"label": "Configure Automation",
"hint": "Various settings automating resource management and more"
},
- "metagaming": {
- "name": "Metagaming Settings",
- "label": "Configure Metagaming",
- "hint": "Various settings controlling the flow of information to players"
- },
"homebrew": {
"name": "Homebrew Settings",
"label": "Configure Homebrew",
diff --git a/module/applications/settings/_module.mjs b/module/applications/settings/_module.mjs
index 28972397..b565777c 100644
--- a/module/applications/settings/_module.mjs
+++ b/module/applications/settings/_module.mjs
@@ -1,5 +1,4 @@
export { default as DhAppearanceSettings } from './appearanceSettings.mjs';
export { default as DhAutomationSettings } from './automationSettings.mjs';
export { default as DhHomebrewSettings } from './homebrewSettings.mjs';
-export { default as DhMetagamingSettings } from './metagamingSettings.mjs';
export { default as DhVariantRuleSettings } from './variantRuleSettings.mjs';
diff --git a/module/applications/settings/automationSettings.mjs b/module/applications/settings/automationSettings.mjs
index 52def7db..e720733e 100644
--- a/module/applications/settings/automationSettings.mjs
+++ b/module/applications/settings/automationSettings.mjs
@@ -31,8 +31,8 @@ export default class DhAutomationSettings extends HandlebarsApplicationMixin(App
};
static PARTS = {
- header: { template: 'systems/daggerheart/templates/settings/automation-settings/header.hbs' },
tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
+ header: { template: 'systems/daggerheart/templates/settings/automation-settings/header.hbs' },
general: { template: 'systems/daggerheart/templates/settings/automation-settings/general.hbs' },
rules: { template: 'systems/daggerheart/templates/settings/automation-settings/deathMoves.hbs' },
roll: { template: 'systems/daggerheart/templates/settings/automation-settings/roll.hbs' },
diff --git a/module/applications/settings/metagamingSettings.mjs b/module/applications/settings/metagamingSettings.mjs
deleted file mode 100644
index c29a021b..00000000
--- a/module/applications/settings/metagamingSettings.mjs
+++ /dev/null
@@ -1,62 +0,0 @@
-import { DhMetagaming } from '../../data/settings/_module.mjs';
-
-const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
-
-export default class DhMetagamingSettings extends HandlebarsApplicationMixin(ApplicationV2) {
- constructor() {
- super({});
-
- this.settings = new DhMetagaming(
- game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming).toObject()
- );
- }
-
- get title() {
- return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.title');
- }
-
- static DEFAULT_OPTIONS = {
- tag: 'form',
- id: 'daggerheart-metagaming-settings',
- classes: ['daggerheart', 'dh-style', 'dialog', 'setting'],
- position: { width: '600', height: 'auto' },
- window: {
- icon: 'fa-solid fa-eye-low-vision'
- },
- actions: {
- reset: this.reset,
- save: this.save
- },
- form: { handler: this.updateData, submitOnChange: true }
- };
-
- static PARTS = {
- header: { template: 'systems/daggerheart/templates/settings/metagaming-settings/header.hbs' },
- general: { template: 'systems/daggerheart/templates/settings/metagaming-settings/general.hbs' },
- footer: { template: 'systems/daggerheart/templates/settings/metagaming-settings/footer.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 DhMetagaming();
- this.render();
- }
-
- static async save() {
- await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming, this.settings.toObject());
- this.close();
- }
-}
diff --git a/module/config/settingsConfig.mjs b/module/config/settingsConfig.mjs
index 38ffcf3b..d3f752bb 100644
--- a/module/config/settingsConfig.mjs
+++ b/module/config/settingsConfig.mjs
@@ -3,10 +3,6 @@ export const menu = {
Name: 'GameSettingsAutomation',
Icon: 'fa-solid fa-robot'
},
- Metagaming: {
- Name: 'GameSettingsMetagaming',
- Icon: 'fa-solid fa-eye-low-vision'
- },
Homebrew: {
Name: 'GameSettingsHomebrew',
Icon: 'fa-solid fa-flask-vial'
@@ -23,7 +19,6 @@ export const menu = {
export const gameSettings = {
Automation: 'Automation',
- Metagaming: 'Metagaming',
Homebrew: 'Homebrew',
appearance: 'Appearance',
variantRules: 'VariantRules',
diff --git a/module/data/settings/Automation.mjs b/module/data/settings/Automation.mjs
index 20fe0baf..6fe91385 100644
--- a/module/data/settings/Automation.mjs
+++ b/module/data/settings/Automation.mjs
@@ -27,6 +27,10 @@ export default class DhAutomation extends foundry.abstract.DataModel {
initial: true,
label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.countdownAutomation.label'
}),
+ hideObserverPermissionInChat: new fields.BooleanField({
+ initial: false,
+ label: 'DAGGERHEART.SETTINGS.Automation.FIELDS.hideObserverPermissionInChat.label'
+ }),
levelupAuto: new fields.BooleanField({
required: true,
initial: true,
diff --git a/module/data/settings/Metagaming.mjs b/module/data/settings/Metagaming.mjs
deleted file mode 100644
index 2bb5afdf..00000000
--- a/module/data/settings/Metagaming.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-export default class DhMetagaming extends foundry.abstract.DataModel {
- static defineSchema() {
- const fields = foundry.data.fields;
- return {
- hideObserverPermissionInChat: new fields.BooleanField({
- initial: false,
- label: 'DAGGERHEART.SETTINGS.Metagaming.FIELDS.hideObserverPermissionInChat.label',
- hint: 'DAGGERHEART.SETTINGS.Metagaming.FIELDS.hideObserverPermissionInChat.hint'
- })
- };
- }
-}
diff --git a/module/data/settings/_module.mjs b/module/data/settings/_module.mjs
index 45405ba5..db1fbfec 100644
--- a/module/data/settings/_module.mjs
+++ b/module/data/settings/_module.mjs
@@ -1,5 +1,4 @@
export { default as DhAppearance } from './Appearance.mjs';
export { default as DhAutomation } from './Automation.mjs';
export { default as DhHomebrew } from './Homebrew.mjs';
-export { default as DhMetagaming } from './Metagaming.mjs';
export { default as DhVariantRules } from './VariantRules.mjs';
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index a836a2ea..4a587bd7 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -141,9 +141,9 @@ export default class DHRoll extends Roll {
async render({ flavor, template = this.constructor.CHAT_TEMPLATE, isPrivate = false, ...options } = {}) {
if (!this._evaluated) return;
- const metagamingSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming);
+ const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
const chatData = await this._prepareChatRenderContext({ flavor, isPrivate, ...options });
- return foundry.applications.handlebars.renderTemplate(template, { ...chatData, metagamingSettings });
+ return foundry.applications.handlebars.renderTemplate(template, { ...chatData, automationSettings });
}
/** @inheritDoc */
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 53921329..6a4c3eb0 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -70,7 +70,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
e.setAttribute('data-use-perm', document.testUserPermission(game.user, 'OWNER'));
- const settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming);
+ const settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
if (settings.hideObserverPermissionInChat)
e.setAttribute('data-view-perm', document.testUserPermission(game.user, 'OBSERVER'));
});
diff --git a/module/systemRegistration/settings.mjs b/module/systemRegistration/settings.mjs
index 4951c6cd..c4acf7ed 100644
--- a/module/systemRegistration/settings.mjs
+++ b/module/systemRegistration/settings.mjs
@@ -1,11 +1,10 @@
import { defaultLevelTiers, DhLevelTiers } from '../data/levelTier.mjs';
import DhCountdowns from '../data/countdowns.mjs';
-import { DhAppearance, DhAutomation, DhHomebrew, DhMetagaming, DhVariantRules } from '../data/settings/_module.mjs';
+import { DhAppearance, DhAutomation, DhHomebrew, DhVariantRules } from '../data/settings/_module.mjs';
import {
DhAppearanceSettings,
DhAutomationSettings,
DhHomebrewSettings,
- DhMetagamingSettings,
DhVariantRuleSettings
} from '../applications/settings/_module.mjs';
import { CompendiumBrowserSettings, DhTagTeamRoll } from '../data/_module.mjs';
@@ -39,12 +38,6 @@ const registerMenuSettings = () => {
type: DhAutomation
});
- game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Metagaming, {
- scope: 'world',
- config: false,
- type: DhMetagaming
- });
-
game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, {
scope: 'world',
config: false,
@@ -83,16 +76,6 @@ const registerMenus = () => {
type: DhAutomationSettings,
restricted: true
});
-
- game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.menu.Metagaming.Name, {
- name: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.metagaming.name'),
- label: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.metagaming.label'),
- hint: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.metagaming.hint'),
- icon: CONFIG.DH.SETTINGS.menu.Metagaming.Icon,
- type: DhMetagamingSettings,
- restricted: true
- });
-
game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.menu.Homebrew.Name, {
name: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.homebrew.name'),
label: game.i18n.localize('DAGGERHEART.SETTINGS.Menu.homebrew.label'),
diff --git a/system.json b/system.json
index 34d7e438..fc5e1615 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
"id": "daggerheart",
"title": "Daggerheart",
"description": "An unofficial implementation of the Daggerheart system",
- "version": "1.9.0",
+ "version": "1.8.0",
"compatibility": {
"minimum": "13.346",
"verified": "13.351",
diff --git a/templates/settings/automation-settings/general.hbs b/templates/settings/automation-settings/general.hbs
index 65bafab8..72ed4bfa 100644
--- a/templates/settings/automation-settings/general.hbs
+++ b/templates/settings/automation-settings/general.hbs
@@ -16,6 +16,7 @@
{{formGroup settingFields.schema.fields.vulnerableAutomation value=settingFields._source.vulnerableAutomation localize=true}}
{{formGroup settingFields.schema.fields.countdownAutomation value=settingFields._source.countdownAutomation localize=true}}
+ {{formGroup settingFields.schema.fields.hideObserverPermissionInChat value=settingFields._source.hideObserverPermissionInChat localize=true}}
{{formGroup settingFields.schema.fields.actionPoints value=settingFields._source.actionPoints localize=true}}
{{formGroup settingFields.schema.fields.hordeDamage value=settingFields._source.hordeDamage localize=true}}
{{formGroup settingFields.schema.fields.effects.fields.rangeDependent value=settingFields._source.effects.rangeDependent localize=true}}
diff --git a/templates/settings/metagaming-settings/footer.hbs b/templates/settings/metagaming-settings/footer.hbs
deleted file mode 100644
index 54939c17..00000000
--- a/templates/settings/metagaming-settings/footer.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-
\ No newline at end of file
diff --git a/templates/settings/metagaming-settings/general.hbs b/templates/settings/metagaming-settings/general.hbs
deleted file mode 100644
index 7f36715e..00000000
--- a/templates/settings/metagaming-settings/general.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-
- {{formGroup settingFields.schema.fields.hideObserverPermissionInChat value=settingFields._source.hideObserverPermissionInChat localize=true}}
-
\ No newline at end of file
diff --git a/templates/settings/metagaming-settings/header.hbs b/templates/settings/metagaming-settings/header.hbs
deleted file mode 100644
index e0f72ee8..00000000
--- a/templates/settings/metagaming-settings/header.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-
\ No newline at end of file
diff --git a/templates/ui/chat/parts/target-part.hbs b/templates/ui/chat/parts/target-part.hbs
index 9a545926..466364a0 100644
--- a/templates/ui/chat/parts/target-part.hbs
+++ b/templates/ui/chat/parts/target-part.hbs
@@ -1,6 +1,6 @@
- {{#if (or isGM (not metagamingSettings.hideObserverPermissionInChat))}}
+ {{#if (or isGM (not automationSettings.hideObserverPermissionInChat))}}