Skip to content

Commit

Permalink
[Automated] Merge dev into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored May 11, 2024
2 parents f5769ed + f6ebfef commit ee3e44c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.2
rev: v4.0.0-alpha.8
hooks:
- id: prettier
args:
Expand All @@ -9,7 +9,7 @@ repos:
- '--trailing-comma=all'
exclude: &build 'CookieMonster(Dev)?.js(.map)?'
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
exclude: *build
Expand Down
5 changes: 2 additions & 3 deletions src/Disp/InfoBars/BottomBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,8 @@ export function UpdateBotBar() {
l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].className =
ColourTextPre + timeColour.colour;
if (timeColour.text === 'Done!' && Game.cookies < Game.Objects[i].bulkPrice) {
l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[
count
].textContent = `${timeColour.text} (with Wrink)`;
l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].textContent =
`${timeColour.text} (with Wrink)`;
} else
l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].textContent =
timeColour.text;
Expand Down
5 changes: 2 additions & 3 deletions src/Disp/Tooltips/TypesOfTooltips/Warnings.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,8 @@ export default function Warnings() {
) {
l('CMDispTooltipWarnUser').style.display = '';
// Need to update tooltip text dynamically
l(
'CMDispTooltipWarnUser',
).children[0].textContent = `Purchase of this item will put you under the number of Cookies equal to ${Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.ToolWarnUser} seconds of CPS`;
l('CMDispTooltipWarnUser').children[0].textContent =
`Purchase of this item will put you under the number of Cookies equal to ${Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.ToolWarnUser} seconds of CPS`;
l('CMDispTooltipWarnUserText').textContent = `${Beautify(
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.ToolWarnUser *
GetCPS() -
Expand Down

0 comments on commit ee3e44c

Please sign in to comment.