New colour settings, changeable flash colour #728
This commit is contained in:
@@ -12,7 +12,7 @@ export default function CheckGardenTick() {
|
||||
LastGardenNextStep !== Game.Objects.Farm.minigame.nextStep
|
||||
) {
|
||||
if (LastGardenNextStep !== 0 && LastGardenNextStep < Date.now()) {
|
||||
Flash(3, 'GardFlash');
|
||||
Flash(3, 'GardFlash', false);
|
||||
PlaySound(CMOptions.GardSoundURL, 'GardSound', 'GardVolume', false);
|
||||
}
|
||||
LastGardenNextStep = Game.Objects.Farm.minigame.nextStep;
|
||||
|
||||
@@ -49,7 +49,7 @@ export default function CheckGoldenCookie() {
|
||||
LastGoldenCookieState = Game.shimmerTypes.golden.n;
|
||||
if (LastGoldenCookieState) {
|
||||
if (LastSpawnedGoldenCookieState < CurrSpawnedGoldenCookieState) {
|
||||
Flash(3, 'GCFlash');
|
||||
Flash(3, 'GCFlash', false);
|
||||
PlaySound(CMOptions.GCSoundURL, 'GCSound', 'GCVolume', false);
|
||||
CreateNotification(
|
||||
'GCNotification',
|
||||
|
||||
@@ -17,7 +17,7 @@ export default function CheckMagicMeter() {
|
||||
if (minigame.magic < minigame.magicM) LastMagicBarFull = false;
|
||||
else if (!LastMagicBarFull) {
|
||||
LastMagicBarFull = true;
|
||||
Flash(3, 'MagicFlash');
|
||||
Flash(3, 'MagicFlash', false);
|
||||
PlaySound(CMOptions.MagicSoundURL, 'MagicSound', 'MagicVolume', false);
|
||||
CreateNotification(
|
||||
'MagicNotification',
|
||||
|
||||
@@ -18,7 +18,7 @@ export default function CheckSeasonPopup() {
|
||||
CacheSeasonPopShimmer = Game.shimmers[i];
|
||||
}
|
||||
});
|
||||
Flash(3, 'SeaFlash');
|
||||
Flash(3, 'SeaFlash', false);
|
||||
PlaySound(CMOptions.SeaSoundURL, 'SeaSound', 'SeaVolume', false);
|
||||
CreateNotification(
|
||||
'SeaNotification',
|
||||
|
||||
@@ -16,7 +16,7 @@ export default function CheckTickerFortune() {
|
||||
LastTickerFortuneState =
|
||||
Game.TickerEffect && Game.TickerEffect.type === 'fortune';
|
||||
if (LastTickerFortuneState) {
|
||||
Flash(3, 'FortuneFlash');
|
||||
Flash(3, 'FortuneFlash', false);
|
||||
PlaySound(
|
||||
CMOptions.FortuneSoundURL,
|
||||
'FortuneSound',
|
||||
|
||||
@@ -20,9 +20,9 @@ export default function CheckWrinklerCount() {
|
||||
CurrentWrinklers === Game.getWrinklersMax() &&
|
||||
CMOptions.WrinklerMaxFlash
|
||||
) {
|
||||
Flash(3, 'WrinklerMaxFlash');
|
||||
Flash(3, 'WrinklerMaxFlash', false);
|
||||
} else {
|
||||
Flash(3, 'WrinklerFlash');
|
||||
Flash(3, 'WrinklerFlash', false);
|
||||
}
|
||||
if (
|
||||
CurrentWrinklers === Game.getWrinklersMax() &&
|
||||
|
||||
@@ -4,13 +4,14 @@ import { CacheStatsCookies } from '../Cache/Stats/Stats';
|
||||
import { LoadConfig } from '../Config/SaveLoadReload/SaveLoadReloadSettings';
|
||||
import { VersionMajor, VersionMinor } from '../Data/Moddata';
|
||||
import CreateUpgradeBar from '../Disp/BuildingsUpgrades/UpgradeBar';
|
||||
import UpdateColours from '../Disp/HelperFunctions/UpdateColours';
|
||||
import { CreateBotBar } from '../Disp/InfoBars/BottomBar';
|
||||
import { CreateTimerBar } from '../Disp/InfoBars/TimerBar';
|
||||
import CreateSectionHideButtons from '../Disp/Initialization/CreateSectionHideButtons';
|
||||
import CreateWrinklerButtons from '../Disp/Initialization/CreateWrinklerButton';
|
||||
import CreateCssArea from '../Disp/Initialization/CssArea';
|
||||
import UpdateBuildingUpgradeStyle from '../Disp/Initialization/UpdateBuildingUpgradeStyle';
|
||||
import CreateWhiteScreen from '../Disp/Initialization/WhiteScreen';
|
||||
import CreateFlashScreen from '../Disp/Initialization/FlashScreen';
|
||||
import { CreateFavicon } from '../Disp/TabTitle/FavIcon';
|
||||
import { CreateSimpleTooltip } from '../Disp/Tooltips/Tooltip';
|
||||
import { CMLastAscendState, TooltipText } from '../Disp/VariablesAndData';
|
||||
@@ -37,7 +38,7 @@ export default function InitializeCookieMonster() {
|
||||
CreateBotBar();
|
||||
CreateTimerBar();
|
||||
CreateUpgradeBar();
|
||||
CreateWhiteScreen();
|
||||
CreateFlashScreen();
|
||||
CreateSectionHideButtons();
|
||||
CreateFavicon();
|
||||
Object.keys(TooltipText).forEach((i) => {
|
||||
@@ -58,8 +59,7 @@ export default function InitializeCookieMonster() {
|
||||
ReplaceNativeGrimoire();
|
||||
Game.CalculateGains();
|
||||
|
||||
LoadConfig(); // Must be after all things are created!
|
||||
Game.UpdateMenu();
|
||||
LoadConfig();
|
||||
CMLastAscendState = Game.OnAscend;
|
||||
|
||||
if (Game.prefs.popups)
|
||||
|
||||
Reference in New Issue
Block a user