Disable flanking for GM-hidden tokens (#13472)

foundryvtt · Feb 2, 2024 · 680aaac · 680aaac
1 parent 7b01ad1
commit 680aaac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/global.ts b/src/global.ts
@@ -122,6 +122,10 @@ interface GamePF2e
  TextEditor: typeof TextEditorPF2e;
  /** Cached values of frequently-checked settings */
  settings: {
+ automation: {
+ /** Flanking detection */
+ flanking: boolean;
+ };
  /** Campaign feat slots */
  campaign: {
  enabled: boolean;

diff --git a/src/module/canvas/token/object.ts b/src/module/canvas/token/object.ts
@@ -106,7 +106,9 @@ class TokenPF2e<TDocument extends TokenDocumentPF2e = TokenDocumentPF2e> extends
  * @param context.reach An optional reach distance specific to this measurement
  * @param context.ignoreFlankable Optionally ignore flankable (for flanking highlight) */
  canFlank(flankee: TokenPF2e, context: { reach?: number; ignoreFlankable?: boolean } = {}): boolean {
- if (this === flankee || !game.settings.get("pf2e", "automation.flankingDetection")) {
+ const settingDisabled = !game.pf2e.settings.automation.flanking;
+ const oneIsGMHidden = this.document.hidden || flankee.document.hidden;
+ if (settingDisabled || oneIsGMHidden || this === flankee) {
  return false;
  }
 
@@ -195,9 +197,9 @@ class TokenPF2e<TDocument extends TokenDocumentPF2e = TokenDocumentPF2e> extends
  * @param context.ignoreFlankable Optionally ignore flankable (for flanking position indicator) */
  buddiesFlanking(flankee: TokenPF2e, context: { reach?: number; ignoreFlankable?: boolean } = {}): TokenPF2e[] {
  if (!this.canFlank(flankee, context)) return [];
-
+ const ignoreFlankable = !!context.ignoreFlankable;
  return canvas.tokens.placeables
- .filter((t) => t !== this && t.canFlank(flankee, R.pick(context, ["ignoreFlankable"])))
+ .filter((t) => t !== this && t.canFlank(flankee, { ignoreFlankable }))
  .filter((b) => this.onOppositeSides(this, b, flankee));
  }
 

diff --git a/src/scripts/set-game-pf2e.ts b/src/scripts/set-game-pf2e.ts
@@ -103,6 +103,9 @@ export const SetGamePF2e = {
  game.pf2e = fu.mergeObject(game.pf2e ?? {}, initSafe);
  game.pf2e.ConditionManager.initialize();
  game.pf2e.settings = {
+ automation: {
+ flanking: game.settings.get("pf2e", "automation.flankingDetection"),
+ },
  campaign: {
  enabled: game.settings.get("pf2e", "campaignFeats"),
  sections: game.settings.get("pf2e", "campaignFeatSections"),