Trait Items #72

Open
Oliver wants to merge 41 commits from feature/trait-items into main
6 changed files with 3 additions and 39 deletions
Showing only changes of commit 8ea22d7eaf - Show all commits

View file

@ -71,7 +71,7 @@ export class RipCryptIcon extends StyledShadowElement(HTMLElement) {
This is so that when we get an HMR event from Foundry we can appropriately This is so that when we get an HMR event from Foundry we can appropriately
handle it using our logic to update the component and the icon cache. handle it using our logic to update the component and the icon cache.
*/ */
if (game.settings.get(`ripcrypt`, `devMode`)) { if (game.system.flags.inDev) {
this.#svgHmr = Hooks.on(`${game.system.id}-hmr:svg`, (iconName, data) => { this.#svgHmr = Hooks.on(`${game.system.id}-hmr:svg`, (iconName, data) => {
if (this._name === iconName || this._path?.endsWith(data.path)) { if (this._name === iconName || this._path?.endsWith(data.path)) {
const svg = this.#parseSVG(data.content); const svg = this.#parseSVG(data.content);

View file

@ -57,7 +57,7 @@ export class ArmourData extends CommonItemData {
}; };
async _preUpdate(changes, options, user) { async _preUpdate(changes, options, user) {
if (options.force && game.settings.get(`ripcrypt`, `devMode`)) { return }; if (options.force && game.system.flags.inDev) { return };
// Ensure changes is a diffed object // Ensure changes is a diffed object
const diff = diffObject(this.parent._source, changes); const diff = diffObject(this.parent._source, changes);

View file

@ -70,7 +70,7 @@ export class WeaponData extends CommonItemData {
* @returns * @returns
*/ */
async _preUpdate(changes, options, user) { async _preUpdate(changes, options, user) {
if (options.force && game.settings.get(`ripcrypt`, `devMode`)) { return }; if (options.force && game.system.flags.inDev) { return };
const diff = diffObject(this.parent._source, changes); const diff = diffObject(this.parent._source, changes);
let valid = super._preUpdate(changes, options, user); let valid = super._preUpdate(changes, options, user);

View file

@ -34,7 +34,6 @@ import { RipCryptToken } from "../documents/token.mjs";
import helpers from "../handlebarHelpers/_index.mjs"; import helpers from "../handlebarHelpers/_index.mjs";
import { Logger } from "../utils/Logger.mjs"; import { Logger } from "../utils/Logger.mjs";
import { registerCustomComponents } from "../Apps/components/_index.mjs"; import { registerCustomComponents } from "../Apps/components/_index.mjs";
import { registerDevSettings } from "../settings/devSettings.mjs";
import { registerMetaSettings } from "../settings/metaSettings.mjs"; import { registerMetaSettings } from "../settings/metaSettings.mjs";
import { registerSockets } from "../sockets/_index.mjs"; import { registerSockets } from "../sockets/_index.mjs";
import { registerUserSettings } from "../settings/userSettings.mjs"; import { registerUserSettings } from "../settings/userSettings.mjs";
@ -51,7 +50,6 @@ Hooks.once(`init`, () => {
// #region Settings // #region Settings
registerMetaSettings(); registerMetaSettings();
registerDevSettings();
registerUserSettings(); registerUserSettings();
registerWorldSettings(); registerWorldSettings();
// #endregion // #endregion

View file

@ -3,23 +3,6 @@ import { Logger } from "../utils/Logger.mjs";
Hooks.once(`ready`, () => { Hooks.once(`ready`, () => {
Logger.log(`Ready`); Logger.log(`Ready`);
let defaultTab = game.settings.get(`ripcrypt`, `defaultTab`);
if (defaultTab) {
try {
Logger.debug(`Switching sidebar tab to:`, defaultTab);
ui.sidebar.changeTab(defaultTab, `primary`);
}
catch {
Logger.error(`Failed to change to sidebar tab:`, defaultTab);
};
};
if (game.settings.get(`ripcrypt`, `devMode`)) {
ui.sidebar.expand();
if (game.paused) { game.togglePause(false, { broadcast: true }) };
};
ui.delveDice.render({ force: true }); ui.delveDice.render({ force: true });
// MARK: 1-time updates // MARK: 1-time updates

View file

@ -1,17 +0,0 @@
export function registerDevSettings() {
game.settings.register(`ripcrypt`, `devMode`, {
scope: `client`,
type: Boolean,
config: false,
default: false,
requiresReload: false,
});
game.settings.register(`ripcrypt`, `defaultTab`, {
name: `Default Tab`,
scope: `client`,
type: String,
config: game.settings.get(`ripcrypt`, `devMode`),
requiresReload: false,
});
};