From 0be56cafa8c333701dd5bbe1bd8908d9216f0397 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 12 Jul 2021 21:32:22 -0700
Subject: [PATCH 01/88] rewrite accdiff dialog as a FormApplication, so it has
 a data model

---
 src/module/helpers/acc_diff.ts    | 243 +++++++++++++++++++-----------
 src/module/macros.ts              | 168 +++++++++------------
 src/templates/window/acc_diff.hbs | 218 ++++++++++++++-------------
 3 files changed, 343 insertions(+), 286 deletions(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 9209c46fa..7fcef78d5 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -1,101 +1,166 @@
 import { TagInstance } from "machine-mind";
+import { LancerActor, LancerActorType } from '../actor/lancer-actor';
+import { gentle_merge } from '../helpers/commons';
 
-export type AccDiffFlag = "ACCURATE" | "INACCURATE" | "SOFT_COVER" | "HARD_COVER" | "SEEKING";
-export const AccDiffRegistry: Record<AccDiffFlag, number> = {
-  ACCURATE: 1,
-  INACCURATE: -1,
-  SOFT_COVER: -1,
-  HARD_COVER: -2,
-  SEEKING: 0,
-};
-
-export function calcAccDiff() {
-  let acc = 0;
-  let diff = 0;
-  let flags: AccDiffFlag[] = [];
-  document
-    .querySelectorAll("[data-acc]:checked:not([disabled])")
-    .forEach(ele => flags.push(ele.getAttribute("data-acc") as AccDiffFlag));
-  document
-    .querySelectorAll("[data-diff]:checked:not([disabled])")
-    .forEach(ele => flags.push(ele.getAttribute("data-diff") as AccDiffFlag));
-
-  const isSeeking = flags.includes("SEEKING");
-  for (let flag of flags) {
-    switch (flag) {
-      case "SOFT_COVER":
-      case "HARD_COVER":
-        diff += isSeeking ? 0 : AccDiffRegistry[flag];
-        break;
-      case "ACCURATE":
-        acc += 1;
-        break;
-      case "INACCURATE":
-        diff -= 1;
-        break;
-      case "SEEKING":
-        break;
-    }
+export type AccDiffFormData = {
+  title: string,
+  baseUntypedAccDiff: { accuracy: number, difficulty: number },
+  baseAccDiff: { accuracy: number, difficulty: number },
+  targetedAccDiffs: { target: LancerActor<LancerActorType>, accuracy: number, difficulty: number }[],
+  accurate: boolean,
+  inaccurate: boolean,
+  softCover: boolean,
+  hardCover: boolean,
+  seeking: boolean,
+  seekingDisabled?: string,
+  totalIcon?: {
+    value: number,
+    color: string,
+    className: string
   }
-  return [acc, -diff];
 }
 
-function calcManualAccDiff() {
-  const acc = parseInt((document.querySelector(`#accdiff-other-acc`) as HTMLInputElement)?.value);
-  const diff = parseInt((document.querySelector(`#accdiff-other-diff`) as HTMLInputElement)?.value);
-  return [acc, diff];
-}
+export class AccDiffForm extends FormApplication {
+  data: AccDiffFormData;
+  resolve: ((data: AccDiffFormData) => void) | null = null;
+  reject: ((v: void) => void) | null = null;
+  promise: Promise<AccDiffFormData>;
+
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      template: "systems/lancer/templates/window/acc_diff.hbs",
+      resizable: false,
+      submitOnChange: false,
+      submitOnClose: false,
+      closeOnSubmit: true,
+    });
+  }
+
+  constructor(data: AccDiffFormData) {
+    super(data, { title: data.title });
+    this.data = data;
+    this.promise = new Promise((resolve, reject) => {
+      this.resolve = resolve;
+      this.reject = reject;
+    })
+  }
+
+  static formDataFromParams(
+    tags?: TagInstance[],
+    title?: string,
+    targets?: LancerActor<LancerActorType>[],
+    starting?: [number, number]
+  ): AccDiffFormData {
+    let baseAccDiff = {
+      accuracy: starting ? starting[0] : 0,
+      difficulty: starting ? starting[1] : 0
+    };
+
+    let ret: AccDiffFormData = {
+      title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
+      baseUntypedAccDiff: baseAccDiff,
+      baseAccDiff: baseAccDiff, // this'll get overwritten by getData soon
 
-export function tagsToFlags(tags: TagInstance[]): AccDiffFlag[] {
-  const ret: AccDiffFlag[] = [];
-  tags.forEach(tag => {
-    switch (tag.Tag.LID) {
-      case "tg_accurate":
-        ret.push("ACCURATE");
-        break;
-      case "tg_inaccurate":
-        ret.push("INACCURATE");
-        break;
-      case "tg_seeking":
-        ret.push("SEEKING");
-        break;
+      targetedAccDiffs: (targets || []).map(t => ({
+        target: t,
+        accuracy: 0,
+        difficulty: 0
+      })),
+
+      accurate: false,
+      inaccurate: false,
+      softCover: false,
+      hardCover: false,
+      seeking: false
+    };
+
+    for (let tag of (tags || [])) {
+      switch (tag.Tag.LID) {
+        case "tg_accurate":
+          ret.accurate = true;
+          break;
+        case "tg_inaccurate":
+          ret.inaccurate = true;
+          break;
+        case "tg_seeking":
+          ret.seeking = true;
+          break;
+      }
     }
-  });
-  return ret;
-}
 
-// DOM Manipulation
-export function toggleCover(toggle: boolean) {
-  const ret = document.querySelectorAll('[data-accdiff="SOFT_COVER"],[data-accdiff="HARD_COVER"]');
-  ret.forEach(ele => (toggle ? ele.removeAttribute("disabled") : ele.setAttribute("disabled", "true")));
-}
+    return ret;
+  }
+
+  static fromData(
+    tags?: TagInstance[],
+    title?: string,
+    targets?: LancerActor<LancerActorType>[],
+    starting?: [number, number]) {
+    return new AccDiffForm(AccDiffForm.formDataFromParams(tags, title, targets, starting));
+  }
 
-export function updateTotals() {
-  const flags = calcAccDiff();
-  const other = calcManualAccDiff();
-  const totalAcc = flags[0] + other[0];
-  const totalDiff = flags[1] + other[1];
-  const fullTotal = totalAcc - totalDiff;
-
-  // SEPARATE SUBTOTALS
-  // const accEle = document.querySelector("#accdiff-total-acc");
-  // const diffEle = document.querySelector("#accdiff-total-diff");
-  // accEle && (accEle.innerHTML = String(totalAcc));
-  // diffEle && (diffEle.innerHTML = String(totalDiff));
-
-  // SINGLE TOTAL
-  const accEle = document.querySelector("#accdiff-total");
-  if (accEle) {
-    accEle.innerHTML = String(Math.abs(fullTotal));
-
-    // Change color based on result.
-    const color = fullTotal > 0 ? "#017934" : fullTotal < 0 ? "#9c0d0d" : "#443c3c";
-    accEle.parentElement!.style.backgroundColor = color;
-
-    // Change icon based on result.
-    fullTotal > 0 && accEle.nextElementSibling?.classList.replace("cci-difficulty", "cci-accuracy");
-    fullTotal < 0 && accEle.nextElementSibling?.classList.replace("cci-accuracy", "cci-difficulty");
+  getData(): AccDiffFormData {
+    let ret = this.data;
+
+    ret.baseAccDiff = {
+      accuracy: ret.baseUntypedAccDiff.accuracy + (ret.accurate ? 1 : 0),
+      difficulty: ret.baseUntypedAccDiff.difficulty + (ret.inaccurate ? 1 : 0)
+    };
+    if (!ret.seeking && (ret.hardCover || ret.softCover)) {
+      ret.baseAccDiff.difficulty += ret.hardCover ? 2 : 1;
+    }
+
+    ret.seekingDisabled = ret.seeking ? "disabled" : "";
+
+    let total = ret.baseAccDiff.accuracy - ret.baseAccDiff.difficulty;
+
+    ret.totalIcon = {
+      value: Math.abs(total),
+      color: total > 0 ? "#017934" : total < 0 ? "#9c0d0d" : "#443c3c",
+      className: total >= 0 ? "cci-accuracy" : "cci-difficulty"
+    };
+
+    return ret;
+  }
+
+  activateListeners(html: JQuery) {
+    super.activateListeners(html);
+    html.find(".cancel").on("click", async (_ev) => {
+      return this.close();
+    });
   }
 
-  return fullTotal;
+  async _onChangeInput(_e: Event) {
+    // @ts-ignore .8 -- FormApplication._onChangeInput does exist
+    await super._onChangeInput(_e);
+    // @ts-ignore .8 -- FormApplication._getSubmitData does exist
+    let data = this._getSubmitData(null);
+    await this._updateObject(_e, data);
+  }
+
+  _updateObject(ev: Event, formData: any) {
+    gentle_merge(this.data, formData);
+    this.render();
+
+    if (ev.type == "submit") {
+      if (this.resolve) {
+        this.resolve(this.data);
+        this.reject = null;
+      }
+      return this.promise;
+    } else {
+      return Promise.resolve(this.data);
+    }
+  }
+
+  // FormApplication.close() does take an options hash
+  // @ts-ignore .8
+  close(options: any = {}) {
+    if (this.reject) {
+      this.reject();
+      this.resolve = null;
+    };
+    // @ts-ignore .8
+    return super.close(options);
+  }
 }
diff --git a/src/module/macros.ts b/src/module/macros.ts
index ebd413f2e..d2a5b01ff 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -50,7 +50,7 @@ import { buildActionHTML, buildDeployableHTML, buildSystemHTML } from "./helpers
 import { ActivationOptions, StabOptions1, StabOptions2 } from "./enums";
 import { applyCollapseListeners, uuid4 } from "./helpers/collapse";
 import { checkForHit, getTargets } from "./helpers/automation/targeting";
-import { AccDiffFlag, tagsToFlags, toggleCover, updateTotals } from "./helpers/acc_diff";
+import { AccDiffForm, AccDiffFormData } from "./helpers/acc_diff";
 import { is_overkill } from "machine-mind/dist/funcs";
 
 const lp = LANCER.log_prefix;
@@ -450,23 +450,48 @@ function getMacroActorItem(a: string, i: string): { actor: Actor | null; item: I
   return result;
 }
 
-async function buildAttackRollString(
+function rollStr(bonus: number, obj: { accuracy: number, difficulty: number }): string {
+  let total = obj.accuracy - obj.difficulty;
+  let modStr = "";
+  if (total != 0) {
+    let sign = total > 0 ? "+" : "-";
+    let abs = Math.abs(total);
+    let roll = abs == 1 ? "1d6" : `${abs}d6kh1`;
+    modStr = ` ${sign} ${roll}`;
+  }
+  return `1d20+${bonus}${modStr}`;
+}
+
+type AttackRoll = {
+  roll: string,
+  targeted: { target: LancerActor<LancerActorType>, roll: string }[]
+}
+
+async function buildAttackRollStrings(
   title: string,
-  flags: AccDiffFlag[],
+  tags: TagInstance[],
   bonus: number,
+  targets: LancerActor<LancerActorType>[],
   starting?: [number, number] // initial [accuracy, difficulty]
-): Promise<string | null> {
-  let abort: boolean = false;
-  let acc = 0;
-  await promptAccDiffModifier(flags, title, starting).then(
-    resolve => (acc = resolve),
-    reject => (abort = reject)
-  );
-  if (abort) return null;
-
-  // Do the attack rolling
-  let acc_str = acc != 0 ? ` + ${acc}d6kh1` : "";
-  return `1d20+${bonus}${acc_str}`;
+): Promise<AttackRoll | null> {
+  try {
+    let accdiff = await promptAccDiffModifiers(tags, title, targets, starting);
+    let res: AttackRoll = {
+      roll: rollStr(bonus, accdiff.baseAccDiff),
+      targeted: accdiff.targetedAccDiffs.map(tad => ({
+        target: tad.target,
+        roll: rollStr(bonus, {
+          accuracy: tad.accuracy + accdiff.baseAccDiff.accuracy,
+          difficulty: tad.difficulty + accdiff.baseAccDiff.difficulty
+        })
+      }))
+    };
+
+    return res;
+  } catch (e) {
+    // an error occurred during the prompt; probably the user cancelling
+    return null;
+  }
 }
 
 export async function prepareStatMacro(a: string, statKey: string) {
@@ -503,8 +528,8 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
   // Get accuracy/difficulty with a prompt
   let acc: number = 0;
   let abort: boolean = false;
-  await promptAccDiffModifier().then(
-    resolve => (acc = resolve),
+  await promptAccDiffModifiers().then(
+    accdiff => (acc = accdiff.baseAccDiff.accuracy - accdiff.baseAccDiff.difficulty),
     () => (abort = true)
   );
   if (abort) return Promise.resolve();
@@ -690,14 +715,16 @@ async function prepareAttackMacro({
     }
   }
 
-  // Build attack string before deducting charge.
-  const atk_str = await buildAttackRollString(
+  // Build attack rolls before deducting charge.
+  const targets = getTargets();
+  const atkRolls = await buildAttackRollStrings(
     mData.title,
-    tagsToFlags(mData.tags),
+    mData.tags,
     mData.grit,
-    mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]
+    targets,
+    mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc],
   );
-  if (!atk_str) return;
+  if (!atkRolls) return;
 
   // Deduct charge if LOADING weapon.
   if (
@@ -712,16 +739,13 @@ async function prepareAttackMacro({
     await itemEnt.writeback();
   }
 
-  await rollAttackMacro(actor, atk_str, mData);
+  await rollAttackMacro(actor, atkRolls, mData);
 }
 
-async function rollAttackMacro(actor: Actor, atk_str: string | null, data: LancerAttackMacroData) {
-  if (!atk_str) return;
-
+async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerAttackMacroData) {
   // IS SMART?
   const isSmart = data.tags.findIndex(tag => tag.Tag.LID === "tg_smart") > -1;
   // CHECK TARGETS
-  const targets = getTargets();
   let hits: {
     token: { name: string; img: string };
     total: string;
@@ -729,10 +753,11 @@ async function rollAttackMacro(actor: Actor, atk_str: string | null, data: Lance
     crit: boolean;
   }[] = [];
   let attacks: { roll: Roll; tt: HTMLElement | JQuery<HTMLElement> }[] = [];
-  if (game.settings.get(LANCER.sys_name, LANCER.setting_automation_attack) && targets.length > 0) {
-    for (const target of targets) {
+  if (game.settings.get(LANCER.sys_name, LANCER.setting_automation_attack) && atkRolls.targeted.length > 0) {
+    for (const targetingData of atkRolls.targeted) {
+      let target = targetingData.target;
       // @ts-ignore .8
-      let attack_roll = await new Roll(atk_str!).evaluate({ async: true });
+      let attack_roll = await new Roll(targetingData.roll).evaluate({ async: true });
       const attack_tt = await attack_roll.getTooltip();
       attacks.push({ roll: attack_roll, tt: attack_tt });
 
@@ -748,7 +773,7 @@ async function rollAttackMacro(actor: Actor, atk_str: string | null, data: Lance
     }
   } else {
     // @ts-ignore .8
-    let attack_roll = await new Roll(atk_str).evaluate({ async: true });
+    let attack_roll = await new Roll(atkRolls.roll).evaluate({ async: true });
     const attack_tt = await attack_roll.getTooltip();
     attacks.push({ roll: attack_roll, tt: attack_tt });
   }
@@ -1084,11 +1109,12 @@ export async function prepareTechMacro(a: string, t: string) {
 }
 
 async function rollTechMacro(actor: Actor, data: LancerTechMacroData) {
-  let atk_str = await buildAttackRollString(data.title, tagsToFlags(data.tags), data.t_atk);
-  if (!atk_str) return;
+  const targets = getTargets();
+
+  let atkRolls = await buildAttackRollStrings(data.title, data.tags, data.t_atk, targets);
+  if (!atkRolls) return;
 
   // CHECK TARGETS
-  const targets = getTargets();
   let hits: {
     token: { name: string; img: string };
     total: string;
@@ -1097,9 +1123,10 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData) {
   }[] = [];
   let attacks: { roll: Roll; tt: HTMLElement | JQuery<HTMLElement> }[] = [];
   if (game.settings.get(LANCER.sys_name, LANCER.setting_automation_attack) && targets.length > 0) {
-    for (const target of targets) {
+    for (const targetingData of atkRolls.targeted) {
+      let target = targetingData.target;
       // @ts-ignore .8
-      let attack_roll = await new Roll(atk_str!).evaluate({ async: true });
+      let attack_roll = await new Roll(targetingData.roll).evaluate({ async: true });
       const attack_tt = await attack_roll.getTooltip();
       attacks.push({ roll: attack_roll, tt: attack_tt });
 
@@ -1115,7 +1142,7 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData) {
     }
   } else {
     // @ts-ignore .8
-    let attack_roll = await new Roll(atk_str).evaluate({ async: true });
+    let attack_roll = await new Roll(atkRolls.roll).evaluate({ async: true });
     const attack_tt = await attack_roll.getTooltip();
     attacks.push({ roll: attack_roll, tt: attack_tt });
   }
@@ -1134,64 +1161,15 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData) {
   return await renderMacroTemplate(actor, template, templateData);
 }
 
-export async function promptAccDiffModifier(flags?: AccDiffFlag[], title?: string, starting?: [number, number]) {
-  let template = await renderTemplate(`systems/lancer/templates/window/acc_diff.hbs`, {});
-  return new Promise<number>((resolve, reject) => {
-    new Dialog({
-      title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
-      content: template,
-      buttons: {
-        submit: {
-          icon: '<i class="fas fa-check"></i>',
-          label: "Submit",
-          callback: async dialog => {
-            let total = updateTotals();
-            console.log(`${lp} Dialog returned a modifier of ${total}d6`);
-            resolve(total);
-          },
-        },
-        cancel: {
-          icon: '<i class="fas fa-times"></i>',
-          label: "Cancel",
-          callback: async () => {
-            reject(true);
-          },
-        },
-      },
-      default: "submit",
-      render: (_html: any) => {
-        if (flags) {
-          for (let flag of flags) {
-            const ret = document.querySelector(`[data-acc="${flag}"],[data-diff="${flag}"]`);
-            ret && ((ret as HTMLInputElement).checked = true);
-          }
-        }
-
-        if (flags?.includes("SEEKING")) {
-          toggleCover(false);
-        }
-        updateTotals();
-
-        if (starting) {
-          $("#accdiff-other-acc").val(starting[0]);
-          $("#accdiff-other-diff").val(starting[1]);
-          updateTotals();
-        }
-
-        // LISTENERS
-        $("[data-acc],[data-diff]").on("click", e => {
-          if (e.currentTarget.dataset.acc === "SEEKING") {
-            toggleCover(!(e.currentTarget as HTMLInputElement).checked);
-          }
-          updateTotals();
-        });
-        $(".accdiff-grid button.dec-set").on("click", _e => {
-          updateTotals();
-        });
-      },
-      close: () => reject(true),
-    } as DialogData).render(true);
-  });
+export function promptAccDiffModifiers(
+  tags?: TagInstance[],
+  title?: string,
+  targets?: LancerActor<LancerActorType>[],
+  starting?: [number, number]
+): Promise<AccDiffFormData> {
+  let form = AccDiffForm.fromData(tags, title, targets, starting);
+  form.render(true);
+  return form.promise;
 }
 
 export async function prepareOverchargeMacro(a: string) {
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 9a9fda2a6..88e21585b 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -1,107 +1,121 @@
-<div id="accdiff-dialog" style="padding:4px">
-  <div class="accdiff-grid">
-    <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;">
-      <h3>
-        <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
-        Accuracy
-      </h3>
-      <label class="container">
-        Accurate (+1)
-        <input type="checkbox" data-acc="ACCURATE" />
-        <span class="checkmark"></span>
-      </label>
-      <label class="container">
-        Seeking (*)
-        <input type="checkbox" data-acc="SEEKING" />
-        <span class="checkmark"></span>
-      </label>
-    </div>
-    <div style="width:100%;padding:4px;">
-      <h3>
-        <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
-        Difficulty
-      </h3>
-      <label class="container">
-        Inaccurate (-1)
-        <input type="checkbox" data-diff="INACCURATE" />
-        <span class="checkmark"></span>
-      </label>
-      <label class="container">
-        Soft Cover (-1)
-        <input type="checkbox" data-diff="SOFT_COVER" />
-        <span class="checkmark"></span>
-      </label>
-      <label class="container">
-        Hard Cover (-2)
-        <input type="checkbox" data-diff="HARD_COVER" />
-        <span class="checkmark"></span>
-      </label>
-    </div>
-  </div>
-  <label class="flexrow accdiff-footer accdiff-weight">
-    Other Sources
-  </label>
-  <div class="accdiff-grid">
-    <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
-      <button
-        class="mod-minus-button dec-set"
-        type="button"
-        onclick="this.nextElementSibling.value = this.nextElementSibling.valueAsNumber - 1"
-      >
-        -
-      </button>
-      <input
-        id="accdiff-other-acc"
-        class="difficulty lancer-invisible-input dec-set"
-        style="max-width: 2em;text-align: center;font-size: 1.2em"
-        type="number"
-        value="0"
-        min="0"
-      />
-      <button
-        class="mod-plus-button dec-set"
-        type="button"
-        onclick="this.previousElementSibling.value = this.previousElementSibling.valueAsNumber + 1"
-      >
-        +
-      </button>
+<form>
+  <div id="accdiff-dialog" style="padding:4px">
+    <div class="accdiff-grid">
+      <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;">
+        <h3>
+          <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
+          Accuracy
+        </h3>
+        <label class="container">
+          Accurate (+1)
+          <input type="checkbox" name="accurate" {{checked accurate}} />
+          <span class="checkmark"></span>
+        </label>
+        <label class="container">
+          Seeking (*)
+          <input type="checkbox" name="seeking" {{checked seeking}} />
+          <span class="checkmark"></span>
+        </label>
+      </div>
+      <div style="width:100%;padding:4px;">
+        <h3>
+          <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
+          Difficulty
+        </h3>
+        <label class="container">
+          Inaccurate (-1)
+          <input type="checkbox" name="inaccurate" {{checked inaccurate}} />
+          <span class="checkmark"></span>
+        </label>
+        <label class="container">
+          Soft Cover (-1)
+          <input type="checkbox" name="softCover" {{checked softCover}} {{seekingDisabled}} />
+          <span class="checkmark"></span>
+        </label>
+        <label class="container">
+          Hard Cover (-2)
+          <input type="checkbox" name="hardCover" {{checked hardCover}} {{seekingDisabled}} />
+          <span class="checkmark"></span>
+        </label>
+      </div>
     </div>
-    <div class="accdiff-other-grid">
-      <button
-        class="mod-minus-button dec-set"
-        type="button"
-        onclick="this.nextElementSibling.value = this.nextElementSibling.valueAsNumber - 1"
-      >
-        -
-      </button>
-      <input
-        id="accdiff-other-diff"
-        class="difficulty lancer-invisible-input dec-set"
-        style="max-width: 2em;text-align: center;font-size: 1.2em"
-        type="number"
-        value="0"
-        min="0"
-      />
-      <button
-        class="mod-plus-button dec-set"
-        type="button"
-        onclick="this.previousElementSibling.value = this.previousElementSibling.valueAsNumber + 1"
-      >
-        +
-      </button>
+    <label class="flexrow accdiff-footer accdiff-weight">
+      Other Sources
+    </label>
+    <div class="accdiff-grid">
+      <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
+        <button
+          class="mod-minus-button dec-set"
+          type="button"
+          onclick="this.nextElementSibling.value = this.nextElementSibling.valueAsNumber - 1; this.nextElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
+        >
+          -
+        </button>
+        <input
+          id="accdiff-other-acc"
+          class="difficulty lancer-invisible-input dec-set"
+          style="max-width: 2em;text-align: center;font-size: 1.2em"
+          type="number"
+          name="baseUntypedAccDiff.accuracy"
+          value="{{baseUntypedAccDiff.accuracy}}"
+          min="0"
+        />
+        <button
+          class="mod-plus-button dec-set"
+          type="button"
+          onclick="this.previousElementSibling.value = this.previousElementSibling.valueAsNumber + 1; this.previousElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
+        >
+          +
+        </button>
+      </div>
+      <div class="accdiff-other-grid">
+        <button
+          class="mod-minus-button dec-set"
+          type="button"
+          onclick="this.nextElementSibling.value = this.nextElementSibling.valueAsNumber - 1; this.nextElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
+        >
+          -
+        </button>
+        <input
+          id="accdiff-other-diff"
+          class="difficulty lancer-invisible-input dec-set"
+          style="max-width: 2em;text-align: center;font-size: 1.2em"
+          type="number"
+          name="baseUntypedAccDiff.difficulty"
+          value="{{baseUntypedAccDiff.difficulty}}"
+          min="0"
+        />
+        <button
+          class="mod-plus-button dec-set"
+          type="button"
+          onclick="this.previousElementSibling.value = this.previousElementSibling.valueAsNumber + 1; this.previousElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
+        >
+          +
+        </button>
+      </div>
     </div>
-  </div>
-  <label class="flexrow accdiff-footer accdiff-weight">
-    Total
-  </label>
-  <div class="accdiff-grid accdiff-weight">
-    <div>
-      <div class="card clipped">
-        <span id="accdiff-total">
-          0
-        </span>
-        <i class="cci cci-accuracy i--m i--dark white--text" style="vertical-align:middle;border:none"></i>
+    <label class="flexrow accdiff-footer accdiff-weight">
+      Total
+    </label>
+    <div class="accdiff-grid accdiff-weight">
+      <div>
+        <div class="card clipped" style="background-color: {{totalIcon.color}}">
+          <span id="accdiff-total">
+            {{totalIcon.value}}
+          </span>
+          <i class="cci {{totalIcon.className}} i--m i--dark white--text" style="vertical-align:middle;border:none"></i>
+        </div>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+  <div class="dialog-buttons flexrow">
+    <button class="dialog-button submit default" data-button="submit" type="submit">
+      <i class="fas fa-check"></i>
+      Roll
+    </button>
+    <button class="dialog-button cancel" data-button="cancel" type="button">
+      <i class="fas fa-times"></i>
+      Cancel
+    </button>
+  </div>
+</form>
\ No newline at end of file

From 28ca3a245f9b8f9f4916cbfbfc4d6d9723f017b4 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 12 Jul 2021 21:33:41 -0700
Subject: [PATCH 02/88] not sure why this collapse was there before

the only practical upshot of this collapse is that sometimes tech attacks
wouldn't expand to show some of the attack rolls. I've adjusted it to match
the regular attack rolls
---
 src/templates/chat/tech-attack-card.hbs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/templates/chat/tech-attack-card.hbs b/src/templates/chat/tech-attack-card.hbs
index 2d1fc77f7..d4b4aeadf 100644
--- a/src/templates/chat/tech-attack-card.hbs
+++ b/src/templates/chat/tech-attack-card.hbs
@@ -8,10 +8,7 @@
       {{localize "lancer.chat-card.title.attack"}}
     </div>
     {{#each attacks as |attack key|}}
-    <div
-      class="dice-roll lancer-dice-roll collapse{{#if ../hits}} collapsed{{/if}}"
-      data-collapse-id="{{../_uuid}}-attacks"
-    >
+    <div class="dice-roll lancer-dice-roll">
       <div class="dice-result">
         <div class="dice-formula lancer-dice-formula flexrow">
           <span style="text-align: left; margin-left: 5px;">{{ attack.roll.formula }}</span>

From 0542ac8bc7c8beb140c0c6aebd93df7aa2ff6d7a Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 12 Jul 2021 21:56:11 -0700
Subject: [PATCH 03/88] factor out common code between tech and weapon attacks

+ take the opportunity to de-serialise operations a tiny bit
---
 src/module/macros.ts | 100 +++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 56 deletions(-)

diff --git a/src/module/macros.ts b/src/module/macros.ts
index d2a5b01ff..13cf7a076 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -742,41 +742,60 @@ async function prepareAttackMacro({
   await rollAttackMacro(actor, atkRolls, mData);
 }
 
-async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerAttackMacroData) {
-  // IS SMART?
-  const isSmart = data.tags.findIndex(tag => tag.Tag.LID === "tg_smart") > -1;
-  // CHECK TARGETS
-  let hits: {
-    token: { name: string; img: string };
-    total: string;
-    hit: boolean;
-    crit: boolean;
-  }[] = [];
-  let attacks: { roll: Roll; tt: HTMLElement | JQuery<HTMLElement> }[] = [];
+type AttackResult = {
+  roll: Roll,
+  tt: HTMLElement | JQuery<HTMLElement>
+}
+
+type HitResult = {
+  token: { name: string, img: string },
+  total: string,
+  hit: boolean,
+  crit: boolean
+}
+
+async function checkTargets(atkRolls: AttackRoll, isSmart: boolean): Promise<{
+  attacks: AttackResult[],
+  hits: HitResult[]
+}> {
   if (game.settings.get(LANCER.sys_name, LANCER.setting_automation_attack) && atkRolls.targeted.length > 0) {
-    for (const targetingData of atkRolls.targeted) {
+    let data = await Promise.all(atkRolls.targeted.map(async targetingData => {
       let target = targetingData.target;
       // @ts-ignore .8
       let attack_roll = await new Roll(targetingData.roll).evaluate({ async: true });
       const attack_tt = await attack_roll.getTooltip();
-      attacks.push({ roll: attack_roll, tt: attack_tt });
+      return {
+        attack: { roll: attack_roll, tt: attack_tt },
+        hit: {
+          token: {
+            name: target.token ? target.token.data.name : target.data.name,
+            img: target.token ? target.token.data.img : target.data.img,
+          },
+          total: String(attack_roll._total).padStart(2, "0"),
+          hit: await checkForHit(isSmart, attack_roll, target),
+          crit: attack_roll._total >= 20,
+        }
+      }
+    }));
 
-      hits.push({
-        token: {
-          name: target.token ? target.token.data.name : target.data.name,
-          img: target.token ? target.token.data.img : target.data.img,
-        },
-        total: String(attack_roll._total).padStart(2, "0"),
-        hit: await checkForHit(isSmart, attack_roll, target),
-        crit: attack_roll._total >= 20,
-      });
-    }
+    return {
+      attacks: data.map(d => d.attack),
+      hits: data.map(d => d.hit)
+    };
   } else {
     // @ts-ignore .8
     let attack_roll = await new Roll(atkRolls.roll).evaluate({ async: true });
     const attack_tt = await attack_roll.getTooltip();
-    attacks.push({ roll: attack_roll, tt: attack_tt });
+    return {
+      attacks: [{ roll: attack_roll, tt: attack_tt }],
+      hits: []
+    }
   }
+}
+
+async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerAttackMacroData) {
+  const isSmart = data.tags.findIndex(tag => tag.Tag.LID === "tg_smart") > -1;
+  const { attacks, hits } = await checkTargets(atkRolls, isSmart);
 
   // Iterate through damage types, rolling each
   let damage_results: Array<{
@@ -1114,38 +1133,7 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData) {
   let atkRolls = await buildAttackRollStrings(data.title, data.tags, data.t_atk, targets);
   if (!atkRolls) return;
 
-  // CHECK TARGETS
-  let hits: {
-    token: { name: string; img: string };
-    total: string;
-    hit: boolean;
-    crit: boolean;
-  }[] = [];
-  let attacks: { roll: Roll; tt: HTMLElement | JQuery<HTMLElement> }[] = [];
-  if (game.settings.get(LANCER.sys_name, LANCER.setting_automation_attack) && targets.length > 0) {
-    for (const targetingData of atkRolls.targeted) {
-      let target = targetingData.target;
-      // @ts-ignore .8
-      let attack_roll = await new Roll(targetingData.roll).evaluate({ async: true });
-      const attack_tt = await attack_roll.getTooltip();
-      attacks.push({ roll: attack_roll, tt: attack_tt });
-
-      hits.push({
-        token: {
-          name: target.token ? target.token.data.name : target.data.name,
-          img: target.token ? target.token.data.img : target.data.img,
-        },
-        total: String(attack_roll._total).padStart(2, "0"),
-        hit: await checkForHit(true, attack_roll, target),
-        crit: attack_roll._total >= 20,
-      });
-    }
-  } else {
-    // @ts-ignore .8
-    let attack_roll = await new Roll(atkRolls.roll).evaluate({ async: true });
-    const attack_tt = await attack_roll.getTooltip();
-    attacks.push({ roll: attack_roll, tt: attack_tt });
-  }
+  const { attacks, hits } = await checkTargets(atkRolls, true); // true = all tech attacks are "smart"
 
   // Output
   const templateData = {

From f46b876ce6d9e4a39e252156a91a65b5c757643d Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 14:31:23 -0700
Subject: [PATCH 04/88] implement multi-target acc/diff and cover in the
 acc_diff form

subtasks:
* separate out {{std-cover-input}} and {{accdiff-total-display}}
* rejigger accdiff's data model (again) (we use get total() functions now)
* messy UI work for the multi-target section of the acc_diff form
---
 src/lancer.scss                   |  79 ++++++++++++++++++
 src/lancer.ts                     |   4 +
 src/module/helpers/acc_diff.ts    | 131 +++++++++++++++++-------------
 src/module/helpers/commons.ts     |  68 ++++++++++++++++
 src/module/macros.ts              |  14 ++--
 src/templates/window/acc_diff.hbs | 108 +++++++++++++++++-------
 6 files changed, 310 insertions(+), 94 deletions(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index 5b916a46f..df9517030 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2094,6 +2094,39 @@ a.action {
   border-top: 1px solid #782e22;
 }
 
+.accdiff-base-cover {
+  margin-top: 12px;
+  margin-bottom: 4px;
+  font-size: 0.9em;
+  user-select: none;
+  padding-left: 5px;
+  line-height: 2;
+}
+
+.accdiff-targeted-cover label span {
+  opacity: 0;
+  position: fixed;
+  width: 0;
+  visibility: hidden;
+}
+
+.accdiff-targeted-cover label > i {
+  font-size: 16px;
+  vertical-align: top;
+}
+
+.accdiff-base-cover label > i {
+  vertical-align: baseline;
+}
+
+// there's a very specific foundry rule that adds some margin here
+// because it assumes all icons in buttons are followed by text, I think
+.accdiff-target-row button > i {
+  margin-inline-end: 0 !important; 
+}
+
+
+
 // V-IMPORTS
 .white--text {
   color: #fff !important;
@@ -2177,3 +2210,49 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   max-width: 60%;
   align-self: center;
 }
+
+.accdiff-target-row .lancer-hit-thumb {
+  margin-right: 0px;
+  margin-left: 4px;
+  margin-bottom: 4px;
+}
+
+.lancer-cover-radio input[type="radio"] {
+  opacity: 0;
+  position: fixed;
+  width: 0;
+}
+
+.lancer-cover-radio label {
+  display: inline-block;
+  padding-left: 5px;
+}
+.lancer-cover-radio.flexrow label {
+  padding: 0px;
+}
+
+
+.lancer-cover-radio:not(.disabled) label:hover {
+  background-color: #dfd;
+}
+
+.lancer-cover-radio input[type="radio"]:checked + label {
+  background-color: #ddd;
+  .card & {
+    background-color: #aaa;
+  }
+}
+
+.lancer-cover-radio.disabled {
+  opacity: 0.6;
+}
+
+.cci-no-cover:before {
+  content: '\25cb';
+}
+.cci-soft-cover:before {
+  content: '\25d1';
+}
+.cci-hard-cover:before {
+  content: '\25cf';
+}
diff --git a/src/lancer.ts b/src/lancer.ts
index 5b3bf4579..6e7c1fec4 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -65,6 +65,8 @@ import {
   std_password_input,
   std_num_input,
   std_checkbox,
+  std_cover_input,
+  accdiff_total_display,
 } from "./module/helpers/commons";
 import {
   weapon_size_selector,
@@ -386,6 +388,8 @@ Hooks.once("init", async function () {
   Handlebars.registerHelper("std-num-input", std_num_input);
   Handlebars.registerHelper("std-checkbox", std_checkbox);
   Handlebars.registerHelper("action-button", action_button);
+  Handlebars.registerHelper("std-cover-input", std_cover_input);
+  Handlebars.registerHelper("accdiff-total-display", accdiff_total_display);
 
   // ------------------------------------------------------------------------
   // Tag helpers
diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 7fcef78d5..6cef9e59d 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -2,22 +2,39 @@ import { TagInstance } from "machine-mind";
 import { LancerActor, LancerActorType } from '../actor/lancer-actor';
 import { gentle_merge } from '../helpers/commons';
 
+enum Cover {
+  None = 0,
+  Soft = 1,
+  Hard = 2
+}
+
 export type AccDiffFormData = {
   title: string,
-  baseUntypedAccDiff: { accuracy: number, difficulty: number },
-  baseAccDiff: { accuracy: number, difficulty: number },
-  targetedAccDiffs: { target: LancerActor<LancerActorType>, accuracy: number, difficulty: number }[],
-  accurate: boolean,
-  inaccurate: boolean,
-  softCover: boolean,
-  hardCover: boolean,
-  seeking: boolean,
-  seekingDisabled?: string,
-  totalIcon?: {
-    value: number,
-    color: string,
-    className: string
-  }
+  base: {
+    untyped: {
+      accuracy: number,
+      difficulty: number,
+    },
+    accuracy: number,
+    difficulty: number,
+    cover: Cover,
+    accurate: boolean,
+    inaccurate: boolean,
+    seeking: boolean,
+    total: number
+  },
+  targets: {
+    target: LancerActor<LancerActorType>,
+    accuracy: number,
+    difficulty: number,
+    cover: Cover,
+    total: number
+  }[],
+}
+
+type AccDiffFormView = {
+  baseCoverDisabled: boolean,
+  hasTargets: boolean
 }
 
 export class AccDiffForm extends FormApplication {
@@ -51,39 +68,53 @@ export class AccDiffForm extends FormApplication {
     targets?: LancerActor<LancerActorType>[],
     starting?: [number, number]
   ): AccDiffFormData {
-    let baseAccDiff = {
-      accuracy: starting ? starting[0] : 0,
-      difficulty: starting ? starting[1] : 0
-    };
-
     let ret: AccDiffFormData = {
       title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
-      baseUntypedAccDiff: baseAccDiff,
-      baseAccDiff: baseAccDiff, // this'll get overwritten by getData soon
-
-      targetedAccDiffs: (targets || []).map(t => ({
-        target: t,
-        accuracy: 0,
-        difficulty: 0
-      })),
-
-      accurate: false,
-      inaccurate: false,
-      softCover: false,
-      hardCover: false,
-      seeking: false
+      base: {
+        accurate: false,
+        inaccurate: false,
+        cover: Cover.None,
+        seeking: false,
+        untyped: {
+          accuracy: starting ? starting[0] : 0,
+          difficulty: starting ? starting[1] : 0
+        },
+        get accuracy() {
+          return this.untyped.accuracy + (this.accurate ? 1 : 0);
+        },
+        get difficulty() {
+          return this.untyped.difficulty
+            + (this.inaccurate ? 1 : 0)
+            + (this.seeking ? 0 : this.cover)
+        },
+        get total() {
+          return this.accuracy - this.difficulty;
+        }
+      },
+      targets: []
     };
 
+    ret.targets = (targets || []).map(t => ({
+      target: t,
+      accuracy: 0,
+      difficulty: 0,
+      cover: Cover.None,
+      get total() {
+        return this.accuracy - this.difficulty
+          + ret.base.total - (ret.base.seeking ? 0 : this.cover);
+      }
+    }));
+
     for (let tag of (tags || [])) {
       switch (tag.Tag.LID) {
         case "tg_accurate":
-          ret.accurate = true;
+          ret.base.accurate = true;
           break;
         case "tg_inaccurate":
-          ret.inaccurate = true;
+          ret.base.inaccurate = true;
           break;
         case "tg_seeking":
-          ret.seeking = true;
+          ret.base.seeking = true;
           break;
       }
     }
@@ -99,28 +130,18 @@ export class AccDiffForm extends FormApplication {
     return new AccDiffForm(AccDiffForm.formDataFromParams(tags, title, targets, starting));
   }
 
-  getData(): AccDiffFormData {
-    let ret = this.data;
+  getData(): AccDiffFormData & AccDiffFormView {
+    let ret: AccDiffFormData = this.data as AccDiffFormData;
 
-    ret.baseAccDiff = {
-      accuracy: ret.baseUntypedAccDiff.accuracy + (ret.accurate ? 1 : 0),
-      difficulty: ret.baseUntypedAccDiff.difficulty + (ret.inaccurate ? 1 : 0)
-    };
-    if (!ret.seeking && (ret.hardCover || ret.softCover)) {
-      ret.baseAccDiff.difficulty += ret.hardCover ? 2 : 1;
+    let view: AccDiffFormView = {
+      baseCoverDisabled: ret.base.seeking || ret.targets.length > 0,
+      hasTargets: ret.targets.length > 0
     }
 
-    ret.seekingDisabled = ret.seeking ? "disabled" : "";
-
-    let total = ret.baseAccDiff.accuracy - ret.baseAccDiff.difficulty;
-
-    ret.totalIcon = {
-      value: Math.abs(total),
-      color: total > 0 ? "#017934" : total < 0 ? "#9c0d0d" : "#443c3c",
-      className: total >= 0 ? "cci-accuracy" : "cci-difficulty"
-    };
-
-    return ret;
+    return mergeObject(
+      ret as AccDiffFormData & AccDiffFormView,
+      view as AccDiffFormData & AccDiffFormView
+    );
   }
 
   activateListeners(html: JQuery) {
diff --git a/src/module/helpers/commons.ts b/src/module/helpers/commons.ts
index f6ae289ed..313e3bf50 100644
--- a/src/module/helpers/commons.ts
+++ b/src/module/helpers/commons.ts
@@ -505,6 +505,74 @@ async function control_structs(key: string, on: LiveEntryTypes<EntryType>): Prom
   return [false, null];
 }
 
+export function std_cover_input(path: string, options: HelperOptions) {
+  let container_classes: string = options.hash["classes"] || "";
+  let label: string = options.hash["label"] || "";
+  let label_classes: string = options.hash["label_classes"] || "";
+
+  let value: string | undefined = options.hash["value"];
+  if (value == undefined) {
+    // Resolve
+    value = (resolve_helper_dotpath(options, path) as number)?.toString() ?? 0;
+  }
+
+  let checked = ["0", "1", "2"].map(v => value == v ? "checked='true'" : "");
+  let disabled: boolean = options.hash["disabled"] ? resolve_helper_dotpath(options, options.hash["disabled"]) : false;
+  let disabledStr = disabled ? "disabled" : "";
+
+  let inputs = [
+    `<input type="radio" id="${path}-cover-none" class="no-grow cover-none" name="${path}" value="0" ${checked[0]} data-dtype="Number" ${disabledStr} />
+     <label for="${path}-cover-none" class="lancer-cover-radio-label ${label_classes}">
+       <i class="cci-no-cover i--s" style="border:none"></i>
+       <span class="no-grow">No Cover</span>
+     </label>`,
+    `<input type="radio" id="${path}-cover-soft" class="no-grow cover-soft" name="${path}" value="1" ${checked[1]} data-dtype="Number" ${disabledStr} />
+    <label for="${path}-cover-soft" class="lancer-cover-radio-label ${label_classes}">
+       <i class="cci-soft-cover i--s" style="border:none"></i>
+       <span class="no-grow">Soft Cover (-1)</span>
+     </label>`,
+    `<input type="radio" id="${path}-cover-hard" class="no-grow cover-hard" name="${path}" value="2" ${checked[2]} data-dtype="Number" ${disabledStr} />
+     <label for="${path}-cover-hard" class="lancer-cover-radio-label ${label_classes}">
+       <i class="cci-hard-cover i--s" style="border:none"></i>
+       <span class="no-grow">Hard Cover (-2)</span>
+     </label>`
+  ];
+
+  if (label) {
+    return `<label class="lancer-cover-radio ${disabledStr} ${label_classes} ${container_classes}">
+              <span class="no-grow" style="padding: 2px 5px;">${label}</span>
+              ${inputs.join(" ")}
+            </label>`
+  } else {
+    return `<div class="lancer-cover-radio ${disabledStr} ${container_classes}">${inputs.join(" ")}</div>`;
+  }
+}
+
+export function accdiff_total_display(path: string, options: HelperOptions) {
+  let container_classes: string = options.hash["classes"] || "";
+  let id: string = options.hash["id"] || "";
+  let value: string | undefined = options.hash["value"];
+  let total = 0;
+  if (value == undefined) {
+    // Resolve
+    total = (resolve_helper_dotpath(options, path) as number) ?? 0;
+  }
+
+  let abs = Math.abs(total);
+  let color = total > 0 ? "#017934" : total < 0 ? "#9c0d0d" : "#443c3c";
+  let icon = total >= 0 ? "cci-accuracy" : "cci-difficulty"
+
+  return `
+<div class="${container_classes}">
+  <div>
+    <div class="card clipped" style="background-color: ${color}">
+      <span id="${id}">${abs}</span>
+      <i class="cci ${icon} i--m i--dark white--text" style="vertical-align:middle;border:none"></i>
+    </div>
+  </div>
+</div>`
+}
+
 // Our standardized functions for making simple key-value input pair
 // Todo - these could on the whole be a bit fancier, yeah?
 
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 13cf7a076..a1a2f0986 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -450,8 +450,7 @@ function getMacroActorItem(a: string, i: string): { actor: Actor | null; item: I
   return result;
 }
 
-function rollStr(bonus: number, obj: { accuracy: number, difficulty: number }): string {
-  let total = obj.accuracy - obj.difficulty;
+function rollStr(bonus: number, total: number): string {
   let modStr = "";
   if (total != 0) {
     let sign = total > 0 ? "+" : "-";
@@ -477,13 +476,10 @@ async function buildAttackRollStrings(
   try {
     let accdiff = await promptAccDiffModifiers(tags, title, targets, starting);
     let res: AttackRoll = {
-      roll: rollStr(bonus, accdiff.baseAccDiff),
-      targeted: accdiff.targetedAccDiffs.map(tad => ({
+      roll: rollStr(bonus, accdiff.base.total),
+      targeted: accdiff.targets.map(tad => ({
         target: tad.target,
-        roll: rollStr(bonus, {
-          accuracy: tad.accuracy + accdiff.baseAccDiff.accuracy,
-          difficulty: tad.difficulty + accdiff.baseAccDiff.difficulty
-        })
+        roll: rollStr(bonus, tad.total)
       }))
     };
 
@@ -529,7 +525,7 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
   let acc: number = 0;
   let abort: boolean = false;
   await promptAccDiffModifiers().then(
-    accdiff => (acc = accdiff.baseAccDiff.accuracy - accdiff.baseAccDiff.difficulty),
+    accdiff => (acc = accdiff.base.total),
     () => (abort = true)
   );
   if (abort) return Promise.resolve();
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 88e21585b..4070bf013 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -1,4 +1,4 @@
-<form>
+<form id="accdiff">
   <div id="accdiff-dialog" style="padding:4px">
     <div class="accdiff-grid">
       <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;">
@@ -8,12 +8,12 @@
         </h3>
         <label class="container">
           Accurate (+1)
-          <input type="checkbox" name="accurate" {{checked accurate}} />
+          <input type="checkbox" name="base.accurate" {{checked base.accurate}} />
           <span class="checkmark"></span>
         </label>
         <label class="container">
           Seeking (*)
-          <input type="checkbox" name="seeking" {{checked seeking}} />
+          <input type="checkbox" name="base.seeking" {{checked base.seeking}} />
           <span class="checkmark"></span>
         </label>
       </div>
@@ -24,19 +24,13 @@
         </h3>
         <label class="container">
           Inaccurate (-1)
-          <input type="checkbox" name="inaccurate" {{checked inaccurate}} />
-          <span class="checkmark"></span>
-        </label>
-        <label class="container">
-          Soft Cover (-1)
-          <input type="checkbox" name="softCover" {{checked softCover}} {{seekingDisabled}} />
-          <span class="checkmark"></span>
-        </label>
-        <label class="container">
-          Hard Cover (-2)
-          <input type="checkbox" name="hardCover" {{checked hardCover}} {{seekingDisabled}} />
+          <input type="checkbox" name="base.inaccurate" {{checked base.inaccurate}} />
           <span class="checkmark"></span>
         </label>
+        {{{std-cover-input "base.cover"
+          classes="accdiff-base-cover flexcol"
+          disabled="baseCoverDisabled"
+        }}}
       </div>
     </div>
     <label class="flexrow accdiff-footer accdiff-weight">
@@ -56,8 +50,8 @@
           class="difficulty lancer-invisible-input dec-set"
           style="max-width: 2em;text-align: center;font-size: 1.2em"
           type="number"
-          name="baseUntypedAccDiff.accuracy"
-          value="{{baseUntypedAccDiff.accuracy}}"
+          name="base.untyped.accuracy"
+          value="{{base.untyped.accuracy}}"
           min="0"
         />
         <button
@@ -81,8 +75,8 @@
           class="difficulty lancer-invisible-input dec-set"
           style="max-width: 2em;text-align: center;font-size: 1.2em"
           type="number"
-          name="baseUntypedAccDiff.difficulty"
-          value="{{baseUntypedAccDiff.difficulty}}"
+          name="base.untyped.difficulty"
+          value="{{base.untyped.difficulty}}"
           min="0"
         />
         <button
@@ -94,19 +88,73 @@
         </button>
       </div>
     </div>
-    <label class="flexrow accdiff-footer accdiff-weight">
-      Total
-    </label>
-    <div class="accdiff-grid accdiff-weight">
-      <div>
-        <div class="card clipped" style="background-color: {{totalIcon.color}}">
-          <span id="accdiff-total">
-            {{totalIcon.value}}
-          </span>
-          <i class="cci {{totalIcon.className}} i--m i--dark white--text" style="vertical-align:middle;border:none"></i>
-        </div>
+    {{#unless hasTargets}}
+      <label class="flexrow accdiff-footer accdiff-weight">
+        Total
+      </label>
+      {{{accdiff-total-display "base.total"
+        id="accdiff-total"
+        classes="accdiff-grid accdiff-weight"
+      }}}
+    {{/unless}}
+    {{#if hasTargets}}
+      <div class="flexrow accdiff-footer accdiff-weight accdiff-grid accdiff-target-row">
+        {{#each targets as |data key|}}
+          <div class="flexcol card">
+            <label class="flexrow flex-center card">
+              {{data.target.data.name}}
+            </label>
+            <div class="flexrow">
+              <div class="accdiff-grid accdiff-weight">
+                <img class="lancer-hit-thumb" src="{{data.target.data.img}}" />
+              </div>
+              {{{accdiff-total-display (concat "targets." key ".total")
+                id=(concat "accdiff-total-" key)
+                classes="accdiff-grid accdiff-weight"
+              }}}
+            </div>
+            <div class="flexrow">
+              <button
+                class="i--m no-grow"
+                type="button"
+                onclick="this.nextElementSibling.value = this.nextElementSibling.valueAsNumber + 1; this.nextElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
+              >
+                <i class="cci cci-accuracy i--m" style="border:none"></i>
+              </button>
+              <input
+                id="accdiff-other-acc-{{key}}"
+                style="display: none"
+                type="number"
+                name="targets.{{key}}.accuracy"
+                value="{{data.accuracy}}"
+                min="0"
+              />
+              {{{std-cover-input (concat "targets." key ".cover")
+                classes="accdiff-targeted-cover flexrow flex-center"
+                label_classes="i--s"
+                container_classes="f-16"
+                disabled="base.seeking"
+              }}}
+              <input
+                id="accdiff-other-diff-{{key}}"
+                style="display: none"
+                type="number"
+                name="targets.{{key}}.difficulty"
+                value="{{data.difficulty}}"
+                min="0"
+              />
+              <button
+                class="i--m no-grow"
+                type="button"
+                onclick="this.previousElementSibling.value = this.previousElementSibling.valueAsNumber + 1; this.previousElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
+              >
+                <i class="cci cci-difficulty i--m" style="border:none"></i>
+              </button>
+            </div>
+          </div>
+        {{/each}}
       </div>
-    </div>
+    {{/if}}
   </div>
   <div class="dialog-buttons flexrow">
     <button class="dialog-button submit default" data-button="submit" type="submit">

From 914676ea24f0859116c8a72690cba4cc9e03c017 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 15:07:48 -0700
Subject: [PATCH 05/88] split out the reactive form logic into an abstract
 class

---
 src/module/helpers/acc_diff.ts      | 79 ++++-----------------------
 src/module/helpers/reactive-form.ts | 84 +++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 70 deletions(-)
 create mode 100644 src/module/helpers/reactive-form.ts

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 6cef9e59d..8a6399a36 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -1,6 +1,6 @@
 import { TagInstance } from "machine-mind";
 import { LancerActor, LancerActorType } from '../actor/lancer-actor';
-import { gentle_merge } from '../helpers/commons';
+import ReactiveForm from './reactive-form';
 
 enum Cover {
   None = 0,
@@ -32,34 +32,21 @@ export type AccDiffFormData = {
   }[],
 }
 
-type AccDiffFormView = {
+type AccDiffFormView = AccDiffFormData & {
   baseCoverDisabled: boolean,
   hasTargets: boolean
 }
 
-export class AccDiffForm extends FormApplication {
-  data: AccDiffFormData;
-  resolve: ((data: AccDiffFormData) => void) | null = null;
-  reject: ((v: void) => void) | null = null;
-  promise: Promise<AccDiffFormData>;
-
+export class AccDiffForm extends ReactiveForm<AccDiffFormData, AccDiffFormView> {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
       template: "systems/lancer/templates/window/acc_diff.hbs",
       resizable: false,
-      submitOnChange: false,
-      submitOnClose: false,
-      closeOnSubmit: true,
     });
   }
 
   constructor(data: AccDiffFormData) {
-    super(data, { title: data.title });
-    this.data = data;
-    this.promise = new Promise((resolve, reject) => {
-      this.resolve = resolve;
-      this.reject = reject;
-    })
+    super(data, { title: data.title })
   }
 
   static formDataFromParams(
@@ -130,58 +117,10 @@ export class AccDiffForm extends FormApplication {
     return new AccDiffForm(AccDiffForm.formDataFromParams(tags, title, targets, starting));
   }
 
-  getData(): AccDiffFormData & AccDiffFormView {
-    let ret: AccDiffFormData = this.data as AccDiffFormData;
-
-    let view: AccDiffFormView = {
-      baseCoverDisabled: ret.base.seeking || ret.targets.length > 0,
-      hasTargets: ret.targets.length > 0
-    }
-
-    return mergeObject(
-      ret as AccDiffFormData & AccDiffFormView,
-      view as AccDiffFormData & AccDiffFormView
-    );
-  }
-
-  activateListeners(html: JQuery) {
-    super.activateListeners(html);
-    html.find(".cancel").on("click", async (_ev) => {
-      return this.close();
-    });
-  }
-
-  async _onChangeInput(_e: Event) {
-    // @ts-ignore .8 -- FormApplication._onChangeInput does exist
-    await super._onChangeInput(_e);
-    // @ts-ignore .8 -- FormApplication._getSubmitData does exist
-    let data = this._getSubmitData(null);
-    await this._updateObject(_e, data);
-  }
-
-  _updateObject(ev: Event, formData: any) {
-    gentle_merge(this.data, formData);
-    this.render();
-
-    if (ev.type == "submit") {
-      if (this.resolve) {
-        this.resolve(this.data);
-        this.reject = null;
-      }
-      return this.promise;
-    } else {
-      return Promise.resolve(this.data);
-    }
-  }
-
-  // FormApplication.close() does take an options hash
-  // @ts-ignore .8
-  close(options: any = {}) {
-    if (this.reject) {
-      this.reject();
-      this.resolve = null;
-    };
-    // @ts-ignore .8
-    return super.close(options);
+  getViewModel(data: AccDiffFormData): AccDiffFormView {
+    let ret = data as AccDiffFormView; // view elements haven't been set yet
+    ret.hasTargets = ret.targets.length > 0;
+    ret.baseCoverDisabled = ret.base.seeking || ret.hasTargets;
+    return ret
   }
 }
diff --git a/src/module/helpers/reactive-form.ts b/src/module/helpers/reactive-form.ts
new file mode 100644
index 000000000..9efd3b4ce
--- /dev/null
+++ b/src/module/helpers/reactive-form.ts
@@ -0,0 +1,84 @@
+import { gentle_merge } from '../helpers/commons';
+
+// this captures a useful pattern where we want to make a reactive form
+// that is rooted on "raw data" rather than a Foundry Document
+// to access the data from outside it, use the .promise property
+// it is resolved when the user clicks submit, and rejected if the form is closed otherwise
+// assumptions:
+// * the name attributes in the html form directly match the keys in the raw data
+//     (modulo gentle_merge)
+// * the template contains precisely one HTML form as its outermost element
+export default abstract class ReactiveForm<DataModel, ViewModel extends DataModel> extends FormApplication {
+  // FormApplication defines this and sets it in the constructor
+  object!: DataModel;
+
+  #resolve: ((data: DataModel) => void) | null = null;
+  #reject: ((v: void) => void) | null = null;
+  promise: Promise<DataModel>;
+
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      submitOnChange: false,
+      submitOnClose: false,
+      closeOnSubmit: true,
+    });
+  }
+
+  constructor(data: DataModel, options: FormApplicationOptions) {
+    super(data, options);
+    this.promise = new Promise((resolve, reject) => {
+      this.#resolve = resolve;
+      this.#reject = reject;
+    })
+  }
+
+  abstract getViewModel(data: DataModel): ViewModel;
+
+  getData(): ViewModel {
+    let ret: DataModel = this.object;
+    return this.getViewModel(ret);
+  }
+
+  // cancel buttons need explicit handling
+  activateListeners(html: JQuery) {
+    super.activateListeners(html);
+    html.find(".cancel").on("click", async (_ev) => {
+      return this.close();
+    });
+  }
+
+  async _onChangeInput(_e: Event) {
+    // @ts-ignore .8 -- FormApplication._onChangeInput does exist
+    await super._onChangeInput(_e);
+    // @ts-ignore .8 -- FormApplication._getSubmitData does exist
+    let data = this._getSubmitData(null);
+    await this._updateObject(_e, data);
+  }
+
+  // requires the names in the template to match
+  _updateObject(ev: Event, formData: any) {
+    gentle_merge(this.object, formData);
+    this.render();
+
+    if (ev.type == "submit") {
+      if (this.#resolve) {
+        this.#resolve(this.object);
+        this.#reject = null;
+      }
+      return this.promise;
+    } else {
+      return Promise.resolve(this.object);
+    }
+  }
+
+  // FormApplication.close() does take an options hash
+  // @ts-ignore .8
+  close(options: any = {}) {
+    if (this.#reject) {
+      this.#reject();
+      this.#resolve = null;
+    };
+    // @ts-ignore .8
+    return super.close(options);
+  }
+}

From 591ac37e5f40c3f6a978c15d18bcf681b7dd9fda Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 15:44:59 -0700
Subject: [PATCH 06/88] simplify a bit of promise logic

---
 src/module/macros.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/module/macros.ts b/src/module/macros.ts
index a1a2f0986..2c4fa9830 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -523,12 +523,13 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
 
   // Get accuracy/difficulty with a prompt
   let acc: number = 0;
-  let abort: boolean = false;
-  await promptAccDiffModifiers().then(
-    accdiff => (acc = accdiff.base.total),
-    () => (abort = true)
-  );
-  if (abort) return Promise.resolve();
+  try {
+    let accdiff = await promptAccDiffModifiers();
+    acc = accdiff.base.total;
+  } catch {
+    // an error occurred during the prompt; probably the user cancelling
+    return Promise.resolve();
+  }
 
   // Do the roll
   let acc_str = acc != 0 ? ` + ${acc}d6kh1` : "";

From 29b5f868ba1d907c92b77933f9c1ca7ff8f77eaf Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 16:02:44 -0700
Subject: [PATCH 07/88] restructure attack macros to allow reroll accdiff data

---
 src/module/helpers/acc_diff.ts | 16 +++----
 src/module/macros.ts           | 85 ++++++++++++++--------------------
 2 files changed, 42 insertions(+), 59 deletions(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 8a6399a36..86c8d5aee 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -8,7 +8,7 @@ enum Cover {
   Hard = 2
 }
 
-export type AccDiffFormData = {
+export type AccDiffData = {
   title: string,
   base: {
     untyped: {
@@ -32,12 +32,12 @@ export type AccDiffFormData = {
   }[],
 }
 
-type AccDiffFormView = AccDiffFormData & {
+type AccDiffView = AccDiffData & {
   baseCoverDisabled: boolean,
   hasTargets: boolean
 }
 
-export class AccDiffForm extends ReactiveForm<AccDiffFormData, AccDiffFormView> {
+export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
       template: "systems/lancer/templates/window/acc_diff.hbs",
@@ -45,7 +45,7 @@ export class AccDiffForm extends ReactiveForm<AccDiffFormData, AccDiffFormView>
     });
   }
 
-  constructor(data: AccDiffFormData) {
+  constructor(data: AccDiffData) {
     super(data, { title: data.title })
   }
 
@@ -54,8 +54,8 @@ export class AccDiffForm extends ReactiveForm<AccDiffFormData, AccDiffFormView>
     title?: string,
     targets?: LancerActor<LancerActorType>[],
     starting?: [number, number]
-  ): AccDiffFormData {
-    let ret: AccDiffFormData = {
+  ): AccDiffData {
+    let ret: AccDiffData = {
       title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
       base: {
         accurate: false,
@@ -117,8 +117,8 @@ export class AccDiffForm extends ReactiveForm<AccDiffFormData, AccDiffFormView>
     return new AccDiffForm(AccDiffForm.formDataFromParams(tags, title, targets, starting));
   }
 
-  getViewModel(data: AccDiffFormData): AccDiffFormView {
-    let ret = data as AccDiffFormView; // view elements haven't been set yet
+  getViewModel(data: AccDiffData): AccDiffView {
+    let ret = data as AccDiffView; // view elements haven't been set yet
     ret.hasTargets = ret.targets.length > 0;
     ret.baseCoverDisabled = ret.base.seeking || ret.hasTargets;
     return ret
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 2c4fa9830..f1fef7328 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -50,7 +50,7 @@ import { buildActionHTML, buildDeployableHTML, buildSystemHTML } from "./helpers
 import { ActivationOptions, StabOptions1, StabOptions2 } from "./enums";
 import { applyCollapseListeners, uuid4 } from "./helpers/collapse";
 import { checkForHit, getTargets } from "./helpers/automation/targeting";
-import { AccDiffForm, AccDiffFormData } from "./helpers/acc_diff";
+import { AccDiffForm, AccDiffData } from "./helpers/acc_diff";
 import { is_overkill } from "machine-mind/dist/funcs";
 
 const lp = LANCER.log_prefix;
@@ -466,28 +466,14 @@ type AttackRoll = {
   targeted: { target: LancerActor<LancerActorType>, roll: string }[]
 }
 
-async function buildAttackRollStrings(
-  title: string,
-  tags: TagInstance[],
-  bonus: number,
-  targets: LancerActor<LancerActorType>[],
-  starting?: [number, number] // initial [accuracy, difficulty]
-): Promise<AttackRoll | null> {
-  try {
-    let accdiff = await promptAccDiffModifiers(tags, title, targets, starting);
-    let res: AttackRoll = {
-      roll: rollStr(bonus, accdiff.base.total),
-      targeted: accdiff.targets.map(tad => ({
-        target: tad.target,
-        roll: rollStr(bonus, tad.total)
-      }))
-    };
-
-    return res;
-  } catch (e) {
-    // an error occurred during the prompt; probably the user cancelling
-    return null;
-  }
+function attackRollStrings(bonus: number, accdiff: AccDiffData): AttackRoll {
+  return {
+    roll: rollStr(bonus, accdiff.base.total),
+    targeted: accdiff.targets.map(tad => ({
+      target: tad.target,
+      roll: rollStr(bonus, tad.total)
+    }))
+  };
 }
 
 export async function prepareStatMacro(a: string, statKey: string) {
@@ -522,14 +508,10 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
   if (!actor) return Promise.resolve();
 
   // Get accuracy/difficulty with a prompt
-  let acc: number = 0;
-  try {
-    let accdiff = await promptAccDiffModifiers();
-    acc = accdiff.base.total;
-  } catch {
-    // an error occurred during the prompt; probably the user cancelling
-    return Promise.resolve();
-  }
+  let initialData = AccDiffForm.formDataFromParams();
+  let promptedData = await promptAccDiffModifiers(initialData);
+  if (!promptedData) return;
+  let acc: number = promptedData.base.total;
 
   // Do the roll
   let acc_str = acc != 0 ? ` + ${acc}d6kh1` : "";
@@ -578,6 +560,7 @@ async function rollTalentMacro(actor: Actor, data: LancerTalentMacroData) {
  *            - accBonus        Flat bonus to accuracy
  *            - damBonus        Object of form {type: val} to apply flat damage bonus of given type.
  *                              The "Bonus" type is recommended but not required
+ * @param rerollData {AccDiffData?} saved accdiff data for rerolls
  */
 async function prepareAttackMacro({
   actor,
@@ -590,7 +573,7 @@ async function prepareAttackMacro({
     accBonus: number;
     damBonus: { type: DamageType; val: number };
   };
-}) {
+}, rerollData?: AccDiffData) {
   let mData: LancerAttackMacroData = {
     title: item.name,
     grit: 0,
@@ -712,16 +695,14 @@ async function prepareAttackMacro({
     }
   }
 
-  // Build attack rolls before deducting charge.
+  // Prompt the user before deducting charges.
   const targets = getTargets();
-  const atkRolls = await buildAttackRollStrings(
-    mData.title,
-    mData.tags,
-    mData.grit,
-    targets,
-    mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc],
-  );
-  if (!atkRolls) return;
+  const initialData = rerollData ?? AccDiffForm.formDataFromParams(
+    mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
+  const promptedData = await promptAccDiffModifiers(initialData);
+  if (!promptedData) return;
+
+  const atkRolls = attackRollStrings(mData.grit, promptedData);
 
   // Deduct charge if LOADING weapon.
   if (
@@ -1124,10 +1105,13 @@ export async function prepareTechMacro(a: string, t: string) {
   await rollTechMacro(actor, mData);
 }
 
-async function rollTechMacro(actor: Actor, data: LancerTechMacroData) {
+async function rollTechMacro(actor: Actor, data: LancerTechMacroData, rerollData?: AccDiffData) {
   const targets = getTargets();
+  const initialData = rerollData ?? AccDiffForm.formDataFromParams(data.tags, data.title, targets);
+  const promptedData = await promptAccDiffModifiers(initialData);
+  if (!promptedData) return;
 
-  let atkRolls = await buildAttackRollStrings(data.title, data.tags, data.t_atk, targets);
+  let atkRolls = attackRollStrings(data.t_atk, promptedData);
   if (!atkRolls) return;
 
   const { attacks, hits } = await checkTargets(atkRolls, true); // true = all tech attacks are "smart"
@@ -1146,15 +1130,14 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData) {
   return await renderMacroTemplate(actor, template, templateData);
 }
 
-export function promptAccDiffModifiers(
-  tags?: TagInstance[],
-  title?: string,
-  targets?: LancerActor<LancerActorType>[],
-  starting?: [number, number]
-): Promise<AccDiffFormData> {
-  let form = AccDiffForm.fromData(tags, title, targets, starting);
+export async function promptAccDiffModifiers(data: AccDiffData): Promise<AccDiffData | null> {
+  let form = new AccDiffForm(data);
   form.render(true);
-  return form.promise;
+  try {
+    return await form.promise; // await to force any rejections into this try/catch
+  } catch (_e) {
+    return null;
+  }
 }
 
 export async function prepareOverchargeMacro(a: string) {

From 77c26bb52cf70331e87ff4b6ebb68eab25978b5b Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 17:30:22 -0700
Subject: [PATCH 08/88] give the accdiff code the tokens, rather than just the
 actors

---
 src/module/helpers/acc_diff.ts             |  7 +++----
 src/module/helpers/automation/targeting.ts |  2 +-
 src/module/macros.ts                       | 15 ++++++---------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 86c8d5aee..28c9006ee 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -1,5 +1,4 @@
 import { TagInstance } from "machine-mind";
-import { LancerActor, LancerActorType } from '../actor/lancer-actor';
 import ReactiveForm from './reactive-form';
 
 enum Cover {
@@ -24,7 +23,7 @@ export type AccDiffData = {
     total: number
   },
   targets: {
-    target: LancerActor<LancerActorType>,
+    target: Token,
     accuracy: number,
     difficulty: number,
     cover: Cover,
@@ -52,7 +51,7 @@ export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
   static formDataFromParams(
     tags?: TagInstance[],
     title?: string,
-    targets?: LancerActor<LancerActorType>[],
+    targets?: Token[],
     starting?: [number, number]
   ): AccDiffData {
     let ret: AccDiffData = {
@@ -112,7 +111,7 @@ export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
   static fromData(
     tags?: TagInstance[],
     title?: string,
-    targets?: LancerActor<LancerActorType>[],
+    targets?: Token[],
     starting?: [number, number]) {
     return new AccDiffForm(AccDiffForm.formDataFromParams(tags, title, targets, starting));
   }
diff --git a/src/module/helpers/automation/targeting.ts b/src/module/helpers/automation/targeting.ts
index 62972b57a..bc0d50821 100644
--- a/src/module/helpers/automation/targeting.ts
+++ b/src/module/helpers/automation/targeting.ts
@@ -1,6 +1,6 @@
 import { LancerActor, LancerActorType } from "../../actor/lancer-actor";
 
-export function getTargets(): LancerActor<LancerActorType>[] {
+export function getTargetActors(): LancerActor<LancerActorType>[] {
   const targets = game.user.targets;
   const ret: LancerActor<LancerActorType>[] = [];
   targets.forEach(token => {
diff --git a/src/module/macros.ts b/src/module/macros.ts
index f1fef7328..8046c4400 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -49,7 +49,7 @@ import { is_ref, resolve_dotpath } from "./helpers/commons";
 import { buildActionHTML, buildDeployableHTML, buildSystemHTML } from "./helpers/item";
 import { ActivationOptions, StabOptions1, StabOptions2 } from "./enums";
 import { applyCollapseListeners, uuid4 } from "./helpers/collapse";
-import { checkForHit, getTargets } from "./helpers/automation/targeting";
+import { checkForHit } from "./helpers/automation/targeting";
 import { AccDiffForm, AccDiffData } from "./helpers/acc_diff";
 import { is_overkill } from "machine-mind/dist/funcs";
 
@@ -463,7 +463,7 @@ function rollStr(bonus: number, total: number): string {
 
 type AttackRoll = {
   roll: string,
-  targeted: { target: LancerActor<LancerActorType>, roll: string }[]
+  targeted: { target: Token, roll: string }[]
 }
 
 function attackRollStrings(bonus: number, accdiff: AccDiffData): AttackRoll {
@@ -696,7 +696,7 @@ async function prepareAttackMacro({
   }
 
   // Prompt the user before deducting charges.
-  const targets = getTargets();
+  const targets = Array.from(game.user.targets);
   const initialData = rerollData ?? AccDiffForm.formDataFromParams(
     mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
   const promptedData = await promptAccDiffModifiers(initialData);
@@ -745,12 +745,9 @@ async function checkTargets(atkRolls: AttackRoll, isSmart: boolean): Promise<{
       return {
         attack: { roll: attack_roll, tt: attack_tt },
         hit: {
-          token: {
-            name: target.token ? target.token.data.name : target.data.name,
-            img: target.token ? target.token.data.img : target.data.img,
-          },
+          token: { name: target.data.name, img: target.data.img },
           total: String(attack_roll._total).padStart(2, "0"),
-          hit: await checkForHit(isSmart, attack_roll, target),
+          hit: await checkForHit(isSmart, attack_roll, target.actor as LancerActor<LancerActorType>),
           crit: attack_roll._total >= 20,
         }
       }
@@ -1106,7 +1103,7 @@ export async function prepareTechMacro(a: string, t: string) {
 }
 
 async function rollTechMacro(actor: Actor, data: LancerTechMacroData, rerollData?: AccDiffData) {
-  const targets = getTargets();
+  const targets = Array.from(game.user.targets);
   const initialData = rerollData ?? AccDiffForm.formDataFromParams(data.tags, data.title, targets);
   const promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;

From 0d1d9099d799c68e1675b7c13206b53e2c1514e6 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 17:59:44 -0700
Subject: [PATCH 09/88] restructure AccDiffData to have a coherent
 serialization story

---
 src/module/helpers/acc_diff.ts | 247 +++++++++++++++++++++++----------
 src/module/macros.ts           |   6 +-
 2 files changed, 174 insertions(+), 79 deletions(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 28c9006ee..dc1ca2a9a 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -7,113 +7,208 @@ enum Cover {
   Hard = 2
 }
 
-export type AccDiffData = {
+type AccDiffBaseSerialized = {
+  untyped: { accuracy: number, difficulty: number },
+  cover: Cover,
+  accurate: boolean,
+  inaccurate: boolean,
+  seeking: boolean
+}
+
+type AccDiffTargetSerialized = {
+  target: string,
+  accuracy: number,
+  difficulty: number,
+  cover: Cover
+}
+
+export type AccDiffDataSerialized = {
   title: string,
-  base: {
-    untyped: {
-      accuracy: number,
-      difficulty: number,
-    },
-    accuracy: number,
-    difficulty: number,
-    cover: Cover,
-    accurate: boolean,
-    inaccurate: boolean,
-    seeking: boolean,
-    total: number
-  },
-  targets: {
+  base: AccDiffBaseSerialized,
+  targets: AccDiffTargetSerialized[],
+}
+
+class AccDiffBase {
+  untyped: { accuracy: number, difficulty: number };
+  cover: Cover;
+  accurate: boolean;
+  inaccurate: boolean;
+  seeking: boolean;
+
+  constructor(obj: AccDiffBaseSerialized) {
+    this.untyped = obj.untyped;
+    this.cover = obj.cover;
+    this.accurate = obj.accurate;
+    this.inaccurate = obj.inaccurate;
+    this.seeking = obj.seeking;
+  }
+
+  static fromObject(obj: AccDiffBaseSerialized): AccDiffBase {
+    return new AccDiffBase(obj);
+  }
+
+  toObject(): AccDiffBaseSerialized {
+    return {
+      untyped: this.untyped,
+      cover: this.cover,
+      accurate: this.accurate,
+      inaccurate: this.inaccurate,
+      seeking: this.seeking
+    }
+  }
+
+  get accuracy() {
+    return this.untyped.accuracy + (this.accurate ? 1 : 0);
+  }
+
+  get difficulty() {
+    return this.untyped.difficulty
+      + (this.inaccurate ? 1 : 0)
+      + (this.seeking ? 0 : this.cover)
+  }
+
+  get total() {
+    return this.accuracy - this.difficulty;
+  }
+}
+
+class AccDiffTarget {
+  target: Token;
+  accuracy: number;
+  difficulty: number;
+  cover: Cover;
+  #base: AccDiffBase;
+
+  constructor(obj: {
     target: Token,
     accuracy: number,
     difficulty: number,
-    cover: Cover,
-    total: number
-  }[],
-}
+    cover: Cover
+  }, base: AccDiffBase) {
+    this.target = obj.target;
+    this.accuracy = obj.accuracy;
+    this.difficulty = obj.difficulty;
+    this.cover = obj.cover;
+    this.#base = base;
+  }
 
-type AccDiffView = AccDiffData & {
-  baseCoverDisabled: boolean,
-  hasTargets: boolean
+  toObject(): AccDiffTargetSerialized {
+    return {
+      target: this.target.id,
+      accuracy: this.accuracy,
+      difficulty: this.difficulty,
+      cover: this.cover
+    }
+  }
+
+  static fromObject(obj: AccDiffTargetSerialized, base: AccDiffBase): AccDiffTarget {
+    let target = canvas.scene.tokens.get(obj.target);
+    if (!target) {
+      ui.notifications.error("Trying to access tokens from a different scene!");
+      throw new Error("Token not found");
+    }
+    return new AccDiffTarget({
+      target: target,
+      accuracy: obj.accuracy,
+      difficulty: obj.difficulty,
+      cover: obj.cover
+    }, base)
+  }
+
+  get total() {
+    return this.accuracy - this.difficulty
+      + this.#base.total - (this.#base.seeking ? 0 : this.cover);
+  }
 }
 
-export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
-  static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
-      template: "systems/lancer/templates/window/acc_diff.hbs",
-      resizable: false,
-    });
+export class AccDiffData {
+  title: string;
+  base: AccDiffBase;
+  targets: AccDiffTarget[];
+
+  constructor(obj: {
+    title: string,
+    base: AccDiffBase,
+    targets: AccDiffTarget[]
+  }) {
+    this.title = obj.title;
+    this.base = obj.base;
+    this.targets = obj.targets;
   }
 
-  constructor(data: AccDiffData) {
-    super(data, { title: data.title })
+  toObject(): AccDiffDataSerialized {
+    return {
+      title: this.title,
+      base: this.base.toObject(),
+      targets: this.targets.map(t => t.toObject())
+    }
+  }
+
+  static fromObject(obj: AccDiffDataSerialized): AccDiffData {
+    let base = AccDiffBase.fromObject(obj.base);
+    let targets = obj.targets.map(t => AccDiffTarget.fromObject(t, base));
+    return new AccDiffData({ title: obj.title, base, targets });
   }
 
-  static formDataFromParams(
+  static fromParams(
     tags?: TagInstance[],
     title?: string,
     targets?: Token[],
     starting?: [number, number]
   ): AccDiffData {
-    let ret: AccDiffData = {
-      title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
-      base: {
-        accurate: false,
-        inaccurate: false,
-        cover: Cover.None,
-        seeking: false,
-        untyped: {
-          accuracy: starting ? starting[0] : 0,
-          difficulty: starting ? starting[1] : 0
-        },
-        get accuracy() {
-          return this.untyped.accuracy + (this.accurate ? 1 : 0);
-        },
-        get difficulty() {
-          return this.untyped.difficulty
-            + (this.inaccurate ? 1 : 0)
-            + (this.seeking ? 0 : this.cover)
-        },
-        get total() {
-          return this.accuracy - this.difficulty;
-        }
-      },
-      targets: []
-    };
-
-    ret.targets = (targets || []).map(t => ({
-      target: t,
-      accuracy: 0,
-      difficulty: 0,
+    let base = AccDiffBase.fromObject({
+      accurate: false,
+      inaccurate: false,
       cover: Cover.None,
-      get total() {
-        return this.accuracy - this.difficulty
-          + ret.base.total - (ret.base.seeking ? 0 : this.cover);
-      }
-    }));
+      seeking: false,
+      untyped: {
+        accuracy: starting ? starting[0] : 0,
+        difficulty: starting ? starting[1] : 0
+      },
+    });
 
     for (let tag of (tags || [])) {
       switch (tag.Tag.LID) {
         case "tg_accurate":
-          ret.base.accurate = true;
+          base.accurate = true;
           break;
         case "tg_inaccurate":
-          ret.base.inaccurate = true;
+          base.inaccurate = true;
           break;
         case "tg_seeking":
-          ret.base.seeking = true;
+          base.seeking = true;
           break;
       }
     }
 
-    return ret;
+    return new AccDiffData({
+      title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
+      base: base,
+      targets: (targets || []).map(t => new AccDiffTarget({
+        target: t,
+        accuracy: 0,
+        difficulty: 0,
+        cover: Cover.None
+      }, base))
+    });
   }
+}
 
-  static fromData(
-    tags?: TagInstance[],
-    title?: string,
-    targets?: Token[],
-    starting?: [number, number]) {
-    return new AccDiffForm(AccDiffForm.formDataFromParams(tags, title, targets, starting));
+type AccDiffView = AccDiffData & {
+  baseCoverDisabled: boolean,
+  hasTargets: boolean
+}
+
+export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      template: "systems/lancer/templates/window/acc_diff.hbs",
+      resizable: false,
+    });
+  }
+
+  constructor(data: AccDiffData) {
+    super(data, { title: data.title })
   }
 
   getViewModel(data: AccDiffData): AccDiffView {
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 8046c4400..345920587 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -508,7 +508,7 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
   if (!actor) return Promise.resolve();
 
   // Get accuracy/difficulty with a prompt
-  let initialData = AccDiffForm.formDataFromParams();
+  let initialData = AccDiffData.fromParams();
   let promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
   let acc: number = promptedData.base.total;
@@ -697,7 +697,7 @@ async function prepareAttackMacro({
 
   // Prompt the user before deducting charges.
   const targets = Array.from(game.user.targets);
-  const initialData = rerollData ?? AccDiffForm.formDataFromParams(
+  const initialData = rerollData ?? AccDiffData.fromParams(
     mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
   const promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
@@ -1104,7 +1104,7 @@ export async function prepareTechMacro(a: string, t: string) {
 
 async function rollTechMacro(actor: Actor, data: LancerTechMacroData, rerollData?: AccDiffData) {
   const targets = Array.from(game.user.targets);
-  const initialData = rerollData ?? AccDiffForm.formDataFromParams(data.tags, data.title, targets);
+  const initialData = rerollData ?? AccDiffData.fromParams(data.tags, data.title, targets);
   const promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
 

From 0d79b68ecf81ef4d971b4ea7728da1cb1272b359 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 20:03:09 -0700
Subject: [PATCH 10/88] encode a reroll macro into attack chat cards

---
 src/lancer.scss                    |  5 ++++
 src/module/macros.ts               | 40 ++++++++++++++++++++++++------
 src/templates/chat/attack-card.hbs |  3 +++
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index df9517030..c6c49ae2e 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2247,6 +2247,11 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   opacity: 0.6;
 }
 
+// needed to override a builtin that removes all shadows from the sidebar
+#sidebar a.chat-button:hover {
+  text-shadow: 0 0 8px red;
+}
+
 .cci-no-cover:before {
   content: '\25cb';
 }
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 345920587..c81fa6e22 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -33,6 +33,7 @@ import {
   PilotWeapon,
   MechWeapon,
   RegDamageData,
+  RegRef,
   MechWeaponProfile,
   NpcFeature,
   OpCtx,
@@ -50,7 +51,7 @@ import { buildActionHTML, buildDeployableHTML, buildSystemHTML } from "./helpers
 import { ActivationOptions, StabOptions1, StabOptions2 } from "./enums";
 import { applyCollapseListeners, uuid4 } from "./helpers/collapse";
 import { checkForHit } from "./helpers/automation/targeting";
-import { AccDiffForm, AccDiffData } from "./helpers/acc_diff";
+import { AccDiffForm, AccDiffData, AccDiffDataSerialized } from "./helpers/acc_diff";
 import { is_overkill } from "machine-mind/dist/funcs";
 
 const lp = LANCER.log_prefix;
@@ -552,6 +553,26 @@ async function rollTalentMacro(actor: Actor, data: LancerTalentMacroData) {
   return renderMacroTemplate(actor, template, templateData);
 }
 
+type AttackMacroOptions = {
+  accBonus: number;
+  damBonus: { type: DamageType; val: number };
+}
+
+export async function prepareEncodedAttackMacro(
+  actor_ref: RegRef<any>, item_id: string, options: AttackMacroOptions, rerollData: AccDiffDataSerialized) {
+  let reg = new FoundryReg();
+  let opCtx = new OpCtx()
+  let mm = await reg.resolve(opCtx, actor_ref);
+  let actor = mm.Flags.orig_doc;
+  let item = ownedItemFromString(item_id, actor);
+  if (!item) {
+    ui.notifications.error("Could not find weapon to reroll");
+    return;
+  }
+  let accdiff = AccDiffData.fromObject(rerollData);
+  return prepareAttackMacro({ actor, item, options }, accdiff);
+}
+
 /**
  * Standalone prepare function for attacks, since they're complex.
  * @param actor   {Actor}       Actor to roll as. Assumes properly prepared item.
@@ -569,10 +590,7 @@ async function prepareAttackMacro({
 }: {
   actor: Actor;
   item: LancerItem<any>;
-  options?: {
-    accBonus: number;
-    damBonus: { type: DamageType; val: number };
-  };
+  options?: AttackMacroOptions;
 }, rerollData?: AccDiffData) {
   let mData: LancerAttackMacroData = {
     title: item.name,
@@ -717,7 +735,14 @@ async function prepareAttackMacro({
     await itemEnt.writeback();
   }
 
-  await rollAttackMacro(actor, atkRolls, mData);
+  let rerollMacro = `prepareEncodedAttackMacro(
+${JSON.stringify(actor.data.data.derived.mm.as_ref())},
+"${item.id}",
+${JSON.stringify(options)},
+${JSON.stringify(promptedData.toObject())}
+)`;
+
+  await rollAttackMacro(actor, atkRolls, mData, rerollMacro);
 }
 
 type AttackResult = {
@@ -768,7 +793,7 @@ async function checkTargets(atkRolls: AttackRoll, isSmart: boolean): Promise<{
   }
 }
 
-async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerAttackMacroData) {
+async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerAttackMacroData, rerollMacro: string) {
   const isSmart = data.tags.findIndex(tag => tag.Tag.LID === "tg_smart") > -1;
   const { attacks, hits } = await checkTargets(atkRolls, isSmart);
 
@@ -908,6 +933,7 @@ async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerA
     effect: data.effect ? data.effect : null,
     on_hit: data.on_hit ? data.on_hit : null,
     tags: data.tags,
+    rerollMacroData: encodeMacroData({ command: rerollMacro, title: "Reroll Attack" })
   };
 
   console.debug(templateData);
diff --git a/src/templates/chat/attack-card.hbs b/src/templates/chat/attack-card.hbs
index 038d7e379..52334329e 100644
--- a/src/templates/chat/attack-card.hbs
+++ b/src/templates/chat/attack-card.hbs
@@ -2,6 +2,9 @@
   <div class="lancer-header mech_weapon medium">
     <i class="cci cci-weapon i--m i--light"> </i>
     <span>{{ title }}</span>
+    <a class="chat-button roll-attack" data-macro="{{rerollMacroData}}" title="Reroll this attack">
+      <i class="fas fa-dice-d20 i--m i--light"></i>
+    </a>
   </div>
   <div class="card clipped">
     <div class="lancer-mini-header collapse-trigger" data-collapse-id="{{_uuid}}-attacks">{{localize "lancer.chat-card.title.attack"}}</div>

From 14f88e136a33ffc4ce3eb22dc0e74c122f7602c0 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 20:04:56 -0700
Subject: [PATCH 11/88] ev.target is the innermost clicked element, not the
 .chat-button

---
 src/lancer.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/lancer.ts b/src/lancer.ts
index 6e7c1fec4..4e72b53ab 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -657,9 +657,15 @@ Hooks.on("renderChatMessage", async (cm: ChatMessage, html: any, data: any) => {
   }
 
   html.find(".chat-button").on("click", (ev: MouseEvent) => {
-    ev.stopPropagation();
-    let element = ev.target as HTMLElement;
-    runEncodedMacro($(element));
+    function checkTarget(element: HTMLElement) {
+      if (element.attributes.getNamedItem('data-macro')) {
+        ev.stopPropagation();
+        runEncodedMacro($(element));
+        return true;
+      }
+      return false;
+    }
+    checkTarget(ev.target as HTMLElement) || checkTarget(ev.currentTarget as HTMLElement);
   })
 });
 

From 42cadb16569eb395729e01cbe6e7fa5a4be23e8e Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 20:22:39 -0700
Subject: [PATCH 12/88] maybe a small animation to let people know it's
 clickable?

---
 src/lancer.scss | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/lancer.scss b/src/lancer.scss
index c6c49ae2e..60e0a987e 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2252,6 +2252,20 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   text-shadow: 0 0 8px red;
 }
 
+#sidebar a.chat-button {
+  animation: pulse 1200ms ease 1s 8 alternate;
+}
+
+@keyframes pulse {
+  0% {
+    text-shadow: none;
+  }
+  100% {
+    text-shadow: 0 0 8px red;
+  }
+}
+
+
 .cci-no-cover:before {
   content: '\25cb';
 }

From d543c065a5f51ba741f91d015b5e6582cf3fce6f Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 21:18:12 -0700
Subject: [PATCH 13/88] three columns for the multitarget row

---
 src/lancer.scss                   | 5 +++++
 src/templates/window/acc_diff.hbs | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index 60e0a987e..67d94667d 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2211,6 +2211,11 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   align-self: center;
 }
 
+.accdiff-target-row {
+  display: grid;
+  grid-template-columns: auto auto auto;
+}
+
 .accdiff-target-row .lancer-hit-thumb {
   margin-right: 0px;
   margin-left: 4px;
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 4070bf013..222bb01d4 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -98,7 +98,7 @@
       }}}
     {{/unless}}
     {{#if hasTargets}}
-      <div class="flexrow accdiff-footer accdiff-weight accdiff-grid accdiff-target-row">
+      <div class="accdiff-footer accdiff-weight accdiff-target-row">
         {{#each targets as |data key|}}
           <div class="flexcol card">
             <label class="flexrow flex-center card">

From ed7309969b39338bcb2d3119f7a83dadeb0b4e42 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 23:35:03 -0700
Subject: [PATCH 14/88] rewrite encoded macros to be restricted to a whitelist

---
 src/lancer.ts                          |  6 ++-
 src/module/actor/lancer-actor-sheet.ts |  2 +-
 src/module/actor/lancer-actor.ts       | 63 ++++++++++++++------------
 src/module/helpers/actor.ts            | 12 ++++-
 src/module/helpers/loadout.ts          |  5 +-
 src/module/helpers/refs.ts             |  6 ++-
 src/module/interfaces.d.ts             |  3 +-
 src/module/macros.ts                   | 50 +++++++++++++-------
 8 files changed, 93 insertions(+), 54 deletions(-)

diff --git a/src/lancer.ts b/src/lancer.ts
index 4e72b53ab..082569cb0 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -16,7 +16,7 @@ import Storage from "@aws-amplify/storage"
 
 import { LANCER, STATUSES, WELCOME } from "./module/config";
 import { LancerGame } from "./module/lancer-game";
-import { LancerActor, lancerActorInit } from "./module/actor/lancer-actor";
+import { LancerActor, lancerActorInit, prepareStructureSecondaryRollMacro } from "./module/actor/lancer-actor";
 import { LancerItem, lancerItemInit } from "./module/item/lancer-item";
 import { populatePilotCache } from "./module/compcon";
 
@@ -179,6 +179,8 @@ Hooks.once("init", async function () {
     prepareOverheatMacro: macros.prepareOverheatMacro,
     prepareStructureMacro: macros.prepareStructureMacro,
     prepareActivationMacro: macros.prepareActivationMacro,
+    prepareEncodedAttackMacro: macros.prepareEncodedAttackMacro,
+    prepareStructureSecondaryRollMacro: prepareStructureSecondaryRollMacro,
     fullRepairMacro: macros.fullRepairMacro,
     stabilizeMacro: macros.stabilizeMacro,
     migrations: migrations,
@@ -660,7 +662,7 @@ Hooks.on("renderChatMessage", async (cm: ChatMessage, html: any, data: any) => {
     function checkTarget(element: HTMLElement) {
       if (element.attributes.getNamedItem('data-macro')) {
         ev.stopPropagation();
-        runEncodedMacro($(element));
+        runEncodedMacro(element);
         return true;
       }
       return false;
diff --git a/src/module/actor/lancer-actor-sheet.ts b/src/module/actor/lancer-actor-sheet.ts
index a45ad90c8..4a95924cf 100644
--- a/src/module/actor/lancer-actor-sheet.ts
+++ b/src/module/actor/lancer-actor-sheet.ts
@@ -304,7 +304,7 @@ export class LancerActorSheet<T extends LancerActorType> extends ActorSheet {
     let encMacros = html.find("a.lancer-macro");
     encMacros.on("click", ev => {
       ev.stopPropagation(); // Avoids triggering parent event handlers
-      runEncodedMacro($(ev.currentTarget));
+      runEncodedMacro(ev.currentTarget);
     });
 
     /*
diff --git a/src/module/actor/lancer-actor.ts b/src/module/actor/lancer-actor.ts
index 7fb6e0fc2..2927c2230 100644
--- a/src/module/actor/lancer-actor.ts
+++ b/src/module/actor/lancer-actor.ts
@@ -35,6 +35,35 @@ import { handleActorExport } from "../helpers/io";
 import { LancerMacroData } from "../interfaces";
 const lp = LANCER.log_prefix;
 
+export function prepareStructureSecondaryRollMacro(registryId: string) {
+  // @ts-ignore
+  let roll = new Roll('1d6').evaluate({ async: false });
+  let result = roll.total;
+  if (result <= 3) {
+    prepareTextMacro(registryId, "Destroy Weapons", `
+<div class="dice-roll lancer-dice-roll">
+  <div class="dice-result">
+    <div class="dice-formula lancer-dice-formula flexrow">
+      <span style="text-align: left; margin-left: 5px;">${roll.formula}</span>
+      <span class="dice-total lancer-dice-total major">${result}</span>
+    </div>
+  </div>
+</div>
+<span>On a 1–3, all weapons on one mount of your choice are destroyed</span>`);
+  } else {
+    prepareTextMacro(registryId, "Destroy Systems", `
+<div class="dice-roll lancer-dice-roll">
+  <div class="dice-result">
+    <div class="dice-formula lancer-dice-formula flexrow">
+      <span style="text-align: left; margin-left: 5px;">${roll.formula}</span>
+      <span class="dice-total lancer-dice-total major">${result}</span>
+    </div>
+  </div>
+</div>
+<span>On a 4–6, a system of your choice is destroyed</span>`);
+  }
+}
+
 export function lancerActorInit(base_actor: any, creation_args: any, sheet_options: any, id_maybe: any, something_or_other: any) {
   // Some subtype of ActorData
   console.log(`${lp} Initializing new ${base_actor.type}`);
@@ -233,8 +262,9 @@ export class LancerActor<T extends LancerActorType> extends Actor {
       } else {
         if(result === 1 && remStress === 2) {
           let macroData = encodeMacroData({
-            command: `game.lancer.prepareStatMacro("${ent.RegistryID}","mm.Eng");`,
             title: "Engineering",
+            fn: "prepareStatMacro",
+            args: [ent.RegistryID, "mm.Eng"]
           });
 
           secondaryRoll = `<button class="chat-macro-button"><a class="chat-button" data-macro="${macroData}"><i class="fas fa-dice-d20"></i> Engineering</a></button>`;
@@ -366,8 +396,9 @@ export class LancerActor<T extends LancerActorType> extends Actor {
       } else {
         if(result === 1 && remStruct === 2) {
           let macroData = encodeMacroData({
-            command: `game.lancer.prepareStatMacro("${ent.RegistryID}","mm.Hull");`,
             title: "Hull",
+            fn: "prepareStatMacro",
+            args: [ent.RegistryID, "mm.Hull"]
           });
 
           secondaryRoll = `<button class="chat-macro-button"><a class="chat-button" data-macro="${macroData}"><i class="fas fa-dice-d20"></i>Hull</a></button>`;
@@ -375,33 +406,9 @@ export class LancerActor<T extends LancerActorType> extends Actor {
           let macroData = encodeMacroData({
             // TODO: Should create a "prepareRollMacro" or something to handle generic roll-based macros
             // Since we can't change prepareTextMacro too much or break everyone's macros
-            command: `
-            let roll = new Roll('1d6').evaluate({async: false});
-            let result = roll.total;
-            if(result<=3) { 
-              game.lancer.prepareTextMacro("${ent.RegistryID}","Destroy Weapons",\`
-              <div class="dice-roll lancer-dice-roll">
-                <div class="dice-result">
-                  <div class="dice-formula lancer-dice-formula flexrow">
-                    <span style="text-align: left; margin-left: 5px;">\${ roll.formula }</span>
-                    <span class="dice-total lancer-dice-total major">\${ result }</span>
-                  </div>
-                </div>
-              </div>
-              <span>On a 1–3, all weapons on one mount of your choice are destroyed</span>\`);
-            } else {
-              game.lancer.prepareTextMacro("${ent.RegistryID}","Destroy Systems",\`
-              <div class="dice-roll lancer-dice-roll">
-                <div class="dice-result">
-                  <div class="dice-formula lancer-dice-formula flexrow">
-                    <span style="text-align: left; margin-left: 5px;">\${ roll.formula }</span>
-                    <span class="dice-total lancer-dice-total major">\${ result }</span>
-                  </div>
-                </div>
-              </div>
-              <span>On a 4–6, a system of your choice is destroyed</span>\`);
-            }`,
             title: "Roll for Destruction",
+            fn: "prepareStructureSecondaryRollMacro",
+            args: [ent.RegistryID]
           });
 
           secondaryRoll = `<button class="chat-macro-button"><a class="chat-button" data-macro="${macroData}"><i class="fas fa-dice-d20"></i>Destroy</a></button>`;
diff --git a/src/module/helpers/actor.ts b/src/module/helpers/actor.ts
index eed7eb4db..4f8532361 100644
--- a/src/module/helpers/actor.ts
+++ b/src/module/helpers/actor.ts
@@ -53,8 +53,12 @@ export function stat_view_card(
   let data_val = resolve_helper_dotpath(options, data_path);
   let macro_button: string | undefined;
   let macroData = encodeMacroData({
-    command: `game.lancer.prepareStatMacro("${options.data.root.data._id}","${data_path}");`,
     title: title,
+    fn: "prepareStatMacro",
+    args: [
+      options.data.root.data._id,
+      data_path
+    ]
   });
   if (options.rollable)
     macro_button = `<a class="i--dark i--sm lancer-macro" data-macro="${macroData}"><i class="fas fa-dice-d20"></i></a>`;
@@ -126,8 +130,12 @@ export function clicker_stat_card(
 ): string {
   let button = "";
   let macroData = encodeMacroData({
-    command: `game.lancer.prepareStatMacro("${options.data.root.data._id}","${data_path}");`,
     title: title,
+    fn: "prepareStatMacro",
+    args: [
+      options.data.root.data._id,
+      data_path
+    ]
   });
   if (roller)
     button = `<a class="lancer-macro i--dark i--sm" data-macro="${macroData}"><i class="fas fa-dice-d20"></i></a>`;
diff --git a/src/module/helpers/loadout.ts b/src/module/helpers/loadout.ts
index 54f967779..f2c1731ff 100644
--- a/src/module/helpers/loadout.ts
+++ b/src/module/helpers/loadout.ts
@@ -265,12 +265,11 @@ function frame_active(actor: LancerActor<EntryType.MECH>, core: CoreSystem): str
   }).join("");
 
   // Should find a better way to do this...
-
-
   let coreMacroData: LancerMacroData = {
-    command: `game.lancer.prepareCoreActiveMacro("${actor.id}")`,
     title: `${actor.name} | CORE POWER`,
     iconPath: `systems/lancer/assets/icons/macro-icons/corebonus.svg`,
+    fn: "prepareCoreActiveMacro",
+    args: [actor.id]
   };
 
   return `
diff --git a/src/module/helpers/refs.ts b/src/module/helpers/refs.ts
index 575d4086c..cbaa1f1b4 100644
--- a/src/module/helpers/refs.ts
+++ b/src/module/helpers/refs.ts
@@ -314,7 +314,11 @@ export function editable_mm_ref_list_item<T extends LancerItemType>(
       let macroData: LancerMacroData = {
         iconPath: `systems/lancer/assets/icons/macro-icons/mech_system.svg`,
         title: sys.Name,
-        command: `game.lancer.prepareItemMacro("${sys.Flags.orig_doc.actor?.id ?? ""}", "${sys.Flags.orig_doc.id}")`,
+        fn: "prepareItemMacro",
+        args: [
+          sys.Flags.orig_doc.actor?.id ?? "",
+          sys.Flags.orig_doc.id
+        ]
       };
 
       let limited = "";
diff --git a/src/module/interfaces.d.ts b/src/module/interfaces.d.ts
index b8a515bdf..6299381bd 100644
--- a/src/module/interfaces.d.ts
+++ b/src/module/interfaces.d.ts
@@ -148,7 +148,8 @@ declare interface LancerOverchargeMacroData {
 }
 
 declare interface LancerMacroData {
-  command: string;
+  fn: string;
+  args: any[];
   iconPath?: string;
   title: string;
 }
diff --git a/src/module/macros.ts b/src/module/macros.ts
index c81fa6e22..530a8a938 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -56,20 +56,34 @@ import { is_overkill } from "machine-mind/dist/funcs";
 
 const lp = LANCER.log_prefix;
 
-export function encodeMacroData(macroData: LancerMacroData): string {
-  return btoa(encodeURI(JSON.stringify(macroData)));
+export function encodeMacroData(data: LancerMacroData): string {
+  return btoa(encodeURI(JSON.stringify(data)));
 }
 
-export async function runEncodedMacro(el: JQuery<HTMLElement>) {
-  let encoded = el.attr("data-macro");
+export async function runEncodedMacro(el: HTMLElement) {
+  let encoded = el.attributes.getNamedItem('data-macro')?.nodeValue;
+  if (!encoded) {
+    console.warn("No macro data available");
+    return;
+  }
 
-  if (!encoded) throw Error("No macro data available");
   let data: LancerMacroData = JSON.parse(decodeURI(atob(encoded)));
 
-  let command = data.command;
+  const whitelist = [
+    "prepareEncodedAttackMacro",
+    "prepareStatMacro",
+    "prepareItemMacro",
+    "prepareCoreActiveMacro",
+    "prepareStructureSecondaryRollMacro",
+  ];
+
+  if (whitelist.indexOf(data.fn) < 0) {
+    console.error("Attempting to call unwhitelisted function via encoded macro: " + data.fn);
+    return;
+  }
 
-  // Some might say eval is bad, but it's no worse than what we can already do with macros
-  eval(command);
+  let fn = game.lancer[data.fn];
+  return fn.apply(null, data.args)
 }
 
 export async function onHotbarDrop(_bar: any, data: any, slot: number) {
@@ -735,12 +749,16 @@ async function prepareAttackMacro({
     await itemEnt.writeback();
   }
 
-  let rerollMacro = `prepareEncodedAttackMacro(
-${JSON.stringify(actor.data.data.derived.mm.as_ref())},
-"${item.id}",
-${JSON.stringify(options)},
-${JSON.stringify(promptedData.toObject())}
-)`;
+  let rerollMacro = {
+    title: "Reroll attack",
+    fn: "prepareEncodedAttackMacro",
+    args: [
+      actor.data.data.derived.mm.as_ref(),
+      item.id,
+      options,
+      promptedData.toObject()
+    ]
+  };
 
   await rollAttackMacro(actor, atkRolls, mData, rerollMacro);
 }
@@ -793,7 +811,7 @@ async function checkTargets(atkRolls: AttackRoll, isSmart: boolean): Promise<{
   }
 }
 
-async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerAttackMacroData, rerollMacro: string) {
+async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerAttackMacroData, rerollMacro: LancerMacroData) {
   const isSmart = data.tags.findIndex(tag => tag.Tag.LID === "tg_smart") > -1;
   const { attacks, hits } = await checkTargets(atkRolls, isSmart);
 
@@ -933,7 +951,7 @@ async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerA
     effect: data.effect ? data.effect : null,
     on_hit: data.on_hit ? data.on_hit : null,
     tags: data.tags,
-    rerollMacroData: encodeMacroData({ command: rerollMacro, title: "Reroll Attack" })
+    rerollMacroData: encodeMacroData(rerollMacro)
   };
 
   console.debug(templateData);

From 99800d47cb1236d51c14b8e28844ab1011488983 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 13 Jul 2021 23:36:25 -0700
Subject: [PATCH 15/88] bugfix: structure damage macro was broken

---
 src/lang/en.json                      | 1 +
 src/templates/chat/structure-card.hbs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lang/en.json b/src/lang/en.json
index 3ccb071ba..0818fb173 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -96,6 +96,7 @@
                 "effect": "// EFFECT //",
                 "charge-roll": "// CHARGE ROLL //",
                 "changes": "// CHANGES //",
+                "structure": "// STRUCTURE DAMAGE //",
                 "overheating": "// OVERHEATING //",
                 "check": "// CHECK :: {check} //",
                 "system": "// SYSTEM :: {system} //"
diff --git a/src/templates/chat/structure-card.hbs b/src/templates/chat/structure-card.hbs
index 363063449..bd8486e9d 100644
--- a/src/templates/chat/structure-card.hbs
+++ b/src/templates/chat/structure-card.hbs
@@ -1,5 +1,5 @@
 <div class="card clipped-bot" style="margin: 0px;">
-  <div class="lancer-stat-header clipped-top">{{localize "lancer.chat-card.title" title="STRUCTURE DAMAGE"}}</div>
+  <div class="lancer-stat-header clipped-top">{{localize "lancer.chat-card.title.structure" title="STRUCTURE DAMAGE"}}</div>
   <div style="align-self: center">{{localize "lancer.chat-card.remaining" total=val max=max}}</div>
   {{#if roll}}
     <div class="dice-roll lancer-dice-roll">

From a6db06ee9365e56ba91b5596bdeea5b93714b291 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 00:26:50 -0700
Subject: [PATCH 16/88] the 1-target case looks nicer without the duplicated UI

---
 src/module/helpers/acc_diff.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index dc1ca2a9a..c559b461a 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -213,7 +213,7 @@ export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
 
   getViewModel(data: AccDiffData): AccDiffView {
     let ret = data as AccDiffView; // view elements haven't been set yet
-    ret.hasTargets = ret.targets.length > 0;
+    ret.hasTargets = ret.targets.length > 1;
     ret.baseCoverDisabled = ret.base.seeking || ret.hasTargets;
     return ret
   }

From fd66efffb295746c75ba8ff51d555db961603efb Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 09:22:29 -0700
Subject: [PATCH 17/88] =?UTF-8?q?woops=20=E2=80=94=20drop=20handler=20also?=
 =?UTF-8?q?=20depends=20on=20the=20old=20LancerMacroData=20defn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module/macros.ts | 46 +++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/module/macros.ts b/src/module/macros.ts
index 530a8a938..13ea9f942 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -56,28 +56,34 @@ import { is_overkill } from "machine-mind/dist/funcs";
 
 const lp = LANCER.log_prefix;
 
+const encodedMacroWhitelist = [
+  "prepareEncodedAttackMacro",
+  "prepareStatMacro",
+  "prepareItemMacro",
+  "prepareCoreActiveMacro",
+  "prepareStructureSecondaryRollMacro",
+];
+
 export function encodeMacroData(data: LancerMacroData): string {
   return btoa(encodeURI(JSON.stringify(data)));
 }
 
-export async function runEncodedMacro(el: HTMLElement) {
-  let encoded = el.attributes.getNamedItem('data-macro')?.nodeValue;
-  if (!encoded) {
-    console.warn("No macro data available");
-    return;
-  }
+export async function runEncodedMacro(el: HTMLElement | LancerMacroData) {
+  let data: LancerMacroData | null = null;
 
-  let data: LancerMacroData = JSON.parse(decodeURI(atob(encoded)));
+  if (el instanceof HTMLElement) {
+    let encoded = el.attributes.getNamedItem('data-macro')?.nodeValue;
+    if (!encoded) {
+      console.warn("No macro data available");
+      return;
+    }
 
-  const whitelist = [
-    "prepareEncodedAttackMacro",
-    "prepareStatMacro",
-    "prepareItemMacro",
-    "prepareCoreActiveMacro",
-    "prepareStructureSecondaryRollMacro",
-  ];
+    data = JSON.parse(decodeURI(atob(encoded))) as LancerMacroData;
+  } else {
+    data = el as LancerMacroData;
+  }
 
-  if (whitelist.indexOf(data.fn) < 0) {
+  if (encodedMacroWhitelist.indexOf(data.fn) < 0) {
     console.error("Attempting to call unwhitelisted function via encoded macro: " + data.fn);
     return;
   }
@@ -95,9 +101,13 @@ export async function onHotbarDrop(_bar: any, data: any, slot: number) {
   let img = "systems/lancer/assets/icons/macro-icons/d20-framed.svg";
 
   // Grab new encoded data ASAP
-  if (data.command && data.title) {
-    (command = data.command),
-      (img = data.iconPath ? data.iconPath : `systems/lancer/assets/icons/macro-icons/generic_item.svg`);
+  if (data.fn && data.args && data.title) { // i.e., data instanceof LancerMacroData
+    if (encodedMacroWhitelist.indexOf(data.fn) < 0) {
+      ui.notifications.error("You are trying to drop an invalid macro");
+      return;
+    }
+    command = `game.lancer.${data.fn}.apply(null, ${JSON.stringify(data.args)})`;
+    img = data.iconPath ? data.iconPath : `systems/lancer/assets/icons/macro-icons/generic_item.svg`;
     title = data.title;
   } else if (data.pack) {
     // If we have a source pack, it's dropped from a compendium and there's no processing for us to do

From 5dfcdd3a7ce0f5ef413a1271708c08d2f155ce7a Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 09:23:13 -0700
Subject: [PATCH 18/88] marking this as lancer-macro does nothing right now,
 but in prep

if/when we choose to extend lancer-actor-sheet's EncodedMacroHandler
to the whole app, we will be _ready_
---
 src/templates/chat/attack-card.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/chat/attack-card.hbs b/src/templates/chat/attack-card.hbs
index 52334329e..a5a1fc23a 100644
--- a/src/templates/chat/attack-card.hbs
+++ b/src/templates/chat/attack-card.hbs
@@ -2,7 +2,7 @@
   <div class="lancer-header mech_weapon medium">
     <i class="cci cci-weapon i--m i--light"> </i>
     <span>{{ title }}</span>
-    <a class="chat-button roll-attack" data-macro="{{rerollMacroData}}" title="Reroll this attack">
+    <a class="chat-button roll-attack lancer-macro" data-macro="{{rerollMacroData}}" title="Reroll this attack">
       <i class="fas fa-dice-d20 i--m i--light"></i>
     </a>
   </div>

From 6c21fc17a8d398540cbb4696a3b79ffd30e43b12 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 10:52:57 -0700
Subject: [PATCH 19/88] restructure accdiff datamodel: separate weapon &
 default base target

---
 src/module/helpers/acc_diff.ts    | 119 +++++++++++++++---------------
 src/templates/window/acc_diff.hbs |  14 ++--
 2 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index c559b461a..c64a2e36a 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -7,76 +7,67 @@ enum Cover {
   Hard = 2
 }
 
-type AccDiffBaseSerialized = {
-  untyped: { accuracy: number, difficulty: number },
-  cover: Cover,
+type AccDiffWeapon = {
   accurate: boolean,
   inaccurate: boolean,
-  seeking: boolean
+  seeking: boolean,
 }
 
-type AccDiffTargetSerialized = {
-  target: string,
+type AccDiffWeaponSerialized = AccDiffWeapon;
+
+type AccDiffBaseSerialized = {
   accuracy: number,
   difficulty: number,
   cover: Cover
 }
 
+type AccDiffTargetSerialized = AccDiffBaseSerialized & {
+  target: string
+}
+
 export type AccDiffDataSerialized = {
   title: string,
+  weapon: AccDiffWeaponSerialized,
   base: AccDiffBaseSerialized,
   targets: AccDiffTargetSerialized[],
 }
 
 class AccDiffBase {
-  untyped: { accuracy: number, difficulty: number };
+  accuracy: number;
+  difficulty: number;
   cover: Cover;
-  accurate: boolean;
-  inaccurate: boolean;
-  seeking: boolean;
+  #weapon: AccDiffWeapon;
 
-  constructor(obj: AccDiffBaseSerialized) {
-    this.untyped = obj.untyped;
+  constructor(obj: AccDiffBaseSerialized, weapon: AccDiffWeapon) {
+    this.accuracy = obj.accuracy;
+    this.difficulty = obj.difficulty;
     this.cover = obj.cover;
-    this.accurate = obj.accurate;
-    this.inaccurate = obj.inaccurate;
-    this.seeking = obj.seeking;
+    this.#weapon = weapon;
   }
 
-  static fromObject(obj: AccDiffBaseSerialized): AccDiffBase {
-    return new AccDiffBase(obj);
+  static fromObject(obj: AccDiffBaseSerialized, extra: { weapon: AccDiffWeapon }): AccDiffBase {
+    return new AccDiffBase(obj, extra.weapon);
   }
 
   toObject(): AccDiffBaseSerialized {
     return {
-      untyped: this.untyped,
+      accuracy: this.accuracy,
+      difficulty: this.difficulty,
       cover: this.cover,
-      accurate: this.accurate,
-      inaccurate: this.inaccurate,
-      seeking: this.seeking
     }
   }
 
-  get accuracy() {
-    return this.untyped.accuracy + (this.accurate ? 1 : 0);
-  }
-
-  get difficulty() {
-    return this.untyped.difficulty
-      + (this.inaccurate ? 1 : 0)
-      + (this.seeking ? 0 : this.cover)
-  }
-
   get total() {
-    return this.accuracy - this.difficulty;
+    return this.accuracy - this.difficulty
+      + (this.#weapon.accurate ? 1 : 0)
+      - (this.#weapon.inaccurate ? 1 : 0)
+      - (this.#weapon.seeking ? 0 : this.cover)
+
   }
 }
 
-class AccDiffTarget {
+class AccDiffTarget extends AccDiffBase {
   target: Token;
-  accuracy: number;
-  difficulty: number;
-  cover: Cover;
   #base: AccDiffBase;
 
   constructor(obj: {
@@ -84,11 +75,9 @@ class AccDiffTarget {
     accuracy: number,
     difficulty: number,
     cover: Cover
-  }, base: AccDiffBase) {
+  }, base: AccDiffBase, weapon: AccDiffWeapon) {
+    super(obj, weapon);
     this.target = obj.target;
-    this.accuracy = obj.accuracy;
-    this.difficulty = obj.difficulty;
-    this.cover = obj.cover;
     this.#base = base;
   }
 
@@ -101,7 +90,8 @@ class AccDiffTarget {
     }
   }
 
-  static fromObject(obj: AccDiffTargetSerialized, base: AccDiffBase): AccDiffTarget {
+  static fromObject(obj: AccDiffTargetSerialized,
+                    extra: { base: AccDiffBase, weapon: AccDiffWeapon }): AccDiffTarget {
     let target = canvas.scene.tokens.get(obj.target);
     if (!target) {
       ui.notifications.error("Trying to access tokens from a different scene!");
@@ -112,26 +102,29 @@ class AccDiffTarget {
       accuracy: obj.accuracy,
       difficulty: obj.difficulty,
       cover: obj.cover
-    }, base)
+    }, extra.base, extra.weapon)
   }
 
   get total() {
-    return this.accuracy - this.difficulty
-      + this.#base.total - (this.#base.seeking ? 0 : this.cover);
+    // the only thing we actually use base for is the untyped bonuses
+    return super.total + this.#base.accuracy - this.#base.difficulty;
   }
 }
 
 export class AccDiffData {
   title: string;
+  weapon: AccDiffWeapon;
   base: AccDiffBase;
   targets: AccDiffTarget[];
 
   constructor(obj: {
     title: string,
     base: AccDiffBase,
+    weapon: AccDiffWeapon,
     targets: AccDiffTarget[]
   }) {
     this.title = obj.title;
+    this.weapon = obj.weapon;
     this.base = obj.base;
     this.targets = obj.targets;
   }
@@ -139,15 +132,20 @@ export class AccDiffData {
   toObject(): AccDiffDataSerialized {
     return {
       title: this.title,
+      weapon: this.weapon,
       base: this.base.toObject(),
       targets: this.targets.map(t => t.toObject())
     }
   }
 
   static fromObject(obj: AccDiffDataSerialized): AccDiffData {
-    let base = AccDiffBase.fromObject(obj.base);
-    let targets = obj.targets.map(t => AccDiffTarget.fromObject(t, base));
-    return new AccDiffData({ title: obj.title, base, targets });
+    let base = AccDiffBase.fromObject(obj.base, obj);
+    let targets = obj.targets.map(t => AccDiffTarget.fromObject(t, { base, weapon: obj.weapon }));
+    return new AccDiffData({
+      title: obj.title,
+      weapon: obj.weapon,
+      base, targets
+    });
   }
 
   static fromParams(
@@ -156,40 +154,41 @@ export class AccDiffData {
     targets?: Token[],
     starting?: [number, number]
   ): AccDiffData {
-    let base = AccDiffBase.fromObject({
+    let weapon = {
       accurate: false,
       inaccurate: false,
-      cover: Cover.None,
       seeking: false,
-      untyped: {
-        accuracy: starting ? starting[0] : 0,
-        difficulty: starting ? starting[1] : 0
-      },
-    });
+    };
 
     for (let tag of (tags || [])) {
       switch (tag.Tag.LID) {
         case "tg_accurate":
-          base.accurate = true;
+          weapon.accurate = true;
           break;
         case "tg_inaccurate":
-          base.inaccurate = true;
+          weapon.inaccurate = true;
           break;
         case "tg_seeking":
-          base.seeking = true;
+          weapon.seeking = true;
           break;
       }
     }
 
+    let base = new AccDiffBase({
+      cover: Cover.None,
+      accuracy: starting ? starting[0] : 0,
+      difficulty: starting ? starting[1] : 0,
+    }, weapon);
+
     return new AccDiffData({
       title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
-      base: base,
+      weapon, base,
       targets: (targets || []).map(t => new AccDiffTarget({
         target: t,
         accuracy: 0,
         difficulty: 0,
         cover: Cover.None
-      }, base))
+      }, base, weapon))
     });
   }
 }
@@ -214,7 +213,7 @@ export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
   getViewModel(data: AccDiffData): AccDiffView {
     let ret = data as AccDiffView; // view elements haven't been set yet
     ret.hasTargets = ret.targets.length > 1;
-    ret.baseCoverDisabled = ret.base.seeking || ret.hasTargets;
+    ret.baseCoverDisabled = ret.weapon.seeking || ret.hasTargets;
     return ret
   }
 }
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 222bb01d4..3d6e54f31 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -8,12 +8,12 @@
         </h3>
         <label class="container">
           Accurate (+1)
-          <input type="checkbox" name="base.accurate" {{checked base.accurate}} />
+          <input type="checkbox" name="weapon.accurate" {{checked weapon.accurate}} />
           <span class="checkmark"></span>
         </label>
         <label class="container">
           Seeking (*)
-          <input type="checkbox" name="base.seeking" {{checked base.seeking}} />
+          <input type="checkbox" name="weapon.seeking" {{checked weapon.seeking}} />
           <span class="checkmark"></span>
         </label>
       </div>
@@ -24,7 +24,7 @@
         </h3>
         <label class="container">
           Inaccurate (-1)
-          <input type="checkbox" name="base.inaccurate" {{checked base.inaccurate}} />
+          <input type="checkbox" name="weapon.inaccurate" {{checked weapon.inaccurate}} />
           <span class="checkmark"></span>
         </label>
         {{{std-cover-input "base.cover"
@@ -50,8 +50,8 @@
           class="difficulty lancer-invisible-input dec-set"
           style="max-width: 2em;text-align: center;font-size: 1.2em"
           type="number"
-          name="base.untyped.accuracy"
-          value="{{base.untyped.accuracy}}"
+          name="base.accuracy"
+          value="{{base.accuracy}}"
           min="0"
         />
         <button
@@ -75,8 +75,8 @@
           class="difficulty lancer-invisible-input dec-set"
           style="max-width: 2em;text-align: center;font-size: 1.2em"
           type="number"
-          name="base.untyped.difficulty"
-          value="{{base.untyped.difficulty}}"
+          name="base.difficulty"
+          value="{{base.difficulty}}"
           min="0"
         />
         <button

From 998b7c2b1229d8cd52f0ffb93bc3c72f8d62d4f7 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 14:02:20 -0700
Subject: [PATCH 20/88] let's be more explicit on the one-target window, using
 it as a teach

---
 src/lancer.scss                   |  3 ++-
 src/module/helpers/acc_diff.ts    |  6 ++---
 src/templates/window/acc_diff.hbs | 41 +++++++++++++++++++++++--------
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index 67d94667d..c6e16c559 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -238,6 +238,7 @@ button {
 
 .lancer-hit-thumb {
   width: 50px;
+  min-width: 50px;
   margin-right: 4px;
   border-right: none;
   border-left: none;
@@ -2216,7 +2217,7 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   grid-template-columns: auto auto auto;
 }
 
-.accdiff-target-row .lancer-hit-thumb {
+#accdiff .lancer-hit-thumb {
   margin-right: 0px;
   margin-left: 4px;
   margin-bottom: 4px;
diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index c64a2e36a..5535f6483 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -194,8 +194,8 @@ export class AccDiffData {
 }
 
 type AccDiffView = AccDiffData & {
-  baseCoverDisabled: boolean,
-  hasTargets: boolean
+  hasTargets: boolean,
+  hasExactlyOneTarget: boolean,
 }
 
 export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
@@ -213,7 +213,7 @@ export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
   getViewModel(data: AccDiffData): AccDiffView {
     let ret = data as AccDiffView; // view elements haven't been set yet
     ret.hasTargets = ret.targets.length > 1;
-    ret.baseCoverDisabled = ret.weapon.seeking || ret.hasTargets;
+    ret.hasExactlyOneTarget = ret.targets.length == 1;
     return ret
   }
 }
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 3d6e54f31..5bf46dc40 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -27,10 +27,19 @@
           <input type="checkbox" name="weapon.inaccurate" {{checked weapon.inaccurate}} />
           <span class="checkmark"></span>
         </label>
-        {{{std-cover-input "base.cover"
-          classes="accdiff-base-cover flexcol"
-          disabled="baseCoverDisabled"
-        }}}
+        {{#unless hasTargets}}
+          {{#if hasExactlyOneTarget}}
+            {{{std-cover-input "targets.0.cover"
+              classes="accdiff-base-cover flexcol"
+              disabled="weapon.seeking"
+            }}}
+          {{else}}
+            {{{std-cover-input "base.cover"
+              classes="accdiff-base-cover flexcol"
+              disabled="weapon.seeking"
+            }}}
+          {{/if}}
+        {{/unless}}
       </div>
     </div>
     <label class="flexrow accdiff-footer accdiff-weight">
@@ -90,12 +99,24 @@
     </div>
     {{#unless hasTargets}}
       <label class="flexrow accdiff-footer accdiff-weight">
-        Total
+        Total {{#if hasExactlyOneTarget}} vs {{targets.0.target.data.name}}{{/if}}
       </label>
-      {{{accdiff-total-display "base.total"
-        id="accdiff-total"
-        classes="accdiff-grid accdiff-weight"
-      }}}
+      {{#if hasExactlyOneTarget}}
+        <div class="flexrow flex-center">
+          <div class="accdiff-grid">
+            <img class="lancer-hit-thumb" src="{{targets.0.target.data.img}}" />
+          </div>
+          {{{accdiff-total-display "targets.0.total"
+            id="accdiff-total-0"
+            classes="accdiff-grid accdiff-weight"
+          }}}
+        </div>
+      {{else}}
+        {{{accdiff-total-display "base.total"
+          id="accdiff-total"
+          classes="accdiff-grid accdiff-weight"
+        }}}
+      {{/if}}
     {{/unless}}
     {{#if hasTargets}}
       <div class="accdiff-footer accdiff-weight accdiff-target-row">
@@ -105,7 +126,7 @@
               {{data.target.data.name}}
             </label>
             <div class="flexrow">
-              <div class="accdiff-grid accdiff-weight">
+              <div class="accdiff-grid">
                 <img class="lancer-hit-thumb" src="{{data.target.data.img}}" />
               </div>
               {{{accdiff-total-display (concat "targets." key ".total")

From 53dd2bb73f192c14b4deb375b20560fb1d9c3089 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 14:03:32 -0700
Subject: [PATCH 21/88] bugfix: target is a LancerTokenDocument here, not a
 LancerToken

---
 src/module/helpers/acc_diff.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 5535f6483..509a731e6 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -98,7 +98,7 @@ class AccDiffTarget extends AccDiffBase {
       throw new Error("Token not found");
     }
     return new AccDiffTarget({
-      target: target,
+      target: target.object,
       accuracy: obj.accuracy,
       difficulty: obj.difficulty,
       cover: obj.cover

From c9a4b5f6fda296c96506ad37dee391243644d7c1 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 14:04:41 -0700
Subject: [PATCH 22/88] consume lockon on the data model/rolling side, w/
 1-target UI

---
 src/module/helpers/acc_diff.ts    | 28 +++++++++++++++++++++-------
 src/module/macros.ts              | 29 ++++++++++++++++++++---------
 src/templates/window/acc_diff.hbs |  7 +++++++
 3 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 509a731e6..d73da44db 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -1,4 +1,5 @@
 import { TagInstance } from "machine-mind";
+import { LancerActor, LancerActorType } from "../actor/lancer-actor";
 import ReactiveForm from './reactive-form';
 
 enum Cover {
@@ -22,7 +23,8 @@ type AccDiffBaseSerialized = {
 }
 
 type AccDiffTargetSerialized = AccDiffBaseSerialized & {
-  target: string
+  target: string,
+  consumeLockOn: boolean,
 }
 
 export type AccDiffDataSerialized = {
@@ -68,16 +70,16 @@ class AccDiffBase {
 
 class AccDiffTarget extends AccDiffBase {
   target: Token;
+  consumeLockOn: boolean;
   #base: AccDiffBase;
 
-  constructor(obj: {
+  constructor(obj: AccDiffBaseSerialized & {
     target: Token,
-    accuracy: number,
-    difficulty: number,
-    cover: Cover
+    consumeLockOn?: boolean,
   }, base: AccDiffBase, weapon: AccDiffWeapon) {
     super(obj, weapon);
     this.target = obj.target;
+    this.consumeLockOn = obj.consumeLockOn ?? true;
     this.#base = base;
   }
 
@@ -86,7 +88,8 @@ class AccDiffTarget extends AccDiffBase {
       target: this.target.id,
       accuracy: this.accuracy,
       difficulty: this.difficulty,
-      cover: this.cover
+      cover: this.cover,
+      consumeLockOn: this.consumeLockOn
     }
   }
 
@@ -105,9 +108,20 @@ class AccDiffTarget extends AccDiffBase {
     }, extra.base, extra.weapon)
   }
 
+  // as it turns out, we can't actually name the ActiveEffect type
+  // it's fine, this is all we need here
+  get usingLockOn(): null | { delete: () => void } {
+    if (!this.consumeLockOn) { return null; }
+    let actor = (this.target.actor as LancerActor<LancerActorType>);
+    return actor.data.effects.find(eff => eff.data.flags.core.statusId == "lockon");
+  }
+
   get total() {
     // the only thing we actually use base for is the untyped bonuses
-    return super.total + this.#base.accuracy - this.#base.difficulty;
+    let raw = super.total + this.#base.accuracy - this.#base.difficulty;
+    let lockon = this.usingLockOn ? 1 : 0;
+
+    return raw + lockon;
   }
 }
 
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 13ea9f942..bcd5a2229 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -486,17 +486,22 @@ function rollStr(bonus: number, total: number): string {
   return `1d20+${bonus}${modStr}`;
 }
 
-type AttackRoll = {
+type AttackRolls = {
   roll: string,
-  targeted: { target: Token, roll: string }[]
+  targeted: {
+    target: Token,
+    roll: string,
+    usedLockOn: { delete: () => void } | null,
+  }[]
 }
 
-function attackRollStrings(bonus: number, accdiff: AccDiffData): AttackRoll {
+function attackRolls(bonus: number, accdiff: AccDiffData): AttackRolls {
   return {
     roll: rollStr(bonus, accdiff.base.total),
     targeted: accdiff.targets.map(tad => ({
       target: tad.target,
-      roll: rollStr(bonus, tad.total)
+      roll: rollStr(bonus, tad.total),
+      usedLockOn: tad.usingLockOn,
     }))
   };
 }
@@ -744,7 +749,7 @@ async function prepareAttackMacro({
   const promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
 
-  const atkRolls = attackRollStrings(mData.grit, promptedData);
+  const atkRolls = attackRolls(mData.grit, promptedData);
 
   // Deduct charge if LOADING weapon.
   if (
@@ -785,22 +790,28 @@ type HitResult = {
   crit: boolean
 }
 
-async function checkTargets(atkRolls: AttackRoll, isSmart: boolean): Promise<{
+async function checkTargets(atkRolls: AttackRolls, isSmart: boolean): Promise<{
   attacks: AttackResult[],
   hits: HitResult[]
 }> {
   if (game.settings.get(LANCER.sys_name, LANCER.setting_automation_attack) && atkRolls.targeted.length > 0) {
     let data = await Promise.all(atkRolls.targeted.map(async targetingData => {
       let target = targetingData.target;
+      let actor = target.actor as LancerActor<LancerActorType>;
       // @ts-ignore .8
       let attack_roll = await new Roll(targetingData.roll).evaluate({ async: true });
       const attack_tt = await attack_roll.getTooltip();
+
+      if (targetingData.usedLockOn) {
+        targetingData.usedLockOn.delete();
+      }
+
       return {
         attack: { roll: attack_roll, tt: attack_tt },
         hit: {
           token: { name: target.data.name, img: target.data.img },
           total: String(attack_roll._total).padStart(2, "0"),
-          hit: await checkForHit(isSmart, attack_roll, target.actor as LancerActor<LancerActorType>),
+          hit: await checkForHit(isSmart, attack_roll, actor),
           crit: attack_roll._total >= 20,
         }
       }
@@ -821,7 +832,7 @@ async function checkTargets(atkRolls: AttackRoll, isSmart: boolean): Promise<{
   }
 }
 
-async function rollAttackMacro(actor: Actor, atkRolls: AttackRoll, data: LancerAttackMacroData, rerollMacro: LancerMacroData) {
+async function rollAttackMacro(actor: Actor, atkRolls: AttackRolls, data: LancerAttackMacroData, rerollMacro: LancerMacroData) {
   const isSmart = data.tags.findIndex(tag => tag.Tag.LID === "tg_smart") > -1;
   const { attacks, hits } = await checkTargets(atkRolls, isSmart);
 
@@ -1162,7 +1173,7 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, rerollData
   const promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
 
-  let atkRolls = attackRollStrings(data.t_atk, promptedData);
+  let atkRolls = attackRolls(data.t_atk, promptedData);
   if (!atkRolls) return;
 
   const { attacks, hits } = await checkTargets(atkRolls, true); // true = all tech attacks are "smart"
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 5bf46dc40..8bac4ea67 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -16,6 +16,13 @@
           <input type="checkbox" name="weapon.seeking" {{checked weapon.seeking}} />
           <span class="checkmark"></span>
         </label>
+        {{#if hasExactlyOneTarget}}
+          <label class="container">
+            Consume Lock On (+1)
+            <input type="checkbox" name="targets.0.consumeLockOn" {{checked targets.0.usingLockOn}} />
+            <span class="checkmark"></span>
+          </label>
+        {{/if}}
       </div>
       <div style="width:100%;padding:4px;">
         <h3>

From 04ebc7cc1c3531feac8da4c40815285e80fac176 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 14:44:03 -0700
Subject: [PATCH 23/88] simplify {{std-cover-input}} a bit

---
 src/module/helpers/commons.ts | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/module/helpers/commons.ts b/src/module/helpers/commons.ts
index 313e3bf50..9ae0a0343 100644
--- a/src/module/helpers/commons.ts
+++ b/src/module/helpers/commons.ts
@@ -516,28 +516,27 @@ export function std_cover_input(path: string, options: HelperOptions) {
     value = (resolve_helper_dotpath(options, path) as number)?.toString() ?? 0;
   }
 
-  let checked = ["0", "1", "2"].map(v => value == v ? "checked='true'" : "");
   let disabled: boolean = options.hash["disabled"] ? resolve_helper_dotpath(options, options.hash["disabled"]) : false;
   let disabledStr = disabled ? "disabled" : "";
 
-  let inputs = [
-    `<input type="radio" id="${path}-cover-none" class="no-grow cover-none" name="${path}" value="0" ${checked[0]} data-dtype="Number" ${disabledStr} />
-     <label for="${path}-cover-none" class="lancer-cover-radio-label ${label_classes}">
-       <i class="cci-no-cover i--s" style="border:none"></i>
-       <span class="no-grow">No Cover</span>
-     </label>`,
-    `<input type="radio" id="${path}-cover-soft" class="no-grow cover-soft" name="${path}" value="1" ${checked[1]} data-dtype="Number" ${disabledStr} />
-    <label for="${path}-cover-soft" class="lancer-cover-radio-label ${label_classes}">
-       <i class="cci-soft-cover i--s" style="border:none"></i>
-       <span class="no-grow">Soft Cover (-1)</span>
-     </label>`,
-    `<input type="radio" id="${path}-cover-hard" class="no-grow cover-hard" name="${path}" value="2" ${checked[2]} data-dtype="Number" ${disabledStr} />
-     <label for="${path}-cover-hard" class="lancer-cover-radio-label ${label_classes}">
-       <i class="cci-hard-cover i--s" style="border:none"></i>
-       <span class="no-grow">Hard Cover (-2)</span>
-     </label>`
+  let datas = [
+    { slug: "no", human: "No Cover" },
+    { slug: "soft", human: "Soft Cover (-1)" },
+    { slug: "hard", human: "Hard Cover (-2)" },
   ];
 
+  let inputs = [0, 1, 2].map(idx => {
+    let checked = value == idx.toString() ? "checked='true'" : "";
+    let data = datas[idx];
+    let id = `${path}-${data.slug}`;
+
+    return `<input type="radio" id="${id}" class="no-grow ${data.slug}-cover" name="${path}" value="${idx}" ${checked} data-dtype="Number" ${disabledStr} />
+      <label for="${id}" class="lancer-cover-radio-label ${label_classes}">
+      <i class="cci-${data.slug}-cover i--s" title="${data.human}" style="border:none"></i>
+      <span class="no-grow">${data.human}</span>
+      </label>`
+  });
+
   if (label) {
     return `<label class="lancer-cover-radio ${disabledStr} ${label_classes} ${container_classes}">
               <span class="no-grow" style="padding: 2px 5px;">${label}</span>

From 7400b7bb365c861af0e65467d50a798347ed5756 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 15:01:37 -0700
Subject: [PATCH 24/88] kill some of the duplication in acc_diff.hbs with an
 inline partial

---
 src/templates/window/acc_diff.hbs | 33 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 8bac4ea67..a28163d0b 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -1,3 +1,15 @@
+{{#*inline "total"}}
+  {{#if target}}
+    <div class="accdiff-grid">
+      <img class="lancer-hit-thumb" src="{{target.data.img}}" />
+    </div>
+  {{/if}}
+  {{{accdiff-total-display (concat key ".total")
+    id=(concat "accdiff-total-" key)
+    classes="accdiff-grid accdiff-weight"
+  }}}
+{{/inline}}
+
 <form id="accdiff">
   <div id="accdiff-dialog" style="padding:4px">
     <div class="accdiff-grid">
@@ -110,19 +122,10 @@
       </label>
       {{#if hasExactlyOneTarget}}
         <div class="flexrow flex-center">
-          <div class="accdiff-grid">
-            <img class="lancer-hit-thumb" src="{{targets.0.target.data.img}}" />
-          </div>
-          {{{accdiff-total-display "targets.0.total"
-            id="accdiff-total-0"
-            classes="accdiff-grid accdiff-weight"
-          }}}
+          {{> total targets.[0] key="targets.0" }}
         </div>
       {{else}}
-        {{{accdiff-total-display "base.total"
-          id="accdiff-total"
-          classes="accdiff-grid accdiff-weight"
-        }}}
+        {{> total base key="base"}}
       {{/if}}
     {{/unless}}
     {{#if hasTargets}}
@@ -133,13 +136,7 @@
               {{data.target.data.name}}
             </label>
             <div class="flexrow">
-              <div class="accdiff-grid">
-                <img class="lancer-hit-thumb" src="{{data.target.data.img}}" />
-              </div>
-              {{{accdiff-total-display (concat "targets." key ".total")
-                id=(concat "accdiff-total-" key)
-                classes="accdiff-grid accdiff-weight"
-              }}}
+              {{> total data key=(concat "targets." key) }}
             </div>
             <div class="flexrow">
               <button

From 24b082a8c96a9e3d1acc4c3f129aa5403b746107 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 18:47:45 -0700
Subject: [PATCH 25/88] UI for lockon on the multi-target accdiff modal

---
 src/lancer.scss                   | 40 +++++++++++++++++++++++++++++--
 src/module/helpers/acc_diff.ts    |  5 +++-
 src/templates/window/acc_diff.hbs | 30 +++++++++++++++++++----
 3 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index c6e16c559..ee735274e 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2249,8 +2249,44 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   }
 }
 
-.lancer-cover-radio.disabled {
-  opacity: 0.6;
+@keyframes lockon {
+  70% {
+    text-shadow: 0 0 8px lightgreen;
+  }
+  80% {
+    text-shadow: 0 0 8px green;
+  }
+  90% {
+    text-shadow: 0 0 8px lightgreen;
+  }
+}
+
+.lancer-consume-lockon  {
+  & .accdiff-grid {
+    position: relative;
+  }
+  & input[type="checkbox"] {
+    opacity: 0 !important;
+    position: fixed;
+    width: 0;
+  }
+  & [for] {
+    position: absolute;
+    right: -4px;
+    top: -4px;
+    & i {
+      @include icon-size(24px);
+      text-shadow: 0 0 12px white;
+    }
+    &.checked i {
+      @include icon-size(36px);
+      animation: lockon 800ms linear 1s infinite alternate;
+    }
+  }
+}
+
+.lancer-cover-radio.disabled, .lancer-consume-lockon .disabled {
+  opacity: 0.4;
 }
 
 // needed to override a builtin that removes all shadows from the sidebar
diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index d73da44db..90158a038 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -111,7 +111,10 @@ class AccDiffTarget extends AccDiffBase {
   // as it turns out, we can't actually name the ActiveEffect type
   // it's fine, this is all we need here
   get usingLockOn(): null | { delete: () => void } {
-    if (!this.consumeLockOn) { return null; }
+    return (this.consumeLockOn && this.lockOnAvailable) || null;
+  }
+
+  get lockOnAvailable(): null | { delete: () => void } {
     let actor = (this.target.actor as LancerActor<LancerActorType>);
     return actor.data.effects.find(eff => eff.data.flags.core.statusId == "lockon");
   }
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index a28163d0b..087eb8937 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -2,6 +2,11 @@
   {{#if target}}
     <div class="accdiff-grid">
       <img class="lancer-hit-thumb" src="{{target.data.img}}" />
+      <label for="{{concat key '.consumeLockOn'}}"
+        class="{{#if usingLockOn}}checked{{/if}} {{#unless lockOnAvailable}}disabled{{/unless}}"
+        title="Consume Lock On (+1)">
+        <i class="cci cci-condition-lock-on" style="border:none"></i>
+      </label>
     </div>
   {{/if}}
   {{{accdiff-total-display (concat key ".total")
@@ -31,7 +36,12 @@
         {{#if hasExactlyOneTarget}}
           <label class="container">
             Consume Lock On (+1)
-            <input type="checkbox" name="targets.0.consumeLockOn" {{checked targets.0.usingLockOn}} />
+            <input type="checkbox"
+              name="targets.0.consumeLockOn"
+              id="targets.0.consumeLockOn"
+              {{checked targets.0.usingLockOn}}
+              {{#unless targets.0.lockOnAvailable}}disabled{{/unless}}
+            />
             <span class="checkmark"></span>
           </label>
         {{/if}}
@@ -121,8 +131,11 @@
         Total {{#if hasExactlyOneTarget}} vs {{targets.0.target.data.name}}{{/if}}
       </label>
       {{#if hasExactlyOneTarget}}
-        <div class="flexrow flex-center">
-          {{> total targets.[0] key="targets.0" }}
+        <div class="flexrow flex-center lancer-consume-lockon">
+          {{> total targets.[0] key="targets.0"
+            usingLockOn=targets.[0].usingLockOn
+            lockOnAvailable=targets.[0].lockOnAvailable
+            hasExactlyOneTarget=hasExactlyOneTarget}}
         </div>
       {{else}}
         {{> total base key="base"}}
@@ -135,8 +148,15 @@
             <label class="flexrow flex-center card">
               {{data.target.data.name}}
             </label>
-            <div class="flexrow">
-              {{> total data key=(concat "targets." key) }}
+            <div class="flexrow lancer-consume-lockon">
+              <input
+                type="checkbox"
+                id="{{concat 'targets.' key '.consumeLockOn'}}"
+                name="{{concat 'targets.' key '.consumeLockOn'}}"
+                {{checked usingLockOn}}
+                {{#unless lockOnAvailable}}disabled{{/unless}}/>
+              {{> total data key=(concat "targets." key)
+                usingLockOn=data.usingLockOn lockOnAvailable=data.lockOnAvailable }}
             </div>
             <div class="flexrow">
               <button

From 13a95229856898fb6a78b506e2cb943bcd50aa06 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 14 Jul 2021 18:48:15 -0700
Subject: [PATCH 26/88] hey let's actually load in persisted `consumeLockOn`s,
 huh?

---
 src/module/helpers/acc_diff.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
index 90158a038..252678b70 100644
--- a/src/module/helpers/acc_diff.ts
+++ b/src/module/helpers/acc_diff.ts
@@ -75,11 +75,11 @@ class AccDiffTarget extends AccDiffBase {
 
   constructor(obj: AccDiffBaseSerialized & {
     target: Token,
-    consumeLockOn?: boolean,
+    consumeLockOn: boolean,
   }, base: AccDiffBase, weapon: AccDiffWeapon) {
     super(obj, weapon);
     this.target = obj.target;
-    this.consumeLockOn = obj.consumeLockOn ?? true;
+    this.consumeLockOn = obj.consumeLockOn;
     this.#base = base;
   }
 
@@ -104,7 +104,8 @@ class AccDiffTarget extends AccDiffBase {
       target: target.object,
       accuracy: obj.accuracy,
       difficulty: obj.difficulty,
-      cover: obj.cover
+      cover: obj.cover,
+      consumeLockOn: obj.consumeLockOn,
     }, extra.base, extra.weapon)
   }
 
@@ -204,7 +205,8 @@ export class AccDiffData {
         target: t,
         accuracy: 0,
         difficulty: 0,
-        cover: Cover.None
+        cover: Cover.None,
+        consumeLockOn: true,
       }, base, weapon))
     });
   }

From 1bcc5de1db83cb5b24e6ff63aa15943985eb442f Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 15 Jul 2021 18:34:19 -0700
Subject: [PATCH 27/88] move to io-ts serialization, in preparation for plugins

---
 package.json                         |   2 +
 src/module/helpers/acc_diff.ts       | 238 -----------------------
 src/module/helpers/acc_diff/index.ts | 278 +++++++++++++++++++++++++++
 src/module/helpers/acc_diff/serde.ts |  28 +++
 4 files changed, 308 insertions(+), 238 deletions(-)
 delete mode 100644 src/module/helpers/acc_diff.ts
 create mode 100644 src/module/helpers/acc_diff/index.ts
 create mode 100644 src/module/helpers/acc_diff/serde.ts

diff --git a/package.json b/package.json
index 156c57fff..38eddf3d7 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,8 @@
     "@types/marked": "^1.2.1",
     "aws-amplify": "^4.0.3",
     "compare-versions": "^3.6.0",
+    "fp-ts": "^2.10.5",
+    "io-ts": "^2.2.16",
     "machine-mind": "0.2.0-beta.118",
     "marked": "^2.0.3",
     "tippy.js": "^6.3.1"
diff --git a/src/module/helpers/acc_diff.ts b/src/module/helpers/acc_diff.ts
deleted file mode 100644
index 252678b70..000000000
--- a/src/module/helpers/acc_diff.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-import { TagInstance } from "machine-mind";
-import { LancerActor, LancerActorType } from "../actor/lancer-actor";
-import ReactiveForm from './reactive-form';
-
-enum Cover {
-  None = 0,
-  Soft = 1,
-  Hard = 2
-}
-
-type AccDiffWeapon = {
-  accurate: boolean,
-  inaccurate: boolean,
-  seeking: boolean,
-}
-
-type AccDiffWeaponSerialized = AccDiffWeapon;
-
-type AccDiffBaseSerialized = {
-  accuracy: number,
-  difficulty: number,
-  cover: Cover
-}
-
-type AccDiffTargetSerialized = AccDiffBaseSerialized & {
-  target: string,
-  consumeLockOn: boolean,
-}
-
-export type AccDiffDataSerialized = {
-  title: string,
-  weapon: AccDiffWeaponSerialized,
-  base: AccDiffBaseSerialized,
-  targets: AccDiffTargetSerialized[],
-}
-
-class AccDiffBase {
-  accuracy: number;
-  difficulty: number;
-  cover: Cover;
-  #weapon: AccDiffWeapon;
-
-  constructor(obj: AccDiffBaseSerialized, weapon: AccDiffWeapon) {
-    this.accuracy = obj.accuracy;
-    this.difficulty = obj.difficulty;
-    this.cover = obj.cover;
-    this.#weapon = weapon;
-  }
-
-  static fromObject(obj: AccDiffBaseSerialized, extra: { weapon: AccDiffWeapon }): AccDiffBase {
-    return new AccDiffBase(obj, extra.weapon);
-  }
-
-  toObject(): AccDiffBaseSerialized {
-    return {
-      accuracy: this.accuracy,
-      difficulty: this.difficulty,
-      cover: this.cover,
-    }
-  }
-
-  get total() {
-    return this.accuracy - this.difficulty
-      + (this.#weapon.accurate ? 1 : 0)
-      - (this.#weapon.inaccurate ? 1 : 0)
-      - (this.#weapon.seeking ? 0 : this.cover)
-
-  }
-}
-
-class AccDiffTarget extends AccDiffBase {
-  target: Token;
-  consumeLockOn: boolean;
-  #base: AccDiffBase;
-
-  constructor(obj: AccDiffBaseSerialized & {
-    target: Token,
-    consumeLockOn: boolean,
-  }, base: AccDiffBase, weapon: AccDiffWeapon) {
-    super(obj, weapon);
-    this.target = obj.target;
-    this.consumeLockOn = obj.consumeLockOn;
-    this.#base = base;
-  }
-
-  toObject(): AccDiffTargetSerialized {
-    return {
-      target: this.target.id,
-      accuracy: this.accuracy,
-      difficulty: this.difficulty,
-      cover: this.cover,
-      consumeLockOn: this.consumeLockOn
-    }
-  }
-
-  static fromObject(obj: AccDiffTargetSerialized,
-                    extra: { base: AccDiffBase, weapon: AccDiffWeapon }): AccDiffTarget {
-    let target = canvas.scene.tokens.get(obj.target);
-    if (!target) {
-      ui.notifications.error("Trying to access tokens from a different scene!");
-      throw new Error("Token not found");
-    }
-    return new AccDiffTarget({
-      target: target.object,
-      accuracy: obj.accuracy,
-      difficulty: obj.difficulty,
-      cover: obj.cover,
-      consumeLockOn: obj.consumeLockOn,
-    }, extra.base, extra.weapon)
-  }
-
-  // as it turns out, we can't actually name the ActiveEffect type
-  // it's fine, this is all we need here
-  get usingLockOn(): null | { delete: () => void } {
-    return (this.consumeLockOn && this.lockOnAvailable) || null;
-  }
-
-  get lockOnAvailable(): null | { delete: () => void } {
-    let actor = (this.target.actor as LancerActor<LancerActorType>);
-    return actor.data.effects.find(eff => eff.data.flags.core.statusId == "lockon");
-  }
-
-  get total() {
-    // the only thing we actually use base for is the untyped bonuses
-    let raw = super.total + this.#base.accuracy - this.#base.difficulty;
-    let lockon = this.usingLockOn ? 1 : 0;
-
-    return raw + lockon;
-  }
-}
-
-export class AccDiffData {
-  title: string;
-  weapon: AccDiffWeapon;
-  base: AccDiffBase;
-  targets: AccDiffTarget[];
-
-  constructor(obj: {
-    title: string,
-    base: AccDiffBase,
-    weapon: AccDiffWeapon,
-    targets: AccDiffTarget[]
-  }) {
-    this.title = obj.title;
-    this.weapon = obj.weapon;
-    this.base = obj.base;
-    this.targets = obj.targets;
-  }
-
-  toObject(): AccDiffDataSerialized {
-    return {
-      title: this.title,
-      weapon: this.weapon,
-      base: this.base.toObject(),
-      targets: this.targets.map(t => t.toObject())
-    }
-  }
-
-  static fromObject(obj: AccDiffDataSerialized): AccDiffData {
-    let base = AccDiffBase.fromObject(obj.base, obj);
-    let targets = obj.targets.map(t => AccDiffTarget.fromObject(t, { base, weapon: obj.weapon }));
-    return new AccDiffData({
-      title: obj.title,
-      weapon: obj.weapon,
-      base, targets
-    });
-  }
-
-  static fromParams(
-    tags?: TagInstance[],
-    title?: string,
-    targets?: Token[],
-    starting?: [number, number]
-  ): AccDiffData {
-    let weapon = {
-      accurate: false,
-      inaccurate: false,
-      seeking: false,
-    };
-
-    for (let tag of (tags || [])) {
-      switch (tag.Tag.LID) {
-        case "tg_accurate":
-          weapon.accurate = true;
-          break;
-        case "tg_inaccurate":
-          weapon.inaccurate = true;
-          break;
-        case "tg_seeking":
-          weapon.seeking = true;
-          break;
-      }
-    }
-
-    let base = new AccDiffBase({
-      cover: Cover.None,
-      accuracy: starting ? starting[0] : 0,
-      difficulty: starting ? starting[1] : 0,
-    }, weapon);
-
-    return new AccDiffData({
-      title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
-      weapon, base,
-      targets: (targets || []).map(t => new AccDiffTarget({
-        target: t,
-        accuracy: 0,
-        difficulty: 0,
-        cover: Cover.None,
-        consumeLockOn: true,
-      }, base, weapon))
-    });
-  }
-}
-
-type AccDiffView = AccDiffData & {
-  hasTargets: boolean,
-  hasExactlyOneTarget: boolean,
-}
-
-export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
-  static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
-      template: "systems/lancer/templates/window/acc_diff.hbs",
-      resizable: false,
-    });
-  }
-
-  constructor(data: AccDiffData) {
-    super(data, { title: data.title })
-  }
-
-  getViewModel(data: AccDiffData): AccDiffView {
-    let ret = data as AccDiffView; // view elements haven't been set yet
-    ret.hasTargets = ret.targets.length > 1;
-    ret.hasExactlyOneTarget = ret.targets.length == 1;
-    return ret
-  }
-}
diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
new file mode 100644
index 000000000..e4216fd90
--- /dev/null
+++ b/src/module/helpers/acc_diff/index.ts
@@ -0,0 +1,278 @@
+import { TagInstance } from "machine-mind";
+import * as t from 'io-ts';
+
+import { LancerActor, LancerActorType } from "../../actor/lancer-actor";
+import ReactiveForm from '../reactive-form';
+import { enclass, encode, decode } from './serde';
+
+
+enum Cover {
+  None = 0,
+  Soft = 1,
+  Hard = 2
+}
+let coverSchema = t.union([t.literal(0), t.literal(1), t.literal(2)]);
+
+// so normally you wouldn't keep the codecs with the classes like this
+// the entire point of io-ts is that the co/dec logic is separable
+// but here we want plugins to actually modify the codecs, so, sigh
+class AccDiffWeapon {
+  accurate: boolean;
+  inaccurate: boolean;
+  seeking: boolean;
+
+  static schema = {
+    accurate: t.boolean,
+    inaccurate: t.boolean,
+    seeking: t.boolean,
+  }
+
+  static get schemaCodec() { return t.type(this.schema); }
+  static get codec() { return enclass(this.schemaCodec, AccDiffWeapon) }
+
+  constructor(obj: t.TypeOf<typeof AccDiffWeapon.schemaCodec>) {
+    this.accurate = obj.accurate;
+    this.inaccurate = obj.inaccurate;
+    this.seeking = obj.seeking;
+  }
+
+  get raw() {
+    return { accurate: this.accurate, inaccurate: this.inaccurate, seeking: this.seeking }
+  }
+
+  hydrate(_d: void) { }
+}
+
+class AccDiffBase {
+  accuracy: number;
+  difficulty: number;
+  cover: Cover;
+  #weapon!: AccDiffWeapon; // never use this class before calling hydrate
+
+  static schema = {
+    accuracy: t.number,
+    difficulty: t.number,
+    cover: coverSchema,
+  }
+  static get schemaCodec() { return t.type(this.schema); }
+  static get codec() { return enclass(this.schemaCodec, AccDiffBase) }
+
+  constructor(obj: t.TypeOf<typeof AccDiffBase.schemaCodec>) {
+    this.accuracy = obj.accuracy;
+    this.difficulty = obj.difficulty;
+    this.cover = obj.cover;
+    // this.#weapon = weapon;
+  }
+
+  get raw() {
+    return { accuracy: this.accuracy, difficulty: this.difficulty, cover: this.cover }
+  }
+
+  hydrate(weapon: AccDiffWeapon) {
+    this.#weapon = weapon;
+  }
+
+  get total() {
+    return this.accuracy - this.difficulty
+      + (this.#weapon.accurate ? 1 : 0)
+      - (this.#weapon.inaccurate ? 1 : 0)
+      - (this.#weapon.seeking ? 0 : this.cover)
+  }
+}
+
+// we _want_ to extend AccDiffBase
+// but ... typescript checks type compatibility between _static_ methods
+// and that + io-ts I think has the variance wrong
+// so if you extend AccDiffBase it's trying to assign AccDiffBase to AccDiffTarget
+class AccDiffTarget {
+  target: Token;
+  accuracy: number;
+  difficulty: number;
+  cover: Cover;
+  consumeLockOn: boolean;
+  #weapon!: AccDiffWeapon; // never use this class before calling hydrate
+  #base!: AccDiffBase; // never use this class before calling hydrate
+
+  static schema = {
+    target_id: t.string,
+    accuracy: t.number,
+    difficulty: t.number,
+    cover: coverSchema,
+    consumeLockOn: t.boolean,
+  }
+
+  static get schemaCodec() { return t.type(this.schema); }
+  static get codec() { return enclass(this.schemaCodec, AccDiffTarget) }
+
+  constructor(obj: t.TypeOf<typeof AccDiffTarget.schemaCodec>) {
+    let target = canvas.scene.tokens.get(obj.target_id);
+    if (!target) {
+      ui.notifications.error("Trying to access tokens from a different scene!");
+      throw new Error("Token not found");
+    }
+
+    this.target = target.object;
+    this.accuracy = obj.accuracy;
+    this.difficulty = obj.difficulty;
+    this.cover = obj.cover;
+    this.consumeLockOn = obj.consumeLockOn;
+    // this.#weapon = weapon;
+    // this.#base = base;
+  }
+
+  get raw() {
+    return {
+      target_id: this.target.id,
+      accuracy: this.accuracy,
+      difficulty: this.difficulty,
+      cover: this.cover,
+      consumeLockOn: this.consumeLockOn
+    }
+  }
+
+  hydrate(weapon: AccDiffWeapon, base: AccDiffBase) {
+    this.#weapon = weapon;
+    this.#base = base;
+  }
+
+  // as it turns out, we can't actually name the ActiveEffect type
+  // it's fine, this is all we need here
+  get usingLockOn(): null | { delete: () => void } {
+    return (this.consumeLockOn && this.lockOnAvailable) || null;
+  }
+
+  get lockOnAvailable(): null | { delete: () => void } {
+    let actor = (this.target.actor as LancerActor<LancerActorType>);
+    return actor.data.effects.find(eff => eff.data.flags.core.statusId == "lockon");
+  }
+
+  get total() {
+    let base = this.accuracy - this.difficulty
+      + (this.#weapon.accurate ? 1 : 0)
+      - (this.#weapon.inaccurate ? 1 : 0)
+      - (this.#weapon.seeking ? 0 : this.cover);
+    // the only thing we actually use base for is the untyped bonuses
+    let raw = base + this.#base.accuracy - this.#base.difficulty;
+    let lockon = this.usingLockOn ? 1 : 0;
+
+    return raw + lockon;
+  }
+}
+
+export type AccDiffDataSerialized = t.TypeOf<typeof AccDiffData.schemaCodec>;
+export class AccDiffData {
+  title: string;
+  weapon: AccDiffWeapon;
+  base: AccDiffBase;
+  targets: AccDiffTarget[];
+
+  static get schema() {
+    return {
+      title: t.string,
+      weapon: AccDiffWeapon.codec,
+      base: AccDiffBase.codec,
+      targets: t.array(AccDiffTarget.codec)
+    }
+  }
+
+  static get schemaCodec() { return t.type(this.schema); }
+  static get codec() { return enclass(this.schemaCodec, AccDiffData) }
+
+  constructor(obj: t.TypeOf<typeof AccDiffData.schemaCodec>) {
+    this.title = obj.title;
+    this.weapon = obj.weapon;
+    this.base = obj.base;
+    this.targets = obj.targets;
+
+    this.weapon.hydrate();
+    this.base.hydrate(this.weapon);
+    for (let target of this.targets) { target.hydrate(this.weapon, this.base); }
+  }
+
+  get raw() {
+    return {
+      title: this.title,
+      weapon: this.weapon,
+      base: this.base,
+      targets: this.targets,
+    }
+  }
+
+  static fromObject(obj: t.InputOf<typeof AccDiffData.codec>) {
+    return decode(obj, AccDiffData.codec);
+  }
+
+  toObject(): t.OutputOf<typeof AccDiffData.codec> {
+    return encode(this, AccDiffData.codec);
+  }
+
+  static fromParams(
+    tags?: TagInstance[],
+    title?: string,
+    targets?: Token[],
+    starting?: [number, number]
+  ): AccDiffData {
+    let weapon = {
+      accurate: false,
+      inaccurate: false,
+      seeking: false,
+    };
+
+    for (let tag of (tags || [])) {
+      switch (tag.Tag.LID) {
+        case "tg_accurate":
+          weapon.accurate = true;
+          break;
+        case "tg_inaccurate":
+          weapon.inaccurate = true;
+          break;
+        case "tg_seeking":
+          weapon.seeking = true;
+          break;
+      }
+    }
+
+    let base = {
+      cover: Cover.None,
+      accuracy: starting ? starting[0] : 0,
+      difficulty: starting ? starting[1] : 0,
+    };
+
+    return AccDiffData.fromObject({
+      title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
+      weapon, base,
+      targets: (targets || []).map(t => ({
+        target_id: t.id,
+        accuracy: 0,
+        difficulty: 0,
+        cover: Cover.None,
+        consumeLockOn: true,
+      }))
+    });
+  }
+}
+
+type AccDiffView = AccDiffData & {
+  hasTargets: boolean,
+  hasExactlyOneTarget: boolean,
+}
+
+export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      template: "systems/lancer/templates/window/acc_diff.hbs",
+      resizable: false,
+    });
+  }
+
+  constructor(data: AccDiffData) {
+    super(data, { title: data.title })
+  }
+
+  getViewModel(data: AccDiffData): AccDiffView {
+    let ret = data as AccDiffView; // view elements haven't been set yet
+    ret.hasTargets = ret.targets.length > 1;
+    ret.hasExactlyOneTarget = ret.targets.length == 1;
+    return ret
+  }
+}
diff --git a/src/module/helpers/acc_diff/serde.ts b/src/module/helpers/acc_diff/serde.ts
new file mode 100644
index 000000000..1fafd1072
--- /dev/null
+++ b/src/module/helpers/acc_diff/serde.ts
@@ -0,0 +1,28 @@
+import * as t from 'io-ts';
+import { isLeft, Either, map } from 'fp-ts/Either';
+
+function unwrap<E, A>(e: Either<E, A>): A {
+  if (isLeft(e)) {
+    throw e.left;
+  } else {
+    return e.right;
+  }
+}
+
+export function enclass<Raw, Klass extends { get raw(): Raw }, I, O>(
+  codec: t.Type<Raw, O, I>,
+  Constructor: new (bag: Raw) => Klass) {
+  return new t.Type<Klass, O, I>(
+    Constructor.name,
+    (v: unknown): v is Klass => v instanceof Constructor,
+    data => map((d: Raw) => new Constructor(d))(codec.decode(data)),
+    inst => codec.encode(inst.raw)
+  );
+}
+
+export function encode<Raw, T>(t: T, codec: t.Type<T, Raw, any>): Raw {
+  return codec.encode(t);
+}
+export function decode<Raw, T>(r: Raw, codec: t.Type<T, Raw, any>): T {
+  return unwrap(codec.decode(r));
+}

From 1cb4658f40c97cc6fe5c451776c40077a487c135 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 15 Jul 2021 21:16:22 -0700
Subject: [PATCH 28/88] plugin framework, and Invisibility as a plugin

we have basic checkbox UI for plugins, but not in the multi-target version of accdiff yet
---
 src/module/helpers/acc_diff/index.ts        | 161 +++++++++++++++-----
 src/module/helpers/acc_diff/invisibility.ts |  94 ++++++++++++
 src/module/helpers/acc_diff/plugin.d.ts     |  36 +++++
 src/module/macros.ts                        |  29 ++--
 src/templates/window/acc_diff.hbs           |  21 ++-
 5 files changed, 293 insertions(+), 48 deletions(-)
 create mode 100644 src/module/helpers/acc_diff/invisibility.ts
 create mode 100644 src/module/helpers/acc_diff/plugin.d.ts

diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index e4216fd90..5825d7d31 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -3,8 +3,11 @@ import * as t from 'io-ts';
 
 import { LancerActor, LancerActorType } from "../../actor/lancer-actor";
 import ReactiveForm from '../reactive-form';
+import { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
 import { enclass, encode, decode } from './serde';
+import { LancerItem } from "../../item/lancer-item";
 
+import { Invisibility } from "./invisibility";
 
 enum Cover {
   None = 0,
@@ -20,39 +23,67 @@ class AccDiffWeapon {
   accurate: boolean;
   inaccurate: boolean;
   seeking: boolean;
+  plugins: { [k: string]: AccDiffPluginData };
 
-  static schema = {
-    accurate: t.boolean,
-    inaccurate: t.boolean,
-    seeking: t.boolean,
+  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
+
+  };
+
+  static get schema() {
+    return {
+      accurate: t.boolean,
+      inaccurate: t.boolean,
+      seeking: t.boolean,
+      plugins: t.type(this.pluginSchema),
+    }
   }
 
-  static get schemaCodec() { return t.type(this.schema); }
+  static get schemaCodec() {
+    return t.type(this.schema);
+  }
   static get codec() { return enclass(this.schemaCodec, AccDiffWeapon) }
 
   constructor(obj: t.TypeOf<typeof AccDiffWeapon.schemaCodec>) {
     this.accurate = obj.accurate;
     this.inaccurate = obj.inaccurate;
     this.seeking = obj.seeking;
+    this.plugins = obj.plugins;
   }
 
   get raw() {
-    return { accurate: this.accurate, inaccurate: this.inaccurate, seeking: this.seeking }
+    return {
+      accurate: this.accurate,
+      inaccurate: this.inaccurate,
+      seeking: this.seeking,
+      plugins: this.plugins
+    }
   }
 
-  hydrate(_d: void) { }
+  hydrate(d: AccDiffData) {
+    for (let key of Object.keys(this.plugins)) {
+      this.plugins[key].hydrate(d);
+    }
+  }
 }
 
 class AccDiffBase {
   accuracy: number;
   difficulty: number;
   cover: Cover;
+  plugins: { [k: string]: AccDiffPluginData };
   #weapon!: AccDiffWeapon; // never use this class before calling hydrate
 
-  static schema = {
-    accuracy: t.number,
-    difficulty: t.number,
-    cover: coverSchema,
+  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
+
+  };
+
+  static get schema() {
+    return {
+      accuracy: t.number,
+      difficulty: t.number,
+      cover: coverSchema,
+      plugins: t.type(this.pluginSchema)
+    }
   }
   static get schemaCodec() { return t.type(this.schema); }
   static get codec() { return enclass(this.schemaCodec, AccDiffBase) }
@@ -61,15 +92,19 @@ class AccDiffBase {
     this.accuracy = obj.accuracy;
     this.difficulty = obj.difficulty;
     this.cover = obj.cover;
+    this.plugins = obj.plugins;
     // this.#weapon = weapon;
   }
 
   get raw() {
-    return { accuracy: this.accuracy, difficulty: this.difficulty, cover: this.cover }
+    return { accuracy: this.accuracy, difficulty: this.difficulty, cover: this.cover, plugins: this.plugins }
   }
 
-  hydrate(weapon: AccDiffWeapon) {
-    this.#weapon = weapon;
+  hydrate(d: AccDiffData) {
+    this.#weapon = d.weapon;
+    for (let key of Object.keys(this.plugins)) {
+      this.plugins[key].hydrate(d, this);
+    }
   }
 
   get total() {
@@ -84,21 +119,29 @@ class AccDiffBase {
 // but ... typescript checks type compatibility between _static_ methods
 // and that + io-ts I think has the variance wrong
 // so if you extend AccDiffBase it's trying to assign AccDiffBase to AccDiffTarget
-class AccDiffTarget {
+export class AccDiffTarget {
   target: Token;
   accuracy: number;
   difficulty: number;
   cover: Cover;
   consumeLockOn: boolean;
+  plugins: { [k: string]: any };
   #weapon!: AccDiffWeapon; // never use this class before calling hydrate
   #base!: AccDiffBase; // never use this class before calling hydrate
 
-  static schema = {
-    target_id: t.string,
-    accuracy: t.number,
-    difficulty: t.number,
-    cover: coverSchema,
-    consumeLockOn: t.boolean,
+  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
+
+  };
+
+  static get schema() {
+    return {
+      target_id: t.string,
+      accuracy: t.number,
+      difficulty: t.number,
+      cover: coverSchema,
+      consumeLockOn: t.boolean,
+      plugins: t.type(this.pluginSchema),
+    }
   }
 
   static get schemaCodec() { return t.type(this.schema); }
@@ -116,6 +159,7 @@ class AccDiffTarget {
     this.difficulty = obj.difficulty;
     this.cover = obj.cover;
     this.consumeLockOn = obj.consumeLockOn;
+    this.plugins = obj.plugins;
     // this.#weapon = weapon;
     // this.#base = base;
   }
@@ -126,13 +170,17 @@ class AccDiffTarget {
       accuracy: this.accuracy,
       difficulty: this.difficulty,
       cover: this.cover,
-      consumeLockOn: this.consumeLockOn
+      consumeLockOn: this.consumeLockOn,
+      plugins: this.plugins,
     }
   }
 
-  hydrate(weapon: AccDiffWeapon, base: AccDiffBase) {
-    this.#weapon = weapon;
-    this.#base = base;
+  hydrate(d: AccDiffData) {
+    this.#weapon = d.weapon;
+    this.#base = d.base;
+    for (let key of Object.keys(this.plugins)) {
+      this.plugins[key].hydrate(d, this);
+    }
   }
 
   // as it turns out, we can't actually name the ActiveEffect type
@@ -184,9 +232,9 @@ export class AccDiffData {
     this.base = obj.base;
     this.targets = obj.targets;
 
-    this.weapon.hydrate();
-    this.base.hydrate(this.weapon);
-    for (let target of this.targets) { target.hydrate(this.weapon, this.base); }
+    this.weapon.hydrate(this);
+    this.base.hydrate(this);
+    for (let target of this.targets) { target.hydrate(this); }
   }
 
   get raw() {
@@ -206,7 +254,24 @@ export class AccDiffData {
     return encode(this, AccDiffData.codec);
   }
 
+  static plugins: AccDiffPlugin<AccDiffPluginData>[] = [];
+  static targetedPlugins: AccDiffPlugin<AccDiffPluginData>[] = [];
+  static registerPlugin<D extends AccDiffPluginData, P extends AccDiffPlugin<D>, O>(plugin: P) {
+    if (plugin.perRoll) {
+      AccDiffWeapon.pluginSchema[plugin.slug] = plugin.codec;
+    }
+    if (plugin.perUnknownTarget) {
+      AccDiffBase.pluginSchema[plugin.slug] = plugin.codec;
+    }
+    if (plugin.perTarget) {
+      AccDiffTarget.pluginSchema[plugin.slug] = plugin.codec;
+      this.targetedPlugins.push(plugin);
+    }
+    this.plugins.push(plugin);
+  }
+
   static fromParams(
+    item?: LancerItem<any>,
     tags?: TagInstance[],
     title?: string,
     targets?: Token[],
@@ -216,6 +281,7 @@ export class AccDiffData {
       accurate: false,
       inaccurate: false,
       seeking: false,
+      plugins: {} as { [k: string]: any },
     };
 
     for (let tag of (tags || [])) {
@@ -236,19 +302,37 @@ export class AccDiffData {
       cover: Cover.None,
       accuracy: starting ? starting[0] : 0,
       difficulty: starting ? starting[1] : 0,
+      plugins: {} as { [k: string]: any },
     };
 
-    return AccDiffData.fromObject({
+    let obj = {
       title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
       weapon, base,
-      targets: (targets || []).map(t => ({
-        target_id: t.id,
-        accuracy: 0,
-        difficulty: 0,
-        cover: Cover.None,
-        consumeLockOn: true,
-      }))
-    });
+      targets: (targets || []).map(t => {
+        let ret = {
+          target_id: t.id,
+          accuracy: 0,
+          difficulty: 0,
+          cover: Cover.None,
+          consumeLockOn: true,
+          plugins: {} as { [k: string]: any },
+        };
+        for (let plugin of this.targetedPlugins) {
+          ret.plugins[plugin.slug] = encode(plugin.perTarget!(t), plugin.codec);
+        }
+        return ret;
+      })
+    };
+
+    for (let plugin of this.plugins) {
+      if (plugin.perRoll) {
+        obj.weapon.plugins[plugin.slug] = encode(plugin.perRoll(item), plugin.codec);
+      }
+      if (plugin.perUnknownTarget) {
+        obj.base.plugins[plugin.slug] = encode(plugin.perUnknownTarget(), plugin.codec);
+      }
+    }
+    return AccDiffData.fromObject(obj);
   }
 }
 
@@ -276,3 +360,6 @@ export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
     return ret
   }
 }
+
+// side effects for importing, yes, yes, I know
+AccDiffData.registerPlugin(Invisibility);
diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
new file mode 100644
index 000000000..a6e5223d4
--- /dev/null
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -0,0 +1,94 @@
+import * as t from 'io-ts';
+import { LancerActor, LancerActorType } from "../../actor/lancer-actor";
+import { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
+import { AccDiffData, AccDiffTarget } from './index';
+import { enclass } from './serde';
+
+// why not just a boolean?
+// we want to try and capture the intent for the reroll, not just the state
+// if the user clicks to force invisible, then clicks it again
+// we want to interpret that as changing their mind, instead of forcing _visibility_
+export enum InvisibilityEnum {
+  ForceVisibility = -1,
+  NoForce = 0,
+  ForceInvisibility = 1,
+}
+
+export class Invisibility implements AccDiffPluginData {
+  data: InvisibilityEnum;
+  token?: Token;
+
+  constructor(ser: t.TypeOf<typeof invisibilityCodec>) {
+    this.data = ser;
+  }
+  get raw(): t.TypeOf<typeof invisibilityCodec> {
+    return this.data;
+  }
+
+  static perUnknownTarget(): Invisibility {
+    return new Invisibility(InvisibilityEnum.NoForce);
+  }
+
+  static perTarget(item: Token): Invisibility {
+    let ret = Invisibility.perUnknownTarget();
+    ret.token = item;
+    return ret;
+  }
+
+  get tokenInvisible(): boolean {
+    if (!this.token) { return false; }
+    let actor = (this.token.actor as LancerActor<LancerActorType>);
+    return !!actor.data.effects.find(eff => eff.data.flags.core.statusId == "invisible");
+  }
+
+  uiElement: "checkbox" = "checkbox";
+  slug: string = "invisibility";
+  static slug: string = "invisibility";
+  humanLabel: string = "Invisible (*)";
+  // uiState = "treat this target as invisible"
+  get uiState() {
+    if (this.data == InvisibilityEnum.NoForce) {
+      return this.tokenInvisible;
+    } else {
+      return !!(this.data + 1);
+    }
+  }
+  // setting invisibility to true or false when the token isn't that is interpreted as a force
+  // setting invisibility to whatever the token is is interpreted as no force
+  set uiState(newState: boolean) {
+    let tki = this.tokenInvisible;
+    if (tki == newState) {
+      this.data = InvisibilityEnum.NoForce;
+    } else if (newState) {
+      this.data = InvisibilityEnum.ForceInvisibility;
+    } else {
+      this.data = InvisibilityEnum.ForceVisibility;
+    }
+  }
+
+  get disabled() { return false; }
+  get visible() { return true; }
+
+  modifyRoll(roll: string): string {
+    if (this.uiState) {
+      return `1d2even[👻] * (${roll})`;
+    } else {
+      return roll;
+    }
+  }
+
+  hydrate(_d: AccDiffData, t?: AccDiffTarget) {
+    if (t) { this.token = t.target; }
+  }
+
+  static get codec() {
+    return invisibilityCodec;
+  }
+}
+
+const _klass: AccDiffPlugin<Invisibility> = Invisibility; // to get type errors
+
+export const invisibilityCodec: AccDiffPluginCodec<Invisibility, InvisibilityEnum, unknown> = enclass(
+  t.union([t.literal(-1), t.literal(0), t.literal(1)]),
+  Invisibility
+)
diff --git a/src/module/helpers/acc_diff/plugin.d.ts b/src/module/helpers/acc_diff/plugin.d.ts
new file mode 100644
index 000000000..1e36f31a5
--- /dev/null
+++ b/src/module/helpers/acc_diff/plugin.d.ts
@@ -0,0 +1,36 @@
+import type * as t from 'io-ts';
+import { LancerItem } from "../../item/lancer-item";
+
+import type { AccDiffData } from './index';
+
+declare interface UIBehaviour {
+  uiElement: "checkbox",
+  slug: string,
+  humanLabel: string,
+  get uiState(): boolean;
+  set uiState(data: boolean): this;
+  get disabled(): boolean;
+  get visible(): boolean;
+}
+
+declare interface RollModifier {
+  modifyRoll(roll: string): string
+}
+
+declare interface Dehydrated {
+  hydrate(data: AccDiffData, target?: AccDiffTarget);
+}
+
+export type AccDiffPluginData = UIBehaviour & RollModifier & Dehydrated;
+
+export type AccDiffPluginCodec<C extends AccDiffPluginData, O, I> = Codec<C, O, I>;
+
+declare interface AccDiffPlugin<Data extends AccDiffPluginData> {
+  slug: string,
+  codec: AccDiffPluginCodec<Data, O, I>,
+  perRoll?(item?: LancerItem<any>),
+  perUnknownTarget?(): Data,
+  perTarget?(item: Token): Data,
+}
+
+export type Data<T> = T extends AccDiffPlugin<infer D> ? D : never;
diff --git a/src/module/macros.ts b/src/module/macros.ts
index bcd5a2229..dca881b2c 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -486,6 +486,10 @@ function rollStr(bonus: number, total: number): string {
   return `1d20+${bonus}${modStr}`;
 }
 
+function applyPluginsToRoll(str: string, plugins: { modifyRoll(i: string): string }[]): string {
+  return plugins.reduce((acc, p) => p.modifyRoll(acc), str);
+}
+
 type AttackRolls = {
   roll: string,
   targeted: {
@@ -496,13 +500,18 @@ type AttackRolls = {
 }
 
 function attackRolls(bonus: number, accdiff: AccDiffData): AttackRolls {
+  let perRoll = Object.values(accdiff.weapon.plugins);
+  let base = perRoll.concat(Object.values(accdiff.base.plugins));
   return {
-    roll: rollStr(bonus, accdiff.base.total),
-    targeted: accdiff.targets.map(tad => ({
-      target: tad.target,
-      roll: rollStr(bonus, tad.total),
-      usedLockOn: tad.usingLockOn,
-    }))
+    roll: applyPluginsToRoll(rollStr(bonus, accdiff.base.total), base),
+    targeted: accdiff.targets.map(tad => {
+      let perTarget = perRoll.concat(Object.values(tad.plugins));
+      return {
+        target: tad.target,
+        roll: applyPluginsToRoll(rollStr(bonus, tad.total), perTarget),
+        usedLockOn: tad.usingLockOn,
+      }
+    })
   };
 }
 
@@ -745,7 +754,7 @@ async function prepareAttackMacro({
   // Prompt the user before deducting charges.
   const targets = Array.from(game.user.targets);
   const initialData = rerollData ?? AccDiffData.fromParams(
-    mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
+    item, mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
   const promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
 
@@ -1164,12 +1173,12 @@ export async function prepareTechMacro(a: string, t: string) {
   }
   console.log(`${lp} Tech Attack Macro Item:`, item, mData);
 
-  await rollTechMacro(actor, mData);
+  await rollTechMacro(actor, mData, item);
 }
 
-async function rollTechMacro(actor: Actor, data: LancerTechMacroData, rerollData?: AccDiffData) {
+async function rollTechMacro(actor: Actor, data: LancerTechMacroData, item?: LancerItem<any>, rerollData?: AccDiffData) {
   const targets = Array.from(game.user.targets);
-  const initialData = rerollData ?? AccDiffData.fromParams(data.tags, data.title, targets);
+  const initialData = rerollData ?? AccDiffData.fromParams(item, data.tags, data.title, targets);
   const promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
 
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 087eb8937..494be9fbd 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -14,7 +14,20 @@
     classes="accdiff-grid accdiff-weight"
   }}}
 {{/inline}}
-
+{{#*inline "plugin"}}
+  {{#if visible}}
+    <label class="container">
+      {{humanLabel}}
+      <input type="checkbox"
+        name="{{key}}.uiState"
+        id="{{key}}.uiState"
+        {{checked uiState}}
+        {{#if disabled}}disabled{{/if}}
+      />
+      <span class="checkmark"></span>
+    </label>
+  {{/if}}
+{{/inline}}
 <form id="accdiff">
   <div id="accdiff-dialog" style="padding:4px">
     <div class="accdiff-grid">
@@ -33,6 +46,9 @@
           <input type="checkbox" name="weapon.seeking" {{checked weapon.seeking}} />
           <span class="checkmark"></span>
         </label>
+        {{#each weapon.plugins as |data key|}}
+          {{> plugin data key=(concat "weapon.plugins." key) visible=visible disabled=disabled uiState=uiState}}
+        {{/each}}
         {{#if hasExactlyOneTarget}}
           <label class="container">
             Consume Lock On (+1)
@@ -44,6 +60,9 @@
             />
             <span class="checkmark"></span>
           </label>
+          {{#each targets.0.plugins as |data key|}}
+            {{> plugin data key=(concat "targets.0.plugins." key)  visible=visible disabled=disabled uiState=uiState}}
+          {{/each}}
         {{/if}}
       </div>
       <div style="width:100%;padding:4px;">

From afe309fb4cb8537a5cfd08a58bfd7feef16f84fb Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Fri, 16 Jul 2021 09:26:16 -0700
Subject: [PATCH 29/88] some comments and cleanup in invisibility / the plugin
 interface

---
 src/module/helpers/acc_diff/invisibility.ts | 60 ++++++++++++---------
 src/module/helpers/acc_diff/plugin.d.ts     | 23 +++++++-
 2 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
index a6e5223d4..6c41f49b7 100644
--- a/src/module/helpers/acc_diff/invisibility.ts
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -4,7 +4,10 @@ import { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
 import { AccDiffData, AccDiffTarget } from './index';
 import { enclass } from './serde';
 
-// why not just a boolean?
+// you don't need to explicitly type the serialized data,
+// but if you do then io-ts codecs can do strong checks at runtime
+
+// so for invisibility: why not persist just a boolean?
 // we want to try and capture the intent for the reroll, not just the state
 // if the user clicks to force invisible, then clicks it again
 // we want to interpret that as changing their mind, instead of forcing _visibility_
@@ -18,34 +21,48 @@ export class Invisibility implements AccDiffPluginData {
   data: InvisibilityEnum;
   token?: Token;
 
-  constructor(ser: t.TypeOf<typeof invisibilityCodec>) {
-    this.data = ser;
+  // these methods are for easy class codecs via `enclass`
+  constructor(ser: InvisibilityEnum) { this.data = ser; }
+  get raw(): InvisibilityEnum { return this.data; }
+
+  // as you may have guessed, the codec just stores the enum
+  static get codec(): AccDiffPluginCodec<Invisibility, InvisibilityEnum, unknown> {
+    return enclass(
+      t.union([t.literal(-1), t.literal(0), t.literal(1)]),
+      Invisibility
+    )
   }
-  get raw(): t.TypeOf<typeof invisibilityCodec> {
-    return this.data;
+
+  // store a reference to the current token when rehydrated
+  hydrate(_d: AccDiffData, t?: AccDiffTarget) {
+    if (t) { this.token = t.target; }
   }
 
+  // invisibility operates on the target level, whether we know the target or not
   static perUnknownTarget(): Invisibility {
     return new Invisibility(InvisibilityEnum.NoForce);
   }
-
   static perTarget(item: Token): Invisibility {
     let ret = Invisibility.perUnknownTarget();
     ret.token = item;
     return ret;
   }
 
-  get tokenInvisible(): boolean {
+  // assume targets aren't invisible if we don't know about them
+  // otherwise, go get the status effects and check them
+  private get tokenInvisible(): boolean {
     if (!this.token) { return false; }
     let actor = (this.token.actor as LancerActor<LancerActorType>);
     return !!actor.data.effects.find(eff => eff.data.flags.core.statusId == "invisible");
   }
 
+  // UI behaviour
   uiElement: "checkbox" = "checkbox";
   slug: string = "invisibility";
   static slug: string = "invisibility";
   humanLabel: string = "Invisible (*)";
-  // uiState = "treat this target as invisible"
+
+  // our uiState is whether we're treating the current target as invisible
   get uiState() {
     if (this.data == InvisibilityEnum.NoForce) {
       return this.tokenInvisible;
@@ -53,8 +70,8 @@ export class Invisibility implements AccDiffPluginData {
       return !!(this.data + 1);
     }
   }
-  // setting invisibility to true or false when the token isn't that is interpreted as a force
-  // setting invisibility to whatever the token is is interpreted as no force
+  // toggling invisibility to what the token isn't is interpreted as a force
+  // toggling invisibility to whatever the token is is interpreted as not wanting to force
   set uiState(newState: boolean) {
     let tki = this.tokenInvisible;
     if (tki == newState) {
@@ -66,9 +83,12 @@ export class Invisibility implements AccDiffPluginData {
     }
   }
 
-  get disabled() { return false; }
-  get visible() { return true; }
+  // no behaviour here — invisibility can always be seen and toggled
+  readonly visible = true;
+  readonly disabled = false;
 
+  // the effect to have on the roll
+  // 1d2even resolves to either 0 or 1 successes, so multiplying works great
   modifyRoll(roll: string): string {
     if (this.uiState) {
       return `1d2even[👻] * (${roll})`;
@@ -76,19 +96,7 @@ export class Invisibility implements AccDiffPluginData {
       return roll;
     }
   }
-
-  hydrate(_d: AccDiffData, t?: AccDiffTarget) {
-    if (t) { this.token = t.target; }
-  }
-
-  static get codec() {
-    return invisibilityCodec;
-  }
 }
 
-const _klass: AccDiffPlugin<Invisibility> = Invisibility; // to get type errors
-
-export const invisibilityCodec: AccDiffPluginCodec<Invisibility, InvisibilityEnum, unknown> = enclass(
-  t.union([t.literal(-1), t.literal(0), t.literal(1)]),
-  Invisibility
-)
+// to check whether the static methods match the interface
+const _klass: AccDiffPlugin<Invisibility> = Invisibility;
diff --git a/src/module/helpers/acc_diff/plugin.d.ts b/src/module/helpers/acc_diff/plugin.d.ts
index 1e36f31a5..04a588d67 100644
--- a/src/module/helpers/acc_diff/plugin.d.ts
+++ b/src/module/helpers/acc_diff/plugin.d.ts
@@ -3,6 +3,14 @@ import { LancerItem } from "../../item/lancer-item";
 
 import type { AccDiffData } from './index';
 
+// Implementing a plugin means implementing
+// * a data object that can compute its view behaviour,
+// * a codec to serialize it,
+// * and a bunch of freestanding constructors
+
+// You don't _have_ to make the data object a class with static methods for the constructors
+// but it's convenient
+
 declare interface UIBehaviour {
   uiElement: "checkbox",
   slug: string,
@@ -18,6 +26,9 @@ declare interface RollModifier {
 }
 
 declare interface Dehydrated {
+  // the codec handles all serializable data,
+  // but we might want to pick up data from the environment too
+  // all perTarget codecs get the target as well
   hydrate(data: AccDiffData, target?: AccDiffTarget);
 }
 
@@ -27,10 +38,20 @@ export type AccDiffPluginCodec<C extends AccDiffPluginData, O, I> = Codec<C, O,
 
 declare interface AccDiffPlugin<Data extends AccDiffPluginData> {
   slug: string,
+  // the codec lets us know how to persist whatever data you need for rerolls
   codec: AccDiffPluginCodec<Data, O, I>,
-  perRoll?(item?: LancerItem<any>),
+  // these constructors handle creating the initial data for a plugin
+  // the presence of these three constructors also indicates what scopes the plugin lives in
+  // a "perRoll" plugin applies to all rolls, like weapon seeking or particularize
+  // a "perTarget" plugin applies individually to every single target
+  // a "perUnknownTarget" applies whenever the user opens the roll dialog without a target
+  // so every roll has perRoll + exactly one of perTarget and perUnknownTarget
+  perRoll?(item?: LancerItem<any>): Data,
   perUnknownTarget?(): Data,
   perTarget?(item: Token): Data,
+  // usually you want to implement either perRoll OR both of the other two
+  // if you implement perRoll AND either or both of the other two, `rollModifier`
+  // will be called twice on the same roll, so watch out for that
 }
 
 export type Data<T> = T extends AccDiffPlugin<infer D> ? D : never;

From 16391f2a5961014142f76954fd635ea1184f21ea Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Fri, 16 Jul 2021 09:40:48 -0700
Subject: [PATCH 30/88] making it the default export is nicer

---
 src/module/helpers/acc_diff/index.ts        | 2 +-
 src/module/helpers/acc_diff/invisibility.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index 5825d7d31..f4534a0ce 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -7,7 +7,7 @@ import { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
 import { enclass, encode, decode } from './serde';
 import { LancerItem } from "../../item/lancer-item";
 
-import { Invisibility } from "./invisibility";
+import Invisibility from "./invisibility";
 
 enum Cover {
   None = 0,
diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
index 6c41f49b7..a4451b62f 100644
--- a/src/module/helpers/acc_diff/invisibility.ts
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -17,7 +17,7 @@ export enum InvisibilityEnum {
   ForceInvisibility = 1,
 }
 
-export class Invisibility implements AccDiffPluginData {
+export default class Invisibility implements AccDiffPluginData {
   data: InvisibilityEnum;
   token?: Token;
 

From a02493174b193cc5b9192f2793bcb5f0edaeeb44 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Fri, 16 Jul 2021 12:26:51 -0700
Subject: [PATCH 31/88] let plugins see the item that started the roll

---
 src/module/helpers/acc_diff/index.ts | 15 +++++++++++----
 src/module/macros.ts                 |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index f4534a0ce..a7c306561 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -213,6 +213,7 @@ export class AccDiffData {
   weapon: AccDiffWeapon;
   base: AccDiffBase;
   targets: AccDiffTarget[];
+  lancerItem?: LancerItem<any>; // not persisted, needs to be hydrated
 
   static get schema() {
     return {
@@ -231,7 +232,10 @@ export class AccDiffData {
     this.weapon = obj.weapon;
     this.base = obj.base;
     this.targets = obj.targets;
+    this.hydrate();
+  }
 
+  hydrate() {
     this.weapon.hydrate(this);
     this.base.hydrate(this);
     for (let target of this.targets) { target.hydrate(this); }
@@ -246,8 +250,11 @@ export class AccDiffData {
     }
   }
 
-  static fromObject(obj: t.InputOf<typeof AccDiffData.codec>) {
-    return decode(obj, AccDiffData.codec);
+  static fromObject(obj: t.InputOf<typeof AccDiffData.codec>, lancerItem?: LancerItem<any>): AccDiffData {
+    let ret = decode(obj, AccDiffData.codec);
+    ret.lancerItem = lancerItem;
+    ret.hydrate();
+    return ret;
   }
 
   toObject(): t.OutputOf<typeof AccDiffData.codec> {
@@ -256,7 +263,7 @@ export class AccDiffData {
 
   static plugins: AccDiffPlugin<AccDiffPluginData>[] = [];
   static targetedPlugins: AccDiffPlugin<AccDiffPluginData>[] = [];
-  static registerPlugin<D extends AccDiffPluginData, P extends AccDiffPlugin<D>, O>(plugin: P) {
+  static registerPlugin<D extends AccDiffPluginData, P extends AccDiffPlugin<D>>(plugin: P) {
     if (plugin.perRoll) {
       AccDiffWeapon.pluginSchema[plugin.slug] = plugin.codec;
     }
@@ -332,7 +339,7 @@ export class AccDiffData {
         obj.base.plugins[plugin.slug] = encode(plugin.perUnknownTarget(), plugin.codec);
       }
     }
-    return AccDiffData.fromObject(obj);
+    return AccDiffData.fromObject(obj, item);
   }
 }
 
diff --git a/src/module/macros.ts b/src/module/macros.ts
index dca881b2c..838e30dd4 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -607,7 +607,7 @@ export async function prepareEncodedAttackMacro(
     ui.notifications.error("Could not find weapon to reroll");
     return;
   }
-  let accdiff = AccDiffData.fromObject(rerollData);
+  let accdiff = AccDiffData.fromObject(rerollData, item);
   return prepareAttackMacro({ actor, item, options }, accdiff);
 }
 

From a78b39c65bfa02770454fd854aa2adbdafede82f Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Fri, 16 Jul 2021 12:27:27 -0700
Subject: [PATCH 32/88] allow plugins to have no ui

---
 src/module/helpers/acc_diff/invisibility.ts |  4 ++--
 src/module/helpers/acc_diff/plugin.d.ts     | 12 +++++++++--
 src/templates/window/acc_diff.hbs           | 22 +++++++++++----------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
index a4451b62f..c70fc313a 100644
--- a/src/module/helpers/acc_diff/invisibility.ts
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -1,6 +1,6 @@
 import * as t from 'io-ts';
 import { LancerActor, LancerActorType } from "../../actor/lancer-actor";
-import { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
+import { AccDiffPlugin, AccDiffCheckboxPluginData, AccDiffPluginCodec } from './plugin';
 import { AccDiffData, AccDiffTarget } from './index';
 import { enclass } from './serde';
 
@@ -17,7 +17,7 @@ export enum InvisibilityEnum {
   ForceInvisibility = 1,
 }
 
-export default class Invisibility implements AccDiffPluginData {
+export default class Invisibility implements AccDiffCheckboxPluginData {
   data: InvisibilityEnum;
   token?: Token;
 
diff --git a/src/module/helpers/acc_diff/plugin.d.ts b/src/module/helpers/acc_diff/plugin.d.ts
index 04a588d67..43f8781a3 100644
--- a/src/module/helpers/acc_diff/plugin.d.ts
+++ b/src/module/helpers/acc_diff/plugin.d.ts
@@ -11,8 +11,8 @@ import type { AccDiffData } from './index';
 // You don't _have_ to make the data object a class with static methods for the constructors
 // but it's convenient
 
-declare interface UIBehaviour {
-  uiElement: "checkbox",
+declare interface CheckboxUI {
+  uiElement: "checkbox" = "checkbox",
   slug: string,
   humanLabel: string,
   get uiState(): boolean;
@@ -21,6 +21,12 @@ declare interface UIBehaviour {
   get visible(): boolean;
 }
 
+declare interface NoUI {
+  uiElement: "none" = "none",
+}
+
+type UIBehaviour = CheckboxUI | NoUI;
+
 declare interface RollModifier {
   modifyRoll(roll: string): string
 }
@@ -33,6 +39,8 @@ declare interface Dehydrated {
 }
 
 export type AccDiffPluginData = UIBehaviour & RollModifier & Dehydrated;
+export type AccDiffCheckboxPluginData = CheckboxUI & RollModifier & Dehydrated;
+export type AccDiffNoUIPluginData = NoUI & RollModifier & Dehydrated;
 
 export type AccDiffPluginCodec<C extends AccDiffPluginData, O, I> = Codec<C, O, I>;
 
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 494be9fbd..32dfd80f9 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -16,16 +16,18 @@
 {{/inline}}
 {{#*inline "plugin"}}
   {{#if visible}}
-    <label class="container">
-      {{humanLabel}}
-      <input type="checkbox"
-        name="{{key}}.uiState"
-        id="{{key}}.uiState"
-        {{checked uiState}}
-        {{#if disabled}}disabled{{/if}}
-      />
-      <span class="checkmark"></span>
-    </label>
+    {{#if (eq uiElement "checkbox")}}
+      <label class="container">
+        {{humanLabel}}
+        <input type="checkbox"
+          name="{{key}}.uiState"
+          id="{{key}}.uiState"
+          {{checked uiState}}
+          {{#if disabled}}disabled{{/if}}
+        />
+        <span class="checkmark"></span>
+      </label>
+    {{/if}}
   {{/if}}
 {{/inline}}
 <form id="accdiff">

From 682e3dfaebad0f0c2156ee1bfb5fe8d4ef2d492d Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Fri, 16 Jul 2021 12:27:48 -0700
Subject: [PATCH 33/88] basic Spotter plugin with no ui and a hacky adjacency
 calculation

---
 src/module/helpers/acc_diff/index.ts    |  2 +
 src/module/helpers/acc_diff/plugin.d.ts |  2 +-
 src/module/helpers/acc_diff/serde.ts    |  9 +++-
 src/module/helpers/acc_diff/spotter.ts  | 57 +++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 src/module/helpers/acc_diff/spotter.ts

diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index a7c306561..427658d13 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -8,6 +8,7 @@ import { enclass, encode, decode } from './serde';
 import { LancerItem } from "../../item/lancer-item";
 
 import Invisibility from "./invisibility";
+import Spotter from "./spotter";
 
 enum Cover {
   None = 0,
@@ -370,3 +371,4 @@ export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
 
 // side effects for importing, yes, yes, I know
 AccDiffData.registerPlugin(Invisibility);
+AccDiffData.registerPlugin(Spotter);
diff --git a/src/module/helpers/acc_diff/plugin.d.ts b/src/module/helpers/acc_diff/plugin.d.ts
index 43f8781a3..4a2e3a81d 100644
--- a/src/module/helpers/acc_diff/plugin.d.ts
+++ b/src/module/helpers/acc_diff/plugin.d.ts
@@ -50,7 +50,7 @@ declare interface AccDiffPlugin<Data extends AccDiffPluginData> {
   codec: AccDiffPluginCodec<Data, O, I>,
   // these constructors handle creating the initial data for a plugin
   // the presence of these three constructors also indicates what scopes the plugin lives in
-  // a "perRoll" plugin applies to all rolls, like weapon seeking or particularize
+  // a "perRoll" plugin applies to all rolls, like weapon seeking
   // a "perTarget" plugin applies individually to every single target
   // a "perUnknownTarget" applies whenever the user opens the roll dialog without a target
   // so every roll has perRoll + exactly one of perTarget and perUnknownTarget
diff --git a/src/module/helpers/acc_diff/serde.ts b/src/module/helpers/acc_diff/serde.ts
index 1fafd1072..02899c47a 100644
--- a/src/module/helpers/acc_diff/serde.ts
+++ b/src/module/helpers/acc_diff/serde.ts
@@ -1,5 +1,5 @@
 import * as t from 'io-ts';
-import { isLeft, Either, map } from 'fp-ts/Either';
+import { isLeft, right, Either, map } from 'fp-ts/Either';
 
 function unwrap<E, A>(e: Either<E, A>): A {
   if (isLeft(e)) {
@@ -20,6 +20,13 @@ export function enclass<Raw, Klass extends { get raw(): Raw }, I, O>(
   );
 }
 
+export function stateless<T>(name: string, predicate: t.Is<T>, synthesise: () => T) {
+  return new t.Type<T, null, unknown>(
+    name, predicate,
+    _ => right(synthesise()), _ => null
+  );
+}
+
 export function encode<Raw, T>(t: T, codec: t.Type<T, Raw, any>): Raw {
   return codec.encode(t);
 }
diff --git a/src/module/helpers/acc_diff/spotter.ts b/src/module/helpers/acc_diff/spotter.ts
new file mode 100644
index 000000000..a3bbbcbb2
--- /dev/null
+++ b/src/module/helpers/acc_diff/spotter.ts
@@ -0,0 +1,57 @@
+import * as t from 'io-ts';
+import { stateless } from './serde';
+import { getMacroSpeaker } from '../../macros';
+import type { AccDiffPlugin, AccDiffPluginData } from './plugin';
+import type { AccDiffData, AccDiffTarget } from './index';
+import type { LancerItem } from '../../item/lancer-item';
+import type { Pilot } from 'machine-mind';
+
+// this is an example of a case implemented without defining a full class
+function adjacentSpotter(item: LancerItem<any>): boolean {
+  let actor = getMacroSpeaker(item?.actor?.id);
+  // only players can have spotter
+  if (!actor || actor.data.type != "mech") { return false; }
+
+  // this isn't adjacency, it's "is within range 1 LOS with a hack for larger mechs", but it's good enough
+  // computation taken from sensor-sight
+  let radius = actor.data.data.derived.mm.Size;
+  let token = actor.getActiveTokens()[0];
+  let point = token.center;
+
+  function inRange(token: { x: number, y: number }) {
+    const range = Math.sqrt((token.x - point.x) * (token.x - point.x) + (token.y - point.y) * (token.y - point.y));
+    const scale = canvas.scene.data.gridType > 1 ? Math.sqrt(3) / 2 : 1; // for hexes
+    const grid = canvas.scene.data.grid;
+    return (radius + .01) * grid * scale > range;
+  }
+
+  let adjacentPilots = canvas.tokens.objects.children
+    .filter((t: Token) => inRange(t.center) && t != token)
+    .map((t: Token) => t.actor.data.data.derived.mm.Pilot);
+
+  return (adjacentPilots.find((p: Pilot) => p.Talents.find(t => t.LID == "t_spotter")));
+}
+
+function spotter(): AccDiffPluginData {
+  return {
+    uiElement: "none",
+    modifyRoll: x => x,
+    hydrate(data: AccDiffData, target?: AccDiffTarget) {
+      if (data.lancerItem && target?.usingLockOn && adjacentSpotter(data.lancerItem)) {
+        this.modifyRoll = str => str.replace('1d20', '2d20kh1[spotter]');
+        return;
+      }
+    }
+  }
+}
+
+const Spotter: AccDiffPlugin<AccDiffPluginData> = {
+  slug: "spotter",
+  codec: stateless("Spotter",
+    (t: unknown): t is AccDiffPluginData => typeof t == 'object' && (t as any)?.modifyRoll,
+    spotter
+  ),
+  perTarget(_t: Token) { return spotter() }
+}
+
+export default Spotter;

From aed6c72c93beb7d8018e4da785f76ba3af1d0f0b Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sat, 17 Jul 2021 09:13:11 -0700
Subject: [PATCH 34/88] nicer roll rendering: {roll} doesn't collapse the roll,
 (roll) does

---
 src/module/helpers/acc_diff/invisibility.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
index c70fc313a..913d1ea3f 100644
--- a/src/module/helpers/acc_diff/invisibility.ts
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -91,7 +91,7 @@ export default class Invisibility implements AccDiffCheckboxPluginData {
   // 1d2even resolves to either 0 or 1 successes, so multiplying works great
   modifyRoll(roll: string): string {
     if (this.uiState) {
-      return `1d2even[👻] * (${roll})`;
+      return `{${roll}} * (1d2even[👻 invisibility])`;
     } else {
       return roll;
     }

From 6913f2ddb641846a2a3a7b108c48a835632b6011 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sat, 17 Jul 2021 09:29:39 -0700
Subject: [PATCH 35/88] add spaces to the bonus for consistency

---
 src/module/macros.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/macros.ts b/src/module/macros.ts
index 838e30dd4..22335444f 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -483,7 +483,7 @@ function rollStr(bonus: number, total: number): string {
     let roll = abs == 1 ? "1d6" : `${abs}d6kh1`;
     modStr = ` ${sign} ${roll}`;
   }
-  return `1d20+${bonus}${modStr}`;
+  return `1d20 + ${bonus}${modStr}`;
 }
 
 function applyPluginsToRoll(str: string, plugins: { modifyRoll(i: string): string }[]): string {

From a0a9b4cb5465a57a2c7662f8ebf3533d51a29717 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sat, 17 Jul 2021 22:09:20 -0700
Subject: [PATCH 36/88] did you know foundry just has special syntax for coins

---
 src/module/helpers/acc_diff/invisibility.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
index 913d1ea3f..7801afd9f 100644
--- a/src/module/helpers/acc_diff/invisibility.ts
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -91,7 +91,7 @@ export default class Invisibility implements AccDiffCheckboxPluginData {
   // 1d2even resolves to either 0 or 1 successes, so multiplying works great
   modifyRoll(roll: string): string {
     if (this.uiState) {
-      return `{${roll}} * (1d2even[👻 invisibility])`;
+      return `{${roll}} * (1dc[👻 invisibility])`;
     } else {
       return roll;
     }

From 85253fa6f9e1c8611e9dcfcb8b945a6c1e3fe7a3 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 22 Jul 2021 17:18:41 -0700
Subject: [PATCH 37/88] some css fixes for the accdiff window

---
 src/lancer.scss                   | 11 +++++++++--
 src/templates/window/acc_diff.hbs |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index ee735274e..0d45bd8b9 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2126,6 +2126,9 @@ a.action {
   margin-inline-end: 0 !important; 
 }
 
+.accdiff-target {
+  padding: 4px;
+}
 
 
 // V-IMPORTS
@@ -2262,13 +2265,17 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
 }
 
 .lancer-consume-lockon  {
+  flex-wrap: nowrap;
+  padding: 4px 10px 4px 10px;
+
   & .accdiff-grid {
     position: relative;
   }
+  // needed to override a builtin that wants to style all checkboxes
   & input[type="checkbox"] {
     opacity: 0 !important;
-    position: fixed;
-    width: 0;
+    position: absolute !important;
+    width: 0 !important;
   }
   & [for] {
     position: absolute;
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 32dfd80f9..7a94fb29e 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -165,7 +165,7 @@
     {{#if hasTargets}}
       <div class="accdiff-footer accdiff-weight accdiff-target-row">
         {{#each targets as |data key|}}
-          <div class="flexcol card">
+          <div class="flexcol card accdiff-target">
             <label class="flexrow flex-center card">
               {{data.target.data.name}}
             </label>

From 03dd7dda142db290aeb140272089eea83b11a3a6 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 22 Jul 2021 19:00:19 -0700
Subject: [PATCH 38/88] dropdown for plugin UIs in the multi-target dialog

---
 src/lancer.scss                      | 15 +++++++++++++++
 src/module/helpers/acc_diff/index.ts | 18 ++++++++++++++++++
 src/templates/window/acc_diff.hbs    | 13 ++++++++++++-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index 0d45bd8b9..cdfd50f36 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2010,6 +2010,21 @@ a.action {
   }
 }
 
+.accdiff-target-row .tippy-box[data-theme~="lancer"] {
+  font-size: 0.8em;
+  padding-left: 0px;
+  padding-right: 0px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  transform: none;
+  .tippy-content {
+    transform: none;
+    .container {
+      margin: 0px;
+    }
+  }
+}
+
 // Acc_Diff
 .accdiff-grid {
   display: flex;
diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index 427658d13..73f2b01f1 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -1,3 +1,4 @@
+import tippy from "tippy.js";
 import { TagInstance } from "machine-mind";
 import * as t from 'io-ts';
 
@@ -361,6 +362,23 @@ export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
     super(data, { title: data.title })
   }
 
+  activateListeners(html: JQuery) {
+    for (let elem of html.find('.accdiff-target-has-dropdown')) {
+      const id = elem.getAttribute('data-template');
+      const tooltip = document.getElementById(id!);
+      if (tooltip) {
+        tippy(elem, {
+          content: tooltip,
+          interactive: true,
+          allowHTML: true,
+          trigger: 'click mouseenter',
+        });
+      }
+    }
+
+    return super.activateListeners(html);
+  }
+
   getViewModel(data: AccDiffData): AccDiffView {
     let ret = data as AccDiffView; // view elements haven't been set yet
     ret.hasTargets = ret.targets.length > 1;
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 7a94fb29e..b62e7e715 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -1,7 +1,7 @@
 {{#*inline "total"}}
   {{#if target}}
     <div class="accdiff-grid">
-      <img class="lancer-hit-thumb" src="{{target.data.img}}" />
+      <img class="lancer-hit-thumb accdiff-target-has-dropdown" data-template="dropdown-template-{{key}}" src="{{target.data.img}}" />
       <label for="{{concat key '.consumeLockOn'}}"
         class="{{#if usingLockOn}}checked{{/if}} {{#unless lockOnAvailable}}disabled{{/unless}}"
         title="Consume Lock On (+1)">
@@ -218,6 +218,17 @@
               </button>
             </div>
           </div>
+          {{#if ../hasTargets}}
+            <div id="dropdown-template-targets.{{key}}">
+              {{#each data.plugins as |pluginData pluginKey|}}
+                {{> plugin pluginData
+                  key=(concat "targets." key ".plugins." pluginKey)
+                  visible=pluginData.visible
+                  disabled=pluginData.disabled
+                  uiState=pluginData.uiState}}
+              {{/each}}
+            </div>
+          {{/if}}
         {{/each}}
       </div>
     {{/if}}

From 86d7f6a72d620f96bc4b7786402327858c8793db Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 22 Jul 2021 19:01:03 -0700
Subject: [PATCH 39/88] use non-breaking spaces inside labels

---
 src/module/helpers/acc_diff/invisibility.ts | 2 +-
 src/templates/window/acc_diff.hbs           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
index 7801afd9f..add7f53cf 100644
--- a/src/module/helpers/acc_diff/invisibility.ts
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -60,7 +60,7 @@ export default class Invisibility implements AccDiffCheckboxPluginData {
   uiElement: "checkbox" = "checkbox";
   slug: string = "invisibility";
   static slug: string = "invisibility";
-  humanLabel: string = "Invisible (*)";
+  humanLabel: string = "Invisible (*)";
 
   // our uiState is whether we're treating the current target as invisible
   get uiState() {
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index b62e7e715..802a72d91 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -39,12 +39,12 @@
           Accuracy
         </h3>
         <label class="container">
-          Accurate (+1)
+          Accurate (+1)
           <input type="checkbox" name="weapon.accurate" {{checked weapon.accurate}} />
           <span class="checkmark"></span>
         </label>
         <label class="container">
-          Seeking (*)
+          Seeking (*)
           <input type="checkbox" name="weapon.seeking" {{checked weapon.seeking}} />
           <span class="checkmark"></span>
         </label>
@@ -53,7 +53,7 @@
         {{/each}}
         {{#if hasExactlyOneTarget}}
           <label class="container">
-            Consume Lock On (+1)
+            Consume Lock On (+1)
             <input type="checkbox"
               name="targets.0.consumeLockOn"
               id="targets.0.consumeLockOn"
@@ -73,7 +73,7 @@
           Difficulty
         </h3>
         <label class="container">
-          Inaccurate (-1)
+          Inaccurate (-1)
           <input type="checkbox" name="weapon.inaccurate" {{checked weapon.inaccurate}} />
           <span class="checkmark"></span>
         </label>

From 5947e10a2353d92eb06c3dd36e9988ed667cb39e Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 22 Jul 2021 19:38:04 -0700
Subject: [PATCH 40/88] give spotter a UI (though no override)

---
 src/module/helpers/acc_diff/spotter.ts | 39 +++++++++++++++++++-------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/module/helpers/acc_diff/spotter.ts b/src/module/helpers/acc_diff/spotter.ts
index a3bbbcbb2..e86c0ab44 100644
--- a/src/module/helpers/acc_diff/spotter.ts
+++ b/src/module/helpers/acc_diff/spotter.ts
@@ -1,4 +1,3 @@
-import * as t from 'io-ts';
 import { stateless } from './serde';
 import { getMacroSpeaker } from '../../macros';
 import type { AccDiffPlugin, AccDiffPluginData } from './plugin';
@@ -33,22 +32,42 @@ function adjacentSpotter(item: LancerItem<any>): boolean {
 }
 
 function spotter(): AccDiffPluginData {
-  return {
-    uiElement: "none",
-    modifyRoll: x => x,
-    hydrate(data: AccDiffData, target?: AccDiffTarget) {
-      if (data.lancerItem && target?.usingLockOn && adjacentSpotter(data.lancerItem)) {
-        this.modifyRoll = str => str.replace('1d20', '2d20kh1[spotter]');
-        return;
+  let sp = {
+    item: null as LancerItem<any> | null,
+    target: null as AccDiffTarget | null,
+    uiElement: "checkbox" as "checkbox",
+    slug: "spotter",
+    humanLabel: "Spotter (*)",
+    get uiState() {
+      return !!(this.item && this.target?.usingLockOn && adjacentSpotter(this.item))
+    },
+    set uiState(_v: boolean) {
+      // noop
+    },
+    disabled: true,
+    get visible() {
+      return !!(this.target?.usingLockOn);
+    },
+    modifyRoll(roll: string) {
+      if (this.uiState) {
+        return roll.replace('1d20', '2d20kh1[spotter]');
+      } else {
+        return roll;
       }
+    },
+    hydrate(data: AccDiffData, target?: AccDiffTarget) {
+      this.item = data.lancerItem || null;
+      this.target = target || null;
     }
-  }
+  };
+
+  return sp;
 }
 
 const Spotter: AccDiffPlugin<AccDiffPluginData> = {
   slug: "spotter",
   codec: stateless("Spotter",
-    (t: unknown): t is AccDiffPluginData => typeof t == 'object' && (t as any)?.modifyRoll,
+    (t: unknown): t is AccDiffPluginData => typeof t == 'object' && (t as any)?.slug == "spotter",
     spotter
   ),
   perTarget(_t: Token) { return spotter() }

From b0665d1ca9499a1162661e9afb9d5a39bceb7edb Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 22 Jul 2021 20:17:04 -0700
Subject: [PATCH 41/88] use opacity to mark disabled, instead of color

this lets us differentiate disabled+checked from disabled+unchecked
---
 src/lancer.scss | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index cdfd50f36..8e82b976b 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2022,6 +2022,9 @@ a.action {
     .container {
       margin: 0px;
     }
+    .checkmark {
+      height: 12px;
+    }
   }
 }
 
@@ -2059,7 +2062,7 @@ a.action {
   }
 
   input[disabled] ~ .checkmark {
-    background-color: #313131;
+    opacity: 0.5;
     cursor: unset;
   }
 
@@ -2067,7 +2070,7 @@ a.action {
     background-color: #757575;
   }
 
-  .container input:checked:not([disabled]) ~ .checkmark {
+  .container input:checked ~ .checkmark {
     background-color: var(--main-theme-color, fuchsia);
   }
 

From 0272746fe6846cdceae4adabb2329ee1d564aa4e Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 22 Jul 2021 20:55:21 -0700
Subject: [PATCH 42/88] implement impaired in the core (not as a plugin)

---
 src/module/helpers/acc_diff/index.ts        | 38 +++++++++++++--------
 src/module/helpers/acc_diff/invisibility.ts |  5 ++-
 src/templates/window/acc_diff.hbs           |  5 +++
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index 73f2b01f1..96777c311 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -11,6 +11,13 @@ import { LancerItem } from "../../item/lancer-item";
 import Invisibility from "./invisibility";
 import Spotter from "./spotter";
 
+// as it turns out, we can't actually name the ActiveEffect type
+// it's fine, this is all we need
+export type Effect = { delete: () => void };
+export function findEffect(actor: LancerActor<LancerActorType>, effect: string): Effect | null {
+  return actor.data.effects.find(eff => eff.data.flags.core.statusId == effect);
+}
+
 enum Cover {
   None = 0,
   Soft = 1,
@@ -25,6 +32,7 @@ class AccDiffWeapon {
   accurate: boolean;
   inaccurate: boolean;
   seeking: boolean;
+  #data!: AccDiffData; // never use this class before calling hydrate
   plugins: { [k: string]: AccDiffPluginData };
 
   static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
@@ -61,10 +69,21 @@ class AccDiffWeapon {
     }
   }
 
+  get impaired(): Effect | null {
+    return (this.#data?.lancerItem?.actor &&
+      findEffect(this.#data.lancerItem.actor as LancerActor<LancerActorType>, "impaired")) || null;
+  }
+
+  total(cover: number) {
+    return (this.accurate ? 1 : 0) - (this.inaccurate ? 1 : 0)
+      - (this.seeking ? 0 : cover) - (this.impaired ? 1 : 0);
+  }
+
   hydrate(d: AccDiffData) {
     for (let key of Object.keys(this.plugins)) {
       this.plugins[key].hydrate(d);
     }
+    this.#data = d;
   }
 }
 
@@ -110,10 +129,7 @@ class AccDiffBase {
   }
 
   get total() {
-    return this.accuracy - this.difficulty
-      + (this.#weapon.accurate ? 1 : 0)
-      - (this.#weapon.inaccurate ? 1 : 0)
-      - (this.#weapon.seeking ? 0 : this.cover)
+    return this.accuracy - this.difficulty + this.#weapon.total(this.cover);
   }
 }
 
@@ -185,22 +201,16 @@ export class AccDiffTarget {
     }
   }
 
-  // as it turns out, we can't actually name the ActiveEffect type
-  // it's fine, this is all we need here
-  get usingLockOn(): null | { delete: () => void } {
+  get usingLockOn(): null | Effect {
     return (this.consumeLockOn && this.lockOnAvailable) || null;
   }
 
-  get lockOnAvailable(): null | { delete: () => void } {
-    let actor = (this.target.actor as LancerActor<LancerActorType>);
-    return actor.data.effects.find(eff => eff.data.flags.core.statusId == "lockon");
+  get lockOnAvailable(): null | Effect {
+    return findEffect(this.target.actor as LancerActor<LancerActorType>, "lockon");
   }
 
   get total() {
-    let base = this.accuracy - this.difficulty
-      + (this.#weapon.accurate ? 1 : 0)
-      - (this.#weapon.inaccurate ? 1 : 0)
-      - (this.#weapon.seeking ? 0 : this.cover);
+    let base = this.accuracy - this.difficulty + this.#weapon.total(this.cover);
     // the only thing we actually use base for is the untyped bonuses
     let raw = base + this.#base.accuracy - this.#base.difficulty;
     let lockon = this.usingLockOn ? 1 : 0;
diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
index add7f53cf..d5280ec27 100644
--- a/src/module/helpers/acc_diff/invisibility.ts
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -1,7 +1,7 @@
 import * as t from 'io-ts';
 import { LancerActor, LancerActorType } from "../../actor/lancer-actor";
 import { AccDiffPlugin, AccDiffCheckboxPluginData, AccDiffPluginCodec } from './plugin';
-import { AccDiffData, AccDiffTarget } from './index';
+import { AccDiffData, AccDiffTarget, findEffect } from './index';
 import { enclass } from './serde';
 
 // you don't need to explicitly type the serialized data,
@@ -52,8 +52,7 @@ export default class Invisibility implements AccDiffCheckboxPluginData {
   // otherwise, go get the status effects and check them
   private get tokenInvisible(): boolean {
     if (!this.token) { return false; }
-    let actor = (this.token.actor as LancerActor<LancerActorType>);
-    return !!actor.data.effects.find(eff => eff.data.flags.core.statusId == "invisible");
+    return !!findEffect(this.token.actor as LancerActor<LancerActorType>, "invisible");
   }
 
   // UI behaviour
diff --git a/src/templates/window/acc_diff.hbs b/src/templates/window/acc_diff.hbs
index 802a72d91..73e95ed94 100644
--- a/src/templates/window/acc_diff.hbs
+++ b/src/templates/window/acc_diff.hbs
@@ -77,6 +77,11 @@
           <input type="checkbox" name="weapon.inaccurate" {{checked weapon.inaccurate}} />
           <span class="checkmark"></span>
         </label>
+        <label class="container">
+          Impaired (-1)
+          <input type="checkbox" name="weapon.impaired" {{checked weapon.impaired}} disabled />
+          <span class="checkmark"></span>
+        </label>
         {{#unless hasTargets}}
           {{#if hasExactlyOneTarget}}
             {{{std-cover-input "targets.0.cover"

From dbb52bcb327cba6856624201ea8dbe11289e1539 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 22 Jul 2021 22:12:30 -0700
Subject: [PATCH 43/88] implement rerolls for tech attacks

on all three entrypoints:
* prepareActivationMacro
* prepareStatMacro
* prepareTechMacro
---
 src/lancer.ts                           |  1 +
 src/module/macros.ts                    | 42 +++++++++++++++++++------
 src/templates/chat/tech-attack-card.hbs |  3 ++
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/lancer.ts b/src/lancer.ts
index 082569cb0..6fb4bc0fa 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -173,6 +173,7 @@ Hooks.once("init", async function () {
     prepareItemMacro: macros.prepareItemMacro,
     prepareStatMacro: macros.prepareStatMacro,
     prepareTextMacro: macros.prepareTextMacro,
+    prepareTechMacro: macros.prepareTechMacro,
     prepareCoreActiveMacro: macros.prepareCoreActiveMacro,
     prepareCorePassiveMacro: macros.prepareCorePassiveMacro,
     prepareOverchargeMacro: macros.prepareOverchargeMacro,
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 22335444f..1e30639e8 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -57,7 +57,9 @@ import { is_overkill } from "machine-mind/dist/funcs";
 const lp = LANCER.log_prefix;
 
 const encodedMacroWhitelist = [
+  "prepareActivationMacro",
   "prepareEncodedAttackMacro",
+  "prepareTechMacro",
   "prepareStatMacro",
   "prepareItemMacro",
   "prepareCoreActiveMacro",
@@ -515,7 +517,7 @@ function attackRolls(bonus: number, accdiff: AccDiffData): AttackRolls {
   };
 }
 
-export async function prepareStatMacro(a: string, statKey: string) {
+export async function prepareStatMacro(a: string, statKey: string, rerollData?: AccDiffDataSerialized) {
   // Determine which Actor to speak as
   let actor: LancerActor<EntryType.PILOT> | null = getMacroSpeaker(a);
   if (!actor) return;
@@ -531,7 +533,12 @@ export async function prepareStatMacro(a: string, statKey: string) {
     bonus: bonus,
   };
   if (mData.title === "TECHATTACK") {
-    rollTechMacro(actor, { acc: 0, action: "Quick", t_atk: bonus, effect: "", tags: [], title: "" });
+    let partialMacroData = {
+      title: "Reroll stat macro",
+      fn: "prepareStatMacro",
+      args: [a, statKey]
+    };
+    rollTechMacro(actor, { acc: 0, action: "Quick", t_atk: bonus, effect: "", tags: [], title: "" }, partialMacroData, rerollData);
   } else {
     rollStatMacro(actor, mData).then();
   }
@@ -1113,7 +1120,7 @@ async function rollTextMacro(actor: Actor, data: LancerTextMacroData) {
   return renderMacroTemplate(actor, template, data);
 }
 
-export async function prepareTechMacro(a: string, t: string) {
+export async function prepareTechMacro(a: string, t: string, rerollData?: AccDiffDataSerialized) {
   // Determine which Actor to speak as
   let actor: Actor | null = getMacroSpeaker(a);
   if (!actor) return;
@@ -1173,14 +1180,23 @@ export async function prepareTechMacro(a: string, t: string) {
   }
   console.log(`${lp} Tech Attack Macro Item:`, item, mData);
 
-  await rollTechMacro(actor, mData, item);
+  let partialMacroData = {
+    title: "Reroll tech attack",
+    fn: "prepareTechMacro",
+    args: [a, t]
+  }
+
+  await rollTechMacro(actor, mData, partialMacroData, rerollData, item);
 }
 
-async function rollTechMacro(actor: Actor, data: LancerTechMacroData, item?: LancerItem<any>, rerollData?: AccDiffData) {
+async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMacroData: LancerMacroData, rerollData?: AccDiffDataSerialized, item?: LancerItem<any>) {
   const targets = Array.from(game.user.targets);
-  const initialData = rerollData ?? AccDiffData.fromParams(item, data.tags, data.title, targets);
+  const initialData = rerollData ?
+    AccDiffData.fromObject(rerollData, item) :
+    AccDiffData.fromParams(item, data.tags, data.title, targets);
   const promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
+  partialMacroData.args.push(promptedData.toObject());
 
   let atkRolls = attackRolls(data.t_atk, promptedData);
   if (!atkRolls) return;
@@ -1195,6 +1211,7 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, item?: Lan
     action: data.action,
     effect: data.effect ? data.effect : null,
     tags: data.tags,
+    rerollMacroData: encodeMacroData(partialMacroData),
   };
 
   const template = `systems/lancer/templates/chat/tech-attack-card.hbs`;
@@ -1348,7 +1365,7 @@ export async function prepareStructureMacro(a: string) {
   await actor.structure();
 }
 
-export async function prepareActivationMacro(a: string, i: string, type: ActivationOptions, index: number) {
+export async function prepareActivationMacro(a: string, i: string, type: ActivationOptions, index: number, rerollData?: AccDiffDataSerialized) {
   // Determine which Actor to speak as
   let actor: Actor | null = getMacroSpeaker(a);
   if (!actor) return;
@@ -1378,7 +1395,12 @@ export async function prepareActivationMacro(a: string, i: string, type: Activat
         case ActivationType.FullTech:
         case ActivationType.Invade:
         case ActivationType.QuickTech:
-          _prepareTechActionMacro(actorEnt, itemEnt, index);
+          let partialMacroData = {
+            title: "Reroll activation",
+            fn: "prepareActivationMacro",
+            args: [a, i, type, index]
+          };
+          _prepareTechActionMacro(actorEnt, itemEnt, index, partialMacroData, rerollData);
           break;
         default:
           _prepareTextActionMacro(actorEnt, itemEnt, index);
@@ -1401,7 +1423,7 @@ async function _prepareTextActionMacro(actorEnt: Mech, itemEnt: MechSystem | Npc
   await renderMacroHTML(actorEnt.Flags.orig_doc, buildActionHTML(action, { full: true, tags: itemEnt.Tags }));
 }
 
-async function _prepareTechActionMacro(actorEnt: Mech, itemEnt: MechSystem | NpcFeature, index: number) {
+async function _prepareTechActionMacro(actorEnt: Mech, itemEnt: MechSystem | NpcFeature, index: number, partialMacroData: LancerMacroData, rerollData?: AccDiffDataSerialized) {
   // Support this later...
   if (itemEnt.Type !== EntryType.MECH_SYSTEM) return;
 
@@ -1435,7 +1457,7 @@ async function _prepareTechActionMacro(actorEnt: Mech, itemEnt: MechSystem | Npc
     mData.detail = tData.effect ? tData.effect : "";
   } */
 
-  await rollTechMacro(actorEnt.Flags.orig_doc, mData);
+  await rollTechMacro(actorEnt.Flags.orig_doc, mData, partialMacroData, rerollData);
 }
 
 async function _prepareDeployableMacro(actorEnt: Mech, itemEnt: MechSystem | NpcFeature, index: number) {
diff --git a/src/templates/chat/tech-attack-card.hbs b/src/templates/chat/tech-attack-card.hbs
index d4b4aeadf..7c72654e1 100644
--- a/src/templates/chat/tech-attack-card.hbs
+++ b/src/templates/chat/tech-attack-card.hbs
@@ -2,6 +2,9 @@
   <div class="lancer-header tech medium">
     <i class="cci cci-tech-quick i--m i--light"> </i>
     <span>TECH ATK{{#if title}} :: {{title}}{{/if}}</span>
+    <a class="chat-button roll-attack lancer-macro" data-macro="{{rerollMacroData}}" title="Reroll this attack">
+      <i class="fas fa-dice-d20 i--m i--light"></i>
+    </a>
   </div>
   <div class="card clipped">
     <div class="lancer-mini-header collapse-trigger" data-collapse-id="{{_uuid}}-attacks">

From 62fa8c603db9aacc393fb3246b199a285cc0b8b7 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 4 Aug 2021 19:03:33 -0700
Subject: [PATCH 44/88] dynamically import everything under accdiff as needed

---
 src/module/macros.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/module/macros.ts b/src/module/macros.ts
index 673733105..1b2cc5c80 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -51,7 +51,7 @@ import { buildActionHTML, buildDeployableHTML, buildSystemHTML } from "./helpers
 import { ActivationOptions, StabOptions1, StabOptions2 } from "./enums";
 import { applyCollapseListeners, uuid4 } from "./helpers/collapse";
 import { checkForHit } from "./helpers/automation/targeting";
-import { AccDiffForm, AccDiffData, AccDiffDataSerialized } from "./helpers/acc_diff";
+import type { AccDiffForm, AccDiffData, AccDiffDataSerialized } from "./helpers/acc_diff";
 import { is_overkill } from "machine-mind/dist/funcs";
 
 const lp = LANCER.log_prefix;
@@ -554,6 +554,7 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
   if (!actor) return Promise.resolve();
 
   // Get accuracy/difficulty with a prompt
+  let { AccDiffData } = await import('./helpers/acc_diff');
   let initialData = AccDiffData.fromParams();
   let promptedData = await promptAccDiffModifiers(initialData);
   if (!promptedData) return;
@@ -614,6 +615,7 @@ export async function prepareEncodedAttackMacro(
     ui.notifications.error("Could not find weapon to reroll");
     return;
   }
+  let { AccDiffData } = await import('./helpers/acc_diff');
   let accdiff = AccDiffData.fromObject(rerollData, item);
   return prepareAttackMacro({ actor, item, options }, accdiff);
 }
@@ -760,6 +762,7 @@ async function prepareAttackMacro({
 
   // Prompt the user before deducting charges.
   const targets = Array.from(game.user.targets);
+  let { AccDiffData } = await import('./helpers/acc_diff');
   const initialData = rerollData ?? AccDiffData.fromParams(
     item, mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
   const promptedData = await promptAccDiffModifiers(initialData);
@@ -1182,6 +1185,7 @@ export async function prepareTechMacro(a: string, t: string, rerollData?: AccDif
 
 async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMacroData: LancerMacroData, rerollData?: AccDiffDataSerialized, item?: LancerItem<any>) {
   const targets = Array.from(game.user.targets);
+  let { AccDiffData } = await import('./helpers/acc_diff');
   const initialData = rerollData ?
     AccDiffData.fromObject(rerollData, item) :
     AccDiffData.fromParams(item, data.tags, data.title, targets);
@@ -1210,6 +1214,7 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
 }
 
 export async function promptAccDiffModifiers(data: AccDiffData): Promise<AccDiffData | null> {
+  let { AccDiffForm } = await import('./helpers/acc_diff');
   let form = new AccDiffForm(data);
   form.render(true);
   try {

From 78c23d5647063bb3e2398e97ce9ca00c06075eaa Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 3 Aug 2021 19:52:07 -0700
Subject: [PATCH 45/88] add svelte to the build

---
 package.json      | 7 +++++++
 svelte.config.cjs | 7 +++++++
 tsconfig.json     | 7 +++++--
 vite.config.ts    | 4 ++++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 svelte.config.cjs

diff --git a/package.json b/package.json
index 8dbe59856..700da21f4 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,9 @@
   "license": "",
   "devDependencies": {
     "@league-of-foundry-developers/foundry-vtt-types": "^0.7.9-6",
+    "@pyoner/svelte-types": "^3.4.4-2",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.15",
+    "@tsconfig/svelte": "^2.0.1",
     "archiver": "^3.1.1",
     "chalk": "^3.0.0",
     "foundry-pc-types": "gitlab:Eranziel/foundry-pc-types",
@@ -30,6 +33,10 @@
     "prettier": "2.0.5",
     "rollup-plugin-visualizer": "^5.5.2",
     "sass": "^1.35.2",
+    "svelte": "^3.41.0",
+    "svelte-check": "^2.2.4",
+    "svelte-language-server": "^0.14.5",
+    "svelte-preprocess": "^4.7.4",
     "tslib": "^1.14.1",
     "typescript": "^4.3.2",
     "vite": "^2.5.0",
diff --git a/svelte.config.cjs b/svelte.config.cjs
new file mode 100644
index 000000000..85b6ce495
--- /dev/null
+++ b/svelte.config.cjs
@@ -0,0 +1,7 @@
+const sveltePreprocess = require('svelte-preprocess');
+
+module.exports = {
+  // Consult https://github.com/sveltejs/svelte-preprocess
+  // for more information about preprocessors
+  preprocess: sveltePreprocess()
+};
diff --git a/tsconfig.json b/tsconfig.json
index 81e92bc34..7343d1023 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "extends": "@tsconfig/svelte/tsconfig.json",
   "compilerOptions": {
     "target": "esnext",
     "experimentalDecorators": true,
@@ -10,14 +11,16 @@
       "ESNext"
     ],
     "types": [
-      "foundry-pc-types"
+      "foundry-pc-types",
+      "@pyoner/svelte-types"
     ],
     "moduleResolution": "node",
     "esModuleInterop": true,
     "noEmit": true,
     "strict": true,
     "useDefineForClassFields": false,
+    "importsNotUsedAsValues": "remove",
     "skipLibCheck": true
   },
-  "include": ["./src"]
+  "include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.js", "src/**/*.svelte"]
 }
diff --git a/vite.config.ts b/vite.config.ts
index a9c6bd862..1318826c5 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,4 +1,5 @@
 import type { UserConfig } from 'vite';
+import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { visualizer } from 'rollup-plugin-visualizer';
 const path = require('path');
 
@@ -40,6 +41,9 @@ const config: UserConfig = {
     }
   },
   plugins: [
+    svelte({
+      configFile: '../svelte.config.cjs', // relative to src/
+    }),
     visualizer({
       gzipSize: true,
       template: "treemap",

From 7569acb3c89b6c64e117e4e7962e16efac22b634 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 3 Aug 2021 19:52:28 -0700
Subject: [PATCH 46/88] rewrite accdiff as a svelte component

---
 .../helpers/acc_diff/ConsumeLockOn.svelte     |  20 ++
 src/module/helpers/acc_diff/Cover.svelte      |  34 ++++
 src/module/helpers/acc_diff/Form.svelte       | 175 ++++++++++++++++++
 src/module/helpers/acc_diff/Plugin.svelte     |  12 ++
 .../helpers/acc_diff/PlusMinusInput.svelte    |  14 ++
 src/module/helpers/acc_diff/Total.svelte      |  83 +++++++++
 src/module/helpers/acc_diff/index.ts          |  52 ++----
 src/module/helpers/svelte-application.ts      |  51 +++++
 8 files changed, 400 insertions(+), 41 deletions(-)
 create mode 100644 src/module/helpers/acc_diff/ConsumeLockOn.svelte
 create mode 100644 src/module/helpers/acc_diff/Cover.svelte
 create mode 100644 src/module/helpers/acc_diff/Form.svelte
 create mode 100644 src/module/helpers/acc_diff/Plugin.svelte
 create mode 100644 src/module/helpers/acc_diff/PlusMinusInput.svelte
 create mode 100644 src/module/helpers/acc_diff/Total.svelte
 create mode 100644 src/module/helpers/svelte-application.ts

diff --git a/src/module/helpers/acc_diff/ConsumeLockOn.svelte b/src/module/helpers/acc_diff/ConsumeLockOn.svelte
new file mode 100644
index 000000000..b9689660c
--- /dev/null
+++ b/src/module/helpers/acc_diff/ConsumeLockOn.svelte
@@ -0,0 +1,20 @@
+<script lang="ts">
+ export let lockOn: {
+   consumeLockOn: boolean,
+   usingLockOn: any | null,
+   lockOnAvailable: any | null
+ };
+ export let visible: boolean = true;
+ export let id: string = '';
+
+ function handleClick(e: { currentTarget: HTMLInputElement}) {
+   lockOn.consumeLockOn = e.currentTarget.checked;
+ }
+</script>
+
+<input type="checkbox" class:invisible={!visible} id={id}
+             checked={!!lockOn.usingLockOn} on:input={handleClick} disabled={!lockOn.lockOnAvailable} />
+
+<style>
+ input.invisible { display: none }
+</style>
diff --git a/src/module/helpers/acc_diff/Cover.svelte b/src/module/helpers/acc_diff/Cover.svelte
new file mode 100644
index 000000000..bf5a33499
--- /dev/null
+++ b/src/module/helpers/acc_diff/Cover.svelte
@@ -0,0 +1,34 @@
+<script context="module">
+ let counter = 0;
+</script>
+
+<script lang="ts">
+ import type { Cover } from './index';
+ export let cover: Cover;
+ export let disabled: boolean = false;
+ export let labelClass: string = '';
+ let klass: string = ''; export { klass as class };
+
+ let id = `accdiff-cover-input-${counter++}`;
+
+  let inputs = [
+    { slug: "no", human: "No Cover", value: 0 },
+    { slug: "soft", human: "Soft Cover (-1)", value: 1 },
+    { slug: "hard", human: "Hard Cover (-2)", value: 2 },
+  ];
+</script>
+
+<div class="lancer-cover-radio {klass}" class:disabled={disabled}>
+  {#each inputs as input}
+    <input type="radio" id="{id}-{input.slug}" class="no-grow {input.slug}-cover"
+           bind:group={cover} value={input.value} disabled={disabled} />
+    <label for="{id}-{input.slug}" class="lancer-cover-radio-label {labelClass}">
+      <i class="cci-{input.slug}-cover i--s" title={input.human}></i>
+      <span class="no-grow">{input.human}</span>
+    </label>
+  {/each}
+</div>
+
+<style>
+ i { border: none }
+</style>
diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
new file mode 100644
index 000000000..98e3f9e21
--- /dev/null
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -0,0 +1,175 @@
+<script lang="ts">
+ import type { AccDiffWeapon, AccDiffBase, AccDiffTarget } from './index';
+ import { createEventDispatcher } from 'svelte';
+
+ import Plugin from './Plugin.svelte';
+ import Cover from './Cover.svelte';
+ import ConsumeLockOn from './ConsumeLockOn.svelte';
+ import Total from './Total.svelte';
+ import PlusMinusInput from './PlusMinusInput.svelte';
+
+ export let weapon: AccDiffWeapon;
+ export let base: AccDiffBase;
+ export let targets: AccDiffTarget[];
+
+ // unused data — this suppresses the svelte-check warnings
+ // unfortunately this generates runtime warnings in dev-mode
+ // it's not currently possible to suppress both of those
+ export const title: any = undefined;
+ export const lancerItem: any = undefined;
+
+ let baseTotalId: string;
+ let targetTotalIds: string[] = [];
+
+ // tell svelte of externally computed dependency arrows
+ $: {
+   // i.e., base depends on weapon
+   weapon;
+   base = base;
+ };
+
+ $: {
+   // i.e., targets depend on weapon and base
+   weapon;
+   base;
+   targets = targets;
+ }
+
+ const dispatch = createEventDispatcher();
+</script>
+
+<form id="accdiff" on:submit={e => {e.preventDefault(); dispatch('submit')}}>
+  <div id="accdiff-dialog" style="padding:4px">
+    <div class="accdiff-grid">
+      <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;">
+        <h3>
+          <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
+          Accuracy
+        </h3>
+        <label class="container">
+          Accurate (+1)
+          <input type="checkbox" bind:checked={weapon.accurate} />
+          <span class="checkmark"></span>
+        </label>
+        <label class="container">
+          Seeking (*)
+          <input type="checkbox" bind:checked={weapon.seeking} />
+          <span class="checkmark"></span>
+        </label>
+        {#each Object.keys(weapon.plugins) as key}
+          <Plugin bind:data={weapon.plugins[key]} />
+        {/each}
+        {#if targets.length == 1}
+          <label class="container" for="base-consume-lockon">
+            Consume Lock On (+1)
+            <ConsumeLockOn bind:lockOn={targets[0]} id="base-consume-lockon" />
+            <span class="checkmark"></span>
+          </label>
+          {#each Object.keys(targets[0].plugins) as key}
+            <Plugin bind:data={targets[0].plugins[key]} />
+          {/each}
+        {/if}
+      </div>
+      <div style="width:100%;padding:4px;">
+        <h3>
+          <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
+          Difficulty
+        </h3>
+        <label class="container">
+          Inaccurate (-1)
+          <input type="checkbox" bind:checked={weapon.inaccurate} />
+          <span class="checkmark"></span>
+        </label>
+        <label class="container">
+          Impaired (-1)
+          <input type="checkbox" checked={!!weapon.impaired} disabled />
+          <span class="checkmark"></span>
+        </label>
+        {#if targets.length == 0}
+          <Cover bind:cover={base.cover} class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
+        {:else if targets.length == 1}
+          <Cover bind:cover={targets[0].cover} class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
+        {/if}
+      </div>
+    </div>
+    <label class="flexrow accdiff-footer accdiff-weight" for="accdiff-other-sources">
+      Other Sources
+    </label>
+    <div id="accdiff-other-sources" class="accdiff-grid">
+      <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
+        <PlusMinusInput bind:value={base.accuracy} id="accdiff-other-acc" />
+      </div>
+      <div class="accdiff-other-grid">
+        <PlusMinusInput bind:value={base.difficulty} id="accdiff-other-diff" />
+      </div>
+    </div>
+    {#if targets.length == 0}
+      <label class="flexrow accdiff-footer accdiff-weight" for={baseTotalId}>
+        Total
+      </label>
+      <Total bind:target={base} bind:id={baseTotalId} />
+    {:else if targets.length == 1}
+      <label class="flexrow accdiff-footer accdiff-weight" for={baseTotalId}>
+        Total vs {targets[0].target.data.name}
+      </label>
+      <div class="flexrow flex-center lancer-consume-lockon">
+        <Total bind:target={targets[0]} bind:id={baseTotalId} onlyTarget={true}/>
+      </div>
+    {:else}
+      <div class="accdiff-footer accdiff-weight accdiff-target-row">
+        {#each targets as data, index}
+          <div class="flexcol card accdiff-target">
+            <label class="flexrow flex-center card" for={targetTotalIds[index]}>
+              {data.target.data.name}
+            </label>
+            <div class="flexrow lancer-consume-lockon">
+              <ConsumeLockOn bind:lockOn={data} />
+              <Total bind:target={data} bind:id={targetTotalIds[index]} />
+            </div>
+            <div class="flexrow">
+              <button
+                class="i--m no-grow"
+                type="button"
+                on:click={() => data.accuracy = data.accuracy + 1}
+              >
+                <i class="cci cci-accuracy i--m" style="border:none"></i>
+              </button>
+              <input
+                style="display: none"
+                type="number"
+                bind:value={data.accuracy}
+                min="0"
+                />
+              <Cover bind:cover={data.cover} disabled={weapon.seeking}
+                          class="accdiff-targeted-cover flexrow flex-center" labelClass="i--s" />
+              <input
+                style="display: none"
+                type="number"
+                bind:value={data.difficulty}
+                min="0"
+              />
+              <button
+                class="i--m no-grow"
+                type="button"
+                on:click={() => data.difficulty = data.difficulty + 1}
+              >
+                <i class="cci cci-difficulty i--m" style="border:none"></i>
+              </button>
+            </div>
+          </div>
+        {/each}
+      </div>
+    {/if}
+  </div>
+  <div class="dialog-buttons flexrow">
+    <button class="dialog-button submit default" data-button="submit" type="submit">
+      <i class="fas fa-check"></i>
+      Roll
+    </button>
+    <button class="dialog-button cancel"
+            data-button="cancel" type="button" on:click={() => dispatch('cancel')}>
+      <i class="fas fa-times"></i>
+      Cancel
+    </button>
+  </div>
+</form>
diff --git a/src/module/helpers/acc_diff/Plugin.svelte b/src/module/helpers/acc_diff/Plugin.svelte
new file mode 100644
index 000000000..3836a3d8a
--- /dev/null
+++ b/src/module/helpers/acc_diff/Plugin.svelte
@@ -0,0 +1,12 @@
+<script lang="ts">
+ import type { AccDiffPluginData } from './plugin';
+ export let data: AccDiffPluginData;
+</script>
+
+{#if data.uiElement == "checkbox" && data.visible}
+  <label class="container">
+    {data.humanLabel}
+    <input type="checkbox" bind:checked={data.uiState} disabled={data.disabled} />
+    <span class="checkmark"></span>
+  </label>
+{/if}
diff --git a/src/module/helpers/acc_diff/PlusMinusInput.svelte b/src/module/helpers/acc_diff/PlusMinusInput.svelte
new file mode 100644
index 000000000..e1296302a
--- /dev/null
+++ b/src/module/helpers/acc_diff/PlusMinusInput.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+  export let value: number = 0;
+  export let id: string;
+</script>
+
+<button class="mod-minus-button dec-set" type="button" on:click={() => value = value - 1}>
+  -
+</button>
+<input id={id} class="difficulty lancer-invisible-input dec-set"
+       style="max-width: 2em;text-align: center;font-size: 1.2em"
+       type="number" bind:value={value} min="0" />
+<button class="mod-plus-button dec-set" type="button" on:click={() => value = value + 1}>
+  +
+</button>
diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
new file mode 100644
index 000000000..00f88a387
--- /dev/null
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -0,0 +1,83 @@
+<script context="module">
+ let lockonCounter = 0;
+ let counter = 0;
+</script>
+
+<script lang="ts">
+ import type { AccDiffBase, AccDiffTarget } from './index';
+
+ import { onMount } from 'svelte';
+ import tippy from "tippy.js";
+
+ import Plugin from './Plugin.svelte';
+ import ConsumeLockOn from './ConsumeLockOn.svelte';
+
+ export let target: AccDiffBase | AccDiffTarget;
+ export let onlyTarget: boolean = false;
+
+ function isTarget(v: any): v is AccDiffTarget {
+   return v?.target;
+ }
+
+ export const id = `accdiff-total-display-${counter++}`;
+ let lockonId = isTarget(target) ? `accdiff-total-display-consume-lockon-${lockonCounter++}` : '';
+
+ let imgElement: HTMLElement;
+ let dropdownElement: HTMLElement;
+
+ onMount(() => {
+   if (imgElement && dropdownElement) {
+     tippy(imgElement, {
+       content: dropdownElement,
+       interactive: true,
+       allowHTML: true,
+       trigger: 'click mouseenter',
+     });
+   }
+ })
+</script>
+
+{#if isTarget(target)}
+  <div class="accdiff-grid">
+    <img class="lancer-hit-thumb accdiff-target-has-dropdown"
+         alt={target.target.data.name}
+         src={target.target.data.img} bind:this={imgElement} />
+    <label for={lockonId} class:checked={target.usingLockOn} class:disabled={!target.lockOnAvailable}
+           title="Consume Lock On (+1)">
+      <i class="cci cci-condition-lock-on"></i>
+      <ConsumeLockOn bind:lockOn={target} visible={false} id={lockonId} />
+    </label>
+  </div>
+  {#if !onlyTarget}
+    <div class="accdiff-target-dropdown" bind:this={dropdownElement}>
+      {#each Object.keys(target.plugins) as key}
+        <Plugin bind:data={target.plugins[key]} />
+      {/each}
+    </div>
+  {/if}
+{/if}
+<div class="accdiff-grid accdiff-weight">
+  <div>
+    <div id={id} class="card clipped total" class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
+      <span>{Math.abs(target.total)}</span>
+      <i class="cci i--m i--dark white--text middle"
+         class:cci-accuracy={target.total >= 0}
+         class:cci-difficulty={target.total < 0} ></i>
+    </div>
+  </div>
+</div>
+
+<style>
+ .total {
+     background-color: #443c3c;
+ }
+ .total.accurate {
+     background-color: #017934;
+ }
+ .total.inaccurate {
+     background-color: #9c0d0d
+ }
+ i {
+     border: none;
+ }
+</style>
diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index 96777c311..70a2d98a9 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -1,12 +1,12 @@
-import tippy from "tippy.js";
-import { TagInstance } from "machine-mind";
+import type { TagInstance } from "machine-mind";
 import * as t from 'io-ts';
 
-import { LancerActor, LancerActorType } from "../../actor/lancer-actor";
-import ReactiveForm from '../reactive-form';
-import { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
+import SvelteApp from "../svelte-application";
+import AccDiffSvelte from "./Form.svelte";
+import type { LancerActor, LancerActorType } from "../../actor/lancer-actor";
+import type { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
 import { enclass, encode, decode } from './serde';
-import { LancerItem } from "../../item/lancer-item";
+import type { LancerItem } from "../../item/lancer-item";
 
 import Invisibility from "./invisibility";
 import Spotter from "./spotter";
@@ -18,7 +18,7 @@ export function findEffect(actor: LancerActor<LancerActorType>, effect: string):
   return actor.data.effects.find(eff => eff.data.flags.core.statusId == effect);
 }
 
-enum Cover {
+export enum Cover {
   None = 0,
   Soft = 1,
   Hard = 2
@@ -28,7 +28,7 @@ let coverSchema = t.union([t.literal(0), t.literal(1), t.literal(2)]);
 // so normally you wouldn't keep the codecs with the classes like this
 // the entire point of io-ts is that the co/dec logic is separable
 // but here we want plugins to actually modify the codecs, so, sigh
-class AccDiffWeapon {
+export class AccDiffWeapon {
   accurate: boolean;
   inaccurate: boolean;
   seeking: boolean;
@@ -87,7 +87,7 @@ class AccDiffWeapon {
   }
 }
 
-class AccDiffBase {
+export class AccDiffBase {
   accuracy: number;
   difficulty: number;
   cover: Cover;
@@ -355,45 +355,15 @@ export class AccDiffData {
   }
 }
 
-type AccDiffView = AccDiffData & {
-  hasTargets: boolean,
-  hasExactlyOneTarget: boolean,
-}
-
-export class AccDiffForm extends ReactiveForm<AccDiffData, AccDiffView> {
+export class AccDiffForm extends SvelteApp<AccDiffData> {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
-      template: "systems/lancer/templates/window/acc_diff.hbs",
       resizable: false,
     });
   }
 
   constructor(data: AccDiffData) {
-    super(data, { title: data.title })
-  }
-
-  activateListeners(html: JQuery) {
-    for (let elem of html.find('.accdiff-target-has-dropdown')) {
-      const id = elem.getAttribute('data-template');
-      const tooltip = document.getElementById(id!);
-      if (tooltip) {
-        tippy(elem, {
-          content: tooltip,
-          interactive: true,
-          allowHTML: true,
-          trigger: 'click mouseenter',
-        });
-      }
-    }
-
-    return super.activateListeners(html);
-  }
-
-  getViewModel(data: AccDiffData): AccDiffView {
-    let ret = data as AccDiffView; // view elements haven't been set yet
-    ret.hasTargets = ret.targets.length > 1;
-    ret.hasExactlyOneTarget = ret.targets.length == 1;
-    return ret
+    super(AccDiffSvelte, data, { title: data.title })
   }
 }
 
diff --git a/src/module/helpers/svelte-application.ts b/src/module/helpers/svelte-application.ts
new file mode 100644
index 000000000..d49f1a786
--- /dev/null
+++ b/src/module/helpers/svelte-application.ts
@@ -0,0 +1,51 @@
+import type SvelteComponent from '*.svelte';
+
+export default class SvelteApp<DataModel> extends Application {
+  klass: typeof SvelteComponent;
+  data: DataModel;
+  component!: any;
+
+  #resolve: ((data: DataModel) => void) | null = null;
+  #reject: ((v: void) => void) | null = null;
+  promise: Promise<DataModel>;
+
+  constructor(App: typeof SvelteComponent, data: DataModel, options: ApplicationOptions) {
+    super(options);
+    this.promise = new Promise((resolve, reject) => {
+      this.#resolve = resolve;
+      this.#reject = reject;
+    })
+    this.data = data;
+    this.klass = App;
+  }
+
+  activateListeners(html: JQuery) {
+    this.component = new this.klass({
+      target: html.get(0),
+      props: this.data,
+    });
+    this.component.$on('submit', (_e: Event) => {
+      if (this.#resolve) {
+        this.#resolve(this.data);
+        this.#reject = null;
+      }
+      return this.close();
+    });
+    this.component.$on('cancel', (_e: Event) => {
+      return this.close();
+    });
+  }
+
+  close() {
+    if (this.#reject) {
+      this.#reject();
+      this.#resolve = null;
+    }
+    return super.close();
+  }
+
+  async _renderInner(_data: any) {
+    return $('<div></div>');
+  }
+
+}

From 5afbf3e03c992b2dffc0c85f61c7f45cd37bf81c Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 4 Aug 2021 18:40:11 -0700
Subject: [PATCH 47/88] move css into the svelte components, to scope them as
 possible

---
 src/lancer.scss                               | 231 ------------------
 .../helpers/acc_diff/ConsumeLockOn.svelte     |   7 +-
 src/module/helpers/acc_diff/Cover.svelte      |  40 +++
 src/module/helpers/acc_diff/Form.svelte       | 124 +++++++++-
 src/module/helpers/acc_diff/Total.svelte      |  85 +++++--
 5 files changed, 236 insertions(+), 251 deletions(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index 7021ea6f6..399ca1f5b 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2013,145 +2013,6 @@ a.action {
   }
 }
 
-.accdiff-target-row .tippy-box[data-theme~="lancer"] {
-  font-size: 0.8em;
-  padding-left: 0px;
-  padding-right: 0px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  transform: none;
-  .tippy-content {
-    transform: none;
-    .container {
-      margin: 0px;
-    }
-    .checkmark {
-      height: 12px;
-    }
-  }
-}
-
-// Acc_Diff
-.accdiff-grid {
-  display: flex;
-  justify-content: space-between;
-
-  .container {
-    display: flex;
-    position: relative;
-    padding-left: 30px;
-    margin-top: 12px;
-    margin-bottom: 4px;
-    font-size: 0.9em;
-    user-select: none;
-    align-items: center;
-  }
-
-  /* Hide the browser's default checkbox */
-  .container input {
-    position: absolute;
-    opacity: 0 !important;
-    height: 0;
-    width: 0;
-  }
-
-  .checkmark {
-    position: absolute;
-    left: 5px;
-    height: 20px;
-    width: 20px;
-    background-color: #a9a9a9;
-    cursor: pointer;
-  }
-
-  input[disabled] ~ .checkmark {
-    opacity: 0.5;
-    cursor: unset;
-  }
-
-  .container:hover input:not([disabled]) ~ .checkmark {
-    background-color: #757575;
-  }
-
-  .container input:checked ~ .checkmark {
-    background-color: var(--main-theme-color, fuchsia);
-  }
-
-  .checkmark:after {
-    content: "";
-    position: absolute;
-    display: none;
-  }
-  .container input:checked ~ .checkmark:after {
-    display: block;
-  }
-
-  .card.clipped {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    padding: 8px 8px 8px 16px;
-    background-color: var(--main-theme-color, fuchsia);
-    color: white;
-    width: fit-content;
-  }
-}
-
-.accdiff-other-grid {
-  width: 100%;
-  padding-left: 5px;
-  display: flex;
-  justify-content: center;
-}
-
-.accdiff-weight {
-  justify-content: center;
-  font-weight: bold;
-}
-
-.accdiff-footer {
-  padding-top: 8px;
-  padding-bottom: 4px;
-  margin-top: 12px;
-  border-top: 1px solid #782e22;
-}
-
-.accdiff-base-cover {
-  margin-top: 12px;
-  margin-bottom: 4px;
-  font-size: 0.9em;
-  user-select: none;
-  padding-left: 5px;
-  line-height: 2;
-}
-
-.accdiff-targeted-cover label span {
-  opacity: 0;
-  position: fixed;
-  width: 0;
-  visibility: hidden;
-}
-
-.accdiff-targeted-cover label > i {
-  font-size: 16px;
-  vertical-align: top;
-}
-
-.accdiff-base-cover label > i {
-  vertical-align: baseline;
-}
-
-// there's a very specific foundry rule that adds some margin here
-// because it assumes all icons in buttons are followed by text, I think
-.accdiff-target-row button > i {
-  margin-inline-end: 0 !important; 
-}
-
-.accdiff-target {
-  padding: 4px;
-}
-
-
 // V-IMPORTS
 .white--text {
   color: #fff !important;
@@ -2236,87 +2097,6 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   align-self: center;
 }
 
-.accdiff-target-row {
-  display: grid;
-  grid-template-columns: auto auto auto;
-}
-
-#accdiff .lancer-hit-thumb {
-  margin-right: 0px;
-  margin-left: 4px;
-  margin-bottom: 4px;
-}
-
-.lancer-cover-radio input[type="radio"] {
-  opacity: 0;
-  position: fixed;
-  width: 0;
-}
-
-.lancer-cover-radio label {
-  display: inline-block;
-  padding-left: 5px;
-}
-.lancer-cover-radio.flexrow label {
-  padding: 0px;
-}
-
-
-.lancer-cover-radio:not(.disabled) label:hover {
-  background-color: #dfd;
-}
-
-.lancer-cover-radio input[type="radio"]:checked + label {
-  background-color: #ddd;
-  .card & {
-    background-color: #aaa;
-  }
-}
-
-@keyframes lockon {
-  70% {
-    text-shadow: 0 0 8px lightgreen;
-  }
-  80% {
-    text-shadow: 0 0 8px green;
-  }
-  90% {
-    text-shadow: 0 0 8px lightgreen;
-  }
-}
-
-.lancer-consume-lockon  {
-  flex-wrap: nowrap;
-  padding: 4px 10px 4px 10px;
-
-  & .accdiff-grid {
-    position: relative;
-  }
-  // needed to override a builtin that wants to style all checkboxes
-  & input[type="checkbox"] {
-    opacity: 0 !important;
-    position: absolute !important;
-    width: 0 !important;
-  }
-  & [for] {
-    position: absolute;
-    right: -4px;
-    top: -4px;
-    & i {
-      @include icon-size(24px);
-      text-shadow: 0 0 12px white;
-    }
-    &.checked i {
-      @include icon-size(36px);
-      animation: lockon 800ms linear 1s infinite alternate;
-    }
-  }
-}
-
-.lancer-cover-radio.disabled, .lancer-consume-lockon .disabled {
-  opacity: 0.4;
-}
-
 // needed to override a builtin that removes all shadows from the sidebar
 #sidebar a.chat-button:hover {
   text-shadow: 0 0 8px red;
@@ -2335,17 +2115,6 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   }
 }
 
-
-.cci-no-cover:before {
-  content: '\25cb';
-}
-.cci-soft-cover:before {
-  content: '\25d1';
-}
-.cci-hard-cover:before {
-  content: '\25cf';
-}
-
 .disabled-cloud {
   color: lightgray;
   pointer-events: none;
diff --git a/src/module/helpers/acc_diff/ConsumeLockOn.svelte b/src/module/helpers/acc_diff/ConsumeLockOn.svelte
index b9689660c..da76dc3f5 100644
--- a/src/module/helpers/acc_diff/ConsumeLockOn.svelte
+++ b/src/module/helpers/acc_diff/ConsumeLockOn.svelte
@@ -16,5 +16,10 @@
              checked={!!lockOn.usingLockOn} on:input={handleClick} disabled={!lockOn.lockOnAvailable} />
 
 <style>
- input.invisible { display: none }
+ input.invisible {
+     display: none;
+     opacity: 0;
+     position: absolute;
+     width: 0;
+ }
 </style>
diff --git a/src/module/helpers/acc_diff/Cover.svelte b/src/module/helpers/acc_diff/Cover.svelte
index bf5a33499..bef1ea300 100644
--- a/src/module/helpers/acc_diff/Cover.svelte
+++ b/src/module/helpers/acc_diff/Cover.svelte
@@ -31,4 +31,44 @@
 
 <style>
  i { border: none }
+
+ input {
+     opacity: 0;
+     position: fixed;
+     width: 0;
+ }
+
+ label {
+     display: inline-block;
+     padding-left: 5px;
+ }
+ .flexrow label {
+     padding: 0px;
+ }
+
+ div:not(.disabled) label:hover {
+     background-color: #dfd;
+ }
+
+ .card input:checked + label {
+     background-color: #aaa;
+ }
+
+ input:checked + label {
+     background-color: #ddd;
+ }
+
+ .disabled {
+     opacity: 0.4;
+ }
+
+ .cci-no-cover:before {
+     content: '\25cb';
+ }
+ .cci-soft-cover:before {
+     content: '\25d1';
+ }
+ .cci-hard-cover:before {
+     content: '\25cf';
+ }
 </style>
diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 98e3f9e21..9be7a7192 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -112,7 +112,7 @@
       <label class="flexrow accdiff-footer accdiff-weight" for={baseTotalId}>
         Total vs {targets[0].target.data.name}
       </label>
-      <div class="flexrow flex-center lancer-consume-lockon">
+      <div class="flexrow flex-center accdiff-total">
         <Total bind:target={targets[0]} bind:id={baseTotalId} onlyTarget={true}/>
       </div>
     {:else}
@@ -122,8 +122,8 @@
             <label class="flexrow flex-center card" for={targetTotalIds[index]}>
               {data.target.data.name}
             </label>
-            <div class="flexrow lancer-consume-lockon">
-              <ConsumeLockOn bind:lockOn={data} />
+            <div class="flexrow accdiff-total">
+              <ConsumeLockOn bind:lockOn={data} visible={false} />
               <Total bind:target={data} bind:id={targetTotalIds[index]} />
             </div>
             <div class="flexrow">
@@ -173,3 +173,121 @@
     </button>
   </div>
 </form>
+
+<style>
+  :global(.accdiff-grid) {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  #accdiff :global(.container) {
+    display: flex;
+    position: relative;
+    padding-left: 30px;
+    margin-top: 12px;
+    margin-bottom: 4px;
+    font-size: 0.9em;
+    user-select: none;
+    align-items: center;
+  }
+
+  /* Hide the browser's default checkbox */
+  #accdiff :global(.container input) {
+    position: absolute;
+    opacity: 0 !important;
+    height: 0;
+    width: 0;
+  }
+
+  #accdiff :global(.checkmark) {
+    position: absolute;
+    left: 5px;
+    height: 20px;
+    width: 20px;
+    background-color: #a9a9a9;
+    cursor: pointer;
+  }
+
+  #accdiff :global(input[disabled] ~ .checkmark) {
+    opacity: 0.5;
+    cursor: unset;
+  }
+
+  #accdiff :global(.container:hover input:not([disabled]) ~ .checkmark) {
+    background-color: #757575;
+  }
+
+  #accdiff :global(.container input:checked ~ .checkmark) {
+    background-color: var(--main-theme-color, fuchsia);
+  }
+
+  #accdiff :global(.checkmark:after) {
+    content: "";
+    position: absolute;
+    display: none;
+  }
+  #accdiff :global(.container input:checked ~ .checkmark:after) {
+    display: block;
+  }
+
+  .accdiff-other-grid {
+    width: 100%;
+    padding-left: 5px;
+    display: flex;
+    justify-content: center;
+  }
+  :global(.accdiff-weight) {
+    justify-content: center;
+    font-weight: bold;
+  }
+  .accdiff-footer {
+    padding-top: 8px;
+    padding-bottom: 4px;
+    margin-top: 12px;
+    border-top: 1px solid #782e22;
+  }
+
+  .accdiff-grid :global(.accdiff-base-cover) {
+    margin-top: 12px;
+    margin-bottom: 4px;
+    font-size: 0.85em;
+    user-select: none;
+    padding-left: 5px;
+    line-height: 2;
+    cursor: pointer;
+  }
+  .accdiff-grid :global(.accdiff-base-cover i) {
+    vertical-align: baseline;
+  }
+
+  .accdiff-footer :global(.accdiff-targeted-cover span) {
+    opacity: 0;
+    position: fixed;
+    width: 0;
+    visibility: hidden;
+  }
+  .accdiff-footer :global(.accdiff-targeted-cover i) {
+    font-size: 16px;
+    vertical-align: top;
+  }
+
+  /* there's a very specific foundry rule that adds some margin here
+     because it assumes all icons in buttons are followed by text, I think */
+  #accdiff .accdiff-target-row button > i {
+    margin-inline-end: 0;
+  }
+
+  .accdiff-target-row {
+    display: grid;
+    grid-template-columns: auto auto auto;
+  }
+
+  .accdiff-target {
+    padding: 4px;
+  }
+
+  .accdiff-total  {
+    flex-wrap: nowrap;
+    padding: 4px 10px 4px 10px;
+  }
+</style>
diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
index 00f88a387..f945d0d3d 100644
--- a/src/module/helpers/acc_diff/Total.svelte
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -44,7 +44,11 @@
          src={target.target.data.img} bind:this={imgElement} />
     <label for={lockonId} class:checked={target.usingLockOn} class:disabled={!target.lockOnAvailable}
            title="Consume Lock On (+1)">
-      <i class="cci cci-condition-lock-on"></i>
+      <i class="cci cci-condition-lock-on"
+         class:i--click={target.lockOnAvailable}
+         class:i--sm={!target.usingLockOn}
+         class:i--l={target.usingLockOn}
+         ></i>
       <ConsumeLockOn bind:lockOn={target} visible={false} id={lockonId} />
     </label>
   </div>
@@ -57,27 +61,76 @@
   {/if}
 {/if}
 <div class="accdiff-grid accdiff-weight">
-  <div>
-    <div id={id} class="card clipped total" class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
-      <span>{Math.abs(target.total)}</span>
-      <i class="cci i--m i--dark white--text middle"
-         class:cci-accuracy={target.total >= 0}
-         class:cci-difficulty={target.total < 0} ></i>
-    </div>
+  <div id={id} class="card clipped total" class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
+    <span>{Math.abs(target.total)}</span>
+    <i class="cci i--m i--dark white--text middle"
+       class:cci-accuracy={target.total >= 0}
+       class:cci-difficulty={target.total < 0} ></i>
   </div>
 </div>
 
 <style>
- .total {
-     background-color: #443c3c;
+ i { border: none; }
+
+ .accdiff-grid { position: relative }
+ .card.clipped {
+     display: flex;
+     flex-direction: row;
+     align-items: center;
+     padding: 8px 8px 8px 16px;
+     background-color: var(--main-theme-color, fuchsia);
+     color: white;
+     width: fit-content;
+ }
+ .card.total { background-color: #443c3c; }
+ .card.total.accurate { background-color: #017934; }
+ .card.total.inaccurate { background-color: #9c0d0d }
+ .disabled { opacity: 0.4; }
+ .lancer-hit-thumb {
+     margin-right: 0px;
+     margin-left: 4px;
+     margin-bottom: 4px;
+ }
+
+ label {
+     position: absolute;
+     right: -4px;
+     top: -4px;
+ }
+
+ @keyframes lockon {
+     70% {
+         text-shadow: 0 0 8px lightgreen;
+     }
+     80% {
+         text-shadow: 0 0 8px green;
+     }
+     90% {
+         text-shadow: 0 0 8px lightgreen;
+     }
+ }
+ .cci-condition-lock-on {
+     text-shadow: 0 0 12px white;
+ }
+ .cci-condition-lock-on.i--l {
+     animation: lockon 800ms linear 1s infinite alternate;
+ }
+
+ .accdiff-grid :global(.tippy-box[data-theme~="lancer"]) {
+     font-size: 0.8em;
+     padding-left: 0px;
+     padding-right: 0px;
+     padding-top: 4px;
+     padding-bottom: 4px;
+     transform: none;
  }
- .total.accurate {
-     background-color: #017934;
+ .accdiff-grid :global(.tippy-box[data-theme~="lancer"] .tippy-content) {
+     transform: none;
  }
- .total.inaccurate {
-     background-color: #9c0d0d
+ .accdiff-grid :global(.tippy-box[data-theme~="lancer"] .tippy-content .container) {
+     margin: 0px;
  }
- i {
-     border: none;
+ .accdiff-grid :global(.tippy-box[data-theme~="lancer"] .tippy-content .checkmark) {
+     height: 12px;
  }
 </style>

From e8290035a2e977d7d457962e5493dc9a8fdea450 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 4 Aug 2021 20:07:33 -0700
Subject: [PATCH 48/88] remove the now-extraneous handlebars helpers/templates

---
 public/templates/window/acc_diff.hbs | 251 ---------------------------
 src/lancer.ts                        |   4 -
 src/module/helpers/commons.ts        |  67 -------
 3 files changed, 322 deletions(-)
 delete mode 100644 public/templates/window/acc_diff.hbs

diff --git a/public/templates/window/acc_diff.hbs b/public/templates/window/acc_diff.hbs
deleted file mode 100644
index 73e95ed94..000000000
--- a/public/templates/window/acc_diff.hbs
+++ /dev/null
@@ -1,251 +0,0 @@
-{{#*inline "total"}}
-  {{#if target}}
-    <div class="accdiff-grid">
-      <img class="lancer-hit-thumb accdiff-target-has-dropdown" data-template="dropdown-template-{{key}}" src="{{target.data.img}}" />
-      <label for="{{concat key '.consumeLockOn'}}"
-        class="{{#if usingLockOn}}checked{{/if}} {{#unless lockOnAvailable}}disabled{{/unless}}"
-        title="Consume Lock On (+1)">
-        <i class="cci cci-condition-lock-on" style="border:none"></i>
-      </label>
-    </div>
-  {{/if}}
-  {{{accdiff-total-display (concat key ".total")
-    id=(concat "accdiff-total-" key)
-    classes="accdiff-grid accdiff-weight"
-  }}}
-{{/inline}}
-{{#*inline "plugin"}}
-  {{#if visible}}
-    {{#if (eq uiElement "checkbox")}}
-      <label class="container">
-        {{humanLabel}}
-        <input type="checkbox"
-          name="{{key}}.uiState"
-          id="{{key}}.uiState"
-          {{checked uiState}}
-          {{#if disabled}}disabled{{/if}}
-        />
-        <span class="checkmark"></span>
-      </label>
-    {{/if}}
-  {{/if}}
-{{/inline}}
-<form id="accdiff">
-  <div id="accdiff-dialog" style="padding:4px">
-    <div class="accdiff-grid">
-      <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;">
-        <h3>
-          <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
-          Accuracy
-        </h3>
-        <label class="container">
-          Accurate (+1)
-          <input type="checkbox" name="weapon.accurate" {{checked weapon.accurate}} />
-          <span class="checkmark"></span>
-        </label>
-        <label class="container">
-          Seeking (*)
-          <input type="checkbox" name="weapon.seeking" {{checked weapon.seeking}} />
-          <span class="checkmark"></span>
-        </label>
-        {{#each weapon.plugins as |data key|}}
-          {{> plugin data key=(concat "weapon.plugins." key) visible=visible disabled=disabled uiState=uiState}}
-        {{/each}}
-        {{#if hasExactlyOneTarget}}
-          <label class="container">
-            Consume Lock On (+1)
-            <input type="checkbox"
-              name="targets.0.consumeLockOn"
-              id="targets.0.consumeLockOn"
-              {{checked targets.0.usingLockOn}}
-              {{#unless targets.0.lockOnAvailable}}disabled{{/unless}}
-            />
-            <span class="checkmark"></span>
-          </label>
-          {{#each targets.0.plugins as |data key|}}
-            {{> plugin data key=(concat "targets.0.plugins." key)  visible=visible disabled=disabled uiState=uiState}}
-          {{/each}}
-        {{/if}}
-      </div>
-      <div style="width:100%;padding:4px;">
-        <h3>
-          <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
-          Difficulty
-        </h3>
-        <label class="container">
-          Inaccurate (-1)
-          <input type="checkbox" name="weapon.inaccurate" {{checked weapon.inaccurate}} />
-          <span class="checkmark"></span>
-        </label>
-        <label class="container">
-          Impaired (-1)
-          <input type="checkbox" name="weapon.impaired" {{checked weapon.impaired}} disabled />
-          <span class="checkmark"></span>
-        </label>
-        {{#unless hasTargets}}
-          {{#if hasExactlyOneTarget}}
-            {{{std-cover-input "targets.0.cover"
-              classes="accdiff-base-cover flexcol"
-              disabled="weapon.seeking"
-            }}}
-          {{else}}
-            {{{std-cover-input "base.cover"
-              classes="accdiff-base-cover flexcol"
-              disabled="weapon.seeking"
-            }}}
-          {{/if}}
-        {{/unless}}
-      </div>
-    </div>
-    <label class="flexrow accdiff-footer accdiff-weight">
-      Other Sources
-    </label>
-    <div class="accdiff-grid">
-      <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
-        <button
-          class="mod-minus-button dec-set"
-          type="button"
-          onclick="this.nextElementSibling.value = this.nextElementSibling.valueAsNumber - 1; this.nextElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
-        >
-          -
-        </button>
-        <input
-          id="accdiff-other-acc"
-          class="difficulty lancer-invisible-input dec-set"
-          style="max-width: 2em;text-align: center;font-size: 1.2em"
-          type="number"
-          name="base.accuracy"
-          value="{{base.accuracy}}"
-          min="0"
-        />
-        <button
-          class="mod-plus-button dec-set"
-          type="button"
-          onclick="this.previousElementSibling.value = this.previousElementSibling.valueAsNumber + 1; this.previousElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
-        >
-          +
-        </button>
-      </div>
-      <div class="accdiff-other-grid">
-        <button
-          class="mod-minus-button dec-set"
-          type="button"
-          onclick="this.nextElementSibling.value = this.nextElementSibling.valueAsNumber - 1; this.nextElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
-        >
-          -
-        </button>
-        <input
-          id="accdiff-other-diff"
-          class="difficulty lancer-invisible-input dec-set"
-          style="max-width: 2em;text-align: center;font-size: 1.2em"
-          type="number"
-          name="base.difficulty"
-          value="{{base.difficulty}}"
-          min="0"
-        />
-        <button
-          class="mod-plus-button dec-set"
-          type="button"
-          onclick="this.previousElementSibling.value = this.previousElementSibling.valueAsNumber + 1; this.previousElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
-        >
-          +
-        </button>
-      </div>
-    </div>
-    {{#unless hasTargets}}
-      <label class="flexrow accdiff-footer accdiff-weight">
-        Total {{#if hasExactlyOneTarget}} vs {{targets.0.target.data.name}}{{/if}}
-      </label>
-      {{#if hasExactlyOneTarget}}
-        <div class="flexrow flex-center lancer-consume-lockon">
-          {{> total targets.[0] key="targets.0"
-            usingLockOn=targets.[0].usingLockOn
-            lockOnAvailable=targets.[0].lockOnAvailable
-            hasExactlyOneTarget=hasExactlyOneTarget}}
-        </div>
-      {{else}}
-        {{> total base key="base"}}
-      {{/if}}
-    {{/unless}}
-    {{#if hasTargets}}
-      <div class="accdiff-footer accdiff-weight accdiff-target-row">
-        {{#each targets as |data key|}}
-          <div class="flexcol card accdiff-target">
-            <label class="flexrow flex-center card">
-              {{data.target.data.name}}
-            </label>
-            <div class="flexrow lancer-consume-lockon">
-              <input
-                type="checkbox"
-                id="{{concat 'targets.' key '.consumeLockOn'}}"
-                name="{{concat 'targets.' key '.consumeLockOn'}}"
-                {{checked usingLockOn}}
-                {{#unless lockOnAvailable}}disabled{{/unless}}/>
-              {{> total data key=(concat "targets." key)
-                usingLockOn=data.usingLockOn lockOnAvailable=data.lockOnAvailable }}
-            </div>
-            <div class="flexrow">
-              <button
-                class="i--m no-grow"
-                type="button"
-                onclick="this.nextElementSibling.value = this.nextElementSibling.valueAsNumber + 1; this.nextElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
-              >
-                <i class="cci cci-accuracy i--m" style="border:none"></i>
-              </button>
-              <input
-                id="accdiff-other-acc-{{key}}"
-                style="display: none"
-                type="number"
-                name="targets.{{key}}.accuracy"
-                value="{{data.accuracy}}"
-                min="0"
-              />
-              {{{std-cover-input (concat "targets." key ".cover")
-                classes="accdiff-targeted-cover flexrow flex-center"
-                label_classes="i--s"
-                container_classes="f-16"
-                disabled="base.seeking"
-              }}}
-              <input
-                id="accdiff-other-diff-{{key}}"
-                style="display: none"
-                type="number"
-                name="targets.{{key}}.difficulty"
-                value="{{data.difficulty}}"
-                min="0"
-              />
-              <button
-                class="i--m no-grow"
-                type="button"
-                onclick="this.previousElementSibling.value = this.previousElementSibling.valueAsNumber + 1; this.previousElementSibling.dispatchEvent(new Event('change', {bubbles: true}))"
-              >
-                <i class="cci cci-difficulty i--m" style="border:none"></i>
-              </button>
-            </div>
-          </div>
-          {{#if ../hasTargets}}
-            <div id="dropdown-template-targets.{{key}}">
-              {{#each data.plugins as |pluginData pluginKey|}}
-                {{> plugin pluginData
-                  key=(concat "targets." key ".plugins." pluginKey)
-                  visible=pluginData.visible
-                  disabled=pluginData.disabled
-                  uiState=pluginData.uiState}}
-              {{/each}}
-            </div>
-          {{/if}}
-        {{/each}}
-      </div>
-    {{/if}}
-  </div>
-  <div class="dialog-buttons flexrow">
-    <button class="dialog-button submit default" data-button="submit" type="submit">
-      <i class="fas fa-check"></i>
-      Roll
-    </button>
-    <button class="dialog-button cancel" data-button="cancel" type="button">
-      <i class="fas fa-times"></i>
-      Cancel
-    </button>
-  </div>
-</form>
\ No newline at end of file
diff --git a/src/lancer.ts b/src/lancer.ts
index 02a815e93..1f21c89f7 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -61,8 +61,6 @@ import {
   std_password_input,
   std_num_input,
   std_checkbox,
-  std_cover_input,
-  accdiff_total_display,
 } from "./module/helpers/commons";
 import {
   weapon_size_selector,
@@ -393,8 +391,6 @@ Hooks.once("init", async function () {
   Handlebars.registerHelper("std-num-input", std_num_input);
   Handlebars.registerHelper("std-checkbox", std_checkbox);
   Handlebars.registerHelper("action-button", action_button);
-  Handlebars.registerHelper("std-cover-input", std_cover_input);
-  Handlebars.registerHelper("accdiff-total-display", accdiff_total_display);
 
   // ------------------------------------------------------------------------
   // Tag helpers
diff --git a/src/module/helpers/commons.ts b/src/module/helpers/commons.ts
index f7b09cdce..eaa54c811 100644
--- a/src/module/helpers/commons.ts
+++ b/src/module/helpers/commons.ts
@@ -505,73 +505,6 @@ async function control_structs(key: string, on: LiveEntryTypes<EntryType>): Prom
   return [false, null];
 }
 
-export function std_cover_input(path: string, options: HelperOptions) {
-  let container_classes: string = options.hash["classes"] || "";
-  let label: string = options.hash["label"] || "";
-  let label_classes: string = options.hash["label_classes"] || "";
-
-  let value: string | undefined = options.hash["value"];
-  if (value == undefined) {
-    // Resolve
-    value = (resolve_helper_dotpath(options, path) as number)?.toString() ?? 0;
-  }
-
-  let disabled: boolean = options.hash["disabled"] ? resolve_helper_dotpath(options, options.hash["disabled"]) : false;
-  let disabledStr = disabled ? "disabled" : "";
-
-  let datas = [
-    { slug: "no", human: "No Cover" },
-    { slug: "soft", human: "Soft Cover (-1)" },
-    { slug: "hard", human: "Hard Cover (-2)" },
-  ];
-
-  let inputs = [0, 1, 2].map(idx => {
-    let checked = value == idx.toString() ? "checked='true'" : "";
-    let data = datas[idx];
-    let id = `${path}-${data.slug}`;
-
-    return `<input type="radio" id="${id}" class="no-grow ${data.slug}-cover" name="${path}" value="${idx}" ${checked} data-dtype="Number" ${disabledStr} />
-      <label for="${id}" class="lancer-cover-radio-label ${label_classes}">
-      <i class="cci-${data.slug}-cover i--s" title="${data.human}" style="border:none"></i>
-      <span class="no-grow">${data.human}</span>
-      </label>`
-  });
-
-  if (label) {
-    return `<label class="lancer-cover-radio ${disabledStr} ${label_classes} ${container_classes}">
-              <span class="no-grow" style="padding: 2px 5px;">${label}</span>
-              ${inputs.join(" ")}
-            </label>`
-  } else {
-    return `<div class="lancer-cover-radio ${disabledStr} ${container_classes}">${inputs.join(" ")}</div>`;
-  }
-}
-
-export function accdiff_total_display(path: string, options: HelperOptions) {
-  let container_classes: string = options.hash["classes"] || "";
-  let id: string = options.hash["id"] || "";
-  let value: string | undefined = options.hash["value"];
-  let total = 0;
-  if (value == undefined) {
-    // Resolve
-    total = (resolve_helper_dotpath(options, path) as number) ?? 0;
-  }
-
-  let abs = Math.abs(total);
-  let color = total > 0 ? "#017934" : total < 0 ? "#9c0d0d" : "#443c3c";
-  let icon = total >= 0 ? "cci-accuracy" : "cci-difficulty"
-
-  return `
-<div class="${container_classes}">
-  <div>
-    <div class="card clipped" style="background-color: ${color}">
-      <span id="${id}">${abs}</span>
-      <i class="cci ${icon} i--m i--dark white--text" style="vertical-align:middle;border:none"></i>
-    </div>
-  </div>
-</div>`
-}
-
 // Our standardized functions for making simple key-value input pair
 // Todo - these could on the whole be a bit fancier, yeah?
 

From 8804d6439571187840879d4cae87ffac9a6c4336 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Tue, 10 Aug 2021 18:40:16 -0700
Subject: [PATCH 49/88] unnecessarily fancy transitions

---
 src/module/helpers/acc_diff/Plugin.svelte |  3 +-
 src/module/helpers/acc_diff/Total.svelte  | 35 +++++++++++++++++------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/module/helpers/acc_diff/Plugin.svelte b/src/module/helpers/acc_diff/Plugin.svelte
index 3836a3d8a..03f2cad24 100644
--- a/src/module/helpers/acc_diff/Plugin.svelte
+++ b/src/module/helpers/acc_diff/Plugin.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
+ import { slide } from 'svelte/transition';
  import type { AccDiffPluginData } from './plugin';
  export let data: AccDiffPluginData;
 </script>
 
 {#if data.uiElement == "checkbox" && data.visible}
-  <label class="container">
+  <label class="container" transition:slide>
     {data.humanLabel}
     <input type="checkbox" bind:checked={data.uiState} disabled={data.disabled} />
     <span class="checkmark"></span>
diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
index f945d0d3d..27d09dd2b 100644
--- a/src/module/helpers/acc_diff/Total.svelte
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -7,6 +7,8 @@
  import type { AccDiffBase, AccDiffTarget } from './index';
 
  import { onMount } from 'svelte';
+ import { fly, blur } from 'svelte/transition';
+
  import tippy from "tippy.js";
 
  import Plugin from './Plugin.svelte';
@@ -61,11 +63,19 @@
   {/if}
 {/if}
 <div class="accdiff-grid accdiff-weight">
-  <div id={id} class="card clipped total" class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
-    <span>{Math.abs(target.total)}</span>
-    <i class="cci i--m i--dark white--text middle"
-       class:cci-accuracy={target.total >= 0}
-       class:cci-difficulty={target.total < 0} ></i>
+  <div class="grid-enforcement">
+    {#key target.total}
+      <div id={id} transition:blur
+        class="card clipped total" class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
+        <span in:fly={{y: -50, duration: 400}} out:fly={{y: 50, duration: 200}}>
+          {Math.abs(target.total)}
+        </span>
+        <i in:fly={{y: -50, duration: 200}} out:fly={{y: 50, duration: 200}}
+          class="cci i--m i--dark white--text middle"
+          class:cci-accuracy={target.total >= 0}
+          class:cci-difficulty={target.total < 0} ></i>
+      </div>
+    {/key}
   </div>
 </div>
 
@@ -73,16 +83,24 @@
  i { border: none; }
 
  .accdiff-grid { position: relative }
+
+ /* this + the grid-column and grid-row in .card.clipped forces
+    the two cards inside it (during animations) to have the same location */
+ .grid-enforcement {
+     display: grid;
+     overflow: hidden;
+ }
  .card.clipped {
      display: flex;
      flex-direction: row;
      align-items: center;
      padding: 8px 8px 8px 16px;
-     background-color: var(--main-theme-color, fuchsia);
      color: white;
-     width: fit-content;
+     width: min-content;
+     background-color: #443c3c;
+     grid-column: 1/2;
+     grid-row: 1/2;
  }
- .card.total { background-color: #443c3c; }
  .card.total.accurate { background-color: #017934; }
  .card.total.inaccurate { background-color: #9c0d0d }
  .disabled { opacity: 0.4; }
@@ -111,6 +129,7 @@
  }
  .cci-condition-lock-on {
      text-shadow: 0 0 12px white;
+     transition: font-size 200ms;
  }
  .cci-condition-lock-on.i--l {
      animation: lockon 800ms linear 1s infinite alternate;

From 2e00a8c838c17385aafb7bb6b80db7d919932ea7 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sun, 22 Aug 2021 21:28:32 -0700
Subject: [PATCH 50/88] bugfix: actually allow id to be sent in as props

---
 src/module/helpers/acc_diff/Total.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
index 27d09dd2b..f800fb4c2 100644
--- a/src/module/helpers/acc_diff/Total.svelte
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -21,7 +21,7 @@
    return v?.target;
  }
 
- export const id = `accdiff-total-display-${counter++}`;
+ export let id = `accdiff-total-display-${counter++}`;
  let lockonId = isTarget(target) ? `accdiff-total-display-consume-lockon-${lockonCounter++}` : '';
 
  let imgElement: HTMLElement;

From f4180bbf66f419617298f4aac638432e510cf15b Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sun, 22 Aug 2021 21:32:51 -0700
Subject: [PATCH 51/88] bugfix: just in case this is a promise

---
 src/module/macros.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/macros.ts b/src/module/macros.ts
index 1b2cc5c80..b1c11635c 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -682,7 +682,7 @@ async function prepareAttackMacro({
     mData.overkill = is_overkill(itemEnt);
     mData.effect = weaponData.Effect;
   } else if (actor.data.type === EntryType.NPC) {
-    const mm: NpcFeature = item.data.data.derived.mm;
+    const mm: NpcFeature = await item.data.data.derived.mm_promise;
     let tier_index: number = mm.TierOverride;
     if(!mm.TierOverride) {
       if (item.actor === null) {

From 443fc20915ff7b1ab5603270b6d21861c42cfe10 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sun, 22 Aug 2021 21:33:46 -0700
Subject: [PATCH 52/88] typefix: this is a bit messy, but Component is still
 better than any

---
 src/module/helpers/svelte-application.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/svelte-application.ts b/src/module/helpers/svelte-application.ts
index d49f1a786..1a5a52f39 100644
--- a/src/module/helpers/svelte-application.ts
+++ b/src/module/helpers/svelte-application.ts
@@ -3,7 +3,7 @@ import type SvelteComponent from '*.svelte';
 export default class SvelteApp<DataModel> extends Application {
   klass: typeof SvelteComponent;
   data: DataModel;
-  component!: any;
+  component!: typeof SvelteComponent; // the type reuses the same type for class and instance
 
   #resolve: ((data: DataModel) => void) | null = null;
   #reject: ((v: void) => void) | null = null;

From 1c0aff3c80b27e8fb8773386026c14fd54245d81 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 23 Aug 2021 17:54:39 -0700
Subject: [PATCH 53/88] bugfix: actually this is what svelte understands as
 dependency arrows

---
 src/module/helpers/acc_diff/Form.svelte | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 9be7a7192..6e6bd92ff 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -24,15 +24,14 @@
  // tell svelte of externally computed dependency arrows
  $: {
    // i.e., base depends on weapon
-   weapon;
-   base = base;
+   // @ts-ignore this syntax is meaningful to svelte
+   base = (weapon, base);
  };
 
  $: {
    // i.e., targets depend on weapon and base
-   weapon;
-   base;
-   targets = targets;
+   // @ts-ignore this syntax is meaningful to svelte
+   targets = (weapon, base, targets);
  }
 
  const dispatch = createEventDispatcher();

From 97d5f0ce28677f78a93ad538590130a9f301bfdb Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 25 Aug 2021 10:40:11 -0700
Subject: [PATCH 54/88] typefix: t.InputOf is just unknown

---
 src/module/helpers/acc_diff/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index 70a2d98a9..fda9a6f82 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -219,7 +219,7 @@ export class AccDiffTarget {
   }
 }
 
-export type AccDiffDataSerialized = t.TypeOf<typeof AccDiffData.schemaCodec>;
+export type AccDiffDataSerialized = t.OutputOf<typeof AccDiffData.schemaCodec>;
 export class AccDiffData {
   title: string;
   weapon: AccDiffWeapon;
@@ -262,7 +262,7 @@ export class AccDiffData {
     }
   }
 
-  static fromObject(obj: t.InputOf<typeof AccDiffData.codec>, lancerItem?: LancerItem<any>): AccDiffData {
+  static fromObject(obj: AccDiffDataSerialized, lancerItem?: LancerItem<any>): AccDiffData {
     let ret = decode(obj, AccDiffData.codec);
     ret.lancerItem = lancerItem;
     ret.hydrate();

From f6b6c8602dd719d21716365e8255bef9806d1281 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 25 Aug 2021 10:48:08 -0700
Subject: [PATCH 55/88] make hydrate slightly more coherent

---
 src/module/helpers/acc_diff/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index fda9a6f82..737805e07 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -247,7 +247,8 @@ export class AccDiffData {
     this.hydrate();
   }
 
-  hydrate() {
+  hydrate(lancerItem?: LancerItem<any>) {
+    this.lancerItem = lancerItem;
     this.weapon.hydrate(this);
     this.base.hydrate(this);
     for (let target of this.targets) { target.hydrate(this); }
@@ -264,8 +265,7 @@ export class AccDiffData {
 
   static fromObject(obj: AccDiffDataSerialized, lancerItem?: LancerItem<any>): AccDiffData {
     let ret = decode(obj, AccDiffData.codec);
-    ret.lancerItem = lancerItem;
-    ret.hydrate();
+    ret.hydrate(lancerItem);
     return ret;
   }
 

From 2af87e8a2b9337ca3d816bf5eeefee17af07a58a Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 25 Aug 2021 10:48:27 -0700
Subject: [PATCH 56/88] add AccDiffTarget.fromParams

---
 src/module/helpers/acc_diff/index.ts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index 737805e07..a8e11461d 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -193,6 +193,21 @@ export class AccDiffTarget {
     }
   }
 
+  static fromParams(t: Token): AccDiffTarget {
+    let ret = {
+      target_id: t.id,
+      accuracy: 0,
+      difficulty: 0,
+      cover: Cover.None,
+      consumeLockOn: true,
+      plugins: {} as { [k: string]: any },
+    };
+    for (let plugin of AccDiffData.targetedPlugins) {
+      ret.plugins[plugin.slug] = encode(plugin.perTarget!(t), plugin.codec);
+    }
+    return decode(ret, AccDiffTarget.codec);
+  }
+
   hydrate(d: AccDiffData) {
     this.#weapon = d.weapon;
     this.#base = d.base;
@@ -351,6 +366,9 @@ export class AccDiffData {
         obj.base.plugins[plugin.slug] = encode(plugin.perUnknownTarget(), plugin.codec);
       }
     }
+
+    // for now this isn't using AccDiffTarget.fromParams, which means the code is duplicated
+    // that's a relatively contained bit of tech debt, but let's handle it next time this is touched
     return AccDiffData.fromObject(obj, item);
   }
 }

From f4d16862283c688ff237ed372ece79aac9c427af Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 25 Aug 2021 10:49:44 -0700
Subject: [PATCH 57/88] clean up svelte-application, provide useful promise
 methods, support intro: true

---
 src/module/helpers/svelte-application.ts | 52 ++++++++++++++++--------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/module/helpers/svelte-application.ts b/src/module/helpers/svelte-application.ts
index 1a5a52f39..ccc86668b 100644
--- a/src/module/helpers/svelte-application.ts
+++ b/src/module/helpers/svelte-application.ts
@@ -1,46 +1,66 @@
 import type SvelteComponent from '*.svelte';
 
+type SvelteAppOptions = ApplicationOptions & {
+  intro?: boolean
+}
+
 export default class SvelteApp<DataModel> extends Application {
   klass: typeof SvelteComponent;
   data: DataModel;
-  component!: typeof SvelteComponent; // the type reuses the same type for class and instance
+  component?: typeof SvelteComponent; // the type reuses the same type for class and instance
+  declare options: SvelteAppOptions;
 
   #resolve: ((data: DataModel) => void) | null = null;
   #reject: ((v: void) => void) | null = null;
-  promise: Promise<DataModel>;
+  promise!: Promise<DataModel>; // constructor calls refreshPromise(), which definitely assigns this
 
-  constructor(App: typeof SvelteComponent, data: DataModel, options: ApplicationOptions) {
+  constructor(App: typeof SvelteComponent, data: DataModel, options?: SvelteAppOptions) {
     super(options);
+    this.refreshPromise();
+    this.data = data;
+    this.klass = App;
+  }
+
+  refreshPromise() {
+    if (this.#reject) { this.#reject(); }
     this.promise = new Promise((resolve, reject) => {
       this.#resolve = resolve;
       this.#reject = reject;
     })
-    this.data = data;
-    this.klass = App;
+  }
+
+  resolvePromise() {
+    if (this.#resolve) {
+      this.#resolve(this.data);
+      this.#reject = null;
+    }
+  }
+
+  rejectPromise() {
+    if (this.#reject) {
+      this.#reject();
+      this.#resolve = null;
+    }
   }
 
   activateListeners(html: JQuery) {
-    this.component = new this.klass({
+    let component = new this.klass({
       target: html.get(0),
       props: this.data,
+      intro: !!this.options.intro
     });
-    this.component.$on('submit', (_e: Event) => {
-      if (this.#resolve) {
-        this.#resolve(this.data);
-        this.#reject = null;
-      }
+    component.$on('submit', (_e: Event) => {
+      this.resolvePromise();
       return this.close();
     });
-    this.component.$on('cancel', (_e: Event) => {
+    component.$on('cancel', (_e: Event) => {
       return this.close();
     });
+    this.component = component;
   }
 
   close() {
-    if (this.#reject) {
-      this.#reject();
-      this.#resolve = null;
-    }
+    this.rejectPromise()
     return super.close();
   }
 

From bbcc8346957a638fe2cd2a2e2d47f6397507e4b1 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Thu, 26 Aug 2021 21:04:24 -0700
Subject: [PATCH 58/88] use my version of vite-plugin-checker that supports
 svelte-check

---
 package.json   | 2 +-
 vite.config.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0b65e2d92..894b1b47a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "tslib": "^1.14.1",
     "typescript": "^4.3.2",
     "vite": "^2.5.1",
-    "vite-plugin-checker": "^0.3.4",
+    "vite-plugin-checker": "https://github.com/SohumB/vite-plugin-checker/releases/download/vite-plugin-checker%400.3.5/vite-plugin-checker-0.3.5.tgz",
     "yargs": "^15.4.1"
   },
   "dependencies": {
diff --git a/vite.config.ts b/vite.config.ts
index 817cd2116..7bb691839 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -52,6 +52,7 @@ const config: UserConfig = {
     }),
     checker({
       typescript: true,
+      svelte: { root: __dirname },
     }),
     visualizer({
       gzipSize: true,

From 361f555cfa754a4722f2d2f2978be15e0f4ef81b Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Wed, 25 Aug 2021 10:58:22 -0700
Subject: [PATCH 59/88] first pass at a persistent accdiff sliding window

TODO:
* clean up index.ts, there's enough logic in there now that it should be split
* hover-targeting breaks once you click inside the window
* Enter and Esc don't work how you expect them to either inside or outside the window
---
 src/lancer.ts                             |   6 +
 src/module/helpers/acc_diff/Form.svelte   | 334 +++++++++++++---------
 src/module/helpers/acc_diff/Plugin.svelte |   2 +-
 src/module/helpers/acc_diff/Total.svelte  |  56 ++--
 src/module/helpers/acc_diff/index.ts      |  92 +++++-
 src/module/macros.ts                      |  67 ++++-
 6 files changed, 389 insertions(+), 168 deletions(-)

diff --git a/src/lancer.ts b/src/lancer.ts
index 1f21c89f7..02ac8e0c4 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -509,6 +509,12 @@ Hooks.once("init", async function () {
   Handlebars.registerHelper("tier-selector", npc_tier_selector);
   Handlebars.registerHelper("npc-feat-preview", npc_feature_preview);
 
+  Hooks.on('targetToken', () => macros.refreshTargeting("do partial refresh"));
+  Hooks.on('createActiveEffect', () => macros.refreshTargeting("force full refresh"));
+  Hooks.on('deleteActiveEffect', () => macros.refreshTargeting("force full refresh"));
+  // updateToken triggers on things like token movement (spotter) and probably a lot of other things
+  Hooks.on('updateToken', () => macros.refreshTargeting("force full refresh"));
+
   // TODO: remove when sanity check is no longer needed.
   game.lancer.finishedInit = true;
 });
diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 6e6bd92ff..8a2515f87 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -1,5 +1,11 @@
+<svelte:options accessors={true} />
+
 <script lang="ts">
  import type { AccDiffWeapon, AccDiffBase, AccDiffTarget } from './index';
+ import type { LancerItem } from "../../item/lancer-item";
+
+ import { slide, blur } from 'svelte/transition';
+ import { flip } from 'svelte/animate';
  import { createEventDispatcher } from 'svelte';
 
  import Plugin from './Plugin.svelte';
@@ -11,15 +17,9 @@
  export let weapon: AccDiffWeapon;
  export let base: AccDiffBase;
  export let targets: AccDiffTarget[];
-
- // unused data — this suppresses the svelte-check warnings
- // unfortunately this generates runtime warnings in dev-mode
- // it's not currently possible to suppress both of those
- export const title: any = undefined;
- export const lancerItem: any = undefined;
-
- let baseTotalId: string;
- let targetTotalIds: string[] = [];
+ export let title: string;
+ export let lancerItem: LancerItem<any>;
+ export let open: boolean = true;
 
  // tell svelte of externally computed dependency arrows
  $: {
@@ -37,141 +37,183 @@
  const dispatch = createEventDispatcher();
 </script>
 
-<form id="accdiff" on:submit={e => {e.preventDefault(); dispatch('submit')}}>
-  <div id="accdiff-dialog" style="padding:4px">
-    <div class="accdiff-grid">
-      <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;">
-        <h3>
-          <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
-          Accuracy
-        </h3>
-        <label class="container">
-          Accurate (+1)
-          <input type="checkbox" bind:checked={weapon.accurate} />
-          <span class="checkmark"></span>
-        </label>
-        <label class="container">
-          Seeking (*)
-          <input type="checkbox" bind:checked={weapon.seeking} />
-          <span class="checkmark"></span>
-        </label>
-        {#each Object.keys(weapon.plugins) as key}
-          <Plugin bind:data={weapon.plugins[key]} />
-        {/each}
-        {#if targets.length == 1}
-          <label class="container" for="base-consume-lockon">
-            Consume Lock On (+1)
-            <ConsumeLockOn bind:lockOn={targets[0]} id="base-consume-lockon" />
-            <span class="checkmark"></span>
-          </label>
-          {#each Object.keys(targets[0].plugins) as key}
-            <Plugin bind:data={targets[0].plugins[key]} />
-          {/each}
-        {/if}
-      </div>
-      <div style="width:100%;padding:4px;">
-        <h3>
-          <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
-          Difficulty
-        </h3>
-        <label class="container">
-          Inaccurate (-1)
-          <input type="checkbox" bind:checked={weapon.inaccurate} />
-          <span class="checkmark"></span>
-        </label>
-        <label class="container">
-          Impaired (-1)
-          <input type="checkbox" checked={!!weapon.impaired} disabled />
-          <span class="checkmark"></span>
-        </label>
-        {#if targets.length == 0}
-          <Cover bind:cover={base.cover} class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
-        {:else if targets.length == 1}
-          <Cover bind:cover={targets[0].cover} class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
-        {/if}
-      </div>
-    </div>
-    <label class="flexrow accdiff-footer accdiff-weight" for="accdiff-other-sources">
-      Other Sources
-    </label>
-    <div id="accdiff-other-sources" class="accdiff-grid">
-      <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
-        <PlusMinusInput bind:value={base.accuracy} id="accdiff-other-acc" />
-      </div>
-      <div class="accdiff-other-grid">
-        <PlusMinusInput bind:value={base.difficulty} id="accdiff-other-diff" />
-      </div>
-    </div>
-    {#if targets.length == 0}
-      <label class="flexrow accdiff-footer accdiff-weight" for={baseTotalId}>
-        Total
-      </label>
-      <Total bind:target={base} bind:id={baseTotalId} />
-    {:else if targets.length == 1}
-      <label class="flexrow accdiff-footer accdiff-weight" for={baseTotalId}>
-        Total vs {targets[0].target.data.name}
-      </label>
-      <div class="flexrow flex-center accdiff-total">
-        <Total bind:target={targets[0]} bind:id={baseTotalId} onlyTarget={true}/>
-      </div>
-    {:else}
-      <div class="accdiff-footer accdiff-weight accdiff-target-row">
-        {#each targets as data, index}
-          <div class="flexcol card accdiff-target">
-            <label class="flexrow flex-center card" for={targetTotalIds[index]}>
-              {data.target.data.name}
+{#if open}
+  {#key lancerItem}
+    <form id="accdiff" class="window-content" transition:slide on:submit={e => {e.preventDefault(); dispatch('submit')}}>
+      {#if title != ''}
+        <div class="lancer-header mech-weapon medium">
+          <i class="cci cci-weapon i--m i--light"></i>
+          <span>{title}</span>
+        </div>
+      {/if}
+      <div id="accdiff-dialog" style="padding:4px">
+        <div class="accdiff-grid">
+          <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;min-width:180px">
+            <h3>
+              <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
+              Accuracy
+            </h3>
+            <label class="container">
+              Accurate (+1)
+              <input type="checkbox" bind:checked={weapon.accurate} />
+              <span class="checkmark"></span>
+            </label>
+            <label class="container">
+              Seeking (*)
+              <input type="checkbox" bind:checked={weapon.seeking} />
+              <span class="checkmark"></span>
             </label>
-            <div class="flexrow accdiff-total">
-              <ConsumeLockOn bind:lockOn={data} visible={false} />
-              <Total bind:target={data} bind:id={targetTotalIds[index]} />
+            {#if weapon.plugins.length > 0 || targets.length == 1}
+              <div transition:slide>
+                <h3 style="border-top: 1px dashed #782e22; padding-right: 4px; padding-top: 16px; margin-top: 16px;">
+                  <i class="cci cci-reticule i--m i--dark" style="vertical-align:middle;border:none"></i>
+                  &nbsp;Misc
+                </h3>
+                {#each Object.keys(weapon.plugins) as key}
+                  <Plugin bind:data={weapon.plugins[key]} />
+                {/each}
+                {#if targets.length == 1}
+                  <label class="container" for="base-consume-lockon">
+                    Consume Lock On (+1)
+                    <ConsumeLockOn bind:lockOn={targets[0]} id="base-consume-lockon" />
+                    <span class="checkmark"></span>
+                  </label>
+                  {#each Object.keys(targets[0].plugins) as key}
+                    <Plugin bind:data={targets[0].plugins[key]} />
+                  {/each}
+                {/if}
+              </div>
+            {/if}
+          </div>
+          <div style="width:100%;padding:4px;min-width:180px">
+            <h3>
+              <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
+              Difficulty
+            </h3>
+            <label class="container">
+              Inaccurate (-1)
+              <input type="checkbox" bind:checked={weapon.inaccurate} />
+              <span class="checkmark"></span>
+            </label>
+            <label class="container">
+              Impaired (-1)
+              <input type="checkbox" checked={!!weapon.impaired} disabled />
+              <span class="checkmark"></span>
+            </label>
+            <div class="grid-enforcement">
+              {#if targets.length == 0}
+                <div transition:slide>
+                  <Cover bind:cover={base.cover} class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
+                </div>
+              {:else if targets.length == 1}
+                <div transition:slide>
+                  <Cover bind:cover={targets[0].cover} class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
+                </div>
+              {/if}
             </div>
-            <div class="flexrow">
-              <button
-                class="i--m no-grow"
-                type="button"
-                on:click={() => data.accuracy = data.accuracy + 1}
-              >
-                <i class="cci cci-accuracy i--m" style="border:none"></i>
-              </button>
-              <input
-                style="display: none"
-                type="number"
-                bind:value={data.accuracy}
-                min="0"
-                />
-              <Cover bind:cover={data.cover} disabled={weapon.seeking}
+          </div>
+        </div>
+        <label class="flexrow accdiff-footer accdiff-weight" for="accdiff-other-sources">
+          Other Sources
+        </label>
+        <div id="accdiff-other-sources" class="accdiff-grid">
+          <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
+            <PlusMinusInput bind:value={base.accuracy} id="accdiff-other-acc" />
+          </div>
+          <div class="accdiff-other-grid">
+            <PlusMinusInput bind:value={base.difficulty} id="accdiff-other-diff" />
+          </div>
+        </div>
+        <div class="grid-enforcement accdiff-footer">
+          <div class="accdiff-total">
+            {#if targets.length < 2}
+              {#key targets.length}
+                <label transition:slide
+                  class="accdiff-weight flex-center flexrow total-label" for="total-display-0">
+                  Total
+                  {#if targets.length > 0}
+                    vs {targets[0].target.data.name}
+                  {/if}
+                </label>
+              {/key}
+            {/if}
+            <div class="grid-enforcement">
+              {#if targets.length == 0}
+                <div
+                  class="flexrow flex-center accdiff-total">
+                  <Total bind:target={base} id="total-display-0" />
+                </div>
+              {:else if targets.length == 1}
+                <div
+                  class="flexrow flex-center accdiff-total">
+                  <Total bind:target={targets[0]} id="total-display-0" onlyTarget={true}/>
+                </div>
+              {:else}
+                <div class="accdiff-weight accdiff-target-row">
+                  {#each targets as data, i (data.target.id)}
+                    <div
+                      in:blur|local={{delay:100, duration:300}} out:blur|local={{duration: 100}}
+                      animate:flip={{duration: 200}}
+                      class="flexcol card accdiff-target">
+                      <label class="flexrow flex-center card" for={data.target.id}>
+                        {data.target.data.name}
+                      </label>
+                      <div class="flexrow accdiff-total">
+                        <ConsumeLockOn bind:lockOn={data} visible={false} />
+                        <Total bind:target={data} id={`total-display-${i}`} />
+                      </div>
+                      <div class="flexrow">
+                        <button
+                          class="i--m no-grow"
+                          type="button"
+                          on:click={() => data.accuracy = data.accuracy + 1}
+                        >
+                          <i class="cci cci-accuracy i--m" style="border:none"></i>
+                        </button>
+                        <input
+                          style="display: none"
+                          type="number"
+                          bind:value={data.accuracy}
+                          min="0"
+                        />
+                        <Cover bind:cover={data.cover} disabled={weapon.seeking}
                           class="accdiff-targeted-cover flexrow flex-center" labelClass="i--s" />
-              <input
-                style="display: none"
-                type="number"
-                bind:value={data.difficulty}
-                min="0"
-              />
-              <button
-                class="i--m no-grow"
-                type="button"
-                on:click={() => data.difficulty = data.difficulty + 1}
-              >
-                <i class="cci cci-difficulty i--m" style="border:none"></i>
-              </button>
+                        <input
+                          style="display: none"
+                          type="number"
+                          bind:value={data.difficulty}
+                          min="0"
+                        />
+                        <button
+                          class="i--m no-grow"
+                          type="button"
+                          on:click={() => data.difficulty = data.difficulty + 1}
+                        >
+                          <i class="cci cci-difficulty i--m" style="border:none"></i>
+                        </button>
+                      </div>
+                   </div>
+                  {/each}
+                </div>
+              {/if}
             </div>
           </div>
-        {/each}
+        </div>
+      </div>
+      <div class="dialog-buttons flexrow">
+        <button class="dialog-button submit default" data-button="submit" type="submit">
+          <i class="fas fa-check"></i>
+          Roll
+        </button>
+        <button class="dialog-button cancel"
+          data-button="cancel" type="button" on:click={() => dispatch('cancel')}>
+          <i class="fas fa-times"></i>
+          Cancel
+        </button>
       </div>
-    {/if}
-  </div>
-  <div class="dialog-buttons flexrow">
-    <button class="dialog-button submit default" data-button="submit" type="submit">
-      <i class="fas fa-check"></i>
-      Roll
-    </button>
-    <button class="dialog-button cancel"
-            data-button="cancel" type="button" on:click={() => dispatch('cancel')}>
-      <i class="fas fa-times"></i>
-      Cancel
-    </button>
-  </div>
-</form>
+    </form>
+  {/key}
+{/if}
 
 <style>
   :global(.accdiff-grid) {
@@ -289,4 +331,20 @@
     flex-wrap: nowrap;
     padding: 4px 10px 4px 10px;
   }
+
+  .total-label {
+    white-space: nowrap;
+  }
+
+ /* this forces all its children to share the same space,
+    which is useful for svelte transitions */
+  :global(.grid-enforcement) {
+    display: grid;
+    overflow: hidden;
+  }
+
+  :global(.grid-enforcement > *) {
+    grid-column: 1/2;
+    grid-row: 1/2;
+  }
 </style>
diff --git a/src/module/helpers/acc_diff/Plugin.svelte b/src/module/helpers/acc_diff/Plugin.svelte
index 03f2cad24..d8935c4b9 100644
--- a/src/module/helpers/acc_diff/Plugin.svelte
+++ b/src/module/helpers/acc_diff/Plugin.svelte
@@ -5,7 +5,7 @@
 </script>
 
 {#if data.uiElement == "checkbox" && data.visible}
-  <label class="container" transition:slide>
+  <label class="container" transition:slide|local>
     {data.humanLabel}
     <input type="checkbox" bind:checked={data.uiState} disabled={data.disabled} />
     <span class="checkmark"></span>
diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
index f800fb4c2..26ce22754 100644
--- a/src/module/helpers/acc_diff/Total.svelte
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -1,13 +1,17 @@
 <script context="module">
+ import { blur, crossfade } from 'svelte/transition';
  let lockonCounter = 0;
  let counter = 0;
+
+ // @ts-ignore the only issue is that crossfade can take a fn for duration and blur can't
+ let [send, recv] = crossfade({ fallback: blur });
 </script>
 
 <script lang="ts">
  import type { AccDiffBase, AccDiffTarget } from './index';
 
  import { onMount } from 'svelte';
- import { fly, blur } from 'svelte/transition';
+ import { fly } from 'svelte/transition';
 
  import tippy from "tippy.js";
 
@@ -40,7 +44,10 @@
 </script>
 
 {#if isTarget(target)}
-  <div class="accdiff-grid">
+  <div
+    in:send={{key: `${id}-img`, delay: 100, duration: 200}}
+    out:recv={{key: `${id}-img`, duration: 200}}
+    class="accdiff-grid">
     <img class="lancer-hit-thumb accdiff-target-has-dropdown"
          alt={target.target.data.name}
          src={target.target.data.img} bind:this={imgElement} />
@@ -62,20 +69,23 @@
     </div>
   {/if}
 {/if}
-<div class="accdiff-grid accdiff-weight">
+<div class="accdiff-grid accdiff-weight" in:send={{key: id}} out:recv={{key: id}}>
   <div class="grid-enforcement">
-    {#key target.total}
-      <div id={id} transition:blur
-        class="card clipped total" class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
-        <span in:fly={{y: -50, duration: 400}} out:fly={{y: 50, duration: 200}}>
-          {Math.abs(target.total)}
-        </span>
-        <i in:fly={{y: -50, duration: 200}} out:fly={{y: 50, duration: 200}}
-          class="cci i--m i--dark white--text middle"
-          class:cci-accuracy={target.total >= 0}
-          class:cci-difficulty={target.total < 0} ></i>
-      </div>
-    {/key}
+    <!-- dummy if block for |local, see https://github.com/sveltejs/svelte/issues/5950 -->
+    {#if true}
+      {#key target.total}
+        <div id={id} transition:blur
+          class="card clipped total" class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
+          <span in:fly|local={{y: -50, duration: 400}} out:fly|local={{y: 50, duration: 200}}>
+            {Math.abs(target.total)}
+          </span>
+          <i in:fly|local={{y: -50, duration: 200}} out:fly|local={{y: 50, duration: 200}}
+            class="cci i--m i--dark white--text middle"
+            class:cci-accuracy={target.total >= 0}
+            class:cci-difficulty={target.total < 0} ></i>
+        </div>
+      {/key}
+    {/if}
   </div>
 </div>
 
@@ -84,12 +94,6 @@
 
  .accdiff-grid { position: relative }
 
- /* this + the grid-column and grid-row in .card.clipped forces
-    the two cards inside it (during animations) to have the same location */
- .grid-enforcement {
-     display: grid;
-     overflow: hidden;
- }
  .card.clipped {
      display: flex;
      flex-direction: row;
@@ -98,8 +102,6 @@
      color: white;
      width: min-content;
      background-color: #443c3c;
-     grid-column: 1/2;
-     grid-row: 1/2;
  }
  .card.total.accurate { background-color: #017934; }
  .card.total.inaccurate { background-color: #9c0d0d }
@@ -135,6 +137,14 @@
      animation: lockon 800ms linear 1s infinite alternate;
  }
 
+ .accdiff-target-dropdown {
+     display: none;
+ }
+
+ :global(.tippy-content) .accdiff-target-dropdown {
+     display: block;
+ }
+
  .accdiff-grid :global(.tippy-box[data-theme~="lancer"]) {
      font-size: 0.8em;
      padding-left: 0px;
diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index a8e11461d..d84a34bc1 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -339,8 +339,8 @@ export class AccDiffData {
       plugins: {} as { [k: string]: any },
     };
 
-    let obj = {
-      title: title ? `${title} - Accuracy and Difficulty` : "Accuracy and Difficulty",
+    let obj: AccDiffDataSerialized = {
+      title: title ? title : 'Accuracy and Difficulty',
       weapon, base,
       targets: (targets || []).map(t => {
         let ret = {
@@ -373,15 +373,101 @@ export class AccDiffData {
   }
 }
 
+let formCache: AccDiffForm;
+
 export class AccDiffForm extends SvelteApp<AccDiffData> {
   static get defaultOptions() {
     return mergeObject(super.defaultOptions, {
       resizable: false,
+      popOut: false,
+      intro: true
     });
   }
 
   constructor(data: AccDiffData) {
-    super(AccDiffSvelte, data, { title: data.title })
+    if (formCache) {
+      formCache.refresh(data);
+      formCache.open();
+    } else {
+      super(AccDiffSvelte, data);
+      formCache = this;
+      this.render(true);
+    }
+    return formCache;
+  }
+
+  static coalesceTargets(ts: Token[], forceFullRefresh: boolean = false): AccDiffForm | null {
+    if (formCache) {
+      let targets = ts.map(t => AccDiffTarget.fromParams(t));
+      formCache.data.targets = targets;
+      for (let target of targets) { target.hydrate(formCache.data); };
+
+      // do a full refresh either if the form is currently closed, or we've been told to
+      if (!formCache.isOpen || forceFullRefresh) {
+        formCache.refresh(formCache.data);
+      } else {
+        formCache.component?.$set({ targets: formCache.data.targets });
+      }
+
+      // when the client only provides us targets, we want to let them
+      // set up downstream actions if and only if nothing else is pending
+      if (formCache.isOpen) {
+        // this is the case where the form already has a pending promise
+        return null;
+      } else {
+        formCache.open();
+        return formCache;
+      }
+    } else {
+      let data = AccDiffData.fromParams(undefined, undefined, 'Basic Attack', ts, undefined);
+      return new AccDiffForm(data);
+    }
+  }
+
+  refresh(data: AccDiffData) {
+    // really simple little diff
+    // broadly just rerendering the whole thing is fast enough
+    // we're just doing this to ensure that the slide in for the whole modal
+    // only happens when the weapon is changed
+    let diff = { ...data };
+    if (diff.lancerItem === this.data.lancerItem) {
+      delete diff.lancerItem;
+    }
+
+    this.data = data;
+    this.refreshPromise();
+    this.component?.$set(diff);
+  }
+
+  get isOpen() {
+    // @ts-ignore open does exist on the component, because we compile it with accessors:true
+    return this.component?.open;
+  }
+
+  open() {
+    this.component?.$set({ open: true });
+  }
+
+  async close() {
+    this.component?.$set({ open: false });
+    this.rejectPromise();
+    return null;
+  }
+
+  async _renderInner(_data: any) {
+    const sidebarWidth = $("#sidebar").width() || 0;
+    return $(`<div class="app window-app" style="bottom: 0; right: ${sidebarWidth + 5}px"></div>`);
+  }
+
+  _injectHTML(html: JQuery) {
+    // override to disable foundry's jquery animations
+    $(document.body).append(html);
+    this._element = html;
+    // @ts-ignore
+    this._element.slideUp = function(timeout: number, callback) {
+      setTimeout(callback, timeout);
+    }
+    return html;
   }
 }
 
diff --git a/src/module/macros.ts b/src/module/macros.ts
index b1c11635c..ca8f79eed 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -557,6 +557,8 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
   let { AccDiffData } = await import('./helpers/acc_diff');
   let initialData = AccDiffData.fromParams();
   let promptedData = await promptAccDiffModifiers(initialData);
+  // note that the previous await waits for the user, and in many cases returns null as the user backs out
+
   if (!promptedData) return;
   let acc: number = promptedData.base.total;
 
@@ -766,6 +768,8 @@ async function prepareAttackMacro({
   const initialData = rerollData ?? AccDiffData.fromParams(
     item, mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
   const promptedData = await promptAccDiffModifiers(initialData);
+  // note that the previous await waits for the user, and in many cases returns null as the user backs out
+
   if (!promptedData) return;
 
   const atkRolls = attackRolls(mData.grit, promptedData);
@@ -797,6 +801,62 @@ async function prepareAttackMacro({
   await rollAttackMacro(actor, atkRolls, mData, rerollMacro);
 }
 
+export async function refreshTargeting(full: "force full refresh" | "do partial refresh") {
+  const targets = Array.from(game.user.targets);
+  let { AccDiffForm } = await import('./helpers/acc_diff');
+  const form = AccDiffForm.coalesceTargets(targets, full == "force full refresh");
+  if (!form) return;
+  const promptedData = await promptAccDiffModifiers(form);
+  // note that the previous await waits for the user, and in many cases returns null as the user backs out
+
+  if (!promptedData) return;
+
+  let actor = getMacroSpeaker();
+  if (!actor) {
+    ui.notifications.error("Can't find actor to attack as.");
+    return;
+  }
+
+  let mData = {
+    grit: 0,
+    tags: [],
+    damage: [],
+  };
+
+
+  let pilotEnt: Pilot;
+  if (actor.data.type === EntryType.MECH) {
+    pilotEnt = (await actor.data.data.derived.mm_promise).Pilot;
+    mData.grit = pilotEnt.Grit;
+  } else if (actor.data.type === EntryType.PILOT) {
+    pilotEnt = await actor.data.data.derived.mm_promise;
+    mData.grit = pilotEnt.Grit;
+  } else if (actor.data.type === EntryType.NPC) {
+    const mm = await actor.data.data.derived.mm_promise;
+    let tier_bonus: number = mm.Tier - 1;
+    mData.grit = tier_bonus || 0;
+  } else {
+    ui.notifications.error(`Error preparing targeting macro - ${actor.name} is an unknown type!`);
+    return;
+  }
+
+  const atkRolls = attackRolls(mData.grit, promptedData);
+
+  let rerollMacro = {
+    title: "Reroll attack",
+    fn: "prepareEncodedAttackMacro",
+    args: [
+      actor.data.data.derived.mm.as_ref(),
+      null, // TODO: this breaks the reroll
+      {},
+      promptedData.toObject()
+    ]
+  };
+
+  // @ts-ignore TODO: check that rollAttackMacro is defensive against the missing attrs
+  await rollAttackMacro(actor, atkRolls, mData, rerollMacro);
+}
+
 type AttackResult = {
   roll: Roll,
   tt: HTMLElement | JQuery<HTMLElement>
@@ -1190,6 +1250,8 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
     AccDiffData.fromObject(rerollData, item) :
     AccDiffData.fromParams(item, data.tags, data.title, targets);
   const promptedData = await promptAccDiffModifiers(initialData);
+  // note that the previous await waits for the user, and in many cases returns null as the user backs out
+
   if (!promptedData) return;
   partialMacroData.args.push(promptedData.toObject());
 
@@ -1213,10 +1275,9 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
   return await renderMacroTemplate(actor, template, templateData);
 }
 
-export async function promptAccDiffModifiers(data: AccDiffData): Promise<AccDiffData | null> {
+export async function promptAccDiffModifiers(data: AccDiffData | AccDiffForm): Promise<AccDiffData | null> {
   let { AccDiffForm } = await import('./helpers/acc_diff');
-  let form = new AccDiffForm(data);
-  form.render(true);
+  let form: AccDiffForm = data instanceof AccDiffForm ? data : new AccDiffForm(data);
   try {
     return await form.promise; // await to force any rejections into this try/catch
   } catch (_e) {

From 2ba6746d3e6bd19ee0f8e0483fa46953ba4265f4 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Fri, 27 Aug 2021 10:06:17 -0700
Subject: [PATCH 60/88] split index.ts into data.ts and form.ts

---
 src/module/helpers/acc_diff/data.ts  | 376 ++++++++++++++++++++
 src/module/helpers/acc_diff/form.ts  | 101 ++++++
 src/module/helpers/acc_diff/index.ts | 501 ++-------------------------
 3 files changed, 502 insertions(+), 476 deletions(-)
 create mode 100644 src/module/helpers/acc_diff/data.ts
 create mode 100644 src/module/helpers/acc_diff/form.ts

diff --git a/src/module/helpers/acc_diff/data.ts b/src/module/helpers/acc_diff/data.ts
new file mode 100644
index 000000000..14cbb96bd
--- /dev/null
+++ b/src/module/helpers/acc_diff/data.ts
@@ -0,0 +1,376 @@
+import type { TagInstance } from "machine-mind";
+import * as t from 'io-ts';
+
+import type { LancerActor, LancerActorType } from "../../actor/lancer-actor";
+import type { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
+import { enclass, encode, decode } from './serde';
+import type { LancerItem } from "../../item/lancer-item";
+
+import Invisibility from "./invisibility";
+import Spotter from "./spotter";
+
+// as it turns out, we can't actually name the ActiveEffect type
+// it's fine, this is all we need
+export type Effect = { delete: () => void };
+export function findEffect(actor: LancerActor<LancerActorType>, effect: string): Effect | null {
+  return actor.data.effects.find(eff => eff.data.flags.core.statusId == effect);
+}
+
+export enum Cover {
+  None = 0,
+  Soft = 1,
+  Hard = 2
+}
+let coverSchema = t.union([t.literal(0), t.literal(1), t.literal(2)]);
+
+// so normally you wouldn't keep the codecs with the classes like this
+// the entire point of io-ts is that the co/dec logic is separable
+// but here we want plugins to actually modify the codecs, so, sigh
+export class AccDiffWeapon {
+  accurate: boolean;
+  inaccurate: boolean;
+  seeking: boolean;
+  #data!: AccDiffData; // never use this class before calling hydrate
+  plugins: { [k: string]: AccDiffPluginData };
+
+  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
+
+  };
+
+  static get schema() {
+    return {
+      accurate: t.boolean,
+      inaccurate: t.boolean,
+      seeking: t.boolean,
+      plugins: t.type(this.pluginSchema),
+    }
+  }
+
+  static get schemaCodec() {
+    return t.type(this.schema);
+  }
+  static get codec() { return enclass(this.schemaCodec, AccDiffWeapon) }
+
+  constructor(obj: t.TypeOf<typeof AccDiffWeapon.schemaCodec>) {
+    this.accurate = obj.accurate;
+    this.inaccurate = obj.inaccurate;
+    this.seeking = obj.seeking;
+    this.plugins = obj.plugins;
+  }
+
+  get raw() {
+    return {
+      accurate: this.accurate,
+      inaccurate: this.inaccurate,
+      seeking: this.seeking,
+      plugins: this.plugins
+    }
+  }
+
+  get impaired(): Effect | null {
+    return (this.#data?.lancerItem?.actor &&
+      findEffect(this.#data.lancerItem.actor as LancerActor<LancerActorType>, "impaired")) || null;
+  }
+
+  total(cover: number) {
+    return (this.accurate ? 1 : 0) - (this.inaccurate ? 1 : 0)
+      - (this.seeking ? 0 : cover) - (this.impaired ? 1 : 0);
+  }
+
+  hydrate(d: AccDiffData) {
+    for (let key of Object.keys(this.plugins)) {
+      this.plugins[key].hydrate(d);
+    }
+    this.#data = d;
+  }
+}
+
+export class AccDiffBase {
+  accuracy: number;
+  difficulty: number;
+  cover: Cover;
+  plugins: { [k: string]: AccDiffPluginData };
+  #weapon!: AccDiffWeapon; // never use this class before calling hydrate
+
+  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
+
+  };
+
+  static get schema() {
+    return {
+      accuracy: t.number,
+      difficulty: t.number,
+      cover: coverSchema,
+      plugins: t.type(this.pluginSchema)
+    }
+  }
+  static get schemaCodec() { return t.type(this.schema); }
+  static get codec() { return enclass(this.schemaCodec, AccDiffBase) }
+
+  constructor(obj: t.TypeOf<typeof AccDiffBase.schemaCodec>) {
+    this.accuracy = obj.accuracy;
+    this.difficulty = obj.difficulty;
+    this.cover = obj.cover;
+    this.plugins = obj.plugins;
+    // this.#weapon = weapon;
+  }
+
+  get raw() {
+    return { accuracy: this.accuracy, difficulty: this.difficulty, cover: this.cover, plugins: this.plugins }
+  }
+
+  hydrate(d: AccDiffData) {
+    this.#weapon = d.weapon;
+    for (let key of Object.keys(this.plugins)) {
+      this.plugins[key].hydrate(d, this);
+    }
+  }
+
+  get total() {
+    return this.accuracy - this.difficulty + this.#weapon.total(this.cover);
+  }
+}
+
+// we _want_ to extend AccDiffBase
+// but ... typescript checks type compatibility between _static_ methods
+// and that + io-ts I think has the variance wrong
+// so if you extend AccDiffBase it's trying to assign AccDiffBase to AccDiffTarget
+export class AccDiffTarget {
+  target: Token;
+  accuracy: number;
+  difficulty: number;
+  cover: Cover;
+  consumeLockOn: boolean;
+  plugins: { [k: string]: any };
+  #weapon!: AccDiffWeapon; // never use this class before calling hydrate
+  #base!: AccDiffBase; // never use this class before calling hydrate
+
+  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
+
+  };
+
+  static get schema() {
+    return {
+      target_id: t.string,
+      accuracy: t.number,
+      difficulty: t.number,
+      cover: coverSchema,
+      consumeLockOn: t.boolean,
+      plugins: t.type(this.pluginSchema),
+    }
+  }
+
+  static get schemaCodec() { return t.type(this.schema); }
+  static get codec() { return enclass(this.schemaCodec, AccDiffTarget) }
+
+  constructor(obj: t.TypeOf<typeof AccDiffTarget.schemaCodec>) {
+    let target = canvas.scene.tokens.get(obj.target_id);
+    if (!target) {
+      ui.notifications.error("Trying to access tokens from a different scene!");
+      throw new Error("Token not found");
+    }
+
+    this.target = target.object;
+    this.accuracy = obj.accuracy;
+    this.difficulty = obj.difficulty;
+    this.cover = obj.cover;
+    this.consumeLockOn = obj.consumeLockOn;
+    this.plugins = obj.plugins;
+    // this.#weapon = weapon;
+    // this.#base = base;
+  }
+
+  get raw() {
+    return {
+      target_id: this.target.id,
+      accuracy: this.accuracy,
+      difficulty: this.difficulty,
+      cover: this.cover,
+      consumeLockOn: this.consumeLockOn,
+      plugins: this.plugins,
+    }
+  }
+
+  static fromParams(t: Token): AccDiffTarget {
+    let ret = {
+      target_id: t.id,
+      accuracy: 0,
+      difficulty: 0,
+      cover: Cover.None,
+      consumeLockOn: true,
+      plugins: {} as { [k: string]: any },
+    };
+    for (let plugin of AccDiffData.targetedPlugins) {
+      ret.plugins[plugin.slug] = encode(plugin.perTarget!(t), plugin.codec);
+    }
+    return decode(ret, AccDiffTarget.codec);
+  }
+
+  hydrate(d: AccDiffData) {
+    this.#weapon = d.weapon;
+    this.#base = d.base;
+    for (let key of Object.keys(this.plugins)) {
+      this.plugins[key].hydrate(d, this);
+    }
+  }
+
+  get usingLockOn(): null | Effect {
+    return (this.consumeLockOn && this.lockOnAvailable) || null;
+  }
+
+  get lockOnAvailable(): null | Effect {
+    return findEffect(this.target.actor as LancerActor<LancerActorType>, "lockon");
+  }
+
+  get total() {
+    let base = this.accuracy - this.difficulty + this.#weapon.total(this.cover);
+    // the only thing we actually use base for is the untyped bonuses
+    let raw = base + this.#base.accuracy - this.#base.difficulty;
+    let lockon = this.usingLockOn ? 1 : 0;
+
+    return raw + lockon;
+  }
+}
+
+export type AccDiffDataSerialized = t.OutputOf<typeof AccDiffData.schemaCodec>;
+export class AccDiffData {
+  title: string;
+  weapon: AccDiffWeapon;
+  base: AccDiffBase;
+  targets: AccDiffTarget[];
+  lancerItem?: LancerItem<any>; // not persisted, needs to be hydrated
+
+  static get schema() {
+    return {
+      title: t.string,
+      weapon: AccDiffWeapon.codec,
+      base: AccDiffBase.codec,
+      targets: t.array(AccDiffTarget.codec)
+    }
+  }
+
+  static get schemaCodec() { return t.type(this.schema); }
+  static get codec() { return enclass(this.schemaCodec, AccDiffData) }
+
+  constructor(obj: t.TypeOf<typeof AccDiffData.schemaCodec>) {
+    this.title = obj.title;
+    this.weapon = obj.weapon;
+    this.base = obj.base;
+    this.targets = obj.targets;
+    this.hydrate();
+  }
+
+  hydrate(lancerItem?: LancerItem<any>) {
+    this.lancerItem = lancerItem;
+    this.weapon.hydrate(this);
+    this.base.hydrate(this);
+    for (let target of this.targets) { target.hydrate(this); }
+  }
+
+  get raw() {
+    return {
+      title: this.title,
+      weapon: this.weapon,
+      base: this.base,
+      targets: this.targets,
+    }
+  }
+
+  static fromObject(obj: AccDiffDataSerialized, lancerItem?: LancerItem<any>): AccDiffData {
+    let ret = decode(obj, AccDiffData.codec);
+    ret.hydrate(lancerItem);
+    return ret;
+  }
+
+  toObject(): t.OutputOf<typeof AccDiffData.codec> {
+    return encode(this, AccDiffData.codec);
+  }
+
+  static plugins: AccDiffPlugin<AccDiffPluginData>[] = [];
+  static targetedPlugins: AccDiffPlugin<AccDiffPluginData>[] = [];
+  static registerPlugin<D extends AccDiffPluginData, P extends AccDiffPlugin<D>>(plugin: P) {
+    if (plugin.perRoll) {
+      AccDiffWeapon.pluginSchema[plugin.slug] = plugin.codec;
+    }
+    if (plugin.perUnknownTarget) {
+      AccDiffBase.pluginSchema[plugin.slug] = plugin.codec;
+    }
+    if (plugin.perTarget) {
+      AccDiffTarget.pluginSchema[plugin.slug] = plugin.codec;
+      this.targetedPlugins.push(plugin);
+    }
+    this.plugins.push(plugin);
+  }
+
+  static fromParams(
+    item?: LancerItem<any>,
+    tags?: TagInstance[],
+    title?: string,
+    targets?: Token[],
+    starting?: [number, number]
+  ): AccDiffData {
+    let weapon = {
+      accurate: false,
+      inaccurate: false,
+      seeking: false,
+      plugins: {} as { [k: string]: any },
+    };
+
+    for (let tag of (tags || [])) {
+      switch (tag.Tag.LID) {
+        case "tg_accurate":
+          weapon.accurate = true;
+          break;
+        case "tg_inaccurate":
+          weapon.inaccurate = true;
+          break;
+        case "tg_seeking":
+          weapon.seeking = true;
+          break;
+      }
+    }
+
+    let base = {
+      cover: Cover.None,
+      accuracy: starting ? starting[0] : 0,
+      difficulty: starting ? starting[1] : 0,
+      plugins: {} as { [k: string]: any },
+    };
+
+    let obj: AccDiffDataSerialized = {
+      title: title ? title : 'Accuracy and Difficulty',
+      weapon, base,
+      targets: (targets || []).map(t => {
+        let ret = {
+          target_id: t.id,
+          accuracy: 0,
+          difficulty: 0,
+          cover: Cover.None,
+          consumeLockOn: true,
+          plugins: {} as { [k: string]: any },
+        };
+        for (let plugin of this.targetedPlugins) {
+          ret.plugins[plugin.slug] = encode(plugin.perTarget!(t), plugin.codec);
+        }
+        return ret;
+      })
+    };
+
+    for (let plugin of this.plugins) {
+      if (plugin.perRoll) {
+        obj.weapon.plugins[plugin.slug] = encode(plugin.perRoll(item), plugin.codec);
+      }
+      if (plugin.perUnknownTarget) {
+        obj.base.plugins[plugin.slug] = encode(plugin.perUnknownTarget(), plugin.codec);
+      }
+    }
+
+    // for now this isn't using AccDiffTarget.fromParams, which means the code is duplicated
+    // that's a relatively contained bit of tech debt, but let's handle it next time this is touched
+    return AccDiffData.fromObject(obj, item);
+  }
+}
+
+// side effects for importing, yes, yes, I know
+AccDiffData.registerPlugin(Invisibility);
+AccDiffData.registerPlugin(Spotter);
diff --git a/src/module/helpers/acc_diff/form.ts b/src/module/helpers/acc_diff/form.ts
new file mode 100644
index 000000000..69f595fe8
--- /dev/null
+++ b/src/module/helpers/acc_diff/form.ts
@@ -0,0 +1,101 @@
+import { AccDiffTarget, AccDiffData } from './data';
+import SvelteApp from "../svelte-application";
+import AccDiffSvelte from "./Form.svelte";
+
+let formCache: AccDiffForm;
+
+export class AccDiffForm extends SvelteApp<AccDiffData> {
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      resizable: false,
+      popOut: false,
+      intro: true
+    });
+  }
+
+  constructor(data: AccDiffData) {
+    if (formCache) {
+      formCache.refresh(data);
+      formCache.open();
+    } else {
+      super(AccDiffSvelte, data);
+      formCache = this;
+      this.render(true);
+    }
+    return formCache;
+  }
+
+  static coalesceTargets(ts: Token[], forceFullRefresh: boolean = false): AccDiffForm | null {
+    if (formCache) {
+      let targets = ts.map(t => AccDiffTarget.fromParams(t));
+      formCache.data.targets = targets;
+      for (let target of targets) { target.hydrate(formCache.data); };
+
+      // do a full refresh either if the form is currently closed, or we've been told to
+      if (!formCache.isOpen || forceFullRefresh) {
+        formCache.refresh(formCache.data);
+      } else {
+        formCache.component?.$set({ targets: formCache.data.targets });
+      }
+
+      // when the client only provides us targets, we want to let them
+      // set up downstream actions if and only if nothing else is pending
+      if (formCache.isOpen) {
+        // this is the case where the form already has a pending promise
+        return null;
+      } else {
+        formCache.open();
+        return formCache;
+      }
+    } else {
+      let data = AccDiffData.fromParams(undefined, undefined, 'Basic Attack', ts, undefined);
+      return new AccDiffForm(data);
+    }
+  }
+
+  refresh(data: AccDiffData) {
+    // really simple little diff
+    // broadly just rerendering the whole thing is fast enough
+    // we're just doing this to ensure that the slide in for the whole modal
+    // only happens when the weapon is changed
+    let diff = { ...data };
+    if (diff.lancerItem === this.data.lancerItem) {
+      delete diff.lancerItem;
+    }
+
+    this.data = data;
+    this.refreshPromise();
+    this.component?.$set(diff);
+  }
+
+  get isOpen() {
+    // @ts-ignore open does exist on the component, because we compile it with accessors:true
+    return this.component?.open;
+  }
+
+  open() {
+    this.component?.$set({ open: true });
+  }
+
+  async close() {
+    this.component?.$set({ open: false });
+    this.rejectPromise();
+    return null;
+  }
+
+  async _renderInner(_data: any) {
+    const sidebarWidth = $("#sidebar").width() || 0;
+    return $(`<div class="app window-app" style="bottom: 0; right: ${sidebarWidth + 5}px"></div>`);
+  }
+
+  _injectHTML(html: JQuery) {
+    // override to disable foundry's jquery animations
+    $(document.body).append(html);
+    this._element = html;
+    // @ts-ignore
+    this._element.slideUp = function(timeout: number, callback) {
+      setTimeout(callback, timeout);
+    }
+    return html;
+  }
+}
diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index d84a34bc1..07960c9ab 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -1,476 +1,25 @@
-import type { TagInstance } from "machine-mind";
-import * as t from 'io-ts';
-
-import SvelteApp from "../svelte-application";
-import AccDiffSvelte from "./Form.svelte";
-import type { LancerActor, LancerActorType } from "../../actor/lancer-actor";
-import type { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
-import { enclass, encode, decode } from './serde';
-import type { LancerItem } from "../../item/lancer-item";
-
-import Invisibility from "./invisibility";
-import Spotter from "./spotter";
-
-// as it turns out, we can't actually name the ActiveEffect type
-// it's fine, this is all we need
-export type Effect = { delete: () => void };
-export function findEffect(actor: LancerActor<LancerActorType>, effect: string): Effect | null {
-  return actor.data.effects.find(eff => eff.data.flags.core.statusId == effect);
-}
-
-export enum Cover {
-  None = 0,
-  Soft = 1,
-  Hard = 2
-}
-let coverSchema = t.union([t.literal(0), t.literal(1), t.literal(2)]);
-
-// so normally you wouldn't keep the codecs with the classes like this
-// the entire point of io-ts is that the co/dec logic is separable
-// but here we want plugins to actually modify the codecs, so, sigh
-export class AccDiffWeapon {
-  accurate: boolean;
-  inaccurate: boolean;
-  seeking: boolean;
-  #data!: AccDiffData; // never use this class before calling hydrate
-  plugins: { [k: string]: AccDiffPluginData };
-
-  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
-
-  };
-
-  static get schema() {
-    return {
-      accurate: t.boolean,
-      inaccurate: t.boolean,
-      seeking: t.boolean,
-      plugins: t.type(this.pluginSchema),
-    }
-  }
-
-  static get schemaCodec() {
-    return t.type(this.schema);
-  }
-  static get codec() { return enclass(this.schemaCodec, AccDiffWeapon) }
-
-  constructor(obj: t.TypeOf<typeof AccDiffWeapon.schemaCodec>) {
-    this.accurate = obj.accurate;
-    this.inaccurate = obj.inaccurate;
-    this.seeking = obj.seeking;
-    this.plugins = obj.plugins;
-  }
-
-  get raw() {
-    return {
-      accurate: this.accurate,
-      inaccurate: this.inaccurate,
-      seeking: this.seeking,
-      plugins: this.plugins
-    }
-  }
-
-  get impaired(): Effect | null {
-    return (this.#data?.lancerItem?.actor &&
-      findEffect(this.#data.lancerItem.actor as LancerActor<LancerActorType>, "impaired")) || null;
-  }
-
-  total(cover: number) {
-    return (this.accurate ? 1 : 0) - (this.inaccurate ? 1 : 0)
-      - (this.seeking ? 0 : cover) - (this.impaired ? 1 : 0);
-  }
-
-  hydrate(d: AccDiffData) {
-    for (let key of Object.keys(this.plugins)) {
-      this.plugins[key].hydrate(d);
-    }
-    this.#data = d;
-  }
-}
-
-export class AccDiffBase {
-  accuracy: number;
-  difficulty: number;
-  cover: Cover;
-  plugins: { [k: string]: AccDiffPluginData };
-  #weapon!: AccDiffWeapon; // never use this class before calling hydrate
-
-  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
-
-  };
-
-  static get schema() {
-    return {
-      accuracy: t.number,
-      difficulty: t.number,
-      cover: coverSchema,
-      plugins: t.type(this.pluginSchema)
-    }
-  }
-  static get schemaCodec() { return t.type(this.schema); }
-  static get codec() { return enclass(this.schemaCodec, AccDiffBase) }
-
-  constructor(obj: t.TypeOf<typeof AccDiffBase.schemaCodec>) {
-    this.accuracy = obj.accuracy;
-    this.difficulty = obj.difficulty;
-    this.cover = obj.cover;
-    this.plugins = obj.plugins;
-    // this.#weapon = weapon;
-  }
-
-  get raw() {
-    return { accuracy: this.accuracy, difficulty: this.difficulty, cover: this.cover, plugins: this.plugins }
-  }
-
-  hydrate(d: AccDiffData) {
-    this.#weapon = d.weapon;
-    for (let key of Object.keys(this.plugins)) {
-      this.plugins[key].hydrate(d, this);
-    }
-  }
-
-  get total() {
-    return this.accuracy - this.difficulty + this.#weapon.total(this.cover);
-  }
-}
-
-// we _want_ to extend AccDiffBase
-// but ... typescript checks type compatibility between _static_ methods
-// and that + io-ts I think has the variance wrong
-// so if you extend AccDiffBase it's trying to assign AccDiffBase to AccDiffTarget
-export class AccDiffTarget {
-  target: Token;
-  accuracy: number;
-  difficulty: number;
-  cover: Cover;
-  consumeLockOn: boolean;
-  plugins: { [k: string]: any };
-  #weapon!: AccDiffWeapon; // never use this class before calling hydrate
-  #base!: AccDiffBase; // never use this class before calling hydrate
-
-  static pluginSchema: { [k: string]: AccDiffPluginCodec<any, any, any> } = {
-
-  };
-
-  static get schema() {
-    return {
-      target_id: t.string,
-      accuracy: t.number,
-      difficulty: t.number,
-      cover: coverSchema,
-      consumeLockOn: t.boolean,
-      plugins: t.type(this.pluginSchema),
-    }
-  }
-
-  static get schemaCodec() { return t.type(this.schema); }
-  static get codec() { return enclass(this.schemaCodec, AccDiffTarget) }
-
-  constructor(obj: t.TypeOf<typeof AccDiffTarget.schemaCodec>) {
-    let target = canvas.scene.tokens.get(obj.target_id);
-    if (!target) {
-      ui.notifications.error("Trying to access tokens from a different scene!");
-      throw new Error("Token not found");
-    }
-
-    this.target = target.object;
-    this.accuracy = obj.accuracy;
-    this.difficulty = obj.difficulty;
-    this.cover = obj.cover;
-    this.consumeLockOn = obj.consumeLockOn;
-    this.plugins = obj.plugins;
-    // this.#weapon = weapon;
-    // this.#base = base;
-  }
-
-  get raw() {
-    return {
-      target_id: this.target.id,
-      accuracy: this.accuracy,
-      difficulty: this.difficulty,
-      cover: this.cover,
-      consumeLockOn: this.consumeLockOn,
-      plugins: this.plugins,
-    }
-  }
-
-  static fromParams(t: Token): AccDiffTarget {
-    let ret = {
-      target_id: t.id,
-      accuracy: 0,
-      difficulty: 0,
-      cover: Cover.None,
-      consumeLockOn: true,
-      plugins: {} as { [k: string]: any },
-    };
-    for (let plugin of AccDiffData.targetedPlugins) {
-      ret.plugins[plugin.slug] = encode(plugin.perTarget!(t), plugin.codec);
-    }
-    return decode(ret, AccDiffTarget.codec);
-  }
-
-  hydrate(d: AccDiffData) {
-    this.#weapon = d.weapon;
-    this.#base = d.base;
-    for (let key of Object.keys(this.plugins)) {
-      this.plugins[key].hydrate(d, this);
-    }
-  }
-
-  get usingLockOn(): null | Effect {
-    return (this.consumeLockOn && this.lockOnAvailable) || null;
-  }
-
-  get lockOnAvailable(): null | Effect {
-    return findEffect(this.target.actor as LancerActor<LancerActorType>, "lockon");
-  }
-
-  get total() {
-    let base = this.accuracy - this.difficulty + this.#weapon.total(this.cover);
-    // the only thing we actually use base for is the untyped bonuses
-    let raw = base + this.#base.accuracy - this.#base.difficulty;
-    let lockon = this.usingLockOn ? 1 : 0;
-
-    return raw + lockon;
-  }
-}
-
-export type AccDiffDataSerialized = t.OutputOf<typeof AccDiffData.schemaCodec>;
-export class AccDiffData {
-  title: string;
-  weapon: AccDiffWeapon;
-  base: AccDiffBase;
-  targets: AccDiffTarget[];
-  lancerItem?: LancerItem<any>; // not persisted, needs to be hydrated
-
-  static get schema() {
-    return {
-      title: t.string,
-      weapon: AccDiffWeapon.codec,
-      base: AccDiffBase.codec,
-      targets: t.array(AccDiffTarget.codec)
-    }
-  }
-
-  static get schemaCodec() { return t.type(this.schema); }
-  static get codec() { return enclass(this.schemaCodec, AccDiffData) }
-
-  constructor(obj: t.TypeOf<typeof AccDiffData.schemaCodec>) {
-    this.title = obj.title;
-    this.weapon = obj.weapon;
-    this.base = obj.base;
-    this.targets = obj.targets;
-    this.hydrate();
-  }
-
-  hydrate(lancerItem?: LancerItem<any>) {
-    this.lancerItem = lancerItem;
-    this.weapon.hydrate(this);
-    this.base.hydrate(this);
-    for (let target of this.targets) { target.hydrate(this); }
-  }
-
-  get raw() {
-    return {
-      title: this.title,
-      weapon: this.weapon,
-      base: this.base,
-      targets: this.targets,
-    }
-  }
-
-  static fromObject(obj: AccDiffDataSerialized, lancerItem?: LancerItem<any>): AccDiffData {
-    let ret = decode(obj, AccDiffData.codec);
-    ret.hydrate(lancerItem);
-    return ret;
-  }
-
-  toObject(): t.OutputOf<typeof AccDiffData.codec> {
-    return encode(this, AccDiffData.codec);
-  }
-
-  static plugins: AccDiffPlugin<AccDiffPluginData>[] = [];
-  static targetedPlugins: AccDiffPlugin<AccDiffPluginData>[] = [];
-  static registerPlugin<D extends AccDiffPluginData, P extends AccDiffPlugin<D>>(plugin: P) {
-    if (plugin.perRoll) {
-      AccDiffWeapon.pluginSchema[plugin.slug] = plugin.codec;
-    }
-    if (plugin.perUnknownTarget) {
-      AccDiffBase.pluginSchema[plugin.slug] = plugin.codec;
-    }
-    if (plugin.perTarget) {
-      AccDiffTarget.pluginSchema[plugin.slug] = plugin.codec;
-      this.targetedPlugins.push(plugin);
-    }
-    this.plugins.push(plugin);
-  }
-
-  static fromParams(
-    item?: LancerItem<any>,
-    tags?: TagInstance[],
-    title?: string,
-    targets?: Token[],
-    starting?: [number, number]
-  ): AccDiffData {
-    let weapon = {
-      accurate: false,
-      inaccurate: false,
-      seeking: false,
-      plugins: {} as { [k: string]: any },
-    };
-
-    for (let tag of (tags || [])) {
-      switch (tag.Tag.LID) {
-        case "tg_accurate":
-          weapon.accurate = true;
-          break;
-        case "tg_inaccurate":
-          weapon.inaccurate = true;
-          break;
-        case "tg_seeking":
-          weapon.seeking = true;
-          break;
-      }
-    }
-
-    let base = {
-      cover: Cover.None,
-      accuracy: starting ? starting[0] : 0,
-      difficulty: starting ? starting[1] : 0,
-      plugins: {} as { [k: string]: any },
-    };
-
-    let obj: AccDiffDataSerialized = {
-      title: title ? title : 'Accuracy and Difficulty',
-      weapon, base,
-      targets: (targets || []).map(t => {
-        let ret = {
-          target_id: t.id,
-          accuracy: 0,
-          difficulty: 0,
-          cover: Cover.None,
-          consumeLockOn: true,
-          plugins: {} as { [k: string]: any },
-        };
-        for (let plugin of this.targetedPlugins) {
-          ret.plugins[plugin.slug] = encode(plugin.perTarget!(t), plugin.codec);
-        }
-        return ret;
-      })
-    };
-
-    for (let plugin of this.plugins) {
-      if (plugin.perRoll) {
-        obj.weapon.plugins[plugin.slug] = encode(plugin.perRoll(item), plugin.codec);
-      }
-      if (plugin.perUnknownTarget) {
-        obj.base.plugins[plugin.slug] = encode(plugin.perUnknownTarget(), plugin.codec);
-      }
-    }
-
-    // for now this isn't using AccDiffTarget.fromParams, which means the code is duplicated
-    // that's a relatively contained bit of tech debt, but let's handle it next time this is touched
-    return AccDiffData.fromObject(obj, item);
-  }
-}
-
-let formCache: AccDiffForm;
-
-export class AccDiffForm extends SvelteApp<AccDiffData> {
-  static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
-      resizable: false,
-      popOut: false,
-      intro: true
-    });
-  }
-
-  constructor(data: AccDiffData) {
-    if (formCache) {
-      formCache.refresh(data);
-      formCache.open();
-    } else {
-      super(AccDiffSvelte, data);
-      formCache = this;
-      this.render(true);
-    }
-    return formCache;
-  }
-
-  static coalesceTargets(ts: Token[], forceFullRefresh: boolean = false): AccDiffForm | null {
-    if (formCache) {
-      let targets = ts.map(t => AccDiffTarget.fromParams(t));
-      formCache.data.targets = targets;
-      for (let target of targets) { target.hydrate(formCache.data); };
-
-      // do a full refresh either if the form is currently closed, or we've been told to
-      if (!formCache.isOpen || forceFullRefresh) {
-        formCache.refresh(formCache.data);
-      } else {
-        formCache.component?.$set({ targets: formCache.data.targets });
-      }
-
-      // when the client only provides us targets, we want to let them
-      // set up downstream actions if and only if nothing else is pending
-      if (formCache.isOpen) {
-        // this is the case where the form already has a pending promise
-        return null;
-      } else {
-        formCache.open();
-        return formCache;
-      }
-    } else {
-      let data = AccDiffData.fromParams(undefined, undefined, 'Basic Attack', ts, undefined);
-      return new AccDiffForm(data);
-    }
-  }
-
-  refresh(data: AccDiffData) {
-    // really simple little diff
-    // broadly just rerendering the whole thing is fast enough
-    // we're just doing this to ensure that the slide in for the whole modal
-    // only happens when the weapon is changed
-    let diff = { ...data };
-    if (diff.lancerItem === this.data.lancerItem) {
-      delete diff.lancerItem;
-    }
-
-    this.data = data;
-    this.refreshPromise();
-    this.component?.$set(diff);
-  }
-
-  get isOpen() {
-    // @ts-ignore open does exist on the component, because we compile it with accessors:true
-    return this.component?.open;
-  }
-
-  open() {
-    this.component?.$set({ open: true });
-  }
-
-  async close() {
-    this.component?.$set({ open: false });
-    this.rejectPromise();
-    return null;
-  }
-
-  async _renderInner(_data: any) {
-    const sidebarWidth = $("#sidebar").width() || 0;
-    return $(`<div class="app window-app" style="bottom: 0; right: ${sidebarWidth + 5}px"></div>`);
-  }
-
-  _injectHTML(html: JQuery) {
-    // override to disable foundry's jquery animations
-    $(document.body).append(html);
-    this._element = html;
-    // @ts-ignore
-    this._element.slideUp = function(timeout: number, callback) {
-      setTimeout(callback, timeout);
-    }
-    return html;
-  }
-}
-
-// side effects for importing, yes, yes, I know
-AccDiffData.registerPlugin(Invisibility);
-AccDiffData.registerPlugin(Spotter);
+export type {
+  Effect,
+  AccDiffDataSerialized
+} from './data';
+export {
+  findEffect,
+  Cover,
+  AccDiffWeapon,
+  AccDiffBase,
+  AccDiffTarget,
+  AccDiffData,
+} from './data';
+export type {
+  CheckboxUI,
+  NoUI,
+  RollModifier,
+  Dehydrated,
+  AccDiffPluginData,
+  AccDiffCheckboxPluginData,
+  AccDiffNoUIPluginData,
+  AccDiffPluginCodec,
+  AccDiffPlugin,
+  Data as AccDiffPluginDataOf
+} from './plugin'
+export { AccDiffForm } from './form';

From 9d1225bb36e9f50034cb8d667a319940b1486148 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Fri, 27 Aug 2021 22:20:00 -0700
Subject: [PATCH 61/88] sliding hud windows for accdiff

---
 src/lancer.scss                               |  12 +
 src/lancer.ts                                 |  14 +-
 src/module/helpers/acc_diff/Form.svelte       | 367 +++++++++---------
 src/module/helpers/acc_diff/data.ts           |   6 +
 src/module/helpers/acc_diff/form.ts           | 101 -----
 src/module/helpers/acc_diff/index.ts          |   1 -
 .../helpers/slidinghud/SlidingHUDZone.svelte  |  98 +++++
 src/module/helpers/slidinghud/index.ts        |  54 +++
 .../helpers/slidinghud/sidebar-width.ts       |  10 +
 src/module/macros.ts                          |  25 +-
 10 files changed, 388 insertions(+), 300 deletions(-)
 delete mode 100644 src/module/helpers/acc_diff/form.ts
 create mode 100644 src/module/helpers/slidinghud/SlidingHUDZone.svelte
 create mode 100644 src/module/helpers/slidinghud/index.ts
 create mode 100644 src/module/helpers/slidinghud/sidebar-width.ts

diff --git a/src/lancer.scss b/src/lancer.scss
index 399ca1f5b..2f4176663 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2133,3 +2133,15 @@ div[data-tab="system"] > .settings-list > div:nth-last-child(-n + 4) {
   text-transform: uppercase;
   font-family: Roboto,sans-serif !important;
 }
+
+/* this forces all its children to share the same space,
+    which is useful for svelte transitions */
+.grid-enforcement {
+  display: grid;
+  overflow: hidden;
+}
+
+.grid-enforcement > * {
+  grid-column: 1/2;
+  grid-row: 1/2;
+}
diff --git a/src/lancer.ts b/src/lancer.ts
index 02ac8e0c4..dc53584f4 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -39,6 +39,9 @@ import { compact_tag_list } from "./module/helpers/tags";
 import * as migrations from "./module/migration";
 import { addLCPManager, updateCore, core_update } from './module/apps/lcpManager';
 
+// Import sliding HUD (used for accuracy/difficulty windows)
+import * as slidingHUD from "./module/helpers/slidinghud";
+
 // Import Machine Mind and helpers
 import * as macros from "./module/macros";
 
@@ -509,11 +512,14 @@ Hooks.once("init", async function () {
   Handlebars.registerHelper("tier-selector", npc_tier_selector);
   Handlebars.registerHelper("npc-feat-preview", npc_feature_preview);
 
-  Hooks.on('targetToken', () => macros.refreshTargeting("do partial refresh"));
-  Hooks.on('createActiveEffect', () => macros.refreshTargeting("force full refresh"));
-  Hooks.on('deleteActiveEffect', () => macros.refreshTargeting("force full refresh"));
+  // ------------------------------------------------------------------------
+  // Sliding HUD Zone, including accuracy/difficulty window
+  Hooks.on('renderHeadsUpDisplay', slidingHUD.attach);
+  Hooks.on('targetToken', () => macros.refreshTargeting());
+  Hooks.on('createActiveEffect', () => macros.refreshTargeting());
+  Hooks.on('deleteActiveEffect', () => macros.refreshTargeting());
   // updateToken triggers on things like token movement (spotter) and probably a lot of other things
-  Hooks.on('updateToken', () => macros.refreshTargeting("force full refresh"));
+  Hooks.on('updateToken', () => macros.refreshTargeting());
 
   // TODO: remove when sanity check is no longer needed.
   game.lancer.finishedInit = true;
diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 8a2515f87..e9cf002a1 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -19,201 +19,219 @@
  export let targets: AccDiffTarget[];
  export let title: string;
  export let lancerItem: LancerItem<any>;
- export let open: boolean = true;
 
- // tell svelte of externally computed dependency arrows
- $: {
-   // i.e., base depends on weapon
-   // @ts-ignore this syntax is meaningful to svelte
-   base = (weapon, base);
- };
+ export let kind: "hase" | "attack";
+ export let redrawItem: any = lancerItem;
 
- $: {
-   // i.e., targets depend on weapon and base
-   // @ts-ignore this syntax is meaningful to svelte
-   targets = (weapon, base, targets);
- }
+ // tell svelte of externally computed dependency arrows
+ // @ts-ignore i.e., base depends on weapon
+ $: base = (weapon, base);
+ // @ts-ignore i.e., targets depend on weapon and base
+ $: targets = (weapon, base, targets);
 
  const dispatch = createEventDispatcher();
+
+ function focus(el: HTMLElement) { el.focus(); }
+ function escToCancel(_el: HTMLElement) {
+   let esc = function(ev: any) {
+     ev.preventDefault();
+     if (ev.key === 'Escape') { dispatch('cancel'); }
+   };
+   window.addEventListener('keydown', esc);
+
+   // onDestroy
+   return {
+     destroy() { window.removeEventListener('keydown', esc); }
+   }
+ }
 </script>
 
-{#if open}
-  {#key lancerItem}
-    <form id="accdiff" class="window-content" transition:slide on:submit={e => {e.preventDefault(); dispatch('submit')}}>
-      {#if title != ''}
-        <div class="lancer-header mech-weapon medium">
+{#key redrawItem}
+  <form id="accdiff" class="accdiff window-content" transition:slide|local use:escToCancel
+    on:submit|preventDefault={() => dispatch('submit')}>
+    {#if title != ''}
+      <div class="lancer-header mech-weapon medium">
+        {#if kind == "attack"}
           <i class="cci cci-weapon i--m i--light"></i>
-          <span>{title}</span>
-        </div>
-      {/if}
-      <div id="accdiff-dialog" style="padding:4px">
-        <div class="accdiff-grid">
-          <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;min-width:180px">
-            <h3>
-              <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
-              Accuracy
-            </h3>
-            <label class="container">
-              Accurate (+1)
-              <input type="checkbox" bind:checked={weapon.accurate} />
-              <span class="checkmark"></span>
-            </label>
+        {:else if kind == "hase"}
+          <i class="fas fa-dice-d20 i--m i--light"></i>
+        {/if}
+        <span>{title}</span>
+      </div>
+    {/if}
+    <div id="{kind}-accdiff-dialog" style="padding:4px">
+      <div class="accdiff-grid">
+        <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;min-width:180px">
+          <h3>
+            <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
+            Accuracy
+          </h3>
+          <label class="container">
+            Accurate (+1)
+            <input type="checkbox" bind:checked={weapon.accurate} />
+            <span class="checkmark"></span>
+          </label>
+          {#if kind == "attack"}
             <label class="container">
               Seeking (*)
               <input type="checkbox" bind:checked={weapon.seeking} />
               <span class="checkmark"></span>
             </label>
-            {#if weapon.plugins.length > 0 || targets.length == 1}
-              <div transition:slide>
-                <h3 style="border-top: 1px dashed #782e22; padding-right: 4px; padding-top: 16px; margin-top: 16px;">
-                  <i class="cci cci-reticule i--m i--dark" style="vertical-align:middle;border:none"></i>
-                  &nbsp;Misc
-                </h3>
-                {#each Object.keys(weapon.plugins) as key}
-                  <Plugin bind:data={weapon.plugins[key]} />
+          {/if}
+          {#if kind == "attack" && (weapon.plugins.length > 0 || targets.length == 1)}
+            <div transition:slide>
+              <h3 style="border-top: 1px dashed #782e22; padding-right: 4px; padding-top: 16px; margin-top: 16px;">
+                <i class="cci cci-reticule i--m i--dark" style="vertical-align:middle;border:none"></i>
+                &nbsp;Misc
+              </h3>
+              {#each Object.keys(weapon.plugins) as key}
+                <Plugin data={weapon.plugins[key]} />
+              {/each}
+              {#if targets.length == 1}
+                <label class="container" for="base-consume-lockon">
+                  Consume Lock On (+1)
+                  <ConsumeLockOn lockOn={targets[0]} id="base-consume-lockon" />
+                  <span class="checkmark"></span>
+                </label>
+                {#each Object.keys(targets[0].plugins) as key}
+                  <Plugin data={targets[0].plugins[key]} />
                 {/each}
-                {#if targets.length == 1}
-                  <label class="container" for="base-consume-lockon">
-                    Consume Lock On (+1)
-                    <ConsumeLockOn bind:lockOn={targets[0]} id="base-consume-lockon" />
-                    <span class="checkmark"></span>
-                  </label>
-                  {#each Object.keys(targets[0].plugins) as key}
-                    <Plugin bind:data={targets[0].plugins[key]} />
-                  {/each}
-                {/if}
-              </div>
-            {/if}
-          </div>
-          <div style="width:100%;padding:4px;min-width:180px">
-            <h3>
-              <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
-              Difficulty
-            </h3>
-            <label class="container">
-              Inaccurate (-1)
-              <input type="checkbox" bind:checked={weapon.inaccurate} />
-              <span class="checkmark"></span>
-            </label>
-            <label class="container">
-              Impaired (-1)
-              <input type="checkbox" checked={!!weapon.impaired} disabled />
-              <span class="checkmark"></span>
-            </label>
-            <div class="grid-enforcement">
-              {#if targets.length == 0}
-                <div transition:slide>
-                  <Cover bind:cover={base.cover} class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
-                </div>
-              {:else if targets.length == 1}
-                <div transition:slide>
-                  <Cover bind:cover={targets[0].cover} class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
-                </div>
               {/if}
             </div>
-          </div>
+          {/if}
         </div>
-        <label class="flexrow accdiff-footer accdiff-weight" for="accdiff-other-sources">
-          Other Sources
-        </label>
-        <div id="accdiff-other-sources" class="accdiff-grid">
-          <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
-            <PlusMinusInput bind:value={base.accuracy} id="accdiff-other-acc" />
-          </div>
-          <div class="accdiff-other-grid">
-            <PlusMinusInput bind:value={base.difficulty} id="accdiff-other-diff" />
-          </div>
-        </div>
-        <div class="grid-enforcement accdiff-footer">
-          <div class="accdiff-total">
-            {#if targets.length < 2}
-              {#key targets.length}
-                <label transition:slide
-                  class="accdiff-weight flex-center flexrow total-label" for="total-display-0">
-                  Total
-                  {#if targets.length > 0}
-                    vs {targets[0].target.data.name}
-                  {/if}
-                </label>
-              {/key}
-            {/if}
+        <div style="width:100%;padding:4px;min-width:180px">
+          <h3>
+            <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
+            Difficulty
+          </h3>
+          <label class="container">
+            Inaccurate (-1)
+            <input type="checkbox" bind:checked={weapon.inaccurate} />
+            <span class="checkmark"></span>
+          </label>
+          <label class="container">
+            Impaired (-1)
+            <input type="checkbox" checked={!!weapon.impaired} disabled />
+            <span class="checkmark"></span>
+          </label>
+          {#if kind == "attack"}
             <div class="grid-enforcement">
               {#if targets.length == 0}
-                <div
-                  class="flexrow flex-center accdiff-total">
-                  <Total bind:target={base} id="total-display-0" />
+                <div transition:slide|local>
+                  <Cover bind:cover={base.cover}
+                         class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
                 </div>
               {:else if targets.length == 1}
-                <div
-                  class="flexrow flex-center accdiff-total">
-                  <Total bind:target={targets[0]} id="total-display-0" onlyTarget={true}/>
-                </div>
-              {:else}
-                <div class="accdiff-weight accdiff-target-row">
-                  {#each targets as data, i (data.target.id)}
-                    <div
-                      in:blur|local={{delay:100, duration:300}} out:blur|local={{duration: 100}}
-                      animate:flip={{duration: 200}}
-                      class="flexcol card accdiff-target">
-                      <label class="flexrow flex-center card" for={data.target.id}>
-                        {data.target.data.name}
-                      </label>
-                      <div class="flexrow accdiff-total">
-                        <ConsumeLockOn bind:lockOn={data} visible={false} />
-                        <Total bind:target={data} id={`total-display-${i}`} />
-                      </div>
-                      <div class="flexrow">
-                        <button
-                          class="i--m no-grow"
-                          type="button"
-                          on:click={() => data.accuracy = data.accuracy + 1}
-                        >
-                          <i class="cci cci-accuracy i--m" style="border:none"></i>
-                        </button>
-                        <input
-                          style="display: none"
-                          type="number"
-                          bind:value={data.accuracy}
-                          min="0"
-                        />
-                        <Cover bind:cover={data.cover} disabled={weapon.seeking}
-                          class="accdiff-targeted-cover flexrow flex-center" labelClass="i--s" />
-                        <input
-                          style="display: none"
-                          type="number"
-                          bind:value={data.difficulty}
-                          min="0"
-                        />
-                        <button
-                          class="i--m no-grow"
-                          type="button"
-                          on:click={() => data.difficulty = data.difficulty + 1}
-                        >
-                          <i class="cci cci-difficulty i--m" style="border:none"></i>
-                        </button>
-                      </div>
-                   </div>
-                  {/each}
+                <div transition:slide|local>
+                  <Cover bind:cover={targets[0].cover}
+                         class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
                 </div>
               {/if}
             </div>
-          </div>
+          {/if}
         </div>
       </div>
-      <div class="dialog-buttons flexrow">
-        <button class="dialog-button submit default" data-button="submit" type="submit">
-          <i class="fas fa-check"></i>
-          Roll
-        </button>
-        <button class="dialog-button cancel"
-          data-button="cancel" type="button" on:click={() => dispatch('cancel')}>
-          <i class="fas fa-times"></i>
-          Cancel
-        </button>
+      <label class="flexrow accdiff-footer accdiff-weight" for="accdiff-other-sources">
+        Other Sources
+      </label>
+      <div id="accdiff-other-sources" class="accdiff-grid">
+        <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
+          <PlusMinusInput bind:value={base.accuracy} id="accdiff-other-acc" />
+        </div>
+        <div class="accdiff-other-grid">
+          <PlusMinusInput bind:value={base.difficulty} id="accdiff-other-diff" />
+        </div>
       </div>
-    </form>
-  {/key}
-{/if}
+      <div class="grid-enforcement accdiff-footer">
+        <div class="accdiff-total">
+          {#if targets.length < 2}
+            {#key targets.length}
+              <label transition:blur
+                class="accdiff-weight flex-center flexrow total-label" for="total-display-0">
+                Total
+                {#if targets.length > 0}
+                  vs {targets[0].target.data.name}
+                {/if}
+              </label>
+            {/key}
+          {/if}
+          <div class="grid-enforcement">
+            {#if targets.length == 0}
+              <div
+                class="flexrow flex-center accdiff-total">
+                <Total target={base} id="total-display-0" />
+              </div>
+            {:else if targets.length == 1}
+              <div
+                class="flexrow flex-center accdiff-total">
+                <Total target={targets[0]} id="total-display-0" onlyTarget={true}/>
+              </div>
+            {:else}
+              <div class="accdiff-weight accdiff-target-row">
+                {#each targets as data, i (data.target.id)}
+                  <div
+                    in:blur|local={{delay:100, duration:300}} out:blur|local={{duration: 100}}
+                    animate:flip={{duration: 200}}
+                    class="flexcol card accdiff-target">
+                    <label class="flexrow flex-center card" for={data.target.id}>
+                      {data.target.data.name}
+                    </label>
+                    <div class="flexrow accdiff-total">
+                      <ConsumeLockOn lockOn={data} visible={false} />
+                      <Total target={data} id={`total-display-${i}`} />
+                    </div>
+                    <div class="flexrow">
+                      <button
+                        class="i--m no-grow"
+                        type="button"
+                        on:click={() => data.accuracy = data.accuracy + 1}
+                      >
+                        <i class="cci cci-accuracy i--m" style="border:none"></i>
+                      </button>
+                      <input
+                        style="display: none"
+                        type="number"
+                        bind:value={data.accuracy}
+                        min="0"
+                      />
+                      <Cover bind:cover={data.cover} disabled={weapon.seeking}
+                        class="accdiff-targeted-cover flexrow flex-center" labelClass="i--s" />
+                      <input
+                        style="display: none"
+                        type="number"
+                        bind:value={data.difficulty}
+                        min="0"
+                      />
+                      <button
+                        class="i--m no-grow"
+                        type="button"
+                        on:click={() => data.difficulty = data.difficulty + 1}
+                      >
+                        <i class="cci cci-difficulty i--m" style="border:none"></i>
+                      </button>
+                    </div>
+                  </div>
+                {/each}
+              </div>
+            {/if}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="dialog-buttons flexrow">
+      <button class="dialog-button submit default" data-button="submit" type="submit" use:focus>
+        <i class="fas fa-check"></i>
+        Roll
+      </button>
+      <button class="dialog-button cancel"
+        data-button="cancel" type="button" on:click={() => dispatch('cancel')}>
+        <i class="fas fa-times"></i>
+        Cancel
+      </button>
+    </div>
+  </form>
+{/key}
 
 <style>
   :global(.accdiff-grid) {
@@ -336,15 +354,4 @@
     white-space: nowrap;
   }
 
- /* this forces all its children to share the same space,
-    which is useful for svelte transitions */
-  :global(.grid-enforcement) {
-    display: grid;
-    overflow: hidden;
-  }
-
-  :global(.grid-enforcement > *) {
-    grid-column: 1/2;
-    grid-row: 1/2;
-  }
 </style>
diff --git a/src/module/helpers/acc_diff/data.ts b/src/module/helpers/acc_diff/data.ts
index 14cbb96bd..37fbb3adc 100644
--- a/src/module/helpers/acc_diff/data.ts
+++ b/src/module/helpers/acc_diff/data.ts
@@ -267,6 +267,12 @@ export class AccDiffData {
     for (let target of this.targets) { target.hydrate(this); }
   }
 
+  replaceTargets(ts: Token[]): AccDiffData {
+    this.targets = ts.map(t => AccDiffTarget.fromParams(t));
+    for (let target of this.targets) { target.hydrate(this); }
+    return this;
+  }
+
   get raw() {
     return {
       title: this.title,
diff --git a/src/module/helpers/acc_diff/form.ts b/src/module/helpers/acc_diff/form.ts
deleted file mode 100644
index 69f595fe8..000000000
--- a/src/module/helpers/acc_diff/form.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { AccDiffTarget, AccDiffData } from './data';
-import SvelteApp from "../svelte-application";
-import AccDiffSvelte from "./Form.svelte";
-
-let formCache: AccDiffForm;
-
-export class AccDiffForm extends SvelteApp<AccDiffData> {
-  static get defaultOptions() {
-    return mergeObject(super.defaultOptions, {
-      resizable: false,
-      popOut: false,
-      intro: true
-    });
-  }
-
-  constructor(data: AccDiffData) {
-    if (formCache) {
-      formCache.refresh(data);
-      formCache.open();
-    } else {
-      super(AccDiffSvelte, data);
-      formCache = this;
-      this.render(true);
-    }
-    return formCache;
-  }
-
-  static coalesceTargets(ts: Token[], forceFullRefresh: boolean = false): AccDiffForm | null {
-    if (formCache) {
-      let targets = ts.map(t => AccDiffTarget.fromParams(t));
-      formCache.data.targets = targets;
-      for (let target of targets) { target.hydrate(formCache.data); };
-
-      // do a full refresh either if the form is currently closed, or we've been told to
-      if (!formCache.isOpen || forceFullRefresh) {
-        formCache.refresh(formCache.data);
-      } else {
-        formCache.component?.$set({ targets: formCache.data.targets });
-      }
-
-      // when the client only provides us targets, we want to let them
-      // set up downstream actions if and only if nothing else is pending
-      if (formCache.isOpen) {
-        // this is the case where the form already has a pending promise
-        return null;
-      } else {
-        formCache.open();
-        return formCache;
-      }
-    } else {
-      let data = AccDiffData.fromParams(undefined, undefined, 'Basic Attack', ts, undefined);
-      return new AccDiffForm(data);
-    }
-  }
-
-  refresh(data: AccDiffData) {
-    // really simple little diff
-    // broadly just rerendering the whole thing is fast enough
-    // we're just doing this to ensure that the slide in for the whole modal
-    // only happens when the weapon is changed
-    let diff = { ...data };
-    if (diff.lancerItem === this.data.lancerItem) {
-      delete diff.lancerItem;
-    }
-
-    this.data = data;
-    this.refreshPromise();
-    this.component?.$set(diff);
-  }
-
-  get isOpen() {
-    // @ts-ignore open does exist on the component, because we compile it with accessors:true
-    return this.component?.open;
-  }
-
-  open() {
-    this.component?.$set({ open: true });
-  }
-
-  async close() {
-    this.component?.$set({ open: false });
-    this.rejectPromise();
-    return null;
-  }
-
-  async _renderInner(_data: any) {
-    const sidebarWidth = $("#sidebar").width() || 0;
-    return $(`<div class="app window-app" style="bottom: 0; right: ${sidebarWidth + 5}px"></div>`);
-  }
-
-  _injectHTML(html: JQuery) {
-    // override to disable foundry's jquery animations
-    $(document.body).append(html);
-    this._element = html;
-    // @ts-ignore
-    this._element.slideUp = function(timeout: number, callback) {
-      setTimeout(callback, timeout);
-    }
-    return html;
-  }
-}
diff --git a/src/module/helpers/acc_diff/index.ts b/src/module/helpers/acc_diff/index.ts
index 07960c9ab..f16940dff 100644
--- a/src/module/helpers/acc_diff/index.ts
+++ b/src/module/helpers/acc_diff/index.ts
@@ -22,4 +22,3 @@ export type {
   AccDiffPlugin,
   Data as AccDiffPluginDataOf
 } from './plugin'
-export { AccDiffForm } from './form';
diff --git a/src/module/helpers/slidinghud/SlidingHUDZone.svelte b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
new file mode 100644
index 000000000..f1b184cfe
--- /dev/null
+++ b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
@@ -0,0 +1,98 @@
+<svelte:options accessors={true} />
+
+<script lang="ts">
+ import type SvelteComponent from "*.svelte";
+
+ import { flip } from 'svelte/animate';
+ import { slide } from 'svelte/transition';
+ import { createEventDispatcher } from 'svelte';
+
+ import { sidebarWidth } from './sidebar-width';
+ import AccDiffForm from '../acc_diff/Form.svelte';
+
+ let dispatch = createEventDispatcher();
+
+ let dialogs: { [key: string]: typeof SvelteComponent } = {
+   hase: AccDiffForm,
+   attack: AccDiffForm,
+ }
+
+ // @hmr:keep
+ let huds: {
+   [key: string]: {
+     open: number | null,
+     data?: any,
+   }
+ } = {
+   hase: { open: null },
+   attack: { open: null }
+ };
+
+ export function open(key: string, data: any, cancelExisting: "cancel existing listeners" | null) {
+   if (cancelExisting) { dispatch(`${key}.cancel`) }
+   huds[key].open = (new Date()).getTime();
+   huds[key].data = data;
+ }
+
+ export function close(key: string) {
+   dispatch(`${key}.cancel`);
+   huds[key].open = null;
+   huds[key].data = null;
+ }
+
+ export function data(key: string) {
+   if (huds[key] && huds[key].data) { return huds[key].data; }
+ }
+
+ export function isOpen(key: string) {
+   return huds[key] && huds[key].open;
+ }
+
+ export let components: { [key: string]: SvelteComponent } = {};
+
+ function forward(key: string, event: string, data?: any | undefined) {
+   dispatch(`${key}.${event}`, data ? data : undefined);
+   // no matter why we get an event from a child, we should close it, it's _done_
+   huds[key].open = null;
+   huds[key].data = null;
+ }
+
+ $: visibleHudsKeys =
+   Object.keys(huds).filter(key => huds[key].open).sort((a,b) => huds[b].open! - huds[a].open!);
+</script>
+
+<div id="hudzone" class="window-app" style="bottom: 0; right: {$sidebarWidth}px">
+  {#each visibleHudsKeys as key (key)}
+    <div class="component grid-enforcement" transition:slide animate:flip>
+      <svelte:component
+        this={dialogs[key]}
+        bind:this={components[key]}
+        kind={key}
+        {...huds[key].data}
+        redrawItem={huds[key].data.title}
+        on:submit={() => forward(key, "submit", huds[key].data)}
+        on:cancel={() =>  forward(key, "cancel")}
+      />
+    </div>
+  {/each}
+</div>
+
+<style>
+ #hudzone {
+     position: absolute;
+     display: flex;
+     align-items: flex-end;
+     background-color: transparent;
+     border: none;
+     box-shadow: none;
+     flex-direction: row-reverse;
+     pointer-events: none;
+     transition: right 600ms;
+ }
+
+ #hudzone > .component {
+     padding-right: 10px;
+     pointer-events: initial;
+     flex: unset;
+ }
+</style>
diff --git a/src/module/helpers/slidinghud/index.ts b/src/module/helpers/slidinghud/index.ts
new file mode 100644
index 000000000..ecc19a7d7
--- /dev/null
+++ b/src/module/helpers/slidinghud/index.ts
@@ -0,0 +1,54 @@
+import type HUDZone from './SlidingHUDZone.svelte';
+import type { AccDiffData } from '../acc_diff';
+
+let hud: typeof HUDZone;
+
+export async function attach() {
+  if (!hud) {
+    let HUDZone = (await import('./SlidingHUDZone.svelte')).default;
+    hud = new HUDZone({
+      target: document.body
+    });
+  }
+}
+
+function rejectedPromise<T>(): Promise<T> {
+  return new Promise((_res, rej) => { rej() });
+}
+
+export async function open(key: "hase" | "attack", newData: AccDiffData | Token[]): Promise<AccDiffData> {
+  let { AccDiffData } = await import('../acc_diff');
+  if (!hud) { attach(); }
+
+  // @ts-ignore
+  let wasOpen: boolean = hud.isOpen(key);
+
+  // if we're an attack roll, and we have no targets, and we weren't open, then... don't do anything
+  if (key == "attack" && !wasOpen && newData instanceof Array && newData.length == 0) {
+    return rejectedPromise();
+  }
+
+  // @ts-ignore
+  let oldData: AccDiffData = hud.data(key);
+
+  let data: AccDiffData = newData instanceof AccDiffData ? newData :
+    (oldData ? oldData.replaceTargets(newData) :
+      AccDiffData.fromParams(undefined, undefined, 'Basic Attack', newData, undefined));
+
+  // when given completely new data, we always want to cancel existing listeners
+  // when given just targets, we want to preserve existing listeners
+  let cancelExisting = newData instanceof AccDiffData ? "cancel existing listeners" : null;
+  // @ts-ignore
+  hud.open(key, data, cancelExisting);
+
+  // if there were older listeners (the form was open), and we didn't cancel them
+  // we want to not allow this particular call to set up new listeners
+  if (wasOpen && !cancelExisting) {
+    return rejectedPromise();
+  } else {
+    return new Promise((resolve, reject) => {
+      hud.$on(`${key}.submit`, (ev: CustomEvent<AccDiffData>) => resolve(ev.detail));
+      hud.$on(`${key}.cancel`, () => reject());
+    });
+  }
+}
diff --git a/src/module/helpers/slidinghud/sidebar-width.ts b/src/module/helpers/slidinghud/sidebar-width.ts
new file mode 100644
index 000000000..b89452168
--- /dev/null
+++ b/src/module/helpers/slidinghud/sidebar-width.ts
@@ -0,0 +1,10 @@
+import { readable } from 'svelte/store';
+
+export const sidebarWidth = readable(0, update => {
+  const sidebar = $("#sidebar");
+
+  function setWidth() { update(sidebar.width() || 0); }
+
+  setWidth();
+  Hooks.on('collapseSidebar', setWidth);
+});
diff --git a/src/module/macros.ts b/src/module/macros.ts
index ca8f79eed..148b32e6f 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -51,7 +51,7 @@ import { buildActionHTML, buildDeployableHTML, buildSystemHTML } from "./helpers
 import { ActivationOptions, StabOptions1, StabOptions2 } from "./enums";
 import { applyCollapseListeners, uuid4 } from "./helpers/collapse";
 import { checkForHit } from "./helpers/automation/targeting";
-import type { AccDiffForm, AccDiffData, AccDiffDataSerialized } from "./helpers/acc_diff";
+import type { AccDiffData, AccDiffDataSerialized } from "./helpers/acc_diff";
 import { is_overkill } from "machine-mind/dist/funcs";
 
 const lp = LANCER.log_prefix;
@@ -555,8 +555,8 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
 
   // Get accuracy/difficulty with a prompt
   let { AccDiffData } = await import('./helpers/acc_diff');
-  let initialData = AccDiffData.fromParams();
-  let promptedData = await promptAccDiffModifiers(initialData);
+  let initialData = AccDiffData.fromParams(undefined, undefined, data.title);
+  let promptedData = await promptAccDiffModifiers('hase', initialData);
   // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
   if (!promptedData) return;
@@ -767,7 +767,7 @@ async function prepareAttackMacro({
   let { AccDiffData } = await import('./helpers/acc_diff');
   const initialData = rerollData ?? AccDiffData.fromParams(
     item, mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
-  const promptedData = await promptAccDiffModifiers(initialData);
+  const promptedData = await promptAccDiffModifiers("attack", initialData);
   // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
   if (!promptedData) return;
@@ -801,12 +801,9 @@ async function prepareAttackMacro({
   await rollAttackMacro(actor, atkRolls, mData, rerollMacro);
 }
 
-export async function refreshTargeting(full: "force full refresh" | "do partial refresh") {
+export async function refreshTargeting() {
   const targets = Array.from(game.user.targets);
-  let { AccDiffForm } = await import('./helpers/acc_diff');
-  const form = AccDiffForm.coalesceTargets(targets, full == "force full refresh");
-  if (!form) return;
-  const promptedData = await promptAccDiffModifiers(form);
+  const promptedData = await promptAccDiffModifiers("attack", targets);
   // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
   if (!promptedData) return;
@@ -818,6 +815,7 @@ export async function refreshTargeting(full: "force full refresh" | "do partial
   }
 
   let mData = {
+    title: 'BASIC ATTACK',
     grit: 0,
     tags: [],
     damage: [],
@@ -1249,7 +1247,7 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
   const initialData = rerollData ?
     AccDiffData.fromObject(rerollData, item) :
     AccDiffData.fromParams(item, data.tags, data.title, targets);
-  const promptedData = await promptAccDiffModifiers(initialData);
+  const promptedData = await promptAccDiffModifiers("attack", initialData);
   // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
   if (!promptedData) return;
@@ -1275,11 +1273,10 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
   return await renderMacroTemplate(actor, template, templateData);
 }
 
-export async function promptAccDiffModifiers(data: AccDiffData | AccDiffForm): Promise<AccDiffData | null> {
-  let { AccDiffForm } = await import('./helpers/acc_diff');
-  let form: AccDiffForm = data instanceof AccDiffForm ? data : new AccDiffForm(data);
+export async function promptAccDiffModifiers(key: "hase" | "attack", data: AccDiffData | Token[]): Promise<AccDiffData | null> {
+  let { open } = await import('./helpers/slidinghud');
   try {
-    return await form.promise; // await to force any rejections into this try/catch
+    return await open(key, data); // await to force any rejections into this try/catch
   } catch (_e) {
     return null;
   }

From 879691b3c2cb8e831db84bdc67e7c10904612c9f Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sun, 29 Aug 2021 13:01:33 -0700
Subject: [PATCH 62/88] make the window popup way way less aggressive

---
 src/lancer.ts                                    | 10 ++++++----
 .../helpers/slidinghud/SlidingHUDZone.svelte     |  4 ++++
 src/module/helpers/slidinghud/index.ts           | 16 +++++++++++++---
 src/module/macros.ts                             | 14 +++++++-------
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/lancer.ts b/src/lancer.ts
index dc53584f4..a2a66abec 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -515,11 +515,13 @@ Hooks.once("init", async function () {
   // ------------------------------------------------------------------------
   // Sliding HUD Zone, including accuracy/difficulty window
   Hooks.on('renderHeadsUpDisplay', slidingHUD.attach);
-  Hooks.on('targetToken', () => macros.refreshTargeting());
-  Hooks.on('createActiveEffect', () => macros.refreshTargeting());
-  Hooks.on('deleteActiveEffect', () => macros.refreshTargeting());
+  Hooks.on('targetToken', (_user: User, _token: Token, isNewTarget: boolean) => {
+    macros.refreshTargeting(isNewTarget ? "may open new window" : "only refresh open window");
+  });
+  Hooks.on('createActiveEffect', () => macros.refreshTargeting("only refresh open window"));
+  Hooks.on('deleteActiveEffect', () => macros.refreshTargeting("only refresh open window"));
   // updateToken triggers on things like token movement (spotter) and probably a lot of other things
-  Hooks.on('updateToken', () => macros.refreshTargeting());
+  Hooks.on('updateToken', () => macros.refreshTargeting("only refresh open window"));
 
   // TODO: remove when sanity check is no longer needed.
   game.lancer.finishedInit = true;
diff --git a/src/module/helpers/slidinghud/SlidingHUDZone.svelte b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
index f1b184cfe..1c16a5d54 100644
--- a/src/module/helpers/slidinghud/SlidingHUDZone.svelte
+++ b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
@@ -40,6 +40,10 @@
    huds[key].data = null;
  }
 
+ export function refresh(key: string, data: any) {
+   huds[key].data = data;
+ }
+
  export function data(key: string) {
    if (huds[key] && huds[key].data) { return huds[key].data; }
  }
diff --git a/src/module/helpers/slidinghud/index.ts b/src/module/helpers/slidinghud/index.ts
index ecc19a7d7..b6c1074ce 100644
--- a/src/module/helpers/slidinghud/index.ts
+++ b/src/module/helpers/slidinghud/index.ts
@@ -16,15 +16,25 @@ function rejectedPromise<T>(): Promise<T> {
   return new Promise((_res, rej) => { rej() });
 }
 
-export async function open(key: "hase" | "attack", newData: AccDiffData | Token[]): Promise<AccDiffData> {
+export async function open(
+  key: "hase" | "attack",
+  newData: AccDiffData | Token[],
+  mode: "may open new window" | "only refresh open window"
+): Promise<AccDiffData> {
   let { AccDiffData } = await import('../acc_diff');
   if (!hud) { attach(); }
 
   // @ts-ignore
   let wasOpen: boolean = hud.isOpen(key);
 
-  // if we're an attack roll, and we have no targets, and we weren't open, then... don't do anything
-  if (key == "attack" && !wasOpen && newData instanceof Array && newData.length == 0) {
+  // if we're only allowed to refresh open windows, and the window isn't open, just refresh it
+  // don't allow new handlers in this case — they wouldn't make sense anyway, the window isn't open
+  // why even bother with the refresh?
+  // just in case there's some data here that would make sense to keep a hold of for a later
+  // target-only open of the window, like a character becoming impaired from underneath us
+  if (!wasOpen && mode == "only refresh open window") {
+    // @ts-ignore
+    hud.refresh(key, newData);
     return rejectedPromise();
   }
 
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 148b32e6f..4298bf8e2 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -556,7 +556,7 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
   // Get accuracy/difficulty with a prompt
   let { AccDiffData } = await import('./helpers/acc_diff');
   let initialData = AccDiffData.fromParams(undefined, undefined, data.title);
-  let promptedData = await promptAccDiffModifiers('hase', initialData);
+  let promptedData = await promptAccDiffModifiers('hase', initialData, "may open new window");
   // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
   if (!promptedData) return;
@@ -767,7 +767,7 @@ async function prepareAttackMacro({
   let { AccDiffData } = await import('./helpers/acc_diff');
   const initialData = rerollData ?? AccDiffData.fromParams(
     item, mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
-  const promptedData = await promptAccDiffModifiers("attack", initialData);
+  const promptedData = await promptAccDiffModifiers("attack", initialData, "may open new window");
   // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
   if (!promptedData) return;
@@ -801,9 +801,9 @@ async function prepareAttackMacro({
   await rollAttackMacro(actor, atkRolls, mData, rerollMacro);
 }
 
-export async function refreshTargeting() {
+export async function refreshTargeting(mode: "may open new window" | "only refresh open window") {
   const targets = Array.from(game.user.targets);
-  const promptedData = await promptAccDiffModifiers("attack", targets);
+  const promptedData = await promptAccDiffModifiers("attack", targets, mode);
   // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
   if (!promptedData) return;
@@ -1247,7 +1247,7 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
   const initialData = rerollData ?
     AccDiffData.fromObject(rerollData, item) :
     AccDiffData.fromParams(item, data.tags, data.title, targets);
-  const promptedData = await promptAccDiffModifiers("attack", initialData);
+  const promptedData = await promptAccDiffModifiers("attack", initialData, "may open new window");
   // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
   if (!promptedData) return;
@@ -1273,10 +1273,10 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
   return await renderMacroTemplate(actor, template, templateData);
 }
 
-export async function promptAccDiffModifiers(key: "hase" | "attack", data: AccDiffData | Token[]): Promise<AccDiffData | null> {
+export async function promptAccDiffModifiers(key: "hase" | "attack", data: AccDiffData | Token[], mode: "may open new window" | "only refresh open window"): Promise<AccDiffData | null> {
   let { open } = await import('./helpers/slidinghud');
   try {
-    return await open(key, data); // await to force any rejections into this try/catch
+    return await open(key, data, mode); // await to force any rejections into this try/catch
   } catch (_e) {
     return null;
   }

From 267448e2aa96b75cfdef0adee533555865b3cbe0 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sun, 29 Aug 2021 19:02:30 -0700
Subject: [PATCH 63/88] this function should be three separate functions

---
 .../helpers/slidinghud/SlidingHUDZone.svelte  |  4 +-
 src/module/helpers/slidinghud/index.ts        | 73 ++++++++++---------
 src/module/macros.ts                          | 56 ++++++++------
 3 files changed, 74 insertions(+), 59 deletions(-)

diff --git a/src/module/helpers/slidinghud/SlidingHUDZone.svelte b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
index 1c16a5d54..3b185a089 100644
--- a/src/module/helpers/slidinghud/SlidingHUDZone.svelte
+++ b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
@@ -28,8 +28,8 @@
    attack: { open: null }
  };
 
- export function open(key: string, data: any, cancelExisting: "cancel existing listeners" | null) {
-   if (cancelExisting) { dispatch(`${key}.cancel`) }
+ export function open(key: string, data: any) {
+   dispatch(`${key}.cancel`);
    huds[key].open = (new Date()).getTime();
    huds[key].data = data;
  }
diff --git a/src/module/helpers/slidinghud/index.ts b/src/module/helpers/slidinghud/index.ts
index b6c1074ce..f18c9f1ec 100644
--- a/src/module/helpers/slidinghud/index.ts
+++ b/src/module/helpers/slidinghud/index.ts
@@ -10,55 +10,56 @@ export async function attach() {
       target: document.body
     });
   }
+  return hud;
 }
 
-function rejectedPromise<T>(): Promise<T> {
-  return new Promise((_res, rej) => { rej() });
+export async function open(key: "hase" | "attack", data: AccDiffData): Promise<AccDiffData> {
+  let hud = await attach();
+
+  // open the hud, cancelling existing listeners
+  // @ts-ignore
+  hud.open(key, data);
+
+  return new Promise((resolve, reject) => {
+    hud.$on(`${key}.submit`, (ev: CustomEvent<AccDiffData>) => resolve(ev.detail));
+    hud.$on(`${key}.cancel`, () => reject());
+  });
 }
 
-export async function open(
-  key: "hase" | "attack",
-  newData: AccDiffData | Token[],
-  mode: "may open new window" | "only refresh open window"
-): Promise<AccDiffData> {
-  let { AccDiffData } = await import('../acc_diff');
-  if (!hud) { attach(); }
+// this method differs from open() in two key ways
+// 1. it's not allowed to open new windows
+// 2. it never allows the caller to observe the data via promise,
+//      assuming if the window was open that the existing handler is what we want to preserve
+export async function refreshTargets(key: "hase" | "attack", ts: Token[]) {
+  let hud = await attach();
 
+  // this method isn't allowed to open new windows, so bail out if it isn't open
   // @ts-ignore
-  let wasOpen: boolean = hud.isOpen(key);
+  if (!hud.isOpen(key)) { return; }
 
-  // if we're only allowed to refresh open windows, and the window isn't open, just refresh it
-  // don't allow new handlers in this case — they wouldn't make sense anyway, the window isn't open
-  // why even bother with the refresh?
-  // just in case there's some data here that would make sense to keep a hold of for a later
-  // target-only open of the window, like a character becoming impaired from underneath us
-  if (!wasOpen && mode == "only refresh open window") {
-    // @ts-ignore
-    hud.refresh(key, newData);
-    return rejectedPromise();
-  }
+  let { AccDiffData } = await import('../acc_diff');
 
   // @ts-ignore
   let oldData: AccDiffData = hud.data(key);
+  if (!oldData || !(oldData instanceof AccDiffData)) {
+    throw new Error(`${key} hud is open without valid data: ${oldData}`);
+  }
+  let data: AccDiffData = oldData.replaceTargets(ts);
 
-  let data: AccDiffData = newData instanceof AccDiffData ? newData :
-    (oldData ? oldData.replaceTargets(newData) :
-      AccDiffData.fromParams(undefined, undefined, 'Basic Attack', newData, undefined));
-
-  // when given completely new data, we always want to cancel existing listeners
-  // when given just targets, we want to preserve existing listeners
-  let cancelExisting = newData instanceof AccDiffData ? "cancel existing listeners" : null;
   // @ts-ignore
-  hud.open(key, data, cancelExisting);
+  hud.refresh(key, data);
+}
 
-  // if there were older listeners (the form was open), and we didn't cancel them
-  // we want to not allow this particular call to set up new listeners
-  if (wasOpen && !cancelExisting) {
-    return rejectedPromise();
+// this method opens a new window if one isn't open, with as much data as we have, allowing new listeners
+// otherwise, it refreshes the existing window, disallowing new listeners
+export async function openOrRefresh(key: "hase" | "attack", ts: Token[], title: string): Promise<AccDiffData> {
+  let hud = await attach();
+  // @ts-ignore
+  if (hud.isOpen(key)) {
+    refreshTargets(key, ts);
+    return new Promise((_res, rej) => rej());
   } else {
-    return new Promise((resolve, reject) => {
-      hud.$on(`${key}.submit`, (ev: CustomEvent<AccDiffData>) => resolve(ev.detail));
-      hud.$on(`${key}.cancel`, () => reject());
-    });
+    let { AccDiffData } = await import('../acc_diff');
+    return open(key, AccDiffData.fromParams(undefined, undefined, title, ts, undefined))
   }
 }
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 4298bf8e2..b66f9f0fa 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -556,10 +556,15 @@ async function rollStatMacro(actor: Actor, data: LancerStatMacroData) {
   // Get accuracy/difficulty with a prompt
   let { AccDiffData } = await import('./helpers/acc_diff');
   let initialData = AccDiffData.fromParams(undefined, undefined, data.title);
-  let promptedData = await promptAccDiffModifiers('hase', initialData, "may open new window");
-  // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
-  if (!promptedData) return;
+  let promptedData;
+  try {
+    let { open } = await import('./helpers/slidinghud');
+    promptedData = await open('hase', initialData);
+  } catch (_e) {
+    return;
+  }
+
   let acc: number = promptedData.base.total;
 
   // Do the roll
@@ -767,10 +772,14 @@ async function prepareAttackMacro({
   let { AccDiffData } = await import('./helpers/acc_diff');
   const initialData = rerollData ?? AccDiffData.fromParams(
     item, mData.tags, mData.title, targets, mData.acc > 0 ? [mData.acc, 0] : [0, -mData.acc]);
-  const promptedData = await promptAccDiffModifiers("attack", initialData, "may open new window");
-  // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
-  if (!promptedData) return;
+  let promptedData;
+  try {
+    let { open } = await import('./helpers/slidinghud');
+    promptedData = await open('attack', initialData);
+  } catch (_e) {
+    return;
+  }
 
   const atkRolls = attackRolls(mData.grit, promptedData);
 
@@ -803,10 +812,19 @@ async function prepareAttackMacro({
 
 export async function refreshTargeting(mode: "may open new window" | "only refresh open window") {
   const targets = Array.from(game.user.targets);
-  const promptedData = await promptAccDiffModifiers("attack", targets, mode);
-  // note that the previous await waits for the user, and in many cases returns null as the user backs out
+  let { refreshTargets, openOrRefresh } = await import('./helpers/slidinghud');
 
-  if (!promptedData) return;
+  if (mode == "only refresh open window") {
+    refreshTargets("attack", targets);
+    return;
+  }
+
+  let promptedData;
+  try {
+    promptedData = await openOrRefresh("attack", targets, "Basic Attack");
+  } catch (_e) {
+    return;
+  }
 
   let actor = getMacroSpeaker();
   if (!actor) {
@@ -1247,10 +1265,15 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
   const initialData = rerollData ?
     AccDiffData.fromObject(rerollData, item) :
     AccDiffData.fromParams(item, data.tags, data.title, targets);
-  const promptedData = await promptAccDiffModifiers("attack", initialData, "may open new window");
-  // note that the previous await waits for the user, and in many cases returns null as the user backs out
 
-  if (!promptedData) return;
+  let promptedData;
+  try {
+    let { open } = await import('./helpers/slidinghud');
+    promptedData = await open('attack', initialData);
+  } catch (_e) {
+    return;
+  }
+
   partialMacroData.args.push(promptedData.toObject());
 
   let atkRolls = attackRolls(data.t_atk, promptedData);
@@ -1273,15 +1296,6 @@ async function rollTechMacro(actor: Actor, data: LancerTechMacroData, partialMac
   return await renderMacroTemplate(actor, template, templateData);
 }
 
-export async function promptAccDiffModifiers(key: "hase" | "attack", data: AccDiffData | Token[], mode: "may open new window" | "only refresh open window"): Promise<AccDiffData | null> {
-  let { open } = await import('./helpers/slidinghud');
-  try {
-    return await open(key, data, mode); // await to force any rejections into this try/catch
-  } catch (_e) {
-    return null;
-  }
-}
-
 export async function prepareOverchargeMacro(a: string) {
   // Determine which Actor to speak as
   let actor: LancerActor<any> | null = getMacroSpeaker(a);

From 8712c1bfc146ba20dd0090698e4977c934ca7ac5 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sun, 29 Aug 2021 19:04:24 -0700
Subject: [PATCH 64/88] bugfix: this esc handler was very wrong

---
 src/module/helpers/acc_diff/Form.svelte | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index e9cf002a1..f52a58678 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -32,17 +32,17 @@
  const dispatch = createEventDispatcher();
 
  function focus(el: HTMLElement) { el.focus(); }
- function escToCancel(_el: HTMLElement) {
-   let esc = function(ev: any) {
-     ev.preventDefault();
-     if (ev.key === 'Escape') { dispatch('cancel'); }
-   };
-   window.addEventListener('keydown', esc);
 
-   // onDestroy
-   return {
-     destroy() { window.removeEventListener('keydown', esc); }
+ function escToCancel(_el: HTMLElement) {
+   function escHandler(ev: KeyboardEvent) {
+     if (ev.key === 'Escape') {
+       ev.preventDefault();
+       dispatch('cancel');
+     }
    }
+
+   window.addEventListener('keydown', escHandler);
+   return { destroy() { window.removeEventListener('keydown', escHandler); } }
  }
 </script>
 

From 460b54208f087fd35d8057c8f874a73b7a36d3e3 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Sun, 29 Aug 2021 19:04:45 -0700
Subject: [PATCH 65/88] bugfix: data should be able to flow in and out of these
 components

---
 src/module/helpers/acc_diff/Form.svelte | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index f52a58678..2c1eab489 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -90,7 +90,7 @@
               {#if targets.length == 1}
                 <label class="container" for="base-consume-lockon">
                   Consume Lock On (+1)
-                  <ConsumeLockOn lockOn={targets[0]} id="base-consume-lockon" />
+                  <ConsumeLockOn bind:lockOn={targets[0]} id="base-consume-lockon" />
                   <span class="checkmark"></span>
                 </label>
                 {#each Object.keys(targets[0].plugins) as key}
@@ -165,7 +165,7 @@
             {:else if targets.length == 1}
               <div
                 class="flexrow flex-center accdiff-total">
-                <Total target={targets[0]} id="total-display-0" onlyTarget={true}/>
+                <Total bind:target={targets[0]} id="total-display-0" onlyTarget={true}/>
               </div>
             {:else}
               <div class="accdiff-weight accdiff-target-row">
@@ -178,8 +178,7 @@
                       {data.target.data.name}
                     </label>
                     <div class="flexrow accdiff-total">
-                      <ConsumeLockOn lockOn={data} visible={false} />
-                      <Total target={data} id={`total-display-${i}`} />
+                      <Total bind:target={data} id={`total-display-${i}`} />
                     </div>
                     <div class="flexrow">
                       <button

From 58347a19efa274973497fd2edc8379cef8cd4487 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 00:23:26 -0700
Subject: [PATCH 66/88] tweak the transitions some

---
 src/module/helpers/acc_diff/Form.svelte       | 342 +++++++++---------
 .../helpers/slidinghud/SlidingHUDZone.svelte  |   5 +-
 2 files changed, 171 insertions(+), 176 deletions(-)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 51c2f721f..9d2b5e439 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -2,9 +2,8 @@
 
 <script lang="ts">
  import type { AccDiffWeapon, AccDiffBase, AccDiffTarget } from './index';
- import type { LancerItem } from "../../item/lancer-item";
 
- import { slide, blur } from 'svelte/transition';
+ import { slide } from 'svelte/transition';
  import { flip } from 'svelte/animate';
  import { createEventDispatcher } from 'svelte';
 
@@ -18,10 +17,9 @@
  export let base: AccDiffBase;
  export let targets: AccDiffTarget[];
  export let title: string;
- export let lancerItem: LancerItem;
+ export const lancerItem: any | null = null;
 
  export let kind: "hase" | "attack";
- export let redrawItem: any = lancerItem;
 
  // tell svelte of externally computed dependency arrows
  // @ts-ignore i.e., base depends on weapon
@@ -46,191 +44,189 @@
  }
 </script>
 
-{#key redrawItem}
-  <form id="accdiff" class="accdiff window-content" transition:slide|local use:escToCancel
-    on:submit|preventDefault={() => dispatch('submit')}>
-    {#if title != ''}
-      <div class="lancer-header mech-weapon medium">
+<form id="accdiff" class="accdiff window-content" use:escToCancel
+  on:submit|preventDefault={() => dispatch('submit')}>
+  {#if title != ''}
+    <div class="lancer-header mech-weapon medium">
+      {#if kind == "attack"}
+        <i class="cci cci-weapon i--m i--light"></i>
+      {:else if kind == "hase"}
+        <i class="fas fa-dice-d20 i--m i--light"></i>
+      {/if}
+      <span>{title}</span>
+    </div>
+  {/if}
+  <div id="{kind}-accdiff-dialog" style="padding:4px">
+    <div class="accdiff-grid">
+      <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;min-width:180px">
+        <h3>
+          <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
+          Accuracy
+        </h3>
+        <label class="container">
+          Accurate (+1)
+          <input type="checkbox" bind:checked={weapon.accurate} />
+          <span class="checkmark"></span>
+        </label>
         {#if kind == "attack"}
-          <i class="cci cci-weapon i--m i--light"></i>
-        {:else if kind == "hase"}
-          <i class="fas fa-dice-d20 i--m i--light"></i>
-        {/if}
-        <span>{title}</span>
-      </div>
-    {/if}
-    <div id="{kind}-accdiff-dialog" style="padding:4px">
-      <div class="accdiff-grid">
-        <div style="width:100%;padding:4px;border-right: 1px dashed #782e22;min-width:180px">
-          <h3>
-            <i class="cci cci-accuracy i--m i--dark" style="vertical-align:middle;border:none"></i>
-            Accuracy
-          </h3>
           <label class="container">
-            Accurate (+1)
-            <input type="checkbox" bind:checked={weapon.accurate} />
+            Seeking (*)
+            <input type="checkbox" bind:checked={weapon.seeking} />
             <span class="checkmark"></span>
           </label>
-          {#if kind == "attack"}
-            <label class="container">
-              Seeking (*)
-              <input type="checkbox" bind:checked={weapon.seeking} />
-              <span class="checkmark"></span>
-            </label>
-          {/if}
-          {#if kind == "attack" && (weapon.plugins.length > 0 || targets.length == 1)}
-            <div transition:slide>
-              <h3 style="border-top: 1px dashed #782e22; padding-right: 4px; padding-top: 16px; margin-top: 16px;">
-                <i class="cci cci-reticule i--m i--dark" style="vertical-align:middle;border:none"></i>
-                &nbsp;Misc
-              </h3>
-              {#each Object.keys(weapon.plugins) as key}
-                <Plugin data={weapon.plugins[key]} />
+        {/if}
+        {#if kind == "attack" && (weapon.plugins.length > 0 || targets.length == 1)}
+          <div transition:slide>
+            <h3 style="border-top: 1px dashed #782e22; padding-right: 4px; padding-top: 16px; margin-top: 16px;">
+              <i class="cci cci-reticule i--m i--dark" style="vertical-align:middle;border:none"></i>
+              &nbsp;Misc
+            </h3>
+            {#each Object.keys(weapon.plugins) as key}
+              <Plugin data={weapon.plugins[key]} />
+            {/each}
+            {#if targets.length == 1}
+              <label class="container" for="base-consume-lockon">
+                Consume Lock On (+1)
+                <ConsumeLockOn bind:lockOn={targets[0]} id="base-consume-lockon" />
+                <span class="checkmark"></span>
+              </label>
+              {#each Object.keys(targets[0].plugins) as key}
+                <Plugin data={targets[0].plugins[key]} />
               {/each}
-              {#if targets.length == 1}
-                <label class="container" for="base-consume-lockon">
-                  Consume Lock On (+1)
-                  <ConsumeLockOn bind:lockOn={targets[0]} id="base-consume-lockon" />
-                  <span class="checkmark"></span>
-                </label>
-                {#each Object.keys(targets[0].plugins) as key}
-                  <Plugin data={targets[0].plugins[key]} />
-                {/each}
-              {/if}
-            </div>
-          {/if}
-        </div>
-        <div style="width:100%;padding:4px;min-width:180px">
-          <h3>
-            <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
-            Difficulty
-          </h3>
-          <label class="container">
-            Inaccurate (-1)
-            <input type="checkbox" bind:checked={weapon.inaccurate} />
-            <span class="checkmark"></span>
-          </label>
-          <label class="container">
-            Impaired (-1)
-            <input type="checkbox" checked={!!weapon.impaired} disabled />
-            <span class="checkmark"></span>
-          </label>
-          {#if kind == "attack"}
-            <div class="grid-enforcement">
-              {#if targets.length == 0}
-                <div transition:slide|local>
-                  <Cover bind:cover={base.cover}
-                         class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
-                </div>
-              {:else if targets.length == 1}
-                <div transition:slide|local>
-                  <Cover bind:cover={targets[0].cover}
-                         class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
-                </div>
-              {/if}
-            </div>
-          {/if}
-        </div>
-      </div>
-      <label class="flexrow accdiff-footer accdiff-weight" for="accdiff-other-sources">
-        Other Sources
-      </label>
-      <div id="accdiff-other-sources" class="accdiff-grid">
-        <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
-          <PlusMinusInput bind:value={base.accuracy} id="accdiff-other-acc" />
-        </div>
-        <div class="accdiff-other-grid">
-          <PlusMinusInput bind:value={base.difficulty} id="accdiff-other-diff" />
-        </div>
+            {/if}
+          </div>
+        {/if}
       </div>
-      <div class="grid-enforcement accdiff-footer">
-        <div class="accdiff-total">
-          {#if targets.length < 2}
-            {#key targets.length}
-              <label transition:blur
-                class="accdiff-weight flex-center flexrow total-label" for="total-display-0">
-                Total
-                {#if targets.length > 0}
-                  vs {targets[0].target.data.name}
-                {/if}
-              </label>
-            {/key}
-          {/if}
+      <div style="width:100%;padding:4px;min-width:180px">
+        <h3>
+          <i class="cci cci-difficulty i--m i--dark" style="vertical-align:middle;border:none"></i>
+          Difficulty
+        </h3>
+        <label class="container">
+          Inaccurate (-1)
+          <input type="checkbox" bind:checked={weapon.inaccurate} />
+          <span class="checkmark"></span>
+        </label>
+        <label class="container">
+          Impaired (-1)
+          <input type="checkbox" checked={!!weapon.impaired} disabled />
+          <span class="checkmark"></span>
+        </label>
+        {#if kind == "attack"}
           <div class="grid-enforcement">
             {#if targets.length == 0}
-              <div
-                class="flexrow flex-center accdiff-total">
-                <Total target={base} id="total-display-0" />
+              <div transition:slide|local>
+                <Cover bind:cover={base.cover}
+                                  class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
               </div>
             {:else if targets.length == 1}
-              <div
-                class="flexrow flex-center accdiff-total">
-                <Total bind:target={targets[0]} id="total-display-0" onlyTarget={true}/>
-              </div>
-            {:else}
-              <div class="accdiff-weight accdiff-target-row">
-                {#each targets as data, i (data.target.id)}
-                  <div
-                    in:blur|local={{delay:100, duration:300}} out:blur|local={{duration: 100}}
-                    animate:flip={{duration: 200}}
-                    class="flexcol card accdiff-target">
-                    <label class="flexrow flex-center card" for={data.target.id}>
-                      {data.target.data.name}
-                    </label>
-                    <div class="flexrow accdiff-total">
-                      <Total bind:target={data} id={`total-display-${i}`} />
-                    </div>
-                    <div class="flexrow">
-                      <button
-                        class="i--m no-grow"
-                        type="button"
-                        on:click={() => data.accuracy = data.accuracy + 1}
-                      >
-                        <i class="cci cci-accuracy i--m" style="border:none"></i>
-                      </button>
-                      <input
-                        style="display: none"
-                        type="number"
-                        bind:value={data.accuracy}
-                        min="0"
-                      />
-                      <Cover bind:cover={data.cover} disabled={weapon.seeking}
-                        class="accdiff-targeted-cover flexrow flex-center" labelClass="i--s" />
-                      <input
-                        style="display: none"
-                        type="number"
-                        bind:value={data.difficulty}
-                        min="0"
-                      />
-                      <button
-                        class="i--m no-grow"
-                        type="button"
-                        on:click={() => data.difficulty = data.difficulty + 1}
-                      >
-                        <i class="cci cci-difficulty i--m" style="border:none"></i>
-                      </button>
-                    </div>
-                  </div>
-                {/each}
+              <div transition:slide|local>
+                <Cover bind:cover={targets[0].cover}
+                                  class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
               </div>
             {/if}
           </div>
-        </div>
+        {/if}
+      </div>
+    </div>
+    <label class="flexrow accdiff-footer accdiff-weight" for="accdiff-other-sources">
+      Other Sources
+    </label>
+    <div id="accdiff-other-sources" class="accdiff-grid">
+      <div class="accdiff-other-grid" style="border-right: 1px dashed #782e22;">
+        <PlusMinusInput bind:value={base.accuracy} id="accdiff-other-acc" />
+      </div>
+      <div class="accdiff-other-grid">
+        <PlusMinusInput bind:value={base.difficulty} id="accdiff-other-diff" />
       </div>
     </div>
-    <div class="dialog-buttons flexrow">
-      <button class="dialog-button submit default" data-button="submit" type="submit" use:focus>
-        <i class="fas fa-check"></i>
-        Roll
-      </button>
-      <button class="dialog-button cancel"
-        data-button="cancel" type="button" on:click={() => dispatch('cancel')}>
-        <i class="fas fa-times"></i>
-        Cancel
-      </button>
+    <div class="grid-enforcement accdiff-footer">
+      <div class="accdiff-total">
+        {#if targets.length < 2}
+          {#key targets.length}
+            <label transition:slide
+              class="accdiff-weight flex-center flexrow total-label" for="total-display-0">
+              Total
+              {#if targets.length > 0}
+                vs {targets[0].target.data.name}
+              {/if}
+            </label>
+          {/key}
+        {/if}
+        <div class="grid-enforcement">
+          {#if targets.length == 0}
+            <div
+              class="flexrow flex-center accdiff-total">
+              <Total target={base} id="total-display-0" />
+            </div>
+          {:else if targets.length == 1}
+            <div
+              class="flexrow flex-center accdiff-total">
+              <Total bind:target={targets[0]} id="total-display-0" onlyTarget={true}/>
+            </div>
+          {:else}
+            <div class="accdiff-weight accdiff-target-row">
+              {#each targets as data, i (data.target.id)}
+                <div
+                  in:slide={{delay:100, duration:300}} out:slide={{duration: 100}}
+                  animate:flip={{duration: 200}}
+                  class="flexcol card accdiff-target">
+                  <label class="flexrow flex-center card" for={data.target.id}>
+                    {data.target.data.name}
+                  </label>
+                  <div class="flexrow accdiff-total">
+                    <Total bind:target={data} id={`total-display-${i}`} />
+                  </div>
+                  <div class="flexrow">
+                    <button
+                      class="i--m no-grow"
+                      type="button"
+                      on:click={() => data.accuracy = data.accuracy + 1}
+                    >
+                      <i class="cci cci-accuracy i--m" style="border:none"></i>
+                    </button>
+                    <input
+                      style="display: none"
+                      type="number"
+                      bind:value={data.accuracy}
+                             min="0"
+                    />
+                    <Cover bind:cover={data.cover} disabled={weapon.seeking}
+                      class="accdiff-targeted-cover flexrow flex-center" labelClass="i--s" />
+                    <input
+                      style="display: none"
+                      type="number"
+                      bind:value={data.difficulty}
+                             min="0"
+                    />
+                    <button
+                      class="i--m no-grow"
+                      type="button"
+                      on:click={() => data.difficulty = data.difficulty + 1}
+                    >
+                      <i class="cci cci-difficulty i--m" style="border:none"></i>
+                    </button>
+                  </div>
+                </div>
+              {/each}
+            </div>
+          {/if}
+        </div>
+      </div>
     </div>
-  </form>
-{/key}
+  </div>
+  <div class="dialog-buttons flexrow">
+    <button class="dialog-button submit default" data-button="submit" type="submit" use:focus>
+      <i class="fas fa-check"></i>
+      Roll
+    </button>
+    <button class="dialog-button cancel"
+      data-button="cancel" type="button" on:click={() => dispatch('cancel')}>
+      <i class="fas fa-times"></i>
+      Cancel
+    </button>
+  </div>
+</form>
 
 <style>
   :global(.accdiff-grid) {
diff --git a/src/module/helpers/slidinghud/SlidingHUDZone.svelte b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
index 3b185a089..e5f19bda0 100644
--- a/src/module/helpers/slidinghud/SlidingHUDZone.svelte
+++ b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
@@ -66,14 +66,13 @@
 </script>
 
 <div id="hudzone" class="window-app" style="bottom: 0; right: {$sidebarWidth}px">
-  {#each visibleHudsKeys as key (key)}
-    <div class="component grid-enforcement" transition:slide animate:flip>
+  {#each visibleHudsKeys as key (key+huds[key].data.title)}
+    <div class="component grid-enforcement" animate:flip transition:slide>
       <svelte:component
         this={dialogs[key]}
         bind:this={components[key]}
         kind={key}
         {...huds[key].data}
-        redrawItem={huds[key].data.title}
         on:submit={() => forward(key, "submit", huds[key].data)}
         on:cancel={() =>  forward(key, "cancel")}
       />

From d636d601a4e7ea95bc32ef26e5b6c46c785f3fa8 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 00:28:33 -0700
Subject: [PATCH 67/88] support cub in findEffect

---
 src/global.d.ts                     | 6 ++++++
 src/module/helpers/acc_diff/data.ts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/global.d.ts b/src/global.d.ts
index 4cdde7934..c70e9bd53 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -5,6 +5,12 @@ declare global {
     game: never;
   }
 
+  interface FlagConfig {
+    ActiveEffect: {
+      core?: { statusId?: string };
+    };
+  }
+
   namespace Game {
     interface SystemData<T> {
       id: "lancer";
diff --git a/src/module/helpers/acc_diff/data.ts b/src/module/helpers/acc_diff/data.ts
index 23454c035..556e63c57 100644
--- a/src/module/helpers/acc_diff/data.ts
+++ b/src/module/helpers/acc_diff/data.ts
@@ -11,7 +11,7 @@ import Spotter from "./spotter";
 import { LancerToken } from "../../token";
 
 export function findEffect(actor: LancerActor, effect: string): ActiveEffect | null {
-  return actor.data.effects.find(eff => (eff.data.flags.core as any).statusId == effect) ?? null;
+  return actor.data.effects.find(eff => eff.data.flags.core?.statusId?.endsWith(effect) ?? false) ?? null;
 }
 
 export enum Cover {

From 786cb28b67420b3213ac85f332dcd5bdddefa074 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 00:46:02 -0700
Subject: [PATCH 68/88] preserve target-specific data as targets are refreshed

---
 src/module/helpers/acc_diff/data.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff/data.ts b/src/module/helpers/acc_diff/data.ts
index 556e63c57..ab48abd1c 100644
--- a/src/module/helpers/acc_diff/data.ts
+++ b/src/module/helpers/acc_diff/data.ts
@@ -266,7 +266,11 @@ export class AccDiffData {
   }
 
   replaceTargets(ts: Token[]): AccDiffData {
-    this.targets = ts.map(t => AccDiffTarget.fromParams(t));
+    let oldTargets: { [key: string]: AccDiffTarget } = {};
+    for (let data of this.targets) { oldTargets[data.target.id] = data; }
+
+    this.targets = ts.map(t => oldTargets[t.id] ?? AccDiffTarget.fromParams(t));
+
     for (let target of this.targets) { target.hydrate(this); }
     return this;
   }

From c25606513b6e8d510fa8890bf88b24b8f42b64c3 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 01:33:33 -0700
Subject: [PATCH 69/88] fade out hudzone on drag/drop

---
 src/module/helpers/dragdrop.ts                  |  6 ++++++
 .../helpers/slidinghud/SlidingHUDZone.svelte    | 17 +++++++++++++++--
 src/module/helpers/slidinghud/index.ts          |  6 ++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/module/helpers/dragdrop.ts b/src/module/helpers/dragdrop.ts
index de84aa79d..3c42cae6e 100644
--- a/src/module/helpers/dragdrop.ts
+++ b/src/module/helpers/dragdrop.ts
@@ -59,6 +59,8 @@ export function HANDLER_enable_dropping(
       let data = event.originalEvent?.dataTransfer?.getData("text/plain");
       if (!data) return;
 
+      import("./slidinghud").then(mod => mod.fade("out"));
+
       // Check if we can drop
       let drop_permitted = !allow_drop || allow_drop(data, item, event);
 
@@ -124,6 +126,8 @@ export function HANDLER_enable_dropping(
 
       event.preventDefault();
       event.stopPropagation();
+
+      import("./slidinghud").then(mod => mod.fade("in"));
     });
   });
 }
@@ -596,6 +600,7 @@ export function applyGlobalDragListeners() {
   body.addEventListener(
     "dragstart",
     e => {
+      import("./slidinghud").then(mod => mod.fade("out"));
       // Even though we are capturing, we need to wait a moment so the event data transfer can occur
       setTimeout(async () => {
         // Ok. Try to resolve
@@ -633,6 +638,7 @@ export function applyGlobalDragListeners() {
   body.addEventListener(
     "dragend",
     e => {
+      import("./slidinghud").then(mod => mod.fade("in"));
       clear_global_drag();
     },
     {
diff --git a/src/module/helpers/slidinghud/SlidingHUDZone.svelte b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
index e5f19bda0..499f9a0b1 100644
--- a/src/module/helpers/slidinghud/SlidingHUDZone.svelte
+++ b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
@@ -52,6 +52,11 @@
    return huds[key] && huds[key].open;
  }
 
+ export let faded: boolean = false;
+ export function fade(dir: "in" | "out") {
+   faded = dir == "out";
+ }
+
  export let components: { [key: string]: SvelteComponent } = {};
 
  function forward(key: string, event: string, data?: any | undefined) {
@@ -65,7 +70,7 @@
    Object.keys(huds).filter(key => huds[key].open).sort((a,b) => huds[b].open! - huds[a].open!);
 </script>
 
-<div id="hudzone" class="window-app" style="bottom: 0; right: {$sidebarWidth}px">
+<div id="hudzone" class="window-app" class:faded style="bottom: 0; right: {$sidebarWidth}px">
   {#each visibleHudsKeys as key (key+huds[key].data.title)}
     <div class="component grid-enforcement" animate:flip transition:slide>
       <svelte:component
@@ -90,7 +95,7 @@
      box-shadow: none;
      flex-direction: row-reverse;
      pointer-events: none;
-     transition: right 600ms;
+     transition: right 600ms, opacity 200ms;
  }
 
  #hudzone > .component {
@@ -98,4 +103,12 @@
      pointer-events: initial;
      flex: unset;
  }
+
+ #hudzone.faded {
+     opacity: 0.2;
+ }
+
+ #hudzone.faded > .component {
+     pointer-events: unset;
+ }
 </style>
diff --git a/src/module/helpers/slidinghud/index.ts b/src/module/helpers/slidinghud/index.ts
index f18c9f1ec..10634bdea 100644
--- a/src/module/helpers/slidinghud/index.ts
+++ b/src/module/helpers/slidinghud/index.ts
@@ -63,3 +63,9 @@ export async function openOrRefresh(key: "hase" | "attack", ts: Token[], title:
     return open(key, AccDiffData.fromParams(undefined, undefined, title, ts, undefined))
   }
 }
+
+export async function fade(dir: "out" | "in" = "out") {
+  let hud = await attach();
+  // @ts-ignore
+  hud.fade(dir);
+}

From 4db2efdcbd5d30cfbbc208a53f8df7dfa1956fcc Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 01:41:47 -0700
Subject: [PATCH 70/88] pull sliding hud to the top, give it a nice drop shadow

---
 src/module/helpers/slidinghud/SlidingHUDZone.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/module/helpers/slidinghud/SlidingHUDZone.svelte b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
index 499f9a0b1..79056a0c2 100644
--- a/src/module/helpers/slidinghud/SlidingHUDZone.svelte
+++ b/src/module/helpers/slidinghud/SlidingHUDZone.svelte
@@ -96,12 +96,14 @@
      flex-direction: row-reverse;
      pointer-events: none;
      transition: right 600ms, opacity 200ms;
+     z-index: 999;
  }
 
  #hudzone > .component {
-     padding-right: 10px;
+     padding-right: 12px;
      pointer-events: initial;
      flex: unset;
+     filter: drop-shadow(.4rem .4rem .6rem #333);
  }
 
  #hudzone.faded {

From 1afdbd3ec6cff66ea30e2eed0778f48e7c360608 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 02:13:17 -0700
Subject: [PATCH 71/88] track impaired even when we don't have a weapon (hase
 rolls)

---
 src/module/helpers/acc_diff/data.ts     | 26 +++++++++++++++----------
 src/module/helpers/acc_diff/plugin.d.ts |  2 +-
 src/module/macros.ts                    |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/module/helpers/acc_diff/data.ts b/src/module/helpers/acc_diff/data.ts
index ab48abd1c..39ca347f1 100644
--- a/src/module/helpers/acc_diff/data.ts
+++ b/src/module/helpers/acc_diff/data.ts
@@ -4,7 +4,7 @@ import * as t from 'io-ts';
 import type { LancerActor } from "../../actor/lancer-actor";
 import type { AccDiffPlugin, AccDiffPluginData, AccDiffPluginCodec } from './plugin';
 import { enclass, encode, decode } from './serde';
-import type { LancerItem } from "../../item/lancer-item";
+import { LancerItem } from "../../item/lancer-item";
 
 import Invisibility from "./invisibility";
 import Spotter from "./spotter";
@@ -66,8 +66,7 @@ export class AccDiffWeapon {
   }
 
   get impaired(): ActiveEffect | null {
-    return (this.#data?.lancerItem?.actor &&
-      findEffect(this.#data.lancerItem.actor as LancerActor, "impaired")) || null;
+    return (this.#data?.lancerActor && findEffect(this.#data.lancerActor, "impaired")) ?? null;
   }
 
   total(cover: number) {
@@ -237,6 +236,7 @@ export class AccDiffData {
   base: AccDiffBase;
   targets: AccDiffTarget[];
   lancerItem?: LancerItem; // not persisted, needs to be hydrated
+  lancerActor?: LancerActor; // not persisted, needs to be hydrated
 
   static get schema() {
     return {
@@ -258,8 +258,14 @@ export class AccDiffData {
     this.hydrate();
   }
 
-  hydrate(lancerItem?: LancerItem) {
-    this.lancerItem = lancerItem;
+  hydrate(runtimeData?: LancerItem | LancerActor) {
+    if (runtimeData instanceof LancerItem) {
+      this.lancerItem = runtimeData;
+      this.lancerActor = runtimeData.actor ?? undefined;
+    } else {
+      this.lancerActor = runtimeData ?? undefined;
+    }
+
     this.weapon.hydrate(this);
     this.base.hydrate(this);
     for (let target of this.targets) { target.hydrate(this); }
@@ -284,9 +290,9 @@ export class AccDiffData {
     }
   }
 
-  static fromObject(obj: AccDiffDataSerialized, lancerItem?: LancerItem): AccDiffData {
+  static fromObject(obj: AccDiffDataSerialized, runtimeData?: LancerItem | LancerActor): AccDiffData {
     let ret = decode(obj, AccDiffData.codec);
-    ret.hydrate(lancerItem);
+    ret.hydrate(runtimeData);
     return ret;
   }
 
@@ -311,7 +317,7 @@ export class AccDiffData {
   }
 
   static fromParams(
-    item?: LancerItem,
+    runtimeData?: LancerItem | LancerActor,
     tags?: TagInstance[],
     title?: string,
     targets?: Token[],
@@ -366,7 +372,7 @@ export class AccDiffData {
 
     for (let plugin of this.plugins) {
       if (plugin.perRoll) {
-        obj.weapon.plugins[plugin.slug] = encode(plugin.perRoll(item), plugin.codec);
+        obj.weapon.plugins[plugin.slug] = encode(plugin.perRoll(runtimeData), plugin.codec);
       }
       if (plugin.perUnknownTarget) {
         obj.base.plugins[plugin.slug] = encode(plugin.perUnknownTarget(), plugin.codec);
@@ -375,7 +381,7 @@ export class AccDiffData {
 
     // for now this isn't using AccDiffTarget.fromParams, which means the code is duplicated
     // that's a relatively contained bit of tech debt, but let's handle it next time this is touched
-    return AccDiffData.fromObject(obj, item);
+    return AccDiffData.fromObject(obj, runtimeData);
   }
 }
 
diff --git a/src/module/helpers/acc_diff/plugin.d.ts b/src/module/helpers/acc_diff/plugin.d.ts
index fe6d4703b..5b604605c 100644
--- a/src/module/helpers/acc_diff/plugin.d.ts
+++ b/src/module/helpers/acc_diff/plugin.d.ts
@@ -54,7 +54,7 @@ declare interface AccDiffPlugin<Data extends AccDiffPluginData> {
   // a "perTarget" plugin applies individually to every single target
   // a "perUnknownTarget" applies whenever the user opens the roll dialog without a target
   // so every roll has perRoll + exactly one of perTarget and perUnknownTarget
-  perRoll?(item?: LancerItem): Data,
+  perRoll?(item?: LancerItem | LancerActor): Data,
   perUnknownTarget?(): Data,
   perTarget?(item: Token): Data,
   // usually you want to implement either perRoll OR both of the other two
diff --git a/src/module/macros.ts b/src/module/macros.ts
index aab7a0bf5..e8e557220 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -540,7 +540,7 @@ async function rollStatMacro(actor: LancerActor, data: LancerStatMacroData) {
 
   // Get accuracy/difficulty with a prompt
   let { AccDiffData } = await import('./helpers/acc_diff');
-  let initialData = AccDiffData.fromParams(undefined, undefined, data.title);
+  let initialData = AccDiffData.fromParams(actor, undefined, data.title);
 
   let promptedData;
   try {

From e4b64b30f815a34296089a3c52143bc71862ebb6 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 02:13:54 -0700
Subject: [PATCH 72/88] unused import

---
 src/module/helpers/acc_diff/invisibility.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff/invisibility.ts b/src/module/helpers/acc_diff/invisibility.ts
index 382796606..4bf1afb25 100644
--- a/src/module/helpers/acc_diff/invisibility.ts
+++ b/src/module/helpers/acc_diff/invisibility.ts
@@ -1,5 +1,5 @@
 import * as t from 'io-ts';
-import { LancerActor, LancerActorType } from "../../actor/lancer-actor";
+import { LancerActor } from "../../actor/lancer-actor";
 import { AccDiffPlugin, AccDiffCheckboxPluginData, AccDiffPluginCodec } from './plugin';
 import { AccDiffData, AccDiffTarget, findEffect } from './index';
 import { enclass } from './serde';

From 9f5891fd82c9ddc6e84df225474f1a0801832760 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 13:26:15 -0700
Subject: [PATCH 73/88] make the +acc/+diff buttons look nice both under emu
 and normal

---
 src/module/helpers/acc_diff/Form.svelte | 33 +++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 9d2b5e439..0c53c3dbd 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -179,7 +179,7 @@
                   </div>
                   <div class="flexrow">
                     <button
-                      class="i--m no-grow"
+                      class="i--m no-grow accdiff-button"
                       type="button"
                       on:click={() => data.accuracy = data.accuracy + 1}
                     >
@@ -200,7 +200,7 @@
                              min="0"
                     />
                     <button
-                      class="i--m no-grow"
+                      class="i--m no-grow accdiff-button"
                       type="button"
                       on:click={() => data.difficulty = data.difficulty + 1}
                     >
@@ -349,4 +349,33 @@
     white-space: nowrap;
   }
 
+  .accdiff-target-row .accdiff-button {
+    align-items: center;
+    display: inline-flex;
+    justify-content: center;
+    margin: 0;
+    border: none;
+    box-shadow: 1px 1px 1px var(--main-theme-color);
+    transition: 100ms cubic-bezier(0.075, 0.82, 0.165, 1);
+  }
+
+  .accdiff-target-row .accdiff-button:hover {
+    background-color: var(--main-theme-text);
+    box-shadow: 1px 1px 1px var(--main-theme-color);
+  }
+
+  .accdiff-target-row .accdiff-button:focus {
+    box-shadow: 1px 1px 1px var(--main-theme-color);
+  }
+
+  .accdiff-target-row .accdiff-button:active {
+    transform: translateX(2px) translateY(2px);
+    box-shadow: -1px -1px 1px var(--main-theme-color);
+  }
+
+  .accdiff-target-row .accdiff-button i {
+    text-shadow: none;
+    color: rgba(var(--color-text-lightest), 1);
+    cursor: pointer;
+  }
 </style>

From 3ae7b4164c691d461a15c48800381879bce75caf Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 14:04:41 -0700
Subject: [PATCH 74/88] fix total's transitions, and apply a nice little shadow
 to the card

---
 src/module/helpers/acc_diff/Total.svelte | 37 ++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
index 2dbaca30f..00c949fca 100644
--- a/src/module/helpers/acc_diff/Total.svelte
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -70,22 +70,20 @@
   {/if}
 {/if}
 <div class="accdiff-grid accdiff-weight" in:send={{key: id}} out:recv={{key: id}}>
-  <div class="grid-enforcement">
-    <!-- dummy if block for |local, see https://github.com/sveltejs/svelte/issues/5950 -->
-    {#if true}
-      {#key target.total}
-        <div id={id} transition:blur
-          class="card clipped total" class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
-          <span in:fly|local={{y: -50, duration: 400}} out:fly|local={{y: 50, duration: 200}}>
-            {Math.abs(target.total)}
-          </span>
-          <i in:fly|local={{y: -50, duration: 200}} out:fly|local={{y: 50, duration: 200}}
-            class="cci i--m i--dark white--text middle"
-            class:cci-accuracy={target.total >= 0}
-            class:cci-difficulty={target.total < 0} ></i>
-        </div>
-      {/key}
-    {/if}
+  <div class="grid-enforcement total-container"
+    class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
+    <!-- #key blocks currently break |local, see https://github.com/sveltejs/svelte/issues/5950 -->
+    {#each [target.total] as total (target.total)}
+      <div id={id} transition:blur class="card clipped total">
+        <span in:fly|local={{y: -50, duration: 400}} out:fly|local={{y: 50, duration: 200}}>
+          {Math.abs(total)}
+        </span>
+        <i in:fly|local={{y: -50, duration: 200}} out:fly|local={{y: 50, duration: 200}}
+          class="cci i--m i--dark white--text middle"
+          class:cci-accuracy={total >= 0}
+          class:cci-difficulty={total < 0} ></i>
+      </div>
+    {/each}
   </div>
 </div>
 
@@ -103,8 +101,11 @@
      width: min-content;
      background-color: #443c3c;
  }
- .card.total.accurate { background-color: #017934; }
- .card.total.inaccurate { background-color: #9c0d0d }
+ .total-container { filter: drop-shadow(1px 1px 0px); }
+ .accurate > .card.total { background-color: #017934; }
+ .total-container.accurate { filter: drop-shadow(1px 1px 0px #013904); }
+ .inaccurate > .card.total { background-color: #9c0d0d }
+ .total-container.inaccurate { filter: drop-shadow(1px 1px 0px #5c0d0d); }
  .disabled { opacity: 0.4; }
  .lancer-hit-thumb {
      margin-right: 0px;

From b224ef18cdd852e46ee8016f37c596c01c435acc Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 14:07:54 -0700
Subject: [PATCH 75/88] situate the target boxes with a box-shadow

---
 src/module/helpers/acc_diff/Form.svelte | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 0c53c3dbd..0f0238685 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -171,7 +171,7 @@
                   in:slide={{delay:100, duration:300}} out:slide={{duration: 100}}
                   animate:flip={{duration: 200}}
                   class="flexcol card accdiff-target">
-                  <label class="flexrow flex-center card" for={data.target.id}>
+                  <label class="flexrow flex-center card card-title" for={data.target.id}>
                     {data.target.data.name}
                   </label>
                   <div class="flexrow accdiff-total">
@@ -337,7 +337,8 @@
   }
 
   .accdiff-target {
-    padding: 4px;
+    padding: 5px;
+    box-shadow: 1px 1px 2px;
   }
 
   .accdiff-total  {
@@ -378,4 +379,8 @@
     color: rgba(var(--color-text-lightest), 1);
     cursor: pointer;
   }
+
+  .accdiff-target-row .card-title {
+    background-color: #00000000;
+  }
 </style>

From 7c12cfe63ca3344e46e71c7dab149883dba764bd Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 15:24:58 -0700
Subject: [PATCH 76/88] style cover nicely with a moving cover selection arrow

---
 src/module/helpers/acc_diff/Cover.svelte | 50 ++++++++++++++++--------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/module/helpers/acc_diff/Cover.svelte b/src/module/helpers/acc_diff/Cover.svelte
index bef1ea300..6a11c7c2c 100644
--- a/src/module/helpers/acc_diff/Cover.svelte
+++ b/src/module/helpers/acc_diff/Cover.svelte
@@ -3,6 +3,7 @@
 </script>
 
 <script lang="ts">
+ import { crossfade } from 'svelte/transition';
  import type { Cover } from './index';
  export let cover: Cover;
  export let disabled: boolean = false;
@@ -11,11 +12,13 @@
 
  let id = `accdiff-cover-input-${counter++}`;
 
-  let inputs = [
-    { slug: "no", human: "No Cover", value: 0 },
-    { slug: "soft", human: "Soft Cover (-1)", value: 1 },
-    { slug: "hard", human: "Hard Cover (-2)", value: 2 },
-  ];
+ let inputs = [
+   { slug: "no", human: "No Cover", value: 0 },
+   { slug: "soft", human: "Soft Cover (-1)", value: 1 },
+   { slug: "hard", human: "Hard Cover (-2)", value: 2 },
+ ];
+
+ let [send, recv] = crossfade({});
 </script>
 
 <div class="lancer-cover-radio {klass}" class:disabled={disabled}>
@@ -25,11 +28,14 @@
     <label for="{id}-{input.slug}" class="lancer-cover-radio-label {labelClass}">
       <i class="cci-{input.slug}-cover i--s" title={input.human}></i>
       <span class="no-grow">{input.human}</span>
+      {#if input.value == cover}
+        <div class="cover-arrow" in:send|local={{key: id}} out:recv|local={{key: id}}></div>
+      {/if}
     </label>
   {/each}
 </div>
 
-<style>
+<style lang="scss">
  i { border: none }
 
  input {
@@ -41,22 +47,34 @@
  label {
      display: inline-block;
      padding-left: 5px;
- }
- .flexrow label {
-     padding: 0px;
+     position: relative;
+     .flexrow & { padding: 0px; }
  }
 
- div:not(.disabled) label:hover {
-     background-color: #dfd;
+ .cover-arrow, :not(.disabled) label:hover::after {
+     content: '';
+     position: absolute;
+     right: 98%;
+     top: calc(50% - 4px);
+     background-color: var(--main-theme-color);
+     width: 8px;
+     height: 8px;
+     clip-path: polygon(0 0, 0 100%, 100% 50%);
+     :global(.card) & {
+         right: unset;
+         top: unset;
+         bottom: 90%;
+         left: calc(50% - 3px);
+         width: 6px;
+         height: 6px;
+         clip-path: polygon(0 0, 100% 0, 50% 100%);
+     }
  }
 
- .card input:checked + label {
-     background-color: #aaa;
+ :not(.disabled) label:hover::after {
+     opacity: 40%;
  }
 
- input:checked + label {
-     background-color: #ddd;
- }
 
  .disabled {
      opacity: 0.4;

From c57a4af6ea2eabb0eda0ef1ec99bc7ad0a31950a Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 15:45:07 -0700
Subject: [PATCH 77/88] remove overflow: hidden from grid-enforcement; it seems
 unnecessary

and breaks this tippy
---
 src/lancer.scss                          |  1 -
 src/module/helpers/acc_diff/Total.svelte | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/lancer.scss b/src/lancer.scss
index 77d4c07cd..3ab6bad26 100644
--- a/src/lancer.scss
+++ b/src/lancer.scss
@@ -2183,7 +2183,6 @@ Here, this means we want to allow for drag stuff etc to show contextually if:
     which is useful for svelte transitions */
 .grid-enforcement {
   display: grid;
-  overflow: hidden;
 }
 
 .grid-enforcement > * {
diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
index 00c949fca..3483982be 100644
--- a/src/module/helpers/acc_diff/Total.svelte
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -146,21 +146,21 @@
      display: block;
  }
 
- .accdiff-grid :global(.tippy-box[data-theme~="lancer"]) {
+ .accdiff-grid :global(.tippy-box) {
      font-size: 0.8em;
      padding-left: 0px;
      padding-right: 0px;
-     padding-top: 4px;
+     padding-top: 0px;
      padding-bottom: 4px;
      transform: none;
  }
- .accdiff-grid :global(.tippy-box[data-theme~="lancer"] .tippy-content) {
+ .accdiff-grid :global(.tippy-box .tippy-content) {
      transform: none;
  }
- .accdiff-grid :global(.tippy-box[data-theme~="lancer"] .tippy-content .container) {
+ .accdiff-grid :global(.tippy-box .tippy-content .container) {
      margin: 0px;
  }
- .accdiff-grid :global(.tippy-box[data-theme~="lancer"] .tippy-content .checkmark) {
+ .accdiff-grid :global(.tippy-box .tippy-content .checkmark) {
      height: 12px;
  }
 </style>

From 53ba4ef0c059c5f7da89c5a48a0abb8bacfb8102 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 16:16:35 -0700
Subject: [PATCH 78/88] handle basic attack rerolls initiated by
 `refreshTargeting`

---
 src/module/helpers/slidinghud/index.ts | 12 ++++++++---
 src/module/interfaces.d.ts             |  8 +++----
 src/module/macros.ts                   | 30 ++++++++++++++------------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/module/helpers/slidinghud/index.ts b/src/module/helpers/slidinghud/index.ts
index 10634bdea..b1749b8d5 100644
--- a/src/module/helpers/slidinghud/index.ts
+++ b/src/module/helpers/slidinghud/index.ts
@@ -30,7 +30,7 @@ export async function open(key: "hase" | "attack", data: AccDiffData): Promise<A
 // 1. it's not allowed to open new windows
 // 2. it never allows the caller to observe the data via promise,
 //      assuming if the window was open that the existing handler is what we want to preserve
-export async function refreshTargets(key: "hase" | "attack", ts: Token[]) {
+export async function refreshTargets(key: "hase" | "attack", ts: Token[] | AccDiffData) {
   let hud = await attach();
 
   // this method isn't allowed to open new windows, so bail out if it isn't open
@@ -39,6 +39,11 @@ export async function refreshTargets(key: "hase" | "attack", ts: Token[]) {
 
   let { AccDiffData } = await import('../acc_diff');
 
+  if (ts instanceof AccDiffData) {
+    // @ts-ignore
+    return hud.refresh(key, ts);
+  }
+
   // @ts-ignore
   let oldData: AccDiffData = hud.data(key);
   if (!oldData || !(oldData instanceof AccDiffData)) {
@@ -52,7 +57,7 @@ export async function refreshTargets(key: "hase" | "attack", ts: Token[]) {
 
 // this method opens a new window if one isn't open, with as much data as we have, allowing new listeners
 // otherwise, it refreshes the existing window, disallowing new listeners
-export async function openOrRefresh(key: "hase" | "attack", ts: Token[], title: string): Promise<AccDiffData> {
+export async function openOrRefresh(key: "hase" | "attack", ts: Token[] | AccDiffData, title: string): Promise<AccDiffData> {
   let hud = await attach();
   // @ts-ignore
   if (hud.isOpen(key)) {
@@ -60,7 +65,8 @@ export async function openOrRefresh(key: "hase" | "attack", ts: Token[], title:
     return new Promise((_res, rej) => rej());
   } else {
     let { AccDiffData } = await import('../acc_diff');
-    return open(key, AccDiffData.fromParams(undefined, undefined, title, ts, undefined))
+    return open(key, ts instanceof AccDiffData ? ts :
+      AccDiffData.fromParams(undefined, undefined, title, ts, undefined))
   }
 }
 
diff --git a/src/module/interfaces.d.ts b/src/module/interfaces.d.ts
index 5c2ba2c18..be21c3136 100644
--- a/src/module/interfaces.d.ts
+++ b/src/module/interfaces.d.ts
@@ -48,12 +48,12 @@ declare interface LancerAttackMacroData {
   grit: number;
   acc: number;
   damage: DamageData[];
-  overkill: boolean;
-  effect: EffectData | string;
+  overkill?: boolean;
+  effect?: EffectData | string;
   on_hit?: string; // For NPC weapons - to be removed once they use EffectData
   tags: TagDataShort[];
-  loaded: boolean;
-  destroyed: boolean;
+  loaded?: boolean;
+  destroyed?: boolean;
 }
 
 declare interface LancerTechMacroData {
diff --git a/src/module/macros.ts b/src/module/macros.ts
index e8e557220..7b628e507 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -596,19 +596,19 @@ type AttackMacroOptions = {
 }
 
 export async function prepareEncodedAttackMacro(
-  actor_ref: RegRef<any>, item_id: string, options: AttackMacroOptions, rerollData: AccDiffDataSerialized) {
+  actor_ref: RegRef<any>, item_id: string | null, options: AttackMacroOptions, rerollData: AccDiffDataSerialized) {
   let reg = new FoundryReg();
   let opCtx = new OpCtx()
   let mm = await reg.resolve(opCtx, actor_ref);
   let actor = mm.Flags.orig_doc;
-  let item = ownedItemFromString(item_id, actor);
-  if (!item) {
-    ui.notifications!.error("Could not find weapon to reroll");
-    return;
-  }
+  let item = item_id ? ownedItemFromString(item_id, actor) : null;
   let { AccDiffData } = await import('./helpers/acc_diff');
-  let accdiff = AccDiffData.fromObject(rerollData, item);
-  return prepareAttackMacro({ actor, item, options }, accdiff);
+  let accdiff = AccDiffData.fromObject(rerollData, item ?? actor);
+  if (item) {
+    return prepareAttackMacro({ actor, item, options }, accdiff);
+  } else {
+    return refreshTargeting("may open new window", accdiff);
+  }
 }
 
 /**
@@ -801,18 +801,20 @@ async function prepareAttackMacro({
   await rollAttackMacro(actor, atkRolls, mData, rerollMacro);
 }
 
-export async function refreshTargeting(mode: "may open new window" | "only refresh open window") {
-  const targets = Array.from(game!.user!.targets);
+export async function refreshTargeting(
+  mode: "may open new window" | "only refresh open window",
+  data: Token[] | AccDiffData = Array.from(game!.user!.targets)
+) {
   let { refreshTargets, openOrRefresh } = await import('./helpers/slidinghud');
 
   if (mode == "only refresh open window") {
-    refreshTargets("attack", targets);
+    refreshTargets("attack", data);
     return;
   }
 
   let promptedData;
   try {
-    promptedData = await openOrRefresh("attack", targets, "Basic Attack");
+    promptedData = await openOrRefresh("attack", data, "Basic Attack");
   } catch (_e) {
     return;
   }
@@ -826,6 +828,7 @@ export async function refreshTargeting(mode: "may open new window" | "only refre
   let mData = {
     title: 'BASIC ATTACK',
     grit: 0,
+    acc: 0,
     tags: [],
     damage: [],
   };
@@ -854,13 +857,12 @@ export async function refreshTargeting(mode: "may open new window" | "only refre
     fn: "prepareEncodedAttackMacro",
     args: [
       actor.data.data.derived.mm!.as_ref(),
-      null, // TODO: this breaks the reroll
+      null,
       {},
       promptedData.toObject()
     ]
   };
 
-  // @ts-ignore TODO: check that rollAttackMacro is defensive against the missing attrs
   await rollAttackMacro(actor, atkRolls, mData, rerollMacro);
 }
 

From 85184a12027cfd233ba0c2c5d93039ba7c8fa0f3 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 16:22:47 -0700
Subject: [PATCH 79/88] the grid rows in accdiff targets needed a larger gap

---
 src/module/helpers/acc_diff/Form.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 0f0238685..fbaff9774 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -334,6 +334,7 @@
   .accdiff-target-row {
     display: grid;
     grid-template-columns: auto auto auto;
+    grid-row-gap: 12px;
   }
 
   .accdiff-target {

From 4cdda1a0d104f219844e30e4b86afd78585be88f Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 16:57:00 -0700
Subject: [PATCH 80/88] add plugin classes, for styling

---
 src/module/helpers/acc_diff/Total.svelte | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
index 3483982be..723665f09 100644
--- a/src/module/helpers/acc_diff/Total.svelte
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -28,6 +28,10 @@
  export let id = `accdiff-total-display-${counter++}`;
  let lockonId = isTarget(target) ? `accdiff-total-display-consume-lockon-${lockonCounter++}` : '';
 
+ let pluginClasses = Object.values(target.plugins).filter((plugin) => {
+   return plugin.uiElement == "checkbox" && plugin.uiState;
+}).map((plugin) => `accdiff-total-${plugin.slug}`).join(" ");
+
  let imgElement: HTMLElement;
  let dropdownElement: HTMLElement;
 
@@ -47,7 +51,7 @@
   <div
     in:send={{key: `${id}-img`, delay: 100, duration: 200}}
     out:recv={{key: `${id}-img`, duration: 200}}
-    class="accdiff-grid">
+    class="accdiff-grid {pluginClasses}">
     <img class="lancer-hit-thumb accdiff-target-has-dropdown"
          alt={target.target.data.name ?? undefined}
          src={target.target.data.img ?? undefined} bind:this={imgElement} />
@@ -70,7 +74,7 @@
   {/if}
 {/if}
 <div class="accdiff-grid accdiff-weight" in:send={{key: id}} out:recv={{key: id}}>
-  <div class="grid-enforcement total-container"
+  <div class="grid-enforcement total-container {pluginClasses}"
     class:accurate={target.total > 0} class:inaccurate={target.total < 0}>
     <!-- #key blocks currently break |local, see https://github.com/sveltejs/svelte/issues/5950 -->
     {#each [target.total] as total (target.total)}

From 2cc70d6414580611c624dac2322c8a459e7b5620 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 16:57:25 -0700
Subject: [PATCH 81/88] invisibility animation

---
 src/module/helpers/acc_diff/Total.svelte | 27 ++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/module/helpers/acc_diff/Total.svelte b/src/module/helpers/acc_diff/Total.svelte
index 723665f09..861180401 100644
--- a/src/module/helpers/acc_diff/Total.svelte
+++ b/src/module/helpers/acc_diff/Total.svelte
@@ -146,6 +146,33 @@
      display: none;
  }
 
+ @keyframes blur {
+     30% {
+         filter: none;
+         opacity: 0.9;
+     }
+     35% {
+         filter: blur(1px);
+         opacity: 0.7;
+     }
+     40% {
+         filter: blur(2px);
+         opacity: 0.5;
+     }
+     43% {
+         filter: blur(1px);
+         opacity: 0.5;
+     }
+     50% {
+         filter: none;
+         opacity: 0.9;
+     }
+ }
+
+ :global(.accdiff-total-invisibility) img {
+     animation: blur 2s linear 1s infinite alternate;
+ }
+
  :global(.tippy-content) .accdiff-target-dropdown {
      display: block;
  }

From f701c2e766f1cb62a3b78bd95c8e623465924baa Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 18:07:57 -0700
Subject: [PATCH 82/88] enable spotter on basic attacks

* spotter needs to look at lancerActor
* we need to do _some_ work to get a valid lancerActor on basic attacks
---
 src/module/helpers/acc_diff/spotter.ts | 15 +++++++--------
 src/module/helpers/slidinghud/index.ts |  5 +++--
 src/module/macros.ts                   |  8 +++++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/module/helpers/acc_diff/spotter.ts b/src/module/helpers/acc_diff/spotter.ts
index fcdad90c8..59f6f90e6 100644
--- a/src/module/helpers/acc_diff/spotter.ts
+++ b/src/module/helpers/acc_diff/spotter.ts
@@ -2,14 +2,13 @@ import { stateless } from './serde';
 import { getMacroSpeaker } from '../../macros';
 import type { AccDiffPlugin, AccDiffPluginData } from './plugin';
 import type { AccDiffData, AccDiffTarget } from './index';
-import type { LancerItem } from '../../item/lancer-item';
+import type { LancerActor } from '../../actor/lancer-actor';
 import type { Pilot } from 'machine-mind';
 
 // this is an example of a case implemented without defining a full class
-function adjacentSpotter(item: LancerItem): boolean {
-  let actor = getMacroSpeaker(item?.actor?.id ?? undefined);
-  // only players can have spotter
-  if (!actor || actor.data.type != "mech") { return false; }
+function adjacentSpotter(actor: LancerActor): boolean {
+  // only players can benefit from spotter
+  if (!actor.is_mech()) { return false; }
 
   // this isn't adjacency, it's "is within range 1 LOS with a hack for larger mechs", but it's good enough
   // computation taken from sensor-sight
@@ -37,13 +36,13 @@ function adjacentSpotter(item: LancerItem): boolean {
 
 function spotter(): AccDiffPluginData {
   let sp = {
-    item: null as LancerItem | null,
+    actor: null as LancerActor | null,
     target: null as AccDiffTarget | null,
     uiElement: "checkbox" as "checkbox",
     slug: "spotter",
     humanLabel: "Spotter (*)",
     get uiState() {
-      return !!(this.item && this.target?.usingLockOn && adjacentSpotter(this.item))
+      return !!(this.actor && this.target?.usingLockOn && adjacentSpotter(this.actor))
     },
     set uiState(_v: boolean) {
       // noop
@@ -60,7 +59,7 @@ function spotter(): AccDiffPluginData {
       }
     },
     hydrate(data: AccDiffData, target?: AccDiffTarget) {
-      this.item = data.lancerItem || null;
+      this.actor = data.lancerActor || null;
       this.target = target || null;
     }
   };
diff --git a/src/module/helpers/slidinghud/index.ts b/src/module/helpers/slidinghud/index.ts
index b1749b8d5..8f704e0e6 100644
--- a/src/module/helpers/slidinghud/index.ts
+++ b/src/module/helpers/slidinghud/index.ts
@@ -1,5 +1,6 @@
 import type HUDZone from './SlidingHUDZone.svelte';
 import type { AccDiffData } from '../acc_diff';
+import type { LancerActor } from '../../actor/lancer-actor';
 
 let hud: typeof HUDZone;
 
@@ -57,7 +58,7 @@ export async function refreshTargets(key: "hase" | "attack", ts: Token[] | AccDi
 
 // this method opens a new window if one isn't open, with as much data as we have, allowing new listeners
 // otherwise, it refreshes the existing window, disallowing new listeners
-export async function openOrRefresh(key: "hase" | "attack", ts: Token[] | AccDiffData, title: string): Promise<AccDiffData> {
+export async function openOrRefresh(key: "hase" | "attack", ts: Token[] | AccDiffData, title: string, actor?: LancerActor,): Promise<AccDiffData> {
   let hud = await attach();
   // @ts-ignore
   if (hud.isOpen(key)) {
@@ -66,7 +67,7 @@ export async function openOrRefresh(key: "hase" | "attack", ts: Token[] | AccDif
   } else {
     let { AccDiffData } = await import('../acc_diff');
     return open(key, ts instanceof AccDiffData ? ts :
-      AccDiffData.fromParams(undefined, undefined, title, ts, undefined))
+      AccDiffData.fromParams(actor, undefined, title, ts, undefined))
   }
 }
 
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 7b628e507..974f8762b 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -812,16 +812,18 @@ export async function refreshTargeting(
     return;
   }
 
+  let actor = getMacroSpeaker();
+
   let promptedData;
   try {
-    promptedData = await openOrRefresh("attack", data, "Basic Attack");
+    promptedData = await openOrRefresh("attack", data, "Basic Attack", actor);
   } catch (_e) {
     return;
   }
 
-  let actor = getMacroSpeaker();
+  actor = actor ?? getMacroSpeaker();
   if (!actor) {
-    ui.notifications!.error("Can't find actor to attack as.");
+    ui.notifications!.error("Can't find unit to attack as. Please select a token.");
     return;
   }
 

From 9d338196f4f88775d873e6214f3b45743aedc36b Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 18:14:53 -0700
Subject: [PATCH 83/88] fix spotter crashing on adjacent npcs

---
 src/module/helpers/acc_diff/spotter.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/module/helpers/acc_diff/spotter.ts b/src/module/helpers/acc_diff/spotter.ts
index 59f6f90e6..98fbac351 100644
--- a/src/module/helpers/acc_diff/spotter.ts
+++ b/src/module/helpers/acc_diff/spotter.ts
@@ -1,9 +1,8 @@
 import { stateless } from './serde';
-import { getMacroSpeaker } from '../../macros';
 import type { AccDiffPlugin, AccDiffPluginData } from './plugin';
 import type { AccDiffData, AccDiffTarget } from './index';
 import type { LancerActor } from '../../actor/lancer-actor';
-import type { Pilot } from 'machine-mind';
+import type { Mech, Pilot } from 'machine-mind';
 
 // this is an example of a case implemented without defining a full class
 function adjacentSpotter(actor: LancerActor): boolean {
@@ -25,13 +24,11 @@ function adjacentSpotter(actor: LancerActor): boolean {
   }
 
   // TODO: TYPECHECK: all of this seems to work
-  let adjacentPilots = canvas!.tokens!.objects!.children
-  // @ts-ignore
-    .filter((t: Token) => inRange((t as any).center) && t != token)
-  // @ts-ignore
-    .map((t: Token) => t.actor.data.data.derived.mm!.Pilot);
+  let adjacentPilots = (canvas!.tokens!.objects!.children as Token[])
+    .filter((t: Token) => t.actor?.is_mech() && inRange((t as any).center) && t.id != token.id)
+    .map((t: Token) => (t.actor!.data.data.derived.mm! as Mech).Pilot);
 
-  return (adjacentPilots.find((p: Pilot) => p.Talents.find(t => t.LID == "t_spotter")));
+  return !!(adjacentPilots.find((p: Pilot | null) => p?.Talents.find(t => t.LID == "t_spotter")));
 }
 
 function spotter(): AccDiffPluginData {

From b81c9893b87fe31e345c31e0185e969c59c6459d Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 18:32:44 -0700
Subject: [PATCH 84/88] swap to mdi-shields for cover iconography

---
 src/module/helpers/acc_diff/Cover.svelte | 19 ++++---------------
 src/module/helpers/acc_diff/Form.svelte  | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/module/helpers/acc_diff/Cover.svelte b/src/module/helpers/acc_diff/Cover.svelte
index 6a11c7c2c..4f68e658d 100644
--- a/src/module/helpers/acc_diff/Cover.svelte
+++ b/src/module/helpers/acc_diff/Cover.svelte
@@ -13,9 +13,9 @@
  let id = `accdiff-cover-input-${counter++}`;
 
  let inputs = [
-   { slug: "no", human: "No Cover", value: 0 },
-   { slug: "soft", human: "Soft Cover (-1)", value: 1 },
-   { slug: "hard", human: "Hard Cover (-2)", value: 2 },
+   { slug: "no", human: "No Cover", value: 0, icon: "shield-outline" },
+   { slug: "soft", human: "Soft Cover (-1)", value: 1, icon: "shield-half-full" },
+   { slug: "hard", human: "Hard Cover (-2)", value: 2, icon: "shield" },
  ];
 
  let [send, recv] = crossfade({});
@@ -26,7 +26,7 @@
     <input type="radio" id="{id}-{input.slug}" class="no-grow {input.slug}-cover"
            bind:group={cover} value={input.value} disabled={disabled} />
     <label for="{id}-{input.slug}" class="lancer-cover-radio-label {labelClass}">
-      <i class="cci-{input.slug}-cover i--s" title={input.human}></i>
+      <i class="mdi mdi-{input.icon} i--s" title={input.human}></i>
       <span class="no-grow">{input.human}</span>
       {#if input.value == cover}
         <div class="cover-arrow" in:send|local={{key: id}} out:recv|local={{key: id}}></div>
@@ -75,18 +75,7 @@
      opacity: 40%;
  }
 
-
  .disabled {
      opacity: 0.4;
  }
-
- .cci-no-cover:before {
-     content: '\25cb';
- }
- .cci-soft-cover:before {
-     content: '\25d1';
- }
- .cci-hard-cover:before {
-     content: '\25cf';
- }
 </style>
diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index fbaff9774..369697031 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -117,12 +117,12 @@
             {#if targets.length == 0}
               <div transition:slide|local>
                 <Cover bind:cover={base.cover}
-                                  class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
+                       class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
               </div>
             {:else if targets.length == 1}
               <div transition:slide|local>
                 <Cover bind:cover={targets[0].cover}
-                                  class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
+                       class="accdiff-base-cover flexcol" disabled={weapon.seeking} />
               </div>
             {/if}
           </div>
@@ -189,7 +189,7 @@
                       style="display: none"
                       type="number"
                       bind:value={data.accuracy}
-                             min="0"
+                      min="0"
                     />
                     <Cover bind:cover={data.cover} disabled={weapon.seeking}
                       class="accdiff-targeted-cover flexrow flex-center" labelClass="i--s" />
@@ -197,7 +197,7 @@
                       style="display: none"
                       type="number"
                       bind:value={data.difficulty}
-                             min="0"
+                      min="0"
                     />
                     <button
                       class="i--m no-grow accdiff-button"
@@ -302,16 +302,18 @@
   }
 
   .accdiff-grid :global(.accdiff-base-cover) {
-    margin-top: 12px;
+    margin-top: 8px;
     margin-bottom: 4px;
     font-size: 0.85em;
-    user-select: none;
-    padding-left: 5px;
-    line-height: 2;
+    padding-left: 10px;
     cursor: pointer;
   }
   .accdiff-grid :global(.accdiff-base-cover i) {
-    vertical-align: baseline;
+    vertical-align: middle;
+  }
+
+  .accdiff-grid :global(.accdiff-base-cover span) {
+      vertical-align: middle;
   }
 
   .accdiff-footer :global(.accdiff-targeted-cover span) {

From 8262e59a6673991d5b5943d087f8de5544674bd2 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 18:42:42 -0700
Subject: [PATCH 85/88] move prepareStructureSecondaryRollMacro into macros.ts

---
 src/lancer.ts                    |  4 ++--
 src/module/actor/lancer-actor.ts | 31 +------------------------------
 src/module/macros.ts             | 29 +++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/lancer.ts b/src/lancer.ts
index 683c9569f..9aecc4158 100644
--- a/src/lancer.ts
+++ b/src/lancer.ts
@@ -20,7 +20,7 @@ import {
   WELCOME,
 } from "./module/config";
 import type { LancerGame } from "./module/lancer-game";
-import { LancerActor, prepareStructureSecondaryRollMacro } from "./module/actor/lancer-actor";
+import { LancerActor } from "./module/actor/lancer-actor";
 import { LancerItem } from "./module/item/lancer-item";
 import { populatePilotCache } from "./module/compcon";
 
@@ -189,7 +189,7 @@ Hooks.once("init", async function () {
     prepareStructureMacro: macros.prepareStructureMacro,
     prepareActivationMacro: macros.prepareActivationMacro,
     prepareEncodedAttackMacro: macros.prepareEncodedAttackMacro,
-    prepareStructureSecondaryRollMacro: prepareStructureSecondaryRollMacro,
+    prepareStructureSecondaryRollMacro: macros.prepareStructureSecondaryRollMacro,
     fullRepairMacro: macros.fullRepairMacro,
     stabilizeMacro: macros.stabilizeMacro,
     migrations: migrations,
diff --git a/src/module/actor/lancer-actor.ts b/src/module/actor/lancer-actor.ts
index 8c6459448..0929a08c0 100644
--- a/src/module/actor/lancer-actor.ts
+++ b/src/module/actor/lancer-actor.ts
@@ -25,42 +25,13 @@ import { LancerHooks, LancerSubscription } from "../helpers/hooks";
 import { mm_wrap_actor } from "../mm-util/helpers";
 import { system_ready } from "../../lancer";
 import type { LancerItemType } from "../item/lancer-item";
-import { renderMacroTemplate, prepareTextMacro, encodeMacroData } from "../macros";
+import { renderMacroTemplate, encodeMacroData } from "../macros";
 import type { RegEntry, MechWeapon, NpcFeature } from "machine-mind";
 import { StabOptions1, StabOptions2 } from "../enums";
 import { fix_modify_token_attribute } from "../token";
 import type { ActionData } from "../action";
 const lp = LANCER.log_prefix;
 
-export function prepareStructureSecondaryRollMacro(registryId: string) {
-  // @ts-ignore
-  let roll = new Roll('1d6').evaluate({ async: false });
-  let result = roll.total!;
-  if (result <= 3) {
-    prepareTextMacro(registryId, "Destroy Weapons", `
-<div class="dice-roll lancer-dice-roll">
-  <div class="dice-result">
-    <div class="dice-formula lancer-dice-formula flexrow">
-      <span style="text-align: left; margin-left: 5px;">${roll.formula}</span>
-      <span class="dice-total lancer-dice-total major">${result}</span>
-    </div>
-  </div>
-</div>
-<span>On a 1–3, all weapons on one mount of your choice are destroyed</span>`);
-  } else {
-    prepareTextMacro(registryId, "Destroy Systems", `
-<div class="dice-roll lancer-dice-roll">
-  <div class="dice-result">
-    <div class="dice-formula lancer-dice-formula flexrow">
-      <span style="text-align: left; margin-left: 5px;">${roll.formula}</span>
-      <span class="dice-total lancer-dice-total major">${result}</span>
-    </div>
-  </div>
-</div>
-<span>On a 4–6, a system of your choice is destroyed</span>`);
-  }
-}
-
 // Use for HP, etc
 interface BoundedValue {
   min: number;
diff --git a/src/module/macros.ts b/src/module/macros.ts
index 974f8762b..be9330ec0 100644
--- a/src/module/macros.ts
+++ b/src/module/macros.ts
@@ -1345,6 +1345,35 @@ async function rollOverchargeMacro(actor: LancerActor, data: LancerOverchargeMac
   return renderMacroTemplate(actor, template, templateData);
 }
 
+export function prepareStructureSecondaryRollMacro(registryId: string) {
+  // @ts-ignore
+  let roll = new Roll('1d6').evaluate({ async: false });
+  let result = roll.total!;
+  if (result <= 3) {
+    prepareTextMacro(registryId, "Destroy Weapons", `
+<div class="dice-roll lancer-dice-roll">
+  <div class="dice-result">
+    <div class="dice-formula lancer-dice-formula flexrow">
+      <span style="text-align: left; margin-left: 5px;">${roll.formula}</span>
+      <span class="dice-total lancer-dice-total major">${result}</span>
+    </div>
+  </div>
+</div>
+<span>On a 1–3, all weapons on one mount of your choice are destroyed</span>`);
+  } else {
+    prepareTextMacro(registryId, "Destroy Systems", `
+<div class="dice-roll lancer-dice-roll">
+  <div class="dice-result">
+    <div class="dice-formula lancer-dice-formula flexrow">
+      <span style="text-align: left; margin-left: 5px;">${roll.formula}</span>
+      <span class="dice-total lancer-dice-total major">${result}</span>
+    </div>
+  </div>
+</div>
+<span>On a 4–6, a system of your choice is destroyed</span>`);
+  }
+}
+
 export async function prepareChargeMacro(a: string) {
   // Determine which Actor to speak as
   let mech = getMacroSpeaker(a);

From 893380a5d10839fabda28c4c115d42680c384672 Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 19:01:16 -0700
Subject: [PATCH 86/88] nope, sorry, I'm changing my mind, 12px is the right
 amount of px

---
 src/module/helpers/acc_diff/Form.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index 369697031..b9f297601 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -302,7 +302,7 @@
   }
 
   .accdiff-grid :global(.accdiff-base-cover) {
-    margin-top: 8px;
+    margin-top: 12px;
     margin-bottom: 4px;
     font-size: 0.85em;
     padding-left: 10px;

From 313dea97024e054f4fc0f231684a95501c4b29bf Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 19:44:11 -0700
Subject: [PATCH 87/88] bugfix: weapon.plugins is an object, not an array

---
 src/module/helpers/acc_diff/Form.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/helpers/acc_diff/Form.svelte b/src/module/helpers/acc_diff/Form.svelte
index b9f297601..ff1643f78 100644
--- a/src/module/helpers/acc_diff/Form.svelte
+++ b/src/module/helpers/acc_diff/Form.svelte
@@ -75,7 +75,7 @@
             <span class="checkmark"></span>
           </label>
         {/if}
-        {#if kind == "attack" && (weapon.plugins.length > 0 || targets.length == 1)}
+        {#if kind == "attack" && (Object.values(weapon.plugins).length > 0 || targets.length == 1)}
           <div transition:slide>
             <h3 style="border-top: 1px dashed #782e22; padding-right: 4px; padding-top: 16px; margin-top: 16px;">
               <i class="cci cci-reticule i--m i--dark" style="vertical-align:middle;border:none"></i>

From 639f18ef00b39e8094f4c843ff2dba8d8501898b Mon Sep 17 00:00:00 2001
From: Sohum Banerjea <sohumb@gmail.com>
Date: Mon, 30 Aug 2021 19:44:28 -0700
Subject: [PATCH 88/88] removing css-loader and @mdi/font, both now unused

---
 package.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package.json b/package.json
index b16c3f583..434e92274 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "@tsconfig/svelte": "^2.0.1",
     "archiver": "^3.1.1",
     "chalk": "^3.0.0",
-    "css-loader": "^5.2.4",
     "fs-extra": "^9.1.0",
     "gulp": "^4.0.2",
     "gulp-git": "^2.10.1",
@@ -46,7 +45,6 @@
     "yargs": "^15.4.1"
   },
   "dependencies": {
-    "@mdi/font": "^5.9.55",
     "@types/marked": "^1.2.1",
     "aws-amplify": "^4.0.3",
     "compare-versions": "^3.6.0",