Continuing Downtime Action work

Eunomiac · Nov 27, 2023 · e74492e · e74492e
1 parent 19542c5
commit e74492e
Show file tree

Hide file tree

Showing 30 changed files with 7,436 additions and 7,314 deletions.
diff --git a/module/BladesRoll.js b/module/BladesRoll.js
@@ -977,21 +977,8 @@ class BladesRollOpposition {
     rollOppImg;
     rollOppModsData;
     rollFactors;
-    _clockData;
-    get clockData() { return this._clockData ?? {}; }
-    set clockData(val) {
-        val.id ??= randomID();
-        val.display ??= "";
-        val.value ??= 0;
-        val.max ??= 8;
-        val.color ??= "white";
-        val.isActive = true;
-        val.isNameVisible = false;
-        val.isVisible = true;
-        this._clockData = val;
-    }
     // #region Constructor ~
-    constructor(rollInstance, { rollOppID, rollOppDoc, rollOppName, rollOppSubName, rollOppType, rollOppImg, rollOppModsData, rollFactors, rollOppClock } = {}) {
+    constructor(rollInstance, { rollOppID, rollOppDoc, rollOppName, rollOppSubName, rollOppType, rollOppImg, rollOppModsData, rollFactors } = {}) {
         this.rollInstance = rollInstance;
         // Attempt to fetch an associated BladesActor or BladesItem document
         const doc = BladesRollOpposition.GetDoc(rollOppDoc ?? rollOppID ?? rollOppName);
@@ -1030,9 +1017,6 @@ class BladesRollOpposition {
         this.rollOppImg = rollOppImg ?? "";
         this.rollOppModsData = rollOppModsData ?? [];
         this.rollFactors = rollFactors;
-        if (rollOppClock) {
-            this.clockData = rollOppClock;
-        }
     }
     // #endregion
     get flagParams() {
@@ -1046,8 +1030,7 @@ class BladesRollOpposition {
             rollOppType: this.rollOppType,
             rollOppImg: this.rollOppImg,
             rollOppModsData: this.rollOppModsData,
-            rollFactors: this.rollFactors,
-            rollOppClock: this.clockData
+            rollFactors: this.rollFactors
         };
     }
     async updateRollFlags() {
@@ -2792,7 +2775,6 @@ class BladesRoll extends DocumentSheet {
             ...rollResultData,
             ...GMBoostsData,
             ...positionEffectTradeData,
-            // ...downtimeData,
             userPermission,
             gamePhase: game.eunoblades.Tracker?.phase || BladesPhase.Freeplay
         };

diff --git a/module/blades.js b/module/blades.js
@@ -8,7 +8,7 @@ import U from "./core/utilities.js";
 import logger from "./core/logger.js";
 import G, { Initialize as GsapInitialize } from "./core/gsap.js";
 import BladesActorProxy, { BladesActor, BladesPC, BladesCrew, BladesNPC, BladesFaction } from "./documents/BladesActorProxy.js";
-import BladesItemProxy, { BladesItem, BladesClockKeeper, BladesGMTracker, BladesLocation, BladesScore } from "./documents/BladesItemProxy.js";
+import BladesItemProxy, { BladesItem, BladesClock, BladesClockKeeper, BladesGMTracker, BladesLocation, BladesScore } from "./documents/BladesItemProxy.js";
 import BladesItemSheet from "./sheets/item/BladesItemSheet.js";
 import BladesPCSheet from "./sheets/actor/BladesPCSheet.js";
 import BladesCrewSheet from "./sheets/actor/BladesCrewSheet.js";
@@ -20,7 +20,7 @@ import BladesAI, { AGENTS, AIAssistant } from "./core/ai.js";
 import BladesActiveEffect from "./BladesActiveEffect.js";
 import BladesGMTrackerSheet from "./sheets/item/BladesGMTrackerSheet.js";
 import BladesClockKeeperSheet from "./sheets/item/BladesClockKeeperSheet.js";
-import { updateClaims, updateContacts, updateOps, updateFactions, updateDescriptions, updateRollMods } from "./data-import/data-import.js";
+// import {updateClaims, updateContacts, updateOps, updateFactions, updateDescriptions, updateRollMods} from "./data-import/data-import.js";
 CONFIG.debug.logging = false;
 /* DEVCODE*/ CONFIG.debug.logging = true;
 Object.assign(globalThis, { eLog: logger });
@@ -231,12 +231,12 @@ class GlobalGetter {
 // #region Globals: Exposing Functionality to Global Scope ~
 /* DEVCODE*/ Object.assign(globalThis, {
     get: new GlobalGetter(),
-    updateClaims,
-    updateContacts,
-    updateOps,
-    updateFactions,
-    updateDescriptions,
-    updateRollMods,
+    // updateClaims,
+    // updateContacts,
+    // updateOps,
+    // updateFactions,
+    // updateDescriptions,
+    // updateRollMods,
     BladesActor,
     BladesPC,
     BladesCrew,
@@ -258,6 +258,7 @@ class GlobalGetter {
     U,
     C,
     BladesItem,
+    BladesClock,
     BladesClockKeeper,
     BladesGMTracker,
     BladesLocation,

diff --git a/module/core/constants.js b/module/core/constants.js
@@ -16,6 +16,7 @@ export var BladesItemType;
 (function (BladesItemType) {
     BladesItemType["ability"] = "ability";
     BladesItemType["background"] = "background";
+    BladesItemType["clock"] = "clock";
     BladesItemType["clock_keeper"] = "clock_keeper";
     BladesItemType["cohort_gang"] = "cohort_gang";
     BladesItemType["cohort_expert"] = "cohort_expert";