Merge pull request #13 from AstronIsTaken/dev

Minor recipe fixes
AstronIsTaken · Jan 26, 2022 · ad3148e · ad3148e
2 parents 9ce27a7 + 1147a8c
commit ad3148e
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 33 deletions.
diff --git a/data/craft_trans_german.json b/data/craft_trans_german.json
@@ -17,7 +17,7 @@
   "Gold Nuggets": "Goldnuggets",
   "Rhodonite": "Rhodonit",
   "Columbite": "Columbit",
-  "Illmenite": "Illmenit",
+  "Ilmenite": "Ilmenit",
   "Vanadinite": "Vanadinit",
   "Oxygen Pure": "Reiner Sauerstoff",
   "Hydrogen Pure": "Reiner Wasserstoff",

diff --git a/data/itemsAccordion.json b/data/itemsAccordion.json
@@ -1846,6 +1846,7 @@
             "data": [
               "Aluminium Honeycomb",
               "Calcium Honeycomb",
+              "Carbon Honeycomb",
               "Chromium Honeycomb",
               "Cobalt Honeycomb",
               "Copper Honeycomb",
@@ -1913,7 +1914,7 @@
                 "name": "Tier 5 Ores",
                 "data": [
                   "Columbite",
-                  "Illmenite",
+                  "Ilmenite",
                   "Rhodonite",
                   "Thoramine",
                   "Vanadinite"
@@ -2210,6 +2211,7 @@
             "data": [
               "Basic Antenna XS",
               "Basic Antenna S",
+              "Basic Antenna XL",
               "Uncommon Antenna S",
               "Uncommon Antenna M",
               "Uncommon Antenna L",

diff --git a/data/orePrices.json b/data/orePrices.json
@@ -16,7 +16,7 @@
   "Gold Nuggets": 1900,
   "Kolbeckite": 1350,
   "Columbite": 3800,
-  "Illmenite": 18000,
+  "Ilmenite": 18000,
   "Rhodonite": 1350,
   "Thoramine": 50000000,
   "Vanadinite": 7000

diff --git a/data/recipes.json b/data/recipes.json
@@ -179,7 +179,7 @@
     "industry": "",
     "input": {}
   },
-  "Illmenite": {
+  "Ilmenite": {
     "tier": 5,
     "type": "Ore",
     "volume": 1,
@@ -510,7 +510,7 @@
     },
     "industry": "Refiner M",
     "input": {
-      "Illmenite": 65
+      "Ilmenite": 65
     }
   },
   "Pure Vanadium": {
@@ -2413,6 +2413,20 @@
       "Basic Screw": 5
     }
   },
+  "Basic Antenna XL": {
+    "tier": 1,
+    "type": "Functional Part",
+    "volume": 7020.8,
+    "outputQuantity": 1,
+    "time": 4860,
+    "byproducts": {},
+    "nanopack": false,
+    "industry": "Electronics Industry M",
+    "input": {
+      "Al-Fe Alloy": 2401,
+      "Basic Screw": 625
+    }
+  },
   "Uncommon Antenna XS": {
     "tier": 2,
     "type": "Functional Part",

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <head>
     <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
     <meta charset="utf-8">
-    <link rel="stylesheet" type="text/css" href="css/craft.css?v=4">
+    <link rel="stylesheet" type="text/css" href="css/craft.css?v=5">
     <link href="https://fonts.googleapis.com/css?family=Aldrich&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Roboto+Mono&display=swap" rel="stylesheet">
     <title>Dual Universe Beta Crafting Calculator</title>
@@ -33,7 +33,9 @@
     <button id="getDataButton" style="float:left;margin:0 5px;">Copy Config</button>
     <button id="setDataButton" style="float:left;margin:0 5px;">Paste Config</button>
 
-    <span style="color:#fff;float:left;padding:0 0 0 15px;">Updated on&nbsp;<a id="lastUpdateTime" href="https://github.com/AstronIsTaken/du-craft/releases" target="_blank">Loading</a></span>
+    <span style="color:#fff;float:left;padding:0 0 0 15px;">Updated on&nbsp;<a id="lastUpdateTime"
+                                                                               href="https://github.com/AstronIsTaken/du-craft/releases"
+                                                                               target="_blank">Loading</a></span>
     <span class="navright legend">
 <span class="tier-1 tier-all">1 : Basic</span>
 <span class="tier-2 tier-all">2 : Uncommon</span>
@@ -239,8 +241,8 @@ <h2>Input Config</h2>
 
 </div>
 
-<script src="js/crafting_calc.js?v=4"></script>
-<script src="js/crafting_calc_interface.js?v=4"></script>
+<script src="js/crafting_calc.js?v=5"></script>
+<script src="js/crafting_calc_interface.js?v=5"></script>
 
 </body>
 </html>
diff --git a/js/crafting_calc_interface.js b/js/crafting_calc_interface.js
@@ -9,6 +9,7 @@ class Skill {
     subject;
     class;
     amount;
+
     constructor(categoryName, groupName, skillName) {
         this.name = skillName;
         this.id = [categoryName, groupName, skillName].join(".");
@@ -19,6 +20,7 @@ class SkillGroup {
     name;
     id;
     skills = [];
+
     constructor(categoryName, groupName) {
         this.name = groupName;
         this.id = [categoryName, groupName].join(".");
@@ -29,6 +31,7 @@ class SkillCategory {
     name;
     id;
     groups = [];
+
     constructor(name) {
         this.name = name;
         this.id = name;
@@ -106,7 +109,7 @@ function copyStringToClipboard(str) {
 var itemsAccordion, prices, recipes, german;
 
 const version = "1";
-const lastUpdateTime = "2021-11-23";
+const lastUpdateTime = "2022-01-25";
 document.getElementById("lastUpdateTime").innerHTML = lastUpdateTime;
 console.log("Crafting Calculator Updated On: " + lastUpdateTime)
 console.log("Crafting Calculator Profile Version: " + version)
@@ -676,29 +679,29 @@ function updateSkillTreeDiv() {
     if (skillValues.onlyApplicableSkills) {
         skillTree.forEach(category => {
             let emptyCategory = true;
-           category.groups.forEach(group => {
-               let emptyGroup = true;
-               group.skills.forEach(skill => {
-                   if (shouldDisplaySkill(skill)) {
-                       emptyGroup = false;
-                   } else {
-                       const skillElement = skillTreeDiv.querySelector('[skill-id="'+ skill.id + '"]');
-                       if (skillElement) {
-                           skillElement.classList.add("hidden-tree-node");
-                       }
-                   }
-               });
-               if (emptyGroup) {
-                   const groupElement = skillTreeDiv.querySelector('[skill-group-id="'+ group.id + '"]');
-                   if (groupElement) {
-                       groupElement.classList.add("hidden-tree-node");
-                   }
-               } else {
-                   emptyCategory = false;
-               }
-           });
+            category.groups.forEach(group => {
+                let emptyGroup = true;
+                group.skills.forEach(skill => {
+                    if (shouldDisplaySkill(skill)) {
+                        emptyGroup = false;
+                    } else {
+                        const skillElement = skillTreeDiv.querySelector('[skill-id="' + skill.id + '"]');
+                        if (skillElement) {
+                            skillElement.classList.add("hidden-tree-node");
+                        }
+                    }
+                });
+                if (emptyGroup) {
+                    const groupElement = skillTreeDiv.querySelector('[skill-group-id="' + group.id + '"]');
+                    if (groupElement) {
+                        groupElement.classList.add("hidden-tree-node");
+                    }
+                } else {
+                    emptyCategory = false;
+                }
+            });
             if (emptyCategory) {
-                const categoryElement = skillTreeDiv.querySelector('[skill-category-id="'+ category.id + '"]');
+                const categoryElement = skillTreeDiv.querySelector('[skill-category-id="' + category.id + '"]');
                 if (categoryElement) {
                     categoryElement.classList.add("hidden-tree-node");
                 }
@@ -1399,7 +1402,7 @@ function tryRestoreState(profile) {
             updatePrices();
         } catch (e) {
             console.log("failed to load prices");
-            prices = oldPrices;
+            prices = oldState.prices;
         }
 
         try {