From 655dd56bfc9f3cfd13900398575e0eb52ed3ff70 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Sun, 21 Jul 2024 11:45:45 +0800
Subject: [PATCH 01/15] adding the achievement modifier

---
 index.html |  5 +++++
 js/site.js | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index 479d35a..e79fd6e 100644
--- a/index.html
+++ b/index.html
@@ -87,6 +87,11 @@ <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
             <input class="w-25" id="v2" type="number" placeholder="Enter level" min="1" value="1" onchange="calculate()">
         </label>
 		<br/>
+        <label class="text-center">
+            <span class="h3 w-50" id="lblAchievementAmount">Unlocked Achievements:</span>
+            <input class="w-25" id="achievement" type="number" placeholder="Enter level" min="0" value="0" onchange="calculate()">
+        </label>
+		<br/>
         <label class="text-center">
             <span class="h3 w-50" id = "lblTarget">Target Star Level:</span>
             <input class="w-25" id="target" type="number" placeholder="Enter level" min="11" value="11" onchange="calculate()">
diff --git a/js/site.js b/js/site.js
index 91197cf..35eb2c5 100644
--- a/js/site.js
+++ b/js/site.js
@@ -1,13 +1,14 @@
-var inputs = ["setAll","v2","target"];
+var inputs = ["setAll","v2","achievement","target"];
 var inpStars = ["inpStar1","inpStar2","inpStar3","inpStar4","inpStar5","inpStar6","inpStar7","inpStar8","inpStar9","inpStar10"]
 var language = window.navigator.userLanguage || window.navigator.language;
 
