From d4df96743a232043f76278ca3a3f36bac0cf6dea Mon Sep 17 00:00:00 2001
From: wktr <94459237+WiktorProj@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:49:44 +0200
Subject: [PATCH] 0.4_1/2.2

---
 MeTMT/js/layers.js                     | 32 ++++++++++++++++++++++++--
 MeTMT/js/mod.js                        |  4 ++--
 MeTMT/js/technical/systemComponents.js |  1 +
 MeTMT/js/utils/options.js              |  3 ++-
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/MeTMT/js/layers.js b/MeTMT/js/layers.js
index d5e05f7..fd852ed 100644
--- a/MeTMT/js/layers.js
+++ b/MeTMT/js/layers.js
@@ -19,8 +19,9 @@ addLayer("+", {
                 "main-display",
                 "prestige-button",
                 "resource-display",
+                ['bar', 'additionReq'],
                 ["display-text",
-                    function() { return "Features:" },],
+                    function() { return "<br>Features:" },],
                 ["display-text",
                     function() { if (player['+'].points.gte(0)) {return "- <span style=\"color: rgb(95, 111, 127); text-shadow: rgb(95, 111, 127) 0px 0px 10px;\">Addition</span> layer"} },],
                 ["display-text",
@@ -85,6 +86,18 @@ addLayer("+", {
             }
         }
     },
+    bars: {
+        additionReq: {
+            direction: RIGHT,
+            width: 700,
+            height: 50,
+            progress() { return player.points.div(getNextAt('+')) },
+            fillStyle: {'background-color': "#5f6f7f"},
+            display() {
+                return `${this.progress().gte(1) ? `<span style=\"color: hsl(${!options.disabledTextColorChange ? this.progress().pow(0.5).times(10).add(120).mod(360) : 120}, 100%, 50%);\">` : ""}${format(player.points) + " / " + format(getNextAt('+')) + " <span style=\"color: rgb(255, 255, 255); text-shadow: rgb(255, 255, 255) 0px 0px 10px;\">points</span> (" + format(this.progress().times(100)) + "%)"}</span>`
+            },
+        },
+    },
     automate() {
         if (player['+'].points.gt(additionCap)) { 
             player['+'].points = new Decimal(additionCap)
@@ -678,7 +691,7 @@ addLayer("u", {
                 setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1))
             },
             effect() {
-                return new Decimal(1).mul(this.cost().sub(1)).times(50 + (hasUpgrade('i', 16) ? -40 : 0)).pow(0.9).add(1)
+                return new Decimal(1).mul(this.cost().sub(1)).times(50 + (hasUpgrade('i', 16) ? -40 : 0)).pow(0.3).add(0.99)
             },
             unlocked() {return player['+'].points.gte(12)}
         },
@@ -701,6 +714,21 @@ addLayer("u", {
         if (tmp['u'].buyables[11].canAfford && hasUpgrade("u", 13)) {
             addBuyables('u', 11, 1)
         }
+        if (tmp['u'].buyables[11].canAfford && hasUpgrade("u", 13)) {
+            addBuyables('u', 11, 1)
+        }
+        if (tmp['u'].buyables[11].canAfford && hasUpgrade("u", 13)) {
+            addBuyables('u', 11, 1)
+        }
+        if (tmp['u'].buyables[11].canAfford && hasUpgrade("u", 13)) {
+            addBuyables('u', 11, 1)
+        }
+        if (tmp['u'].buyables[11].canAfford && hasUpgrade("u", 13)) {
+            addBuyables('u', 11, 1)
+        }
+        if (tmp['u'].buyables[11].canAfford && hasUpgrade("u", 13)) {
+            addBuyables('u', 11, 1)
+        }
     },
     row: 3, // Row the layer is in on the tree (0 is the first row)
     hotkeys: [
diff --git a/MeTMT/js/mod.js b/MeTMT/js/mod.js
index 5f50211..8f4c1ff 100644
--- a/MeTMT/js/mod.js
+++ b/MeTMT/js/mod.js
@@ -13,8 +13,8 @@ let modInfo = {
 
 // Set your version in num and name
 let VERSION = {
-	num: "0.4½.1",
-	name: "The option update T1",
+	num: "0.4½.2",
+	name: "The option update T2",
 }
 
 let changelog = `galaxy has a changelog you don't need this one!`
diff --git a/MeTMT/js/technical/systemComponents.js b/MeTMT/js/technical/systemComponents.js
index 8d00999..c5b8908 100644
--- a/MeTMT/js/technical/systemComponents.js
+++ b/MeTMT/js/technical/systemComponents.js
@@ -170,6 +170,7 @@ var systemComponents = {
                 <td><button class="opt" onclick="switchTheme()">Theme: {{ getThemeName() }}</button></td>
                 <td><button class="opt" onclick="adjustMSDisp()">Show Milestones: {{ MS_DISPLAYS[MS_SETTINGS.indexOf(options.msDisplay)]}}</button></td>
                 <td><button class="opt" onclick="toggleOpt('hqTree')">High-Quality Tree: {{ options.hqTree?"ON":"OFF" }}</button></td>
+				<td><button class="opt" onclick="toggleOpt('disabledTextColorChange')">Disabled Text Color Change: {{ options.disabledTextColorChange?"YES":"NO" }}</button></td>
             </tr>
             <tr>
                 <td><button class="opt" onclick="toggleOpt('hideChallenges')">Completed Challenges: {{ options.hideChallenges?"HIDDEN":"SHOWN" }}</button></td>
diff --git a/MeTMT/js/utils/options.js b/MeTMT/js/utils/options.js
index 3d0a1e6..43ffd90 100644
--- a/MeTMT/js/utils/options.js
+++ b/MeTMT/js/utils/options.js
@@ -17,7 +17,8 @@ function getStartOptions() {
 		formatting: "default",
 		addictionMode: false,
 		disabledTextFlickering: false,
-		maxTickLen: "1h"
+		maxTickLen: "1h",
+		disabledTextColorChange: false
 	}
 }