Properly added total purchase list + fixed bug when closing dialogs with esc

Author: MathisSinet

index.html

@@ -140,6 +140,7 @@ <h1 style="margin-bottom: 1.5rem">Sim settings</h1>
       <!--span>Skip completed CTs in "all" mode: </span> <input type="checkbox" class="skipcompletedcts" /><br /><br /-->
       <span>Show a2 and a3 lvl in EFAI strat output: </span> <input type="checkbox" class="a23" /><br /><br />
       <span>Show unofficial CTs: </span> <input type="checkbox" class="unofficials" /><br /><br />
+      <span>Generate a total purchase list: </span> <input type="checkbox" class="totalPurchaseList" /><br /><br />
     </dialog>
     <dialog class="boughtVars">
       <button class="boughtVarsCloseBtn">X</button>

src/Sim/parse.ts

@@ -25,6 +25,7 @@ const simAllStrats = qs<HTMLSelectElement>(".simallstrats");
 const completedCTs = qs<HTMLSelectElement>(".completedcts");
 const showA23 = qs<HTMLInputElement>(".a23");
 const showUnofficials = qs<HTMLInputElement>(".unofficials");
+const generateTotalPurchaseList = qs<HTMLInputElement>(".totalPurchaseList");
 
 function parseSettings(): Settings {
     return {
@@ -36,7 +37,8 @@ function parseSettings(): Settings {
         simAllStrats: simAllStrats.value as SettingsSimAllStratsMode,
         completedCTs: completedCTs.value as SettingsCompletedCTsMode,
         showA23: showA23.checked,
-        showUnofficials: showUnofficials.checked
+        showUnofficials: showUnofficials.checked,
+        totalPurchaseList: generateTotalPurchaseList.checked
     }
 }
 

src/Sim/write.ts

@@ -2,8 +2,8 @@ import jsonData from "../Data/data.json" assert { type: "json" };
 import { convertTime, formatNumber, isMainTheory, logToExp } from "../Utils/helpers";
 import { qs, qsa, ce, event, removeAllChilds } from "../Utils/DOMhelpers";
 
-// Other
-const sigmaInput = qs<HTMLInputElement>(".sigma");
+// Settings
+const generateTotalPurchaseList = qs<HTMLInputElement>(".totalPurchaseList");
 
 // Outputs
 const table = qs(".simTable");
@@ -18,6 +18,8 @@ const varBuyListCloseBtn = qs<HTMLButtonElement>(".boughtVarsCloseBtn");
 const tau = `<span style="font-size:0.9rem; font-style:italics">&tau;</span>`;
 const rho = `<span style="font-size:0.9rem; font-style:italics">&rho;</span>`;
 
+let totalBuys: varBuy[] = [];
+
 // Utils
 function clearTable() {
     removeAllChilds(tbody);
@@ -62,13 +64,13 @@ function fillTableRow(row: HTMLTableRowElement, count: number) {
     for (let i = 0; i < count; i++) addTableCell(row, "");
 }
 
-let totalBuys: varBuy[] = [];
-
 /** Binds a var buy list to the last cell of a result row */
-const bindVarBuy = (row: HTMLTableRowElement, buys: varBuy[]) => {
+const bindVarBuy = (row: HTMLTableRowElement, buys: varBuy[], addToTotal = true) => {
     if (row.lastChild == null) return;
-    totalBuys.push(...buys);
-    totalBuys.push({variable: "---", level: 0, cost: 0, timeStamp: 0});
+    if (addToTotal && generateTotalPurchaseList.checked) {
+        totalBuys.push(...buys);
+        totalBuys.push({variable: "---", level: 0, cost: 0, timeStamp: 0});
+    }
     const lastChild = row.lastChild as HTMLElement;
     lastChild.onclick = () => {
       openVarModal(buys);
@@ -102,10 +104,6 @@ function highlightResetCells() {
 
 /** Generates and open the var buy list */
 function openVarModal(arr: varBuy[]) {
-  if (sigmaInput.value === "hax") {
-    console.log("HAX");
-    arr = totalBuys;
-  }
   document.body.style.overflow = "hidden";
   varBuyDialog.showModal();
   removeAllChilds(varBuyTable);
@@ -120,10 +118,9 @@ function openVarModal(arr: varBuy[]) {
   highlightResetCells();
 }
 
-event(varBuyListCloseBtn, "pointerdown", () => {
-  varBuyDialog.close();
-  document.body.style.overflow = "auto";
-});
+event(varBuyListCloseBtn, "pointerdown", () => varBuyDialog.close());
+
+event(varBuyDialog, "close", () => document.body.style.overflow = "auto");
 
 // Response writers
 
@@ -164,13 +161,23 @@ function writeChainSimResponse(response: ChainSimResponse) {
 
     tbody.append(labelRow);
     tbody.append(resRow);
+    if (generateTotalPurchaseList.checked) {
+        bindVarBuy(resRow, totalBuys, false);
+    }
 }
 
 function writeStepSimResponse(response: StepSimResponse) {
     response.results.forEach(res => writeSingleSimResponse({
         responseType: "single",
         result: res
     }));
+    if (generateTotalPurchaseList.checked) {
+        const resRow = ce<HTMLTableRowElement>("tr");
+        fillTableRow(resRow, 8);
+        addTableCell(resRow, "Total");
+        bindVarBuy(resRow, totalBuys, false);
+        tbody.append(resRow);
+    }
 }
 
 function writeSimAllResponse(response: SimAllResponse) {

src/UI/settings.ts

@@ -13,11 +13,12 @@ event(settingsBtn, "pointerdown", () => {
   document.body.style.overflow = "hidden";
 });
 
-event(settingsCloseBtn, "pointerdown", () => {
+event(settingsCloseBtn, "pointerdown", () => settingsModal.close());
+
+event(settingsModal, "close", () => {
   setSimState();
-  settingsModal.close();
   document.body.style.overflow = "auto";
-});
+})
 
 // Instructions menu
 
@@ -30,10 +31,9 @@ event(instructionsBtn, "pointerdown", () => {
   document.body.style.overflow = "hidden";
 });
 
-event(instructionsCloseBtn, "pointerdown", () => {
-  instructionsModal.close();
-  document.body.style.overflow = "auto";
-});
+event(instructionsCloseBtn, "pointerdown", () => instructionsModal.close());
+
+event(instructionsModal, "close", () => document.body.style.overflow = "auto");
 
 // Settings inputs
 

src/Utils/global.types.ts

@@ -123,6 +123,7 @@ declare global {
     completedCTs: SettingsCompletedCTsMode;
     showA23: boolean;
     showUnofficials: boolean;
+    totalPurchaseList: boolean;
   }
 
   interface simResult {