-var languages = {
+var languages = { //TODO translate AchievementAmount label
   "en": {
     "Title": "Star Calc",
     "SetAll": "Set all to: ",
     "Settings": "Remember levels: ",
     "v2Level": "Scrapyard V2: ",
+    "AchievementAmount": "Unlocked Achievements: ",
     "Target": "Target Stars: "
   },
   "es": {
@@ -15,6 +16,7 @@ var languages = {
     "SetAll": "Establecer todo en: ",
     "Settings": "Recuerda niveles: ",
     "v2Level": "Vertedero V2: ",
+    "AchievementAmount": "Unlocked Achievements: ",
     "Target": "Objetivo Estrellas: "
   },
   "ru": {
@@ -22,6 +24,7 @@ var languages = {
     "SetAll": "Установить все звезды: ",
     "Settings": "Запомнить уровни: ",
     "v2Level": "Двор мусора v2: ",
+    "AchievementAmount": "Unlocked Achievements: ",
     "Target": "Целевые звезды: "
   },
   "de": {
@@ -29,6 +32,7 @@ var languages = {
     "Settings": "Merken Sie sich die Level: ",
     "SetAll": "Setze alle Sterne: ",
     "v2Level": "Schrottplatz V2: ",
+    "AchievementAmount": "Unlocked Achievements: ",
     "Target": "Zielsterne: "
   },
   "fr": {
@@ -36,6 +40,7 @@ var languages = {
     "Settings": "Mémoriser les niveaux: ",
     "SetAll": "Définir toutes les étoiles: ",
     "v2Level": "Parc à casse V2: ",
+    "AchievementAmount": "Unlocked Achievements: ",
     "Target": "Cible Étoile: "
   }
 }
@@ -46,6 +51,7 @@ document.getElementById("lblTitle").innerHTML = languages[language]["Title"];
 document.getElementById("lblSetAll").innerHTML = languages[language]["SetAll"];
 document.getElementById("lblSettings").innerHTML = languages[language]["Settings"];
 document.getElementById("lblv2Level").innerHTML = languages[language]["v2Level"];
+document.getElementById("lblAchievementAmount").innerHTML = languages[language]["AchievementAmount"];
 document.getElementById("lblTarget").innerHTML = languages[language]["Target"];
 
 window.onload = checkLocalStorage();
@@ -139,12 +145,13 @@ function calculate() {
   var magAmount = 0;
   var fragmentAmount = 0;
   var scrapyardMul = scrapyardModifier();
+  var achievementMul = achievementModifier(); // scaled by 1000, to be multiplied
 
   stars.forEach((star) => {
       for (let index = Number(star); index < Number(desired); index++) {
-          gsAmount += gsCost(index, scrapyardMul);
-          magAmount += magnetCost(index, scrapyardMul);
-          fragmentAmount += fragmentCost(index, scrapyardMul);
+          gsAmount += gsCost(index, scrapyardMul, achievementMul);
+          magAmount += magnetCost(index, scrapyardMul, achievementMul);
+          fragmentAmount += fragmentCost(index, scrapyardMul, achievementMul);
       }
   });
 
@@ -156,7 +163,7 @@ function calculate() {
   
 }
 
-function gsCost(starLevel, scrapyardMul) {
+function gsCost(starLevel, scrapyardMul, achievementMul) {
   var cost = 100000 * (starLevel - 10) + 250000; //adjust for first 10 stars
   if (starLevel >= 20) cost *= 1.3;
   if (starLevel >= 30) cost *= 1.3;
@@ -180,7 +187,7 @@ function gsCost(starLevel, scrapyardMul) {
   if (starLevel >= 450) cost *= 1.1;
   if (starLevel >= 500) cost *= 1.1;
   if (starLevel >= 550) cost *= 1.1;
-  return Math.floor((cost * 100) / (scrapyardMul + 100));
+  return Math.floor((cost * 100) * achievementMul / ((scrapyardMul + 100) * 1000));
 }
 
 function scrapyardModifier()
@@ -200,7 +207,15 @@ function scrapyardModifier()
     return modifier - 1;
 }
 
-function magnetCost(starLevel, scrapyardMul) {
+function achievementModifier()
+  {
+    var modifier;
+    var amount = document.getElementById("achievement").value;
+    modifier = 1000 - Math.min(0,Math.max(50,amount - 25));
+    return modifier;
+  }
+
+function magnetCost(starLevel, scrapyardMul, achievementMul) {
   var cost = 250 * (starLevel - 10) + 1000; //adjust for first 10 stars
   if (starLevel >= 12) cost *= 0.98;
   if (starLevel >= 13) cost *= 0.98;
@@ -288,10 +303,10 @@ function magnetCost(starLevel, scrapyardMul) {
   if (starLevel >= 1760) cost *= 1.269;
   if (starLevel >= 1810) cost *= 1.1;
   if (starLevel >= 1860) cost *= Math.pow(1.1, Math.floor((starLevel - 1810) / 50));
-  return Math.floor(cost * 100 / (scrapyardMul + 100));
+  return Math.floor((cost * 100) * achievementMul / ((scrapyardMul + 100) * 1000));
 }
 
-function fragmentCost(starLevel, scrapyardMul) {
+function fragmentCost(starLevel, scrapyardMul, achievementMul) {
   var cost = 4 + (starLevel - 10); //adjust for first 10 stars
   if (starLevel >= 60) cost *= 1.05;
   if (starLevel >= 70) cost *= 1.05;
@@ -325,5 +340,5 @@ function fragmentCost(starLevel, scrapyardMul) {
   if (starLevel >= 810) cost *= 1.1;
   if (starLevel >= 910) cost *= 1.1;
   if (starLevel >= 1010) cost *= 1.1;
-  return Math.floor((cost * 100) / (scrapyardMul + 100));
+  return Math.floor((cost * 100) * achievementMul / ((scrapyardMul + 100) * 1000));
 }

From 2e030699706791dd67bfc2114b8c4b2aa76f1276 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Sun, 21 Jul 2024 12:03:27 +0800
Subject: [PATCH 02/15] fixing the min and max bug

---
 js/site.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/site.js b/js/site.js
index 35eb2c5..98b0674 100644
--- a/js/site.js
+++ b/js/site.js
@@ -211,7 +211,7 @@ function achievementModifier()
   {
     var modifier;
     var amount = document.getElementById("achievement").value;
-    modifier = 1000 - Math.min(0,Math.max(50,amount - 25));
+    modifier = 1000 - Math.max(0,Math.min(50,amount - 25));
     return modifier;
   }
 

From 663d11b020e6fbf26aa226db82067389f15353e6 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Sun, 21 Jul 2024 14:11:22 +0800
Subject: [PATCH 03/15] Slight change to the placeholder description of
 Achievements

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index e79fd6e..4071bd4 100644
--- a/index.html
+++ b/index.html
@@ -89,7 +89,7 @@ <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
 		<br/>
         <label class="text-center">
             <span class="h3 w-50" id="lblAchievementAmount">Unlocked Achievements:</span>
-            <input class="w-25" id="achievement" type="number" placeholder="Enter level" min="0" value="0" onchange="calculate()">
+            <input class="w-25" id="achievement" type="number" placeholder="Enter Amount" min="0" value="0" onchange="calculate()">
         </label>
 		<br/>
         <label class="text-center">

From c7ebbef54d12f121eea303ee78a0ff61c14ce283 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Sat, 19 Oct 2024 16:10:50 +0800
Subject: [PATCH 04/15] implementing masteryBoost17

---
 index.html |  4 +++
 js/site.js | 89 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/index.html b/index.html
index 4071bd4..19245be 100644
--- a/index.html
+++ b/index.html
@@ -90,6 +90,10 @@ <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
         <label class="text-center">
             <span class="h3 w-50" id="lblAchievementAmount">Unlocked Achievements:</span>
             <input class="w-25" id="achievement" type="number" placeholder="Enter Amount" min="0" value="0" onchange="calculate()">
+        </label>
+        <label class="text-center">
+            <span class="h3 w-50" id="lblMasteryBoost17">Mastery 17+ Barrels:</span>
+            <input class="w-25" id="achievement" type="number" placeholder="Enter Amount" min="0" value="0" onchange="calculate()">
         </label>
 		<br/>
         <label class="text-center">
diff --git a/js/site.js b/js/site.js
index 98b0674..9de28c4 100644
--- a/js/site.js
+++ b/js/site.js
@@ -1,14 +1,15 @@
-var inputs = ["setAll","v2","achievement","target"];
+var inputs = ["setAll","v2","achievement","masteryBoost17","target"]; //TODO mb17
 var inpStars = ["inpStar1","inpStar2","inpStar3","inpStar4","inpStar5","inpStar6","inpStar7","inpStar8","inpStar9","inpStar10"]
 var language = window.navigator.userLanguage || window.navigator.language;
 
-var languages = { //TODO translate AchievementAmount label
+var languages = { //TODO translate AchievementAmount, MasteryBoost17 label
   "en": {
     "Title": "Star Calc",
     "SetAll": "Set all to: ",
     "Settings": "Remember levels: ",
     "v2Level": "Scrapyard V2: ",
     "AchievementAmount": "Unlocked Achievements: ",
+    "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Target Stars: "
   },
   "es": {
@@ -17,6 +18,7 @@ var languages = { //TODO translate AchievementAmount label
     "Settings": "Recuerda niveles: ",
     "v2Level": "Vertedero V2: ",
     "AchievementAmount": "Unlocked Achievements: ",
+    "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Objetivo Estrellas: "
   },
   "ru": {
@@ -25,6 +27,7 @@ var languages = { //TODO translate AchievementAmount label
     "Settings": "Запомнить уровни: ",
     "v2Level": "Двор мусора v2: ",
     "AchievementAmount": "Unlocked Achievements: ",
+    "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Целевые звезды: "
   },
   "de": {
@@ -33,6 +36,7 @@ var languages = { //TODO translate AchievementAmount label
     "SetAll": "Setze alle Sterne: ",
     "v2Level": "Schrottplatz V2: ",
     "AchievementAmount": "Unlocked Achievements: ",
+    "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Zielsterne: "
   },
   "fr": {
@@ -41,6 +45,7 @@ var languages = { //TODO translate AchievementAmount label
     "SetAll": "Définir toutes les étoiles: ",
     "v2Level": "Parc à casse V2: ",
     "AchievementAmount": "Unlocked Achievements: ",
+    "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Cible Étoile: "
   }
 }
@@ -52,6 +57,7 @@ document.getElementById("lblSetAll").innerHTML = languages[language]["SetAll"];
 document.getElementById("lblSettings").innerHTML = languages[language]["Settings"];
 document.getElementById("lblv2Level").innerHTML = languages[language]["v2Level"];
 document.getElementById("lblAchievementAmount").innerHTML = languages[language]["AchievementAmount"];
+document.getElementById("lblMasteryBoost17").innerHTML = languages[language]["MasteryBoost17"];
 document.getElementById("lblTarget").innerHTML = languages[language]["Target"];
 
 window.onload = checkLocalStorage();
@@ -115,7 +121,7 @@ function setAll() {
 function calculate() {
   var isValid = true;
   inpStars.every(input => {
-    if (document.getElementById(input).value <= 0) {
+    if (document.getElementById(input).value <= 0) { // TODO can be raised to < 10
       document.getElementById(input).select();
       document.getElementById(input).classList.add("red");
       isValid = false;
@@ -146,12 +152,13 @@ function calculate() {
   var fragmentAmount = 0;
   var scrapyardMul = scrapyardModifier();
   var achievementMul = achievementModifier(); // scaled by 1000, to be multiplied
+  var masteryBoost17Mul = masteryBoost17Modifier(); // To be multiplied
 
   stars.forEach((star) => {
       for (let index = Number(star); index < Number(desired); index++) {
-          gsAmount += gsCost(index, scrapyardMul, achievementMul);
-          magAmount += magnetCost(index, scrapyardMul, achievementMul);
-          fragmentAmount += fragmentCost(index, scrapyardMul, achievementMul);
+          gsAmount += gsCost(index, scrapyardMul, achievementMul, masteryBoost17Mul);
+          magAmount += magnetCost(index, scrapyardMul, achievementMul, masteryBoost17Mul);
+          fragmentAmount += fragmentCost(index, scrapyardMul, achievementMul, masteryBoost17Mul);
       }
   });
 
@@ -163,7 +170,40 @@ function calculate() {
   
 }
 
-function gsCost(starLevel, scrapyardMul, achievementMul) {
+function scrapyardModifier()
+{
+    var modifier;
+    var level = document.getElementById("v2").value;
+    if (level > 200)
+      {
+        modifier = (level - 200) * 4 + 300;
+    }
+    else
+    {
+      modifier = level;
+      if (level > 100)
+        modifier = (level - 100) * 2 + 100;
+    }
+    return modifier - 1;
+}
+
+function achievementModifier()
+{
+  var modifier;
+  var amount = document.getElementById("achievement").value;
+  modifier = 1000 - Math.max(0,Math.min(50,amount - 25));
+  return modifier;
+}
+
+function masteryBoost17Modifier()
+{
+  var modifier;
+  var amount = document.getElementById("masteryBoost17").value;
+  modifier = Math.pow(0.99,Math.floor(amount/10));
+  return modifier;
+}
+
+function gsCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
   var cost = 100000 * (starLevel - 10) + 250000; //adjust for first 10 stars
   if (starLevel >= 20) cost *= 1.3;
   if (starLevel >= 30) cost *= 1.3;
@@ -187,35 +227,10 @@ function gsCost(starLevel, scrapyardMul, achievementMul) {
   if (starLevel >= 450) cost *= 1.1;
   if (starLevel >= 500) cost *= 1.1;
   if (starLevel >= 550) cost *= 1.1;
-  return Math.floor((cost * 100) * achievementMul / ((scrapyardMul + 100) * 1000));
+  return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
 }
 
-function scrapyardModifier()
-  {
-    var modifier;
-    var level = document.getElementById("v2").value;
-    if (level > 200)
-    {
-        modifier = (level - 200) * 4 + 300;
-    }
-    else
-    {
-        modifier = level;
-        if (level > 100)
-            modifier = (level - 100) * 2 + 100;
-    }
-    return modifier - 1;
-}
-
-function achievementModifier()
-  {
-    var modifier;
-    var amount = document.getElementById("achievement").value;
-    modifier = 1000 - Math.max(0,Math.min(50,amount - 25));
-    return modifier;
-  }
-
-function magnetCost(starLevel, scrapyardMul, achievementMul) {
+function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
   var cost = 250 * (starLevel - 10) + 1000; //adjust for first 10 stars
   if (starLevel >= 12) cost *= 0.98;
   if (starLevel >= 13) cost *= 0.98;
@@ -303,10 +318,10 @@ function magnetCost(starLevel, scrapyardMul, achievementMul) {
   if (starLevel >= 1760) cost *= 1.269;
   if (starLevel >= 1810) cost *= 1.1;
   if (starLevel >= 1860) cost *= Math.pow(1.1, Math.floor((starLevel - 1810) / 50));
-  return Math.floor((cost * 100) * achievementMul / ((scrapyardMul + 100) * 1000));
+  return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
 }
 
-function fragmentCost(starLevel, scrapyardMul, achievementMul) {
+function fragmentCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
   var cost = 4 + (starLevel - 10); //adjust for first 10 stars
   if (starLevel >= 60) cost *= 1.05;
   if (starLevel >= 70) cost *= 1.05;
@@ -340,5 +355,5 @@ function fragmentCost(starLevel, scrapyardMul, achievementMul) {
   if (starLevel >= 810) cost *= 1.1;
   if (starLevel >= 910) cost *= 1.1;
   if (starLevel >= 1010) cost *= 1.1;
-  return Math.floor((cost * 100) * achievementMul / ((scrapyardMul + 100) * 1000));
+  return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
 }

From c2a8e120eff5a0b08bec74c15ced247b3f9b370e Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Sat, 19 Oct 2024 16:11:33 +0800
Subject: [PATCH 05/15] deleting a finished TODO

---
 js/site.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/site.js b/js/site.js
index 9de28c4..af91185 100644
--- a/js/site.js
+++ b/js/site.js
@@ -1,4 +1,4 @@
-var inputs = ["setAll","v2","achievement","masteryBoost17","target"]; //TODO mb17
+var inputs = ["setAll","v2","achievement","masteryBoost17","target"];
 var inpStars = ["inpStar1","inpStar2","inpStar3","inpStar4","inpStar5","inpStar6","inpStar7","inpStar8","inpStar9","inpStar10"]
 var language = window.navigator.userLanguage || window.navigator.language;
 

From 61d798c3501daca7e5822938ba86310da9bcbf1c Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Sat, 19 Oct 2024 16:15:51 +0800
Subject: [PATCH 06/15] slight change to README

---
 Readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index 83affb0..45d36b1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -5,6 +5,8 @@ A companion app/website for the merging game Scrap Clicker 2.
 Provides the ability to calculate the resources needed to reach a specific Star level when providing:
 * Current Star Level
 * Current Scrapyard v2 Level
+* Obtained Achievements
+* Amount of barrels that reached Mastery 17
 * Target Star Level
 
 One calculated, it will provide the needed amounts of:

From 8d8f45b3641b4f8166baa481c5e641b9575355ef Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Sat, 19 Oct 2024 16:23:31 +0800
Subject: [PATCH 07/15] fixes id for mastery boost 17

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 19245be..d1b37df 100644
--- a/index.html
+++ b/index.html
@@ -93,7 +93,7 @@ <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
         </label>
         <label class="text-center">
             <span class="h3 w-50" id="lblMasteryBoost17">Mastery 17+ Barrels:</span>
-            <input class="w-25" id="achievement" type="number" placeholder="Enter Amount" min="0" value="0" onchange="calculate()">
+            <input class="w-25" id="masteryBoost17" type="number" placeholder="Enter Amount" min="0" value="0" onchange="calculate()">
         </label>
 		<br/>
         <label class="text-center">

From bf0ebe6764a21b9774f6ca56ae1e9b01be2595ef Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Tue, 31 Dec 2024 07:41:12 +0800
Subject: [PATCH 08/15] changed how the achievement field work to reflect 11.6

---
 index.html |  2 +-
 js/site.js | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index d1b37df..1516441 100644
--- a/index.html
+++ b/index.html
@@ -88,7 +88,7 @@ <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
         </label>
 		<br/>
         <label class="text-center">
-            <span class="h3 w-50" id="lblAchievementAmount">Unlocked Achievements:</span>
+            <span class="h3 w-50" id="lblAchievement25">Unlocked Achievements:</span>
             <input class="w-25" id="achievement" type="number" placeholder="Enter Amount" min="0" value="0" onchange="calculate()">
         </label>
         <label class="text-center">
diff --git a/js/site.js b/js/site.js
index af91185..0c2ddfe 100644
--- a/js/site.js
+++ b/js/site.js
@@ -2,13 +2,13 @@ var inputs = ["setAll","v2","achievement","masteryBoost17","target"];
 var inpStars = ["inpStar1","inpStar2","inpStar3","inpStar4","inpStar5","inpStar6","inpStar7","inpStar8","inpStar9","inpStar10"]
 var language = window.navigator.userLanguage || window.navigator.language;
 
-var languages = { //TODO translate AchievementAmount, MasteryBoost17 label
+var languages = { //TODO translate Achievement25, MasteryBoost17 label
   "en": {
     "Title": "Star Calc",
     "SetAll": "Set all to: ",
     "Settings": "Remember levels: ",
     "v2Level": "Scrapyard V2: ",
-    "AchievementAmount": "Unlocked Achievements: ",
+    "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Target Stars: "
   },
@@ -17,7 +17,7 @@ var languages = { //TODO translate AchievementAmount, MasteryBoost17 label
     "SetAll": "Establecer todo en: ",
     "Settings": "Recuerda niveles: ",
     "v2Level": "Vertedero V2: ",
-    "AchievementAmount": "Unlocked Achievements: ",
+    "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Objetivo Estrellas: "
   },
@@ -26,7 +26,7 @@ var languages = { //TODO translate AchievementAmount, MasteryBoost17 label
     "SetAll": "Установить все звезды: ",
     "Settings": "Запомнить уровни: ",
     "v2Level": "Двор мусора v2: ",
-    "AchievementAmount": "Unlocked Achievements: ",
+    "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Целевые звезды: "
   },
@@ -35,7 +35,7 @@ var languages = { //TODO translate AchievementAmount, MasteryBoost17 label
     "Settings": "Merken Sie sich die Level: ",
     "SetAll": "Setze alle Sterne: ",
     "v2Level": "Schrottplatz V2: ",
-    "AchievementAmount": "Unlocked Achievements: ",
+    "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Zielsterne: "
   },
@@ -44,7 +44,7 @@ var languages = { //TODO translate AchievementAmount, MasteryBoost17 label
     "Settings": "Mémoriser les niveaux: ",
     "SetAll": "Définir toutes les étoiles: ",
     "v2Level": "Parc à casse V2: ",
-    "AchievementAmount": "Unlocked Achievements: ",
+    "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
     "Target": "Cible Étoile: "
   }
@@ -56,7 +56,7 @@ document.getElementById("lblTitle").innerHTML = languages[language]["Title"];
 document.getElementById("lblSetAll").innerHTML = languages[language]["SetAll"];
 document.getElementById("lblSettings").innerHTML = languages[language]["Settings"];
 document.getElementById("lblv2Level").innerHTML = languages[language]["v2Level"];
-document.getElementById("lblAchievementAmount").innerHTML = languages[language]["AchievementAmount"];
+document.getElementById("lblAchievement25").innerHTML = languages[language]["Achievement25"];
 document.getElementById("lblMasteryBoost17").innerHTML = languages[language]["MasteryBoost17"];
 document.getElementById("lblTarget").innerHTML = languages[language]["Target"];
 
@@ -191,7 +191,7 @@ function achievementModifier()
 {
   var modifier;
   var amount = document.getElementById("achievement").value;
-  modifier = 1000 - Math.max(0,Math.min(50,amount - 25));
+  modifier = Math.min(0, 1000 - Math.max(0,amount * 2));
   return modifier;
 }
 
@@ -356,4 +356,4 @@ function fragmentCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul
   if (starLevel >= 910) cost *= 1.1;
   if (starLevel >= 1010) cost *= 1.1;
   return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
-}
+}
\ No newline at end of file

From 58d5e44c9dbd499e17b45632d9f78f15cc8b0f75 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Tue, 31 Dec 2024 07:49:48 +0800
Subject: [PATCH 09/15] fix min max confusion (hate these)

---
 js/site.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/site.js b/js/site.js
index 0c2ddfe..3626096 100644
--- a/js/site.js
+++ b/js/site.js
@@ -191,7 +191,7 @@ function achievementModifier()
 {
   var modifier;
   var amount = document.getElementById("achievement").value;
-  modifier = Math.min(0, 1000 - Math.max(0,amount * 2));
+  modifier = Math.max(0, 1000 - Math.max(0,amount * 2));
   return modifier;
 }
 

From 6937586ee48b4491d2e1fb30faff004f9b289ed6 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Tue, 31 Dec 2024 08:10:52 +0800
Subject: [PATCH 10/15] tuck in a TODO note for magnets (formula change...)

---
 js/site.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/site.js b/js/site.js
index 3626096..c80463b 100644
--- a/js/site.js
+++ b/js/site.js
@@ -230,7 +230,7 @@ function gsCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
   return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
 }
 
-function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
+function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) { //TODO: adjust with 11.6 formula change
   var cost = 250 * (starLevel - 10) + 1000; //adjust for first 10 stars
   if (starLevel >= 12) cost *= 0.98;
   if (starLevel >= 13) cost *= 0.98;

From 6146bbb3c1ac506fda1b68cfba90fa282cbc6d11 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Mon, 6 Jan 2025 01:21:20 +0800
Subject: [PATCH 11/15] textbox label fix

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 1516441..b4a87d7 100644
--- a/index.html
+++ b/index.html
@@ -83,12 +83,12 @@ <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
     </div>
     <div class="text-center">
         <label class="text-center">
-            <span class="h3 w-50" id="lblv2Level">Scrapyard V2 Level:</span>
+            <span class="h3 w-50" id="lblv2Level">Scrapyard V2:</span>
             <input class="w-25" id="v2" type="number" placeholder="Enter level" min="1" value="1" onchange="calculate()">
         </label>
 		<br/>
         <label class="text-center">
-            <span class="h3 w-50" id="lblAchievement25">Unlocked Achievements:</span>
+            <span class="h3 w-50" id="lblAchievement25">Achievement Boost 2 Level:</span>
             <input class="w-25" id="achievement" type="number" placeholder="Enter Amount" min="0" value="0" onchange="calculate()">
         </label>
         <label class="text-center">

From 0e02c592472469decdc08e12edb2ff54f4f14df0 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Mon, 6 Jan 2025 01:21:36 +0800
Subject: [PATCH 12/15] THANKS ENDTE! (11.6)

---
 js/site.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/js/site.js b/js/site.js
index c80463b..503e2ac 100644
--- a/js/site.js
+++ b/js/site.js
@@ -302,22 +302,21 @@ function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul)
   if (starLevel >= 1090) cost *= 1.1;
   if (starLevel >= 1110) cost *= 1.3;
   if (starLevel >= 1120) cost *= 1.1;
-  if (starLevel >= 1130) cost *= 1.1;
+  if (starLevel >= 1160) cost *= 1.1;
   if (starLevel >= 1210) cost *= 1.3;
   if (starLevel >= 1260) cost *= 1.18;
   if (starLevel >= 1285) cost *= 1.18;
-  if (starLevel >= 1310) cost *= 1.36;
-  if (starLevel >= 1360) cost *= 1.36;
-  if (starLevel >= 1410) cost *= 1.37;
-  if (starLevel >= 1460) cost *= 1.37;
+  if (starLevel >= 1310) cost *= 1.34;
+  if (starLevel >= 1360) cost *= 1.34;
+  if (starLevel >= 1410) cost *= 1.34;
+  if (starLevel >= 1460) cost *= 1.34;
   if (starLevel >= 1510) cost *= 1.3;
   if (starLevel >= 1560) cost *= 1.269;
   if (starLevel >= 1610) cost *= 1.1;
   if (starLevel >= 1660) cost *= 1.1;
   if (starLevel >= 1710) cost *= 1.3;
   if (starLevel >= 1760) cost *= 1.269;
-  if (starLevel >= 1810) cost *= 1.1;
-  if (starLevel >= 1860) cost *= Math.pow(1.1, Math.floor((starLevel - 1810) / 50));
+  if (starLevel >= 1810) cost *= Math.pow(1.1, Math.floor((starLevel - 1760) / 50));
   return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
 }
 

From de7f72a15eaf032c1b2b72e45437050694ec8533 Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Mon, 6 Jan 2025 01:35:22 +0800
Subject: [PATCH 13/15] remove todo for formula change because it has been
 fixed

---
 js/site.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/site.js b/js/site.js
index 503e2ac..6dbcfd4 100644
--- a/js/site.js
+++ b/js/site.js
@@ -230,7 +230,7 @@ function gsCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
   return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
 }
 
-function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) { //TODO: adjust with 11.6 formula change
+function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
   var cost = 250 * (starLevel - 10) + 1000; //adjust for first 10 stars
   if (starLevel >= 12) cost *= 0.98;
   if (starLevel >= 13) cost *= 0.98;

From 745af1d5e225f9fce335b26c85ddda7e35af078f Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Mon, 17 Mar 2025 00:14:11 +0800
Subject: [PATCH 14/15] Introducing Black Magic!

---
 index.html |  1 +
 js/site.js | 46 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index b4a87d7..db812c3 100644
--- a/index.html
+++ b/index.html
@@ -100,6 +100,7 @@ <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
             <span class="h3 w-50" id = "lblTarget">Target Star Level:</span>
             <input class="w-25" id="target" type="number" placeholder="Enter level" min="11" value="11" onchange="calculate()">
         </label>
+        <div class="text-center" ><span id = "lblMagic">Use Black Magic (Experimental): </span><input id="useMagic" type="checkbox" onchange="calculate()"></div>
         <!--<div class="text-center" style="padding: 10px;">
             <button class="btn btn-primary" onclick="calculate()" >Submit</button>
         </div> 
diff --git a/js/site.js b/js/site.js
index 6dbcfd4..aa3e6d2 100644
--- a/js/site.js
+++ b/js/site.js
@@ -1,8 +1,9 @@
 var inputs = ["setAll","v2","achievement","masteryBoost17","target"];
 var inpStars = ["inpStar1","inpStar2","inpStar3","inpStar4","inpStar5","inpStar6","inpStar7","inpStar8","inpStar9","inpStar10"]
+var inpCheckbox = ["rememberMe","useMagic"]
 var language = window.navigator.userLanguage || window.navigator.language;
 
-var languages = { //TODO translate Achievement25, MasteryBoost17 label
+var languages = { //TODO translate Achievement25, MasteryBoost17, Magic label
   "en": {
     "Title": "Star Calc",
     "SetAll": "Set all to: ",
@@ -10,7 +11,8 @@ var languages = { //TODO translate Achievement25, MasteryBoost17 label
     "v2Level": "Scrapyard V2: ",
     "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
-    "Target": "Target Stars: "
+    "Target": "Target Stars: ",
+    "Magic": "Use Black Magic (Experimental): "
   },
   "es": {
     "Title": "Cálculo de Estrellas",
@@ -19,7 +21,8 @@ var languages = { //TODO translate Achievement25, MasteryBoost17 label
     "v2Level": "Vertedero V2: ",
     "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
-    "Target": "Objetivo Estrellas: "
+    "Target": "Objetivo Estrellas: ",
+    "Magic": "Use Black Magic (Experimental): "
   },
   "ru": {
     "Title": "Звездный Кальк",
@@ -28,7 +31,8 @@ var languages = { //TODO translate Achievement25, MasteryBoost17 label
     "v2Level": "Двор мусора v2: ",
     "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
-    "Target": "Целевые звезды: "
+    "Target": "Целевые звезды: ",
+    "Magic": "Use Black Magic (Experimental): "
   },
   "de": {
     "Title": "Sterne Kalkulator",
@@ -37,7 +41,8 @@ var languages = { //TODO translate Achievement25, MasteryBoost17 label
     "v2Level": "Schrottplatz V2: ",
     "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
-    "Target": "Zielsterne: "
+    "Target": "Zielsterne: ",
+    "Magic": "Use Black Magic (Experimental): "
   },
   "fr": {
     "Title": "Étoile Calculette",
@@ -46,7 +51,8 @@ var languages = { //TODO translate Achievement25, MasteryBoost17 label
     "v2Level": "Parc à casse V2: ",
     "Achievement25": "Achievement Boost 2 Level:",
     "MasteryBoost17": "Mastery 17+ Barrels:",
-    "Target": "Cible Étoile: "
+    "Target": "Cible Étoile: ",
+    "Magic": "Use Black Magic (Experimental): "
   }
 }
 
@@ -59,6 +65,7 @@ document.getElementById("lblv2Level").innerHTML = languages[language]["v2Level"]
 document.getElementById("lblAchievement25").innerHTML = languages[language]["Achievement25"];
 document.getElementById("lblMasteryBoost17").innerHTML = languages[language]["MasteryBoost17"];
 document.getElementById("lblTarget").innerHTML = languages[language]["Target"];
+document.getElementById("lblMagic").innerHTML = languages[language]["Magic"];
 
 window.onload = checkLocalStorage();
 
@@ -80,7 +87,9 @@ function setLocalStorage() {
 	inpStars.forEach(input => {
 		localStorage.setItem(input,document.getElementById(input).value);
 	});
-	localStorage.setItem("rememberMe",document.getElementById("rememberMe").checked);
+  inpCheckbox.forEach(input => {
+    localStorage.setItem(input,document.getElementById(input).checked)
+  })
 }
 
 function checkLocalStorage(){
@@ -90,6 +99,9 @@ function checkLocalStorage(){
 		calculate();
 		return;
 	}
+  inpCheckbox.forEach(input => {
+		document.getElementById(input).checked = JSON.parse(localStorage.getItem(input));
+	});
 	document.getElementById("rememberMe").checked = JSON.parse(localStorage.getItem("rememberMe"));
 	inpStars.forEach(input => {
 		if (Number(localStorage.getItem(input))) 
@@ -203,6 +215,22 @@ function masteryBoost17Modifier()
   return modifier;
 }
 
+function magic(starLevel){ // I like it when *(long)2147483648 becomes *(long)2100000000 due to [REDACTED] - IcyZeroTwo
+  if(starLevel < 1760) return 1;
+  if(!document.getElementById("useMagic").checked) return 1;
+
+  const BULK_SIZE = 300;
+  const BULK_PRECISION = 1e8;
+  const BULK_DEVIATION = (Math.floor(Math.pow(1.1,BULK_SIZE)/BULK_PRECISION)*BULK_PRECISION) / Math.pow(1.1,BULK_SIZE);
+
+  var jumpCount = Math.floor((starLevel - 1760)/50);
+  var bulkCount = Math.floor(jumpCount/BULK_SIZE);
+  jumpCount -= bulkCount * BULK_SIZE;
+  var precision = Math.pow(10, Math.floor((Math.log10(1.1) * jumpCount - 6) / 8) * 8 + 5);
+  var jumpDeviation = (Math.floor(Math.pow(1.1,jumpCount)/precision)*precision) / Math.pow(1.1,jumpCount);
+  return Math.pow(BULK_DEVIATION,bulkCount) * jumpDeviation;
+}
+
 function gsCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
   var cost = 100000 * (starLevel - 10) + 250000; //adjust for first 10 stars
   if (starLevel >= 20) cost *= 1.3;
@@ -230,7 +258,7 @@ function gsCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
   return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
 }
 
-function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {
+function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) { // formula from v11.6
   var cost = 250 * (starLevel - 10) + 1000; //adjust for first 10 stars
   if (starLevel >= 12) cost *= 0.98;
   if (starLevel >= 13) cost *= 0.98;
@@ -317,7 +345,7 @@ function magnetCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul)
   if (starLevel >= 1710) cost *= 1.3;
   if (starLevel >= 1760) cost *= 1.269;
   if (starLevel >= 1810) cost *= Math.pow(1.1, Math.floor((starLevel - 1760) / 50));
-  return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul / ((scrapyardMul + 100) * 1000));
+  return Math.floor((cost * 100) * achievementMul * masteryBoost17Mul * magic(starLevel) / ((scrapyardMul + 100) * 1000));
 }
 
 function fragmentCost(starLevel, scrapyardMul, achievementMul, masteryBoost17Mul) {

From 1b9f3043c73f5a848294cd9a79bf4a41a00f5d6b Mon Sep 17 00:00:00 2001
From: CUBrucE <47922426+CUBrucE@users.noreply.github.com>
Date: Mon, 17 Mar 2025 02:23:45 +0800
Subject: [PATCH 15/15] implement notations

---
 index.html | 13 ++++++++++++-
 js/site.js | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index db812c3..2d07094 100644
--- a/index.html
+++ b/index.html
@@ -8,6 +8,15 @@
 </head>
 <body>
 <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
+<div class="text-center">
+    <span id="lblNotation">Number Notation:</span>
+    <select id="inputNotation" onchange="calculate()">
+        <option value="Original">Original</option>
+        <option value="Normal">Normal</option>
+        <option value="Abstract">Abstract</option>
+        <option value="Scientific">Scientific</option>
+    </select>
+</div>
 <div class="text-center" ><span id = "lblSetAll" >Set all Stars: </span><input id="setAll" type="number" maxlength="5" placeholder="Enter level" onchange="setAll();calculate()" min="10" value="10" ></div>
 <div class="text-center" ><span id = "lblSettings">Remember My Settings: </span><input id="rememberMe" type="checkbox" onchange="onRememberMeChange()"></div>
 <div class="d-grid gap-3">
@@ -100,7 +109,9 @@ <h1 class="text-center"><span id = "lblTitle">Star Levels </span></h1>
             <span class="h3 w-50" id = "lblTarget">Target Star Level:</span>
             <input class="w-25" id="target" type="number" placeholder="Enter level" min="11" value="11" onchange="calculate()">
         </label>
-        <div class="text-center" ><span id = "lblMagic">Use Black Magic (Experimental): </span><input id="useMagic" type="checkbox" onchange="calculate()"></div>
+        <label class="text-center" >
+            <span id = "lblMagic">Use Black Magic (Experimental): </span><input id="useMagic" type="checkbox" onchange="calculate()">
+        </label>
         <!--<div class="text-center" style="padding: 10px;">
             <button class="btn btn-primary" onclick="calculate()" >Submit</button>
         </div> 
diff --git a/js/site.js b/js/site.js
index aa3e6d2..9ca3b20 100644
--- a/js/site.js
+++ b/js/site.js
@@ -90,6 +90,7 @@ function setLocalStorage() {
   inpCheckbox.forEach(input => {
     localStorage.setItem(input,document.getElementById(input).checked)
   })
+  localStorage.setItem("inputNotation", document.getElementById("inputNotation").value)
 }
 
 function checkLocalStorage(){
@@ -115,6 +116,7 @@ function checkLocalStorage(){
 		  document.getElementById(input).value = localStorage.getItem(input);
 		}
 	});
+  document.getElementById("inputNotation").value = localStorage.getItem("inputNotation");
 	calculate();
 }
 
@@ -174,14 +176,60 @@ function calculate() {
       }
   });
 
-  document.getElementById("gs").innerHTML = gsAmount.toLocaleString(language);
-  document.getElementById("mag").innerHTML = magAmount.toLocaleString(language);
-  document.getElementById("fragment").innerHTML = fragmentAmount.toLocaleString(language);
+  document.getElementById("gs").innerHTML = convertNumberToNotation(gsAmount);
+  document.getElementById("mag").innerHTML = convertNumberToNotation(magAmount);
+  document.getElementById("fragment").innerHTML = convertNumberToNotation(fragmentAmount);
   
   if ( document.getElementById("rememberMe").checked ) setLocalStorage();
   
 }
 
+function convertNumberToNotation(number) {
+  if((Math.abs(number)<1e9) || (Math.abs(number)==1/0)) return number.toLocaleString(language);
+  var exponent = Math.floor(Math.log10(number));
+  var mantissa = (Math.floor(1e8 * (number / Math.pow(10,exponent)))/1e8);
+  switch(document.getElementById("inputNotation").value){
+    case "Original":
+      return number.toLocaleString(language);
+    case "Normal":
+      mantissa *= Math.pow(10, exponent%3);
+      var index = Math.floor(exponent/3)-1;
+      var index1 = Math.floor(index%10)
+      var index10 = Math.floor(index%100/10)
+      var index100 = Math.floor(index%1000/100)
+      var normal1 = ["", "U", "D", "T", "Q", "q", "S", "s", "O", "N"]
+      var normal10 = ["", "D", "V", "Tr", "QU", "qu", "Se", "Sp", "Oc", "No"]
+      var normal100 = ["", "C", "Overflow"]
+      var normalConcat = ""
+      switch(index%100){
+        case 0:
+          normalConcat = "".concat(normal100[index100], "t");
+          break;
+        case 1:
+          normalConcat = "".concat(normal100[index100], "M")
+          break;
+        case 2:
+          normalConcat = "".concat(normal100[index100], "B")
+          break;
+        default:
+          normalConcat = "".concat(normal100[index100], normal1[index1], normal10[index10])
+      }
+      return "".concat(mantissa.toPrecision(9)," ",normalConcat)
+    case "Abstract":
+      mantissa *= Math.pow(10, exponent%3);
+      var index = Math.floor(exponent/3)-1;
+      return "".concat(mantissa.toPrecision(9)," ",convertIndexToAbstract(index))
+    case "Scientific":
+      return "".concat(mantissa.toPrecision(9),"e",exponent)
+  }
+}
+
+function convertIndexToAbstract(index){
+  if(index<=0) return ""
+  var remainder = (Math.floor(index)-1)%26+1;
+  return "".concat(convertIndexToAbstract((index-remainder)/26),String.fromCharCode(96+remainder))
+}
+
 function scrapyardModifier()
 {
     var modifier;