Merge pull request #47 from pafvel/main

DrOgres · web-flow · commit 43e4636a53af · 2024-09-04T07:55:25.000-05:00
fix: 🐛 Single action mode for actors with speed &gt; 1
diff --git a/src/combat/combat.js b/src/combat/combat.js
@@ -308,7 +308,7 @@ export default class YearZeroCombat extends Combat {
     const slowAndFastActions = game.settings.get(MODULE_ID, SETTINGS_KEYS.SLOW_AND_FAST_ACTIONS);
     const singleAction = game.settings.get(MODULE_ID, SETTINGS_KEYS.SINGLE_ACTION);
     if (toEnd && (slowAndFastActions || singleAction)) {
-      await this.#removeAllFastAndSlowActions();
+      await this.#removeAllActions();
     }
   }
 
@@ -334,7 +334,7 @@ export default class YearZeroCombat extends Combat {
     const slowAndFastActions = game.settings.get(MODULE_ID, SETTINGS_KEYS.SLOW_AND_FAST_ACTIONS);
     const singleAction = game.settings.get(MODULE_ID, SETTINGS_KEYS.SINGLE_ACTION);
     if (slowAndFastActions || singleAction) {
-      await this.#removeAllFastAndSlowActions();
+      await this.#removeAllActions();
     }
 
     return this;
@@ -421,20 +421,38 @@ export default class YearZeroCombat extends Combat {
    * @returns {Promise.<void>}
    * @async
    */
-  async #removeAllFastAndSlowActions() {
+  async #removeAllActions() {
     const tokens = Array.from(new Set(this.combatants.map(c => c.token)));
     Promise.all(tokens.map(async c => await YearZeroCombat.#removeSlowAndFastActions(c)));
+    Promise.all(tokens.map(async c => await YearZeroCombat.#removeSingleActions(c)));
   }
 
   static async #removeSlowAndFastActions(token) {
     const effects = [
       STATUS_EFFECTS.FAST_ACTION,
       STATUS_EFFECTS.SLOW_ACTION,
-      STATUS_EFFECTS.SINGLE_ACTION,
     ].filter(action => CONFIG.statusEffects.find(e => e.id === action));
 
     return Promise.all(effects.map(async effect =>
-      await token.toggleActiveEffect({ id: effect }, { active: false }),
+      await token.actor.toggleStatusEffect(effect, { active: false }),
+    ));
+  }
+
+  static async #removeSingleActions(token) {
+    const effects = [
+      STATUS_EFFECTS.SINGLE_ACTION_1,
+      STATUS_EFFECTS.SINGLE_ACTION_2,
+      STATUS_EFFECTS.SINGLE_ACTION_3,
+      STATUS_EFFECTS.SINGLE_ACTION_4,
+      STATUS_EFFECTS.SINGLE_ACTION_5,
+      STATUS_EFFECTS.SINGLE_ACTION_6,
+      STATUS_EFFECTS.SINGLE_ACTION_7,
+      STATUS_EFFECTS.SINGLE_ACTION_8,
+      STATUS_EFFECTS.SINGLE_ACTION_9,
+    ].filter(action => CONFIG.statusEffects.find(e => e.id === action));
+
+    return Promise.all(effects.map(async effect =>
+      await token.actor.toggleStatusEffect(effect, { active: false }),
     ));
   }
 
diff --git a/src/combat/combatant.js b/src/combat/combatant.js
@@ -229,6 +229,32 @@ export default class YearZeroCombatant extends Combatant {
   }
 
   /* ------------------------------------------ */
+  #getSingleActionStatus(combatant) {
+    const as = combatant.combat.turns
+      .filter(t => t.tokenId === combatant.tokenId)
+      .slice(0, YZEC.StatusEffects.singleAction.length);
+    for (let i = 0; i < as.length; i++) {
+      as[i] = {
+        id: as[i].id,
+        action: as[i].token.hasStatusEffect(YZEC.StatusEffects.singleAction[i].id),
+      };
+    }
+    return as;
+  }
+
+  #updateSingleActionStatus(combatant, preCombatantActions) {
+    const post = this.#getSingleActionStatus(combatant);
+    for (let i = 0; i < post.length; i++) {
+      const preIndex = preCombatantActions.findIndex(e => e.id === post[i].id);
+      if (preIndex < 0) continue;
+      const preAction = preCombatantActions[preIndex].action;
+      const postAction = post[i].action;
+      if (preAction != postAction) {
+        const postEffect = YZEC.StatusEffects.singleAction[i];
+        combatant.token.actor.toggleStatusEffect(postEffect.id, { active: preAction });
+      }
+    }
+  }
 
   /**
    * Swaps initiative cards between two combatants.
@@ -266,9 +292,24 @@ export default class YearZeroCombatant extends Combatant {
         });
       }
     }
+    if (game.settings.get(MODULE_ID, SETTINGS_KEYS.SINGLE_ACTION)) {
+      // Action status effects rely on the order of combatants with the same token.
+      // If that order changes, the actions must be updated accordingly.
+      const thisActions = this.#getSingleActionStatus(this);
+      const combatantActions = this.#getSingleActionStatus(tCombatant);
+
+      const result = await this.combat.updateEmbeddedDocuments('Combatant', updates, { turnEvents: false });
+
+      this.#updateSingleActionStatus(this, thisActions);
+      if (this.tokenId != tCombatant.tokenId) {
+        this.#updateSingleActionStatus(tCombatant, combatantActions);
+      }
+      return result;
+    }
     return this.combat.updateEmbeddedDocuments('Combatant', updates, { turnEvents: false });
   }
 
+
   /* ------------------------------------------ */
   /*  Combatant Creation                        */
   /* ------------------------------------------ */
diff --git a/src/combat/slow-and-fast-actions.js b/src/combat/slow-and-fast-actions.js
@@ -1,9 +1,23 @@
 import { YZEC } from '@module/config';
+import { MODULE_ID, SETTINGS_KEYS } from '@module/constants';
 
 export function addSlowAndFastStatusEffects() {
   CONFIG.statusEffects.push(...YZEC.StatusEffects.slowAndFastActions);
 }
 
 export function addSingleActionStatusEffect() {
-  CONFIG.statusEffects.push(YZEC.StatusEffects.singleAction);
+  CONFIG.statusEffects.push(...YZEC.StatusEffects.singleAction);
+}
+
+export function onRenderTokenHUD(_app, html, options) {
+  const key = game.settings.get(MODULE_ID, SETTINGS_KEYS.ACTOR_SPEED_ATTRIBUTE);
+  const speed = foundry.utils.getProperty(options.delta, key)
+  || foundry.utils.getProperty(game.actors.get(options.actorId), key)
+  || 1;
+
+  // Remove unused single action status effects from HUD
+  for (let i = 1 + speed; i <= 9; i++) {
+    const effects = html.find(`.effect-control[data-status-id="action${i}"]`);
+    effects.remove();
+  }
 }
diff --git a/src/module/config.js b/src/module/config.js
@@ -7,6 +7,16 @@ import { CARDS_DRAW_KEEP_STATES, MODULE_ID, STATUS_EFFECTS } from './constants.j
  */
 export const YZEC = {};
 
+function singleActionCondition(combat, combatant, index) {
+  const tokenId = combat.combatants.get(combatant.id).tokenId;
+  let action = 0;
+  for (const turn of combat.turns) {
+    if (turn.tokenId === tokenId) action++;
+    if (turn.id === combatant.id) break;
+  }
+  return action === index;
+}
+
 YZEC.CombatTracker = {
   src: `modules/${MODULE_ID}/sidebar/combat-tracker.config.json`,
   // config: undefined,
@@ -31,12 +41,85 @@ YZEC.CombatTracker = {
     ],
     singleAction: [
       {
-        eventName: 'single-action-button-clicked',
+        eventName: 'single-action-button-1-clicked',
+        icon: 'fa-play',
+        id: 'single-action-button-1',
+        property: 'action1',
+        label: 'YZEC.CombatTracker.SingleAction',
+        visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 1),
+      },
+      {
+        eventName: 'single-action-button-2-clicked',
+        icon: 'fa-play',
+        id: 'single-action-button-2',
+        property: 'action2',
+        label: 'YZEC.CombatTracker.SingleAction',
+        visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 2),
+      },
+      {
+        eventName: 'single-action-button-3-clicked',
+        icon: 'fa-play',
+        id: 'single-action-button-3',
+        property: 'action3',
+        label: 'YZEC.CombatTracker.SingleAction',
+        visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 3),
+      },
+      {
+        eventName: 'single-action-button-4-clicked',
+        icon: 'fa-play',
+        id: 'single-action-button-4',
+        property: 'action4',
+        label: 'YZEC.CombatTracker.SingleAction',
+        visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 4),
+      },
+      {
+        eventName: 'single-action-button-5-clicked',
+        icon: 'fa-play',
+        id: 'single-action-button-5',
+        property: 'action5',
+        label: 'YZEC.CombatTracker.SingleAction',
+        visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 5),
+      },
+      {
+        eventName: 'single-action-button-6-clicked',
+        icon: 'fa-play',
+        id: 'single-action-button-6',
+        property: 'action6',
+        label: 'YZEC.CombatTracker.SingleAction',
+        visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 6),
+      },
+      {
+        eventName: 'single-action-button-7-clicked',
+        icon: 'fa-play',
+        id: 'single-action-button-7',
+        property: 'action7',
+        label: 'YZEC.CombatTracker.SingleAction',
+        visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 7),
+      },
+      {
+        eventName: 'single-action-button-8-clicked',
         icon: 'fa-play',
-        id: 'single-action-button',
-        property: 'action',
+        id: 'single-action-button-8',
+        property: 'action8',
         label: 'YZEC.CombatTracker.SingleAction',
         visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 8),
