More Clock Trackable Resources (#968)

* feat:Moved addClockResource to BaseCharacterDataModel

* feat:Pressure clock trackable resource only added if feature is enabled; added brainwave clock to trackable PC resources

* feat:Added garden clock

* feat:Added (optional) zero power trackable resource

* fix:Updated garden clock fuid

Author: Unarekin

module/documents/actors/character/character-data-model.mjs

@@ -109,6 +109,7 @@ export class CharacterDataModel extends BaseCharacterDataModel {
 		this.resources.hp.attribute = 'mig';
 		this.resources.mp.attribute = 'wlp';
 		this.#prepareBasicResources();
+		this.#prepareClockResources();
 		this.vehicle.prepareData();
 		this.floralist.prepareData();
 		this.derived.prepareData();
@@ -236,4 +237,10 @@ export class CharacterDataModel extends BaseCharacterDataModel {
 		this.resources.fp.value = this.resources.fp.value || 0;
 		this.resources.exp.value = this.resources.exp.value || 0;
 	}
+
+	#prepareClockResources() {
+		this.addClockResource('brainwave', 'brainwave-clock');
+		this.addClockResource('garden', 'garden');
+		this.addClockResource('zeroPower', 'zero-power');
+	}
 }

module/documents/actors/common/base-character-data-model.mjs

@@ -34,6 +34,38 @@ export class BaseCharacterDataModel extends foundry.abstract.TypeDataModel {
 		};
 	}
 
+	/**
+	 * Adds a trackable resource to the clocks property of this DataModel
+	 * @param {string} key - Key name for the clock to be added to the DataModel
+	 * @param {string} fuid - fuid of the progress clock -- will be resolved with {@link FUActor.resolveProgress}
+	 */
+	addClockResource(key, fuid) {
+		this.clocks ??= {};
+		this.clocks[key] ??= {};
+
+		const actor = this.parent;
+
+		Object.defineProperty(this.clocks[key], 'value', {
+			configurable: true,
+			enumerable: true,
+			get() {
+				const clock = actor?.resolveProgress(fuid);
+				if (!clock) return 0;
+				return clock.current;
+			},
+		});
+
+		Object.defineProperty(this.clocks[key], 'max', {
+			configurable: true,
+			enumerable: true,
+			get() {
+				const clock = actor?.resolveProgress(fuid);
+				if (!clock) return 0;
+				return clock.max;
+			},
+		});
+	}
+
 	/**
 	 * @return FUActor
 	 */

module/documents/actors/npc/npc-data-model.mjs

@@ -225,38 +225,6 @@ export class NpcDataModel extends BaseCharacterDataModel {
 		});
 	}
 
-	/**
-	 * Adds a trackable resource to the clocks property of this DataModel
-	 * @param {string} key - Key name for the clock to be added to the DataModel
-	 * @param {string} fuid - fuid of the progress clock -- will be resolved with {@link FUActor.resolveProgress}
-	 */
-	addClockResource(key, fuid) {
-		this.clocks ??= {};
-		this.clocks[key] ??= {};
-
-		const actor = this.parent;
-
-		Object.defineProperty(this.clocks[key], 'value', {
-			configurable: true,
-			enumerable: true,
-			get() {
-				const clock = actor?.resolveProgress(fuid);
-				if (!clock) return 0;
-				return clock.current;
-			},
-		});
-
-		Object.defineProperty(this.clocks[key], 'max', {
-			configurable: true,
-			enumerable: true,
-			get() {
-				const clock = actor?.resolveProgress(fuid);
-				if (!clock) return 0;
-				return clock.max;
-			},
-		});
-	}
-
 	#prepareClockResources() {
 		this.addClockResource('pressure', 'pressure');
 	}

module/projectfu.mjs

@@ -7,7 +7,7 @@ import { FUStandardItemSheet } from './sheets/item-standard-sheet.mjs';
 // Import helper/utility classes and constants.
 import { preloadHandlebarsTemplates } from './helpers/templates.mjs';
 import { FU, SYSTEM } from './helpers/config.mjs';
-import { registerSystemSettings } from './settings.js';
+import { registerSystemSettings, SETTINGS } from './settings.js';
 import { FUCombatTracker } from './ui/combat-tracker.mjs';
 import { FUCombat, FUCombatDataModel } from './ui/combat.mjs';
 import { FUCombatant } from './ui/combatant.mjs';
@@ -233,16 +233,7 @@ Hooks.once('init', async () => {
 		party: PartyDataModel,
 		stash: StashDataModel,
 	};
-	CONFIG.Actor.trackableAttributes = {
-		character: {
-			bar: ['resources.hp', 'resources.mp', 'resources.ip'],
-			value: ['resources.fp.value', 'resources.exp.value'],
-		},
-		npc: {
-			bar: ['resources.hp', 'resources.mp', 'clocks.pressure'],
-			value: ['resources.fp.value'],
-		},
-	};
+
 	CONFIG.Item.documentClass = FUItem;
 	CONFIG.Item.dataModels = {
 		accessory: AccessoryDataModel,
@@ -276,6 +267,25 @@ Hooks.once('init', async () => {
 	await registerSystemSettings();
 	await registerKeyBindings();
 
+	CONFIG.Actor.trackableAttributes = {
+		character: {
+			bar: ['resources.hp', 'resources.mp', 'resources.ip', 'clocks.brainwave', 'clocks.garden'],
+			value: ['resources.fp.value', 'resources.exp.value'],
+		},
+		npc: {
+			bar: ['resources.hp', 'resources.mp'],
+			value: ['resources.fp.value'],
+		},
+	};
+
+	if (game.settings.get(SYSTEM, SETTINGS.pressureSystem)) {
+		CONFIG.Actor.trackableAttributes.npc.bar.push('clocks.pressure');
+	}
+
+	if (game.settings.get(SYSTEM, SETTINGS.optionZeroPower)) {
+		CONFIG.Actor.trackableAttributes.character.bar.push('clocks.zeroPower');
+	}
+
 	// Set combat tracker
 	console.log(`${SYSTEM} | Initializing combat tracker`);
 	CONFIG.Combat.documentClass = FUCombat;