From d81bdd8e93419dd8849d5b547f4babde501c19b2 Mon Sep 17 00:00:00 2001
From: hppeng <hppeng>
Date: Tue, 2 Aug 2022 23:42:59 -0700
Subject: [PATCH] Fix fatal typo causing default ings to show as undefined in
 crafter

---
 js/crafter.js  | 25 ++++++-------------------
 js/load_ing.js |  2 +-
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/js/crafter.js b/js/crafter.js
index 4c19efe..b616e1c 100644
--- a/js/crafter.js
+++ b/js/crafter.js
@@ -31,16 +31,6 @@ let player_craft;
 
 
 function init_crafter() {
-    //no ing
-    
-    console.log("all ingredients");
-    console.log(ingMap);
-    console.log("all recipes");
-    console.log(recipeMap);
-    /*console.log(ingList);
-    console.log(recipeList);   
-    console.log(ingIDMap);
-    console.log(recipeIDMap);*/
     try {
         document.getElementById("recipe-choice").addEventListener("change", (event) => {
             updateMaterials();
@@ -56,17 +46,16 @@ function init_crafter() {
         });
         
         for (let i = 1; i < 4; ++i) {
-            document.getElementById("mat-1-"+i).setAttribute("onclick", document.getElementById("mat-1-"+i).getAttribute("onclick") + "; calculateCraftSchedule();");
-            document.getElementById("mat-2-"+i).setAttribute("onclick", document.getElementById("mat-2-"+i).getAttribute("onclick") + "; calculateCraftSchedule();");
+            document.getElementById("mat-1-"+i).addEventListener("click", (e) => calculateCraftSchedule());
+            document.getElementById("mat-2-"+i).addEventListener("click", (e) => calculateCraftSchedule());
         }
         for (let i = 1; i < 7; ++i) {
-            document.getElementById("ing-choice-" + i ).setAttribute("oninput", "calculateCraftSchedule();");
+            document.getElementById("ing-choice-" + i ).addEventListener("oninput", (e) => calculateCraftSchedule());
         }
         for (const str of ["slow", "normal", "fast"]) {
-            document.getElementById(str + "-atk-button").setAttribute("onclick", document.getElementById(str + "-atk-button").getAttribute("onclick") + "; calculateCraftSchedule();");
+            document.getElementById(str + "-atk-button").addEventListener("onclick", (e) => calculateCraftSchedule());
         }
 
-
         populateFields();
         decodeCraft(ing_url_tag);
     } catch (error) {
@@ -259,12 +248,10 @@ function populateFields() {
             ing_list.appendChild(el);
         }
     }
-    
-    
 }
 /*
-    Copies the CR Hash (CR-blahblahblah)
-*/
+ *  Copies the CR Hash (CR-blahblahblah)
+ */
 function copyRecipeHash() {
     if (player_craft) {
         copyTextToClipboard("CR-"+location.hash.slice(1));
diff --git a/js/load_ing.js b/js/load_ing.js
index 3443bfc..c6989a7 100644
--- a/js/load_ing.js
+++ b/js/load_ing.js
@@ -197,7 +197,7 @@ function init_ing_maps() {
                 posMods: {"left": 0, "right": 0, "above": 0, "under": 0, "touching": 0, "notTouching": 0}
             };
             ing.id = 4001 + ing.pid;
-            ing.diplayName = ing.name;
+            ing.displayName = ing.name;
             switch(i) {
                 case 0:
                     ing.itemIDs["strReq"] = powderIng["skpReq"];