From f31e345f2fbeb16d6ea9fdb3898086b6c4a2fc54 Mon Sep 17 00:00:00 2001 From: Harley White Date: Wed, 8 Sep 2021 00:01:24 -0400 Subject: [PATCH] Locked subtabs don't cause notify --- changelog.md | 2 ++ js/Demo/demoMod.js | 2 +- js/game.js | 2 +- js/utils.js | 12 ++++++------ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/changelog.md b/changelog.md index 201c9ff..964aa77 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,11 @@ # The Modding Tree changelog: +# v2.6.6 - 9/7/21 - Added option for shift-clicking nodes toggling their tooltips. - Fixed NaN check for setting Decimal values with text boxes. - Added display-image, h-line, and v-line to documentation. - Fixed an issue with subtab glow colors. +- Locked/hidden subtabs can't cause node glowing. - Fixed being able to buy upgrades on deactivated layers. - Updated break_eternity library. - Cleaned up buyable/clickable code. diff --git a/js/Demo/demoMod.js b/js/Demo/demoMod.js index 03ba360..ee3c3ee 100644 --- a/js/Demo/demoMod.js +++ b/js/Demo/demoMod.js @@ -13,7 +13,7 @@ let modInfo = { // Set your version in num and name let VERSION = { - num: "2.6.5.1", + num: "2.6.6", name: "Fixed Reality", } diff --git a/js/game.js b/js/game.js index 331d32d..e6c8ea7 100644 --- a/js/game.js +++ b/js/game.js @@ -3,7 +3,7 @@ var needCanvasUpdate = true; // Don't change this const TMT_VERSION = { - tmtNum: "2.6.5.1", + tmtNum: "2.6.6", tmtName: "Fixed Reality" } diff --git a/js/utils.js b/js/utils.js index e1dc004..f56ca9c 100644 --- a/js/utils.js +++ b/js/utils.js @@ -219,12 +219,12 @@ function notifyLayer(name) { } function subtabShouldNotify(layer, family, id) { - let subtab = {} - if (family == "mainTabs") subtab = tmp[layer].tabFormat[id] - else subtab = tmp[layer].microtabs[family][id] - - if (subtab.embedLayer) return tmp[subtab.embedLayer].notify - else return subtab.shouldNotify + let subtab = {} + if (family == "mainTabs") subtab = tmp[layer].tabFormat[id] + else subtab = tmp[layer].microtabs[family][id] + if (!subtab.unlocked) return false + if (subtab.embedLayer) return tmp[subtab.embedLayer].notify + else return subtab.shouldNotify } function subtabResetNotify(layer, family, id) {