+      },
+      {
+        eventName: 'single-action-button-9-clicked',
+        icon: 'fa-play',
+        id: 'single-action-button-9',
+        property: 'action9',
+        label: 'YZEC.CombatTracker.SingleAction',
+        visibility: 'owner',
+        condition: (combat, combatant) => singleActionCondition(combat, combatant, 9),
       },
     ],
     lockInitiative: [
@@ -85,12 +168,62 @@ YZEC.StatusEffects = {
       statuses: ['slowAction'],
     },
   ],
-  singleAction: {
-    id: STATUS_EFFECTS.SINGLE_ACTION,
-    label: 'YZEC.CombatTracker.SingleAction',
-    icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
-    statuses: ['action'],
-  },
+  singleAction: [
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_1,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action1'],
+    },
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_2,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action2'],
+    },
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_3,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action3'],
+    },
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_4,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action4'],
+    },
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_5,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action5'],
+    },
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_6,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action6'],
+    },
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_7,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action7'],
+    },
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_8,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action8'],
+    },
+    {
+      id: STATUS_EFFECTS.SINGLE_ACTION_9,
+      label: 'YZEC.CombatTracker.SingleAction',
+      icon: `modules/${MODULE_ID}/assets/icons/slow-action.svg`,
+      statuses: ['action9'],
+    },
+  ],
 };
 
 /* ------------------------------------------ */
