david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/CookieMonsterTeam/CookieMonster into short-time-format

Browse Source
This commit is contained in:
Daniël van Noord
2021-09-05 17:33:29 +02:00
parent 1842c40c01 b191d9a434
commit aa5cad663b
5 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/CookieMonster.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/CookieMonster.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/CookieMonsterDev.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/CookieMonsterDev.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
src/Main/ReplaceGameElements/NativeGrimoire.js
View File

@@ -20,7 +20,8 @@ function ReplaceNativeGrimoireDraw() {
BackupGrimoireDraw();
if (
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.GrimoireBar === 1 &&
minigame.magic < minigame.magicM
minigame.magic < minigame.magicM &&
(typeof Steam === 'undefined' || Game.drawT % 5 === 0)
) {
minigame.magicBarTextL.innerHTML += ` (${FormatTime(
CalculateGrimoireRefillTime(minigame.magic, minigame.magicM, minigame.magicM),