From 3023d309f93a4f7e90c1808d3a407703e30e4212 Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Wed, 16 Aug 2023 00:08:47 +0200 Subject: [PATCH 1/3] Leveled non-maxed blueberry modules have purple bg instead of green --- Synergism.css | 11 +++++++++++ src/BlueberryUpgrades.ts | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Synergism.css b/Synergism.css index dda037639..d5278f62a 100644 --- a/Synergism.css +++ b/Synergism.css @@ -3752,6 +3752,17 @@ img#singularityPerksIcon { .hoveredBlueberryLoadout6 div.bbPurchasedLoadout6, .hoveredBlueberryLoadout7 div.bbPurchasedLoadout7, .hoveredBlueberryLoadout8 div.bbPurchasedLoadout8 { + background-color: purple; +} + +.hoveredBlueberryLoadout1 div.bbMaxedLoadout1, +.hoveredBlueberryLoadout2 div.bbMaxedLoadout2, +.hoveredBlueberryLoadout3 div.bbMaxedLoadout3, +.hoveredBlueberryLoadout4 div.bbMaxedLoadout4, +.hoveredBlueberryLoadout5 div.bbMaxedLoadout5, +.hoveredBlueberryLoadout6 div.bbMaxedLoadout6, +.hoveredBlueberryLoadout7 div.bbMaxedLoadout7, +.hoveredBlueberryLoadout8 div.bbMaxedLoadout8 { background-color: green; } diff --git a/src/BlueberryUpgrades.ts b/src/BlueberryUpgrades.ts index e81cfed1b..5bea0d697 100644 --- a/src/BlueberryUpgrades.ts +++ b/src/BlueberryUpgrades.ts @@ -659,12 +659,19 @@ export const updateLoadoutHoverClasses = () => { const loadout = player.blueberryLoadouts[i] const upgradeHoverClass = `bbPurchasedLoadout${i}` + const maxedHoverClass = `bbMaxedLoadout${i}` for (const upgradeKey of upgradeNames) { // eslint-disable-next-line if (loadout[upgradeKey]) { - DOMCacheGetOrSet(upgradeKey).parentElement?.classList.add(upgradeHoverClass) + // eslint-disable-next-line + if (loadout[upgradeKey] === blueberryUpgradeData[upgradeKey].maxLevel) { + DOMCacheGetOrSet(upgradeKey).parentElement?.classList.add(maxedHoverClass) + } else { + DOMCacheGetOrSet(upgradeKey).parentElement?.classList.add(upgradeHoverClass) + } } else { DOMCacheGetOrSet(upgradeKey).parentElement?.classList.remove(upgradeHoverClass) + DOMCacheGetOrSet(upgradeKey).parentElement?.classList.remove(maxedHoverClass) } } } From db3450c93562c81e75eb5f85e657774937afba7a Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Wed, 16 Aug 2023 00:24:28 +0200 Subject: [PATCH 2/3] bbupgrade: handle DOM changes better This prevents a bunch of code duplication --- src/BlueberryUpgrades.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BlueberryUpgrades.ts b/src/BlueberryUpgrades.ts index 5bea0d697..928f19d56 100644 --- a/src/BlueberryUpgrades.ts +++ b/src/BlueberryUpgrades.ts @@ -661,6 +661,9 @@ export const updateLoadoutHoverClasses = () => { const upgradeHoverClass = `bbPurchasedLoadout${i}` const maxedHoverClass = `bbMaxedLoadout${i}` for (const upgradeKey of upgradeNames) { + DOMCacheGetOrSet(upgradeKey).parentElement?.classList.remove(upgradeHoverClass) + DOMCacheGetOrSet(upgradeKey).parentElement?.classList.remove(maxedHoverClass) + // eslint-disable-next-line if (loadout[upgradeKey]) { // eslint-disable-next-line @@ -669,9 +672,6 @@ export const updateLoadoutHoverClasses = () => { } else { DOMCacheGetOrSet(upgradeKey).parentElement?.classList.add(upgradeHoverClass) } - } else { - DOMCacheGetOrSet(upgradeKey).parentElement?.classList.remove(upgradeHoverClass) - DOMCacheGetOrSet(upgradeKey).parentElement?.classList.remove(maxedHoverClass) } } } From 2fcb031a69d9c4bb510cf23a2560378a1a6b3cf8 Mon Sep 17 00:00:00 2001 From: Fredrik Ljungdahl Date: Wed, 16 Aug 2023 18:56:36 +0200 Subject: [PATCH 3/3] bbupgrade: minor refactor --- src/BlueberryUpgrades.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/BlueberryUpgrades.ts b/src/BlueberryUpgrades.ts index 928f19d56..118b0a6e2 100644 --- a/src/BlueberryUpgrades.ts +++ b/src/BlueberryUpgrades.ts @@ -661,16 +661,21 @@ export const updateLoadoutHoverClasses = () => { const upgradeHoverClass = `bbPurchasedLoadout${i}` const maxedHoverClass = `bbMaxedLoadout${i}` for (const upgradeKey of upgradeNames) { - DOMCacheGetOrSet(upgradeKey).parentElement?.classList.remove(upgradeHoverClass) - DOMCacheGetOrSet(upgradeKey).parentElement?.classList.remove(maxedHoverClass) + const parent = DOMCacheGetOrSet(upgradeKey).parentElement + if (!parent) { + continue + } + + parent.classList.remove(upgradeHoverClass) + parent.classList.remove(maxedHoverClass) // eslint-disable-next-line if (loadout[upgradeKey]) { // eslint-disable-next-line if (loadout[upgradeKey] === blueberryUpgradeData[upgradeKey].maxLevel) { - DOMCacheGetOrSet(upgradeKey).parentElement?.classList.add(maxedHoverClass) + parent.classList.add(maxedHoverClass) } else { - DOMCacheGetOrSet(upgradeKey).parentElement?.classList.add(upgradeHoverClass) + parent.classList.add(upgradeHoverClass) } } }