diff --git a/src/module/constants.js b/src/module/constants.js
@@ -18,7 +18,15 @@ export const CARD_STACK = {
 export const STATUS_EFFECTS = {
   FAST_ACTION: 'fastAction',
   SLOW_ACTION: 'slowAction',
-  SINGLE_ACTION: 'action',
+  SINGLE_ACTION_1: 'action1',
+  SINGLE_ACTION_2: 'action2',
+  SINGLE_ACTION_3: 'action3',
+  SINGLE_ACTION_4: 'action4',
+  SINGLE_ACTION_5: 'action5',
+  SINGLE_ACTION_6: 'action6',
+  SINGLE_ACTION_7: 'action7',
+  SINGLE_ACTION_8: 'action8',
+  SINGLE_ACTION_9: 'action9',
 };
 
 /** @enum {string} */
diff --git a/src/sidebar/combat-tracker.js b/src/sidebar/combat-tracker.js
@@ -12,7 +12,7 @@ import {
   duplicateCombatant, getCombatantsSharingToken,
 } from '@combat/duplicate-combatant';
 import { YZEC } from '@module/config';
-import { MODULE_ID, SETTINGS_KEYS } from '@module/constants';
+import { MODULE_ID, SETTINGS_KEYS, STATUS_EFFECTS } from '@module/constants';
 import { getCombatantSortOrderModifier, resetInitiativeDeck } from '@utils/utils';
 import YearZeroCombatGroupColor from '../apps/combat-group-color';
 
@@ -280,14 +280,12 @@ export default class YearZeroCombatTracker extends CombatTracker {
       event: eventName,
       origin: btn,
     };
-    if (property === 'slowAction' || property === 'fastAction' || property === 'action') {
+
+    if (Object.values(STATUS_EFFECTS).includes(property)) {
       const effect = CONFIG.statusEffects.find(e => e.id === property);
       const active = !combatant[property];
       if (!active) await combatant.unsetFlag(MODULE_ID, property);
-      await combatant.token.toggleActiveEffect(
-        { ...effect },
-        { active },
-      );
+      await combatant.token.actor.toggleStatusEffect(effect.id, { active });
     }
     else if (property) {
       await combatant.setFlag(MODULE_ID, property, !combatant.getFlag(MODULE_ID, property));
@@ -493,7 +491,15 @@ export default class YearZeroCombatTracker extends CombatTracker {
     // FIXME: Figure out why these turn up as flags.
     delete flags.fastAction;
     delete flags.slowAction;
-    delete flags.action;
+    delete flags.action1;
+    delete flags.action2;
+    delete flags.action3;
+    delete flags.action4;
+    delete flags.action5;
+    delete flags.action6;
+    delete flags.action7;
+    delete flags.action8;
+    delete flags.action9;
     const statuses = combatant.actor?.statuses.reduce((acc, s) => {
       acc[s] = true;
       return acc;
diff --git a/src/yze-combat.js b/src/yze-combat.js
@@ -18,7 +18,11 @@
 import YearZeroCards from '@combat/cards';
 import YearZeroCombat from '@combat/combat';
 import YearZeroCombatant from '@combat/combatant';
-import { addSlowAndFastStatusEffects, addSingleActionStatusEffect } from '@combat/slow-and-fast-actions';
+import {
+  addSlowAndFastStatusEffects,
+  addSingleActionStatusEffect,
+  onRenderTokenHUD,
+} from '@combat/slow-and-fast-actions';
 import { YZEC } from '@module/config';
 import { HOOKS_KEYS, MODULE_ID, SETTINGS_KEYS } from '@module/constants';
 import { initializeHandlebars } from '@module/handlebars';
@@ -99,3 +103,6 @@ Hooks.on('getCombatTrackerEntryContext', YearZeroCombatTracker.appendControlsToC
 Hooks.on('renderCombatantConfig', onRenderCombatantConfig);
 
 Hooks.on('createCombatant', YearZeroCombat.createCombatant);
+
+// Removes unused single action status effects from the HUD
+Hooks.on('renderTokenHUD', onRenderTokenHUD);
