diff --git a/src/Data/Scales.js b/src/Data/Scales.js
index 8c5e794..f6510f9 100644
--- a/src/Data/Scales.js
+++ b/src/Data/Scales.js
@@ -1,148 +1,141 @@
/** Data related directly to the scales used by Cookie Monster */
/** Array of abbreviations used in the "Metric" scale */
-export const metric = ['',
- '',
- 'M',
- 'G',
- 'T',
- 'P',
- 'E',
- 'Z',
- 'Y',
-];
+export const metric = ['', '', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
/** Array of abbreviations used in the "Short" scale */
-export const shortScale = ['',
- '',
- 'M',
- 'B',
- 'Tr',
- 'Quadr',
- 'Quint',
- 'Sext',
- 'Sept',
- 'Oct',
- 'Non',
- 'Dec',
- 'Undec',
- 'Duodec',
- 'Tredec',
- 'Quattuordec',
- 'Quindec',
- 'Sexdec',
- 'Septendec',
- 'Octodec',
- 'Novemdec',
- 'Vigint',
- 'Unvigint',
- 'Duovigint',
- 'Trevigint',
- 'Quattuorvigint',
+export const shortScale = [
+ '',
+ '',
+ 'M',
+ 'B',
+ 'Tr',
+ 'Quadr',
+ 'Quint',
+ 'Sext',
+ 'Sept',
+ 'Oct',
+ 'Non',
+ 'Dec',
+ 'Undec',
+ 'Duodec',
+ 'Tredec',
+ 'Quattuordec',
+ 'Quindec',
+ 'Sexdec',
+ 'Septendec',
+ 'Octodec',
+ 'Novemdec',
+ 'Vigint',
+ 'Unvigint',
+ 'Duovigint',
+ 'Trevigint',
+ 'Quattuorvigint',
];
/** Array of abbreviations used in the "Abbreviated Short" scale */
-export const shortScaleAbbreviated = ['',
- 'K',
- 'M',
- 'B',
- 'T',
- 'Qa',
- 'Qi',
- 'Sx',
- 'Sp',
- 'Oc',
- 'No',
- 'De',
- 'UDe',
- 'DDe',
- 'TDe',
- 'QaDe',
- 'QiDe',
- 'SxDe',
- 'SpDe',
- 'ODe',
- 'NDe',
- 'Vi',
- 'UVi',
- 'DVi',
- 'TVi',
- 'QaVi',
- 'QiVi',
- 'SxVi',
- 'SpVi',
- 'OVi',
- 'NVi',
- 'Tr',
- 'UTr',
- 'DTr',
- 'TTr',
- 'QaTr',
- 'QiTr',
- 'SxTr',
- 'SpTr',
- 'OTr',
- 'NTr',
- 'Qaa',
- 'UQa',
- 'DQa',
- 'TQa',
- 'QaQa',
- 'QiQa',
- 'SxQa',
- 'SpQa',
- 'OQa',
- 'NQa',
- 'Qia',
- 'UQi',
- 'DQi',
- 'TQi',
- 'QaQi',
- 'QiQi',
- 'SxQi',
- 'SpQi',
- 'OQi',
- 'NQi',
- 'Sxa',
- 'USx',
- 'DSx',
- 'TSx',
- 'QaSx',
- 'QiSx',
- 'SxSx',
- 'SpSx',
- 'OSx',
- 'NSx',
- 'Spa',
- 'USp',
- 'DSp',
- 'TSp',
- 'QaSp',
- 'QiSp',
- 'SxSp',
- 'SpSp',
- 'OSp',
- 'NSp',
- 'Oco',
- 'UOc',
- 'DOc',
- 'TOc',
- 'QaOc',
- 'QiOc',
- 'SxOc',
- 'SpOc',
- 'OOc',
- 'NOc',
- 'Noa',
- 'UNo',
- 'DNo',
- 'TNo',
- 'QaNo',
- 'QiNo',
- 'SxNo',
- 'SpNo',
- 'ONo',
- 'NNo',
- 'Ct',
- 'UCt',
+export const shortScaleAbbreviated = [
+ '',
+ 'K',
+ 'M',
+ 'B',
+ 'T',
+ 'Qa',
+ 'Qi',
+ 'Sx',
+ 'Sp',
+ 'Oc',
+ 'No',
+ 'De',
+ 'UDe',
+ 'DDe',
+ 'TDe',
+ 'QaDe',
+ 'QiDe',
+ 'SxDe',
+ 'SpDe',
+ 'ODe',
+ 'NDe',
+ 'Vi',
+ 'UVi',
+ 'DVi',
+ 'TVi',
+ 'QaVi',
+ 'QiVi',
+ 'SxVi',
+ 'SpVi',
+ 'OVi',
+ 'NVi',
+ 'Tr',
+ 'UTr',
+ 'DTr',
+ 'TTr',
+ 'QaTr',
+ 'QiTr',
+ 'SxTr',
+ 'SpTr',
+ 'OTr',
+ 'NTr',
+ 'Qaa',
+ 'UQa',
+ 'DQa',
+ 'TQa',
+ 'QaQa',
+ 'QiQa',
+ 'SxQa',
+ 'SpQa',
+ 'OQa',
+ 'NQa',
+ 'Qia',
+ 'UQi',
+ 'DQi',
+ 'TQi',
+ 'QaQi',
+ 'QiQi',
+ 'SxQi',
+ 'SpQi',
+ 'OQi',
+ 'NQi',
+ 'Sxa',
+ 'USx',
+ 'DSx',
+ 'TSx',
+ 'QaSx',
+ 'QiSx',
+ 'SxSx',
+ 'SpSx',
+ 'OSx',
+ 'NSx',
+ 'Spa',
+ 'USp',
+ 'DSp',
+ 'TSp',
+ 'QaSp',
+ 'QiSp',
+ 'SxSp',
+ 'SpSp',
+ 'OSp',
+ 'NSp',
+ 'Oco',
+ 'UOc',
+ 'DOc',
+ 'TOc',
+ 'QaOc',
+ 'QiOc',
+ 'SxOc',
+ 'SpOc',
+ 'OOc',
+ 'NOc',
+ 'Noa',
+ 'UNo',
+ 'DNo',
+ 'TNo',
+ 'QaNo',
+ 'QiNo',
+ 'SxNo',
+ 'SpNo',
+ 'ONo',
+ 'NNo',
+ 'Ct',
+ 'UCt',
];
diff --git a/src/Data/Sectionheaders.js b/src/Data/Sectionheaders.js
index 28b6f55..9c8e9ec 100644
--- a/src/Data/Sectionheaders.js
+++ b/src/Data/Sectionheaders.js
@@ -2,23 +2,23 @@
/** Display titles of the headers of the Cookie Monster settings section */
export const ConfigGroups = {
- BarsColors: 'Bars/Colors',
- Calculation: 'Calculation',
- Notification: 'Notification',
- Tooltip: 'Tooltips and additional insights',
- Statistics: 'Statistics',
- Notation: 'Notation',
- Miscellaneous: 'Miscellaneous',
+ BarsColors: 'Bars/Colors',
+ Calculation: 'Calculation',
+ Notification: 'Notification',
+ Tooltip: 'Tooltips and additional insights',
+ Statistics: 'Statistics',
+ Notation: 'Notation',
+ Miscellaneous: 'Miscellaneous',
};
/** Display titles of the headers of the notification section of the Cookie Monster settings */
export const ConfigGroupsNotification = {
- NotificationGeneral: 'General Notifications',
- NotificationGC: 'Golden Cookie',
- NotificationFC: 'Fortune Cookie',
- NotificationSea: 'Season Special',
- NotificationGard: 'Garden Tick',
- NotificationMagi: 'Full Magic Bar',
- NotificationWrink: 'Wrinkler',
- NotificationWrinkMax: 'Maximum Wrinklers',
+ NotificationGeneral: 'General Notifications',
+ NotificationGC: 'Golden Cookie',
+ NotificationFC: 'Fortune Cookie',
+ NotificationSea: 'Season Special',
+ NotificationGard: 'Garden Tick',
+ NotificationMagi: 'Full Magic Bar',
+ NotificationWrink: 'Wrinkler',
+ NotificationWrinkMax: 'Maximum Wrinklers',
};
diff --git a/src/Data/SettingClasses.js b/src/Data/SettingClasses.js
index 4273611..5c41036 100644
--- a/src/Data/SettingClasses.js
+++ b/src/Data/SettingClasses.js
@@ -3,52 +3,52 @@
/** The basic setting class */
export class Setting {
- constructor(type, group) {
- this.type = type;
- this.group = group;
- }
+ constructor(type, group) {
+ this.type = type;
+ this.group = group;
+ }
}
/** The standard toggle setting class */
export class SettingStandard extends Setting {
- constructor(type, group, label, desc, toggle, func = null) {
- super(type, group);
- this.label = label;
- this.desc = desc;
- this.toggle = toggle;
- if (func) {
- this.func = func;
- }
- }
+ constructor(type, group, label, desc, toggle, func = null) {
+ super(type, group);
+ this.label = label;
+ this.desc = desc;
+ this.toggle = toggle;
+ if (func) {
+ this.func = func;
+ }
+ }
}
/** The colour picker setting class */
export class SettingColours extends Setting {
- constructor(type, group, desc, func) {
- super(type, group);
- this.desc = desc;
- this.func = func;
- }
+ constructor(type, group, desc, func) {
+ super(type, group);
+ this.desc = desc;
+ this.func = func;
+ }
}
/** The volume level setting class */
export class SettingVolume extends Setting {
- constructor(type, group, label, desc) {
- super(type, group);
- this.label = label;
- this.desc = desc;
- for (let i = 0; i < 101; i++) {
- this.label[i] = `${i}%`;
- }
- }
+ constructor(type, group, label, desc) {
+ super(type, group);
+ this.label = label;
+ this.desc = desc;
+ for (let i = 0; i < 101; i++) {
+ this.label[i] = `${i}%`;
+ }
+ }
}
/** The number input setting class */
export class SettingInputNumber extends Setting {
- constructor(type, group, label, desc, min, max) {
- super(type, group);
- this.label = label;
- this.desc = desc;
- this.min = min;
- this.max = max;
- }
+ constructor(type, group, label, desc, min, max) {
+ super(type, group);
+ this.label = label;
+ this.desc = desc;
+ this.min = min;
+ this.max = max;
+ }
}
diff --git a/src/Data/SettingsData.js b/src/Data/SettingsData.js
index 7b48eed..aafe5bb 100644
--- a/src/Data/SettingsData.js
+++ b/src/Data/SettingsData.js
@@ -15,657 +15,738 @@ import RefreshScale from '../Disp/HelperFunctions/RefreshScale';
import UpdateColors from '../Disp/HelperFunctions/UpdateColors';
import { UpdateFavicon } from '../Disp/TabTitle/FavIcon';
import {
- SettingStandard, SettingColours, SettingVolume, SettingInputNumber,
+ SettingStandard,
+ SettingColours,
+ SettingVolume,
+ SettingInputNumber,
} from './SettingClasses';
/** This includes all options of CookieMonster and their relevant data */
const Config = {
- // Barscolors
- BotBar: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Bottom Bar OFF', 'Bottom Bar ON'],
- 'Building Information',
- true,
- function () { ToggleBotBar(); },
- ),
- TimerBar: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Timer Bar OFF', 'Timer Bar ON'],
- 'Timers of Golden Cookie, Season Popup, Frenzy (Normal, Clot, Elder), Click Frenzy',
- true,
- function () { ToggleTimerBar(); },
- ),
- TimerBarPos: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Timer Bar Position (Top Left)', 'Timer Bar Position (Bottom)'],
- 'Placement of the Timer Bar',
- false,
- function () { ToggleTimerBarPos(); },
- ),
- TimerBarOverlay: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Timer Bar Overlay OFF', 'Timer Bar Overlay Only Seconds', 'Timer Bar Overlay Full'],
- 'Overlay on timers displaying seconds and/or percentage left',
- true,
- ),
- SortBuildings: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Sort Buildings: Default', 'Sort Buildings: PP'],
- 'Sort the display of buildings in either default order or by PP',
- false,
- function () { UpdateBuildings(); },
- ),
- SortUpgrades: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Sort Upgrades: Default', 'Sort Upgrades: PP'],
- 'Sort the display of upgrades in either default order or by PP',
- false,
- function () { UpdateUpgrades(); },
- ),
- BuildColor: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Building Colors OFF', 'Building Colors ON'],
- 'Color code buildings',
- true,
- function () { UpdateBuildings(); },
- ),
- BulkBuildColor: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Bulk Building Colors (Single Building Color)', 'Bulk Building Colors (Calculated Bulk Color)'],
- 'Color code bulk buildings based on single buildings color or calculated bulk value color',
- false,
- function () { UpdateBuildings(); },
- ),
- UpBarColor: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Upgrade Colors/Bar OFF', 'Upgrade Colors with Bar ON', 'Upgrade Colors without Bar ON'],
- 'Color code upgrades and optionally add a counter bar',
- false,
- function () { ToggleUpgradeBarAndColor(); },
- ),
- Colors: new SettingColours(
- 'color',
- 'BarsColors',
- {
- Blue: 'Color Blue. Used to show better than best PP building, for Click Frenzy bar, and for various labels',
- Green: 'Color Green. Used to show best PP building, for Blood Frenzy bar, and for various labels',
- Yellow: 'Color Yellow. Used to show between best and worst PP buildings closer to best, for Frenzy bar, and for various labels',
- Orange: 'Color Orange. Used to show between best and worst PP buildings closer to worst, for Next Reindeer bar, and for various labels',
- Red: 'Color Red. Used to show worst PP building, for Clot bar, and for various labels',
- Purple: 'Color Purple. Used to show worse than worst PP building, for Next Cookie bar, and for various labels',
- Gray: 'Color Gray. Used to show negative or infinity PP, and for Next Cookie/Next Reindeer bar',
- Pink: 'Color Pink. Used for Dragonflight bar',
- Brown: 'Color Brown. Used for Dragon Harvest bar',
- },
- function () { UpdateColors(); },
- ),
- UpgradeBarFixedPos: new SettingStandard(
- 'bool',
- 'BarsColors',
- ['Upgrade Bar Fixed Position OFF', 'Upgrade Bar Fixed Position ON'],
- 'Lock the upgrade bar at top of the screen to prevent it from moving ofscreen when scrolling',
- true,
- function () { ToggleUpgradeBarFixedPos(); },
- ),
+ // Barscolors
+ BotBar: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ ['Bottom Bar OFF', 'Bottom Bar ON'],
+ 'Building Information',
+ true,
+ function () {
+ ToggleBotBar();
+ },
+ ),
+ TimerBar: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ ['Timer Bar OFF', 'Timer Bar ON'],
+ 'Timers of Golden Cookie, Season Popup, Frenzy (Normal, Clot, Elder), Click Frenzy',
+ true,
+ function () {
+ ToggleTimerBar();
+ },
+ ),
+ TimerBarPos: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ ['Timer Bar Position (Top Left)', 'Timer Bar Position (Bottom)'],
+ 'Placement of the Timer Bar',
+ false,
+ function () {
+ ToggleTimerBarPos();
+ },
+ ),
+ TimerBarOverlay: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ [
+ 'Timer Bar Overlay OFF',
+ 'Timer Bar Overlay Only Seconds',
+ 'Timer Bar Overlay Full',
+ ],
+ 'Overlay on timers displaying seconds and/or percentage left',
+ true,
+ ),
+ SortBuildings: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ ['Sort Buildings: Default', 'Sort Buildings: PP'],
+ 'Sort the display of buildings in either default order or by PP',
+ false,
+ function () {
+ UpdateBuildings();
+ },
+ ),
+ SortUpgrades: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ ['Sort Upgrades: Default', 'Sort Upgrades: PP'],
+ 'Sort the display of upgrades in either default order or by PP',
+ false,
+ function () {
+ UpdateUpgrades();
+ },
+ ),
+ BuildColor: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ ['Building Colors OFF', 'Building Colors ON'],
+ 'Color code buildings',
+ true,
+ function () {
+ UpdateBuildings();
+ },
+ ),
+ BulkBuildColor: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ [
+ 'Bulk Building Colors (Single Building Color)',
+ 'Bulk Building Colors (Calculated Bulk Color)',
+ ],
+ 'Color code bulk buildings based on single buildings color or calculated bulk value color',
+ false,
+ function () {
+ UpdateBuildings();
+ },
+ ),
+ UpBarColor: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ [
+ 'Upgrade Colors/Bar OFF',
+ 'Upgrade Colors with Bar ON',
+ 'Upgrade Colors without Bar ON',
+ ],
+ 'Color code upgrades and optionally add a counter bar',
+ false,
+ function () {
+ ToggleUpgradeBarAndColor();
+ },
+ ),
+ Colors: new SettingColours(
+ 'color',
+ 'BarsColors',
+ {
+ Blue:
+ 'Color Blue. Used to show better than best PP building, for Click Frenzy bar, and for various labels',
+ Green:
+ 'Color Green. Used to show best PP building, for Blood Frenzy bar, and for various labels',
+ Yellow:
+ 'Color Yellow. Used to show between best and worst PP buildings closer to best, for Frenzy bar, and for various labels',
+ Orange:
+ 'Color Orange. Used to show between best and worst PP buildings closer to worst, for Next Reindeer bar, and for various labels',
+ Red:
+ 'Color Red. Used to show worst PP building, for Clot bar, and for various labels',
+ Purple:
+ 'Color Purple. Used to show worse than worst PP building, for Next Cookie bar, and for various labels',
+ Gray:
+ 'Color Gray. Used to show negative or infinity PP, and for Next Cookie/Next Reindeer bar',
+ Pink: 'Color Pink. Used for Dragonflight bar',
+ Brown: 'Color Brown. Used for Dragon Harvest bar',
+ },
+ function () {
+ UpdateColors();
+ },
+ ),
+ UpgradeBarFixedPos: new SettingStandard(
+ 'bool',
+ 'BarsColors',
+ ['Upgrade Bar Fixed Position OFF', 'Upgrade Bar Fixed Position ON'],
+ 'Lock the upgrade bar at top of the screen to prevent it from moving ofscreen when scrolling',
+ true,
+ function () {
+ ToggleUpgradeBarFixedPos();
+ },
+ ),
- // Calculation
- CalcWrink: new SettingStandard(
- 'bool',
- 'Calculation',
- ['Calculate with Wrinklers OFF', 'Calculate with Wrinklers ON', 'Calculate with Single Fattest Wrinkler ON'],
- 'Calculate times and average Cookies Per Second with (only the single non-shiny fattest) Wrinklers',
- true,
- ),
- CPSMode: new SettingStandard(
- 'bool',
- 'Calculation',
- ['Current Cookies Per Second', 'Average Cookies Per Second'],
- 'Calculate times using current Cookies Per Second or average Cookies Per Second',
- false,
- ),
- AvgCPSHist: new SettingStandard(
- 'bool',
- 'Calculation',
- ['Average CPS for past 10s', 'Average CPS for past 15s', 'Average CPS for past 30s', 'Average CPS for past 1m', 'Average CPS for past 5m', 'Average CPS for past 10m', 'Average CPS for past 15m', 'Average CPS for past 30m'],
- 'How much time average Cookies Per Second should consider',
- false,
- ),
- AvgClicksHist: new SettingStandard(
- 'bool',
- 'Calculation',
- ['Average Cookie Clicks for past 1s', 'Average Cookie Clicks for past 5s', 'Average Cookie Clicks for past 10s', 'Average Cookie Clicks for past 15s', 'Average Cookie Clicks for past 30s'],
- 'How much time average Cookie Clicks should consider',
- false,
- ),
- ColorPPBulkMode: new SettingStandard(
- 'bool',
- 'Calculation',
- ['Color of PP (Compared to Single)', 'Color of PP (Compared to Bulk)'],
- 'Color PP-values based on comparison with single purchase or with selected bulk-buy mode',
- false,
- function () { CachePP(); },
- ),
- PPExcludeTop: new SettingStandard(
- 'bool',
- 'Calculation',
- ["Don't Ignore Any", 'Ignore 1st Best', 'Ignore 1st and 2nd Best', 'Ignore 1st, 2nd and 3rd Best'],
- 'Makes CookieMonster ignore the 1st, 2nd or 3rd best buildings in labeling and colouring PP values',
- true,
- ),
- PPSecondsLowerLimit: new SettingInputNumber(
- 'numscale',
- 'Calculation',
- 'Lower limit for PP (in seconds): ',
- 'If a building or upgrade costs less than the specified seconds of CPS it will also be considered optimal and label it as such ("PP is less than xx seconds of CPS"); setting to 0 ignores this option',
- 0,
- Infinity,
- ),
- PPOnlyConsiderBuyable: new SettingStandard(
- 'bool',
- 'Calculation',
- ["Don't Ignore Non-Buyable", 'Ignore Non-Buyable'],
- "Makes CookieMonster label buildings and upgrades you can't buy right now red, useful in those situations where you just want to spend your full bank 'most optimally'",
- true,
- ),
- ToolWarnBon: new SettingStandard(
- 'bool',
- 'Calculation',
- ['Calculate Tooltip Warning With Bonus CPS OFF', 'Calculate Tooltip Warning With Bonus CPS ON'],
- 'Calculate the warning with or without the bonus CPS you get from buying',
- true,
- ),
+ // Calculation
+ CalcWrink: new SettingStandard(
+ 'bool',
+ 'Calculation',
+ [
+ 'Calculate with Wrinklers OFF',
+ 'Calculate with Wrinklers ON',
+ 'Calculate with Single Fattest Wrinkler ON',
+ ],
+ 'Calculate times and average Cookies Per Second with (only the single non-shiny fattest) Wrinklers',
+ true,
+ ),
+ CPSMode: new SettingStandard(
+ 'bool',
+ 'Calculation',
+ ['Current Cookies Per Second', 'Average Cookies Per Second'],
+ 'Calculate times using current Cookies Per Second or average Cookies Per Second',
+ false,
+ ),
+ AvgCPSHist: new SettingStandard(
+ 'bool',
+ 'Calculation',
+ [
+ 'Average CPS for past 10s',
+ 'Average CPS for past 15s',
+ 'Average CPS for past 30s',
+ 'Average CPS for past 1m',
+ 'Average CPS for past 5m',
+ 'Average CPS for past 10m',
+ 'Average CPS for past 15m',
+ 'Average CPS for past 30m',
+ ],
+ 'How much time average Cookies Per Second should consider',
+ false,
+ ),
+ AvgClicksHist: new SettingStandard(
+ 'bool',
+ 'Calculation',
+ [
+ 'Average Cookie Clicks for past 1s',
+ 'Average Cookie Clicks for past 5s',
+ 'Average Cookie Clicks for past 10s',
+ 'Average Cookie Clicks for past 15s',
+ 'Average Cookie Clicks for past 30s',
+ ],
+ 'How much time average Cookie Clicks should consider',
+ false,
+ ),
+ ColorPPBulkMode: new SettingStandard(
+ 'bool',
+ 'Calculation',
+ ['Color of PP (Compared to Single)', 'Color of PP (Compared to Bulk)'],
+ 'Color PP-values based on comparison with single purchase or with selected bulk-buy mode',
+ false,
+ function () {
+ CachePP();
+ },
+ ),
+ PPExcludeTop: new SettingStandard(
+ 'bool',
+ 'Calculation',
+ [
+ "Don't Ignore Any",
+ 'Ignore 1st Best',
+ 'Ignore 1st and 2nd Best',
+ 'Ignore 1st, 2nd and 3rd Best',
+ ],
+ 'Makes CookieMonster ignore the 1st, 2nd or 3rd best buildings in labeling and colouring PP values',
+ true,
+ ),
+ PPSecondsLowerLimit: new SettingInputNumber(
+ 'numscale',
+ 'Calculation',
+ 'Lower limit for PP (in seconds): ',
+ 'If a building or upgrade costs less than the specified seconds of CPS it will also be considered optimal and label it as such ("PP is less than xx seconds of CPS"); setting to 0 ignores this option',
+ 0,
+ Infinity,
+ ),
+ PPOnlyConsiderBuyable: new SettingStandard(
+ 'bool',
+ 'Calculation',
+ ["Don't Ignore Non-Buyable", 'Ignore Non-Buyable'],
+ "Makes CookieMonster label buildings and upgrades you can't buy right now red, useful in those situations where you just want to spend your full bank 'most optimally'",
+ true,
+ ),
+ ToolWarnBon: new SettingStandard(
+ 'bool',
+ 'Calculation',
+ [
+ 'Calculate Tooltip Warning With Bonus CPS OFF',
+ 'Calculate Tooltip Warning With Bonus CPS ON',
+ ],
+ 'Calculate the warning with or without the bonus CPS you get from buying',
+ true,
+ ),
- // Notification
- Title: new SettingStandard(
- 'bool',
- 'NotificationGeneral',
- ['Title OFF', 'Title ON', 'Title Pinned Tab Highlight'],
- 'Update title with Golden Cookie/Season Popup timers; pinned tab highlight only changes the title when a Golden Cookie/Season Popup spawns; "!" means that Golden Cookie/Reindeer can spawn',
- true,
- ),
- GeneralSound: new SettingStandard(
- 'bool',
- 'NotificationGeneral',
- ['Consider Game Volume Setting OFF', 'Consider Game Volume Setting ON'],
- 'Turning this toggle to "off" makes Cookie Monster no longer consider the volume setting of the base game, allowing mod notifications to play with base game volume turned down',
- true,
- ),
- GCNotification: new SettingStandard(
- 'bool',
- 'NotificationGC',
- ['Notification OFF', 'Notification ON'],
- 'Create a notification when Golden Cookie spawns',
- true,
- function () { CheckNotificationPermissions(CMOptions.GCNotification); },
- ),
- GCFlash: new SettingStandard(
- 'bool',
- 'NotificationGC',
- ['Flash OFF', 'Flash ON'],
- 'Flash screen on Golden Cookie',
- true,
- ),
- GCSound: new SettingStandard(
- 'bool',
- 'NotificationGC',
- ['Sound OFF', 'Sound ON'],
- 'Play a sound on Golden Cookie',
- true,
- ),
- GCVolume: new SettingVolume(
- 'vol',
- 'NotificationGC',
- [],
- 'Volume',
- ),
- GCSoundURL: new SettingStandard(
- 'url',
- 'NotificationGC',
- 'Sound URL:',
- 'URL of the sound to be played when a Golden Cookie spawns',
- ),
- FortuneNotification: new SettingStandard(
- 'bool',
- 'NotificationFC',
- ['Notification OFF', 'Notification ON'],
- 'Create a notification when Fortune Cookie is on the Ticker',
- true,
- function () { CheckNotificationPermissions(CMOptions.FortuneNotification); },
- ),
- FortuneFlash: new SettingStandard(
- 'bool',
- 'NotificationFC',
- ['Flash OFF', 'Flash ON'],
- 'Flash screen on Fortune Cookie',
- true,
- ),
- FortuneSound: new SettingStandard(
- 'bool',
- 'NotificationFC',
- ['Sound OFF', 'Sound ON'],
- 'Play a sound on Fortune Cookie',
- true,
- ),
- FortuneVolume: new SettingVolume(
- 'vol',
- 'NotificationFC',
- [],
- 'Volume',
- ),
+ // Notification
+ Title: new SettingStandard(
+ 'bool',
+ 'NotificationGeneral',
+ ['Title OFF', 'Title ON', 'Title Pinned Tab Highlight'],
+ 'Update title with Golden Cookie/Season Popup timers; pinned tab highlight only changes the title when a Golden Cookie/Season Popup spawns; "!" means that Golden Cookie/Reindeer can spawn',
+ true,
+ ),
+ GeneralSound: new SettingStandard(
+ 'bool',
+ 'NotificationGeneral',
+ ['Consider Game Volume Setting OFF', 'Consider Game Volume Setting ON'],
+ 'Turning this toggle to "off" makes Cookie Monster no longer consider the volume setting of the base game, allowing mod notifications to play with base game volume turned down',
+ true,
+ ),
+ GCNotification: new SettingStandard(
+ 'bool',
+ 'NotificationGC',
+ ['Notification OFF', 'Notification ON'],
+ 'Create a notification when Golden Cookie spawns',
+ true,
+ function () {
+ CheckNotificationPermissions(CMOptions.GCNotification);
+ },
+ ),
+ GCFlash: new SettingStandard(
+ 'bool',
+ 'NotificationGC',
+ ['Flash OFF', 'Flash ON'],
+ 'Flash screen on Golden Cookie',
+ true,
+ ),
+ GCSound: new SettingStandard(
+ 'bool',
+ 'NotificationGC',
+ ['Sound OFF', 'Sound ON'],
+ 'Play a sound on Golden Cookie',
+ true,
+ ),
+ GCVolume: new SettingVolume('vol', 'NotificationGC', [], 'Volume'),
+ GCSoundURL: new SettingStandard(
+ 'url',
+ 'NotificationGC',
+ 'Sound URL:',
+ 'URL of the sound to be played when a Golden Cookie spawns',
+ ),
+ FortuneNotification: new SettingStandard(
+ 'bool',
+ 'NotificationFC',
+ ['Notification OFF', 'Notification ON'],
+ 'Create a notification when Fortune Cookie is on the Ticker',
+ true,
+ function () {
+ CheckNotificationPermissions(CMOptions.FortuneNotification);
+ },
+ ),
+ FortuneFlash: new SettingStandard(
+ 'bool',
+ 'NotificationFC',
+ ['Flash OFF', 'Flash ON'],
+ 'Flash screen on Fortune Cookie',
+ true,
+ ),
+ FortuneSound: new SettingStandard(
+ 'bool',
+ 'NotificationFC',
+ ['Sound OFF', 'Sound ON'],
+ 'Play a sound on Fortune Cookie',
+ true,
+ ),
+ FortuneVolume: new SettingVolume('vol', 'NotificationFC', [], 'Volume'),
- FortuneSoundURL: new SettingStandard(
- 'url',
- 'NotificationFC',
- 'Sound URL:',
- 'URL of the sound to be played when the Ticker has a Fortune Cookie',
- ),
- SeaNotification: new SettingStandard(
- 'bool',
- 'NotificationSea',
- ['Notification OFF', 'Notification ON'],
- 'Create a notification on Season Popup',
- true,
- function () { CheckNotificationPermissions(CMOptions.SeaNotification); },
- ),
- SeaFlash: new SettingStandard(
- 'bool',
- 'NotificationSea',
- ['Flash OFF', 'Flash ON'],
- 'Flash screen on Season Popup',
- true,
- ),
- SeaSound: new SettingStandard(
- 'bool',
- 'NotificationSea',
- ['Sound OFF', 'Sound ON'],
- 'Play a sound on Season Popup',
- true,
- ),
- SeaVolume: new SettingVolume(
- 'vol',
- 'NotificationSea',
- [],
- 'Volume',
- ),
- SeaSoundURL: new SettingStandard(
- 'url',
- 'NotificationSea',
- 'Sound URL:',
- 'URL of the sound to be played when a Season Special spawns',
- ),
- GardFlash: new SettingStandard(
- 'bool',
- 'NotificationGard',
- ['Garden Tick Flash OFF', 'Flash ON'],
- 'Flash screen on Garden Tick',
- true,
- ),
- GardSound: new SettingStandard(
- 'bool',
- 'NotificationGard',
- ['Sound OFF', 'Sound ON'],
- 'Play a sound on Garden Tick',
- true,
- ),
- GardVolume: new SettingVolume(
- 'vol',
- 'NotificationGard',
- [],
- 'Volume',
- ),
- GardSoundURL: new SettingStandard(
- 'url',
- 'NotificationGard',
- 'Garden Tick Sound URL:',
- 'URL of the sound to be played when the garden ticks',
- ),
- MagicNotification: new SettingStandard(
- 'bool',
- 'NotificationMagi',
- ['Notification OFF', 'Notification ON'],
- 'Create a notification when magic reaches maximum',
- true,
- function () { CheckNotificationPermissions(CMOptions.MagicNotification); },
- ),
- MagicFlash: new SettingStandard(
- 'bool',
- 'NotificationMagi',
- ['Flash OFF', 'Flash ON'],
- 'Flash screen when magic reaches maximum',
- true,
- ),
- MagicSound: new SettingStandard(
- 'bool',
- 'NotificationMagi',
- ['Sound OFF', 'Sound ON'],
- 'Play a sound when magic reaches maximum',
- true,
- ),
- MagicVolume: new SettingVolume(
- 'vol',
- 'NotificationMagi',
- [],
- 'Volume',
- ),
- MagicSoundURL: new SettingStandard(
- 'url',
- 'NotificationMagi',
- 'Sound URL:',
- 'URL of the sound to be played when magic reaches maxium',
- ),
- WrinklerNotification: new SettingStandard(
- 'bool',
- 'NotificationWrink',
- ['Notification OFF', 'Notification ON'],
- 'Create a notification when a Wrinkler appears',
- true,
- function () { CheckNotificationPermissions(CMOptions.WrinklerNotification); },
- ),
- WrinklerFlash: new SettingStandard(
- 'bool',
- 'NotificationWrink',
- ['Flash OFF', 'Flash ON'],
- 'Flash screen when a Wrinkler appears',
- true,
- ),
- WrinklerSound: new SettingStandard(
- 'bool',
- 'NotificationWrink',
- ['Sound OFF', 'Sound ON'],
- 'Play a sound when a Wrinkler appears',
- true,
- ),
- WrinklerVolume: new SettingVolume(
- 'vol',
- 'NotificationWrink',
- [],
- 'Volume',
- ),
- WrinklerSoundURL: new SettingStandard(
- 'url',
- 'NotificationWrink',
- 'Sound URL:',
- 'URL of the sound to be played when a Wrinkler appears',
- ),
- WrinklerMaxNotification: new SettingStandard(
- 'bool',
- 'NotificationWrinkMax',
- ['Notification OFF', 'Notification ON'],
- 'Create a notification when the maximum amount of Wrinklers has appeared',
- true,
- function () { CheckNotificationPermissions(CMOptions.WrinklerMaxNotification); },
- ),
- WrinklerMaxFlash: new SettingStandard(
- 'bool',
- 'NotificationWrinkMax',
- ['Flash OFF', 'Flash ON'],
- 'Flash screen when the maximum amount of Wrinklers has appeared',
- true,
- ),
- WrinklerMaxSound: new SettingStandard(
- 'bool',
- 'NotificationWrinkMax',
- ['Sound OFF', 'Sound ON'],
- 'Play a sound when the maximum amount of Wrinklers has appeared',
- true,
- ),
- WrinklerMaxVolume: new SettingVolume(
- 'vol',
- 'NotificationWrinkMax',
- [],
- 'Volume',
- ),
- WrinklerMaxSoundURL: new SettingStandard(
- 'url',
- 'NotificationWrinkMax',
- 'Sound URL:',
- 'URL of the sound to be played when the maximum amount of Wrinklers has appeared',
- ),
+ FortuneSoundURL: new SettingStandard(
+ 'url',
+ 'NotificationFC',
+ 'Sound URL:',
+ 'URL of the sound to be played when the Ticker has a Fortune Cookie',
+ ),
+ SeaNotification: new SettingStandard(
+ 'bool',
+ 'NotificationSea',
+ ['Notification OFF', 'Notification ON'],
+ 'Create a notification on Season Popup',
+ true,
+ function () {
+ CheckNotificationPermissions(CMOptions.SeaNotification);
+ },
+ ),
+ SeaFlash: new SettingStandard(
+ 'bool',
+ 'NotificationSea',
+ ['Flash OFF', 'Flash ON'],
+ 'Flash screen on Season Popup',
+ true,
+ ),
+ SeaSound: new SettingStandard(
+ 'bool',
+ 'NotificationSea',
+ ['Sound OFF', 'Sound ON'],
+ 'Play a sound on Season Popup',
+ true,
+ ),
+ SeaVolume: new SettingVolume('vol', 'NotificationSea', [], 'Volume'),
+ SeaSoundURL: new SettingStandard(
+ 'url',
+ 'NotificationSea',
+ 'Sound URL:',
+ 'URL of the sound to be played when a Season Special spawns',
+ ),
+ GardFlash: new SettingStandard(
+ 'bool',
+ 'NotificationGard',
+ ['Garden Tick Flash OFF', 'Flash ON'],
+ 'Flash screen on Garden Tick',
+ true,
+ ),
+ GardSound: new SettingStandard(
+ 'bool',
+ 'NotificationGard',
+ ['Sound OFF', 'Sound ON'],
+ 'Play a sound on Garden Tick',
+ true,
+ ),
+ GardVolume: new SettingVolume('vol', 'NotificationGard', [], 'Volume'),
+ GardSoundURL: new SettingStandard(
+ 'url',
+ 'NotificationGard',
+ 'Garden Tick Sound URL:',
+ 'URL of the sound to be played when the garden ticks',
+ ),
+ MagicNotification: new SettingStandard(
+ 'bool',
+ 'NotificationMagi',
+ ['Notification OFF', 'Notification ON'],
+ 'Create a notification when magic reaches maximum',
+ true,
+ function () {
+ CheckNotificationPermissions(CMOptions.MagicNotification);
+ },
+ ),
+ MagicFlash: new SettingStandard(
+ 'bool',
+ 'NotificationMagi',
+ ['Flash OFF', 'Flash ON'],
+ 'Flash screen when magic reaches maximum',
+ true,
+ ),
+ MagicSound: new SettingStandard(
+ 'bool',
+ 'NotificationMagi',
+ ['Sound OFF', 'Sound ON'],
+ 'Play a sound when magic reaches maximum',
+ true,
+ ),
+ MagicVolume: new SettingVolume('vol', 'NotificationMagi', [], 'Volume'),
+ MagicSoundURL: new SettingStandard(
+ 'url',
+ 'NotificationMagi',
+ 'Sound URL:',
+ 'URL of the sound to be played when magic reaches maxium',
+ ),
+ WrinklerNotification: new SettingStandard(
+ 'bool',
+ 'NotificationWrink',
+ ['Notification OFF', 'Notification ON'],
+ 'Create a notification when a Wrinkler appears',
+ true,
+ function () {
+ CheckNotificationPermissions(CMOptions.WrinklerNotification);
+ },
+ ),
+ WrinklerFlash: new SettingStandard(
+ 'bool',
+ 'NotificationWrink',
+ ['Flash OFF', 'Flash ON'],
+ 'Flash screen when a Wrinkler appears',
+ true,
+ ),
+ WrinklerSound: new SettingStandard(
+ 'bool',
+ 'NotificationWrink',
+ ['Sound OFF', 'Sound ON'],
+ 'Play a sound when a Wrinkler appears',
+ true,
+ ),
+ WrinklerVolume: new SettingVolume('vol', 'NotificationWrink', [], 'Volume'),
+ WrinklerSoundURL: new SettingStandard(
+ 'url',
+ 'NotificationWrink',
+ 'Sound URL:',
+ 'URL of the sound to be played when a Wrinkler appears',
+ ),
+ WrinklerMaxNotification: new SettingStandard(
+ 'bool',
+ 'NotificationWrinkMax',
+ ['Notification OFF', 'Notification ON'],
+ 'Create a notification when the maximum amount of Wrinklers has appeared',
+ true,
+ function () {
+ CheckNotificationPermissions(CMOptions.WrinklerMaxNotification);
+ },
+ ),
+ WrinklerMaxFlash: new SettingStandard(
+ 'bool',
+ 'NotificationWrinkMax',
+ ['Flash OFF', 'Flash ON'],
+ 'Flash screen when the maximum amount of Wrinklers has appeared',
+ true,
+ ),
+ WrinklerMaxSound: new SettingStandard(
+ 'bool',
+ 'NotificationWrinkMax',
+ ['Sound OFF', 'Sound ON'],
+ 'Play a sound when the maximum amount of Wrinklers has appeared',
+ true,
+ ),
+ WrinklerMaxVolume: new SettingVolume(
+ 'vol',
+ 'NotificationWrinkMax',
+ [],
+ 'Volume',
+ ),
+ WrinklerMaxSoundURL: new SettingStandard(
+ 'url',
+ 'NotificationWrinkMax',
+ 'Sound URL:',
+ 'URL of the sound to be played when the maximum amount of Wrinklers has appeared',
+ ),
- // Tooltip
- TooltipBuildUpgrade: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Building/Upgrade Tooltip Information OFF', 'Building/Upgrade Tooltip Information ON'],
- 'Extra information in Building/Upgrade tooltips',
- true,
- ),
- TooltipAmor: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Buildings Tooltip Amortization Information OFF', 'Buildings Tooltip Amortization Information ON'],
- 'Add amortization information to buildings tooltip',
- true,
- ),
- ToolWarnLucky: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Tooltip Lucky Warning OFF', 'Tooltip Lucky Warning ON'],
- 'A warning when buying if it will put the bank under the amount needed for max "Lucky!" rewards',
- true,
- ),
- ToolWarnLuckyFrenzy: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Tooltip Lucky Frenzy Warning OFF', 'Tooltip Lucky Frenzy Warning ON'],
- 'A warning when buying if it will put the bank under the amount needed for max "Lucky!" (Frenzy) rewards',
- true,
- ),
- ToolWarnConjure: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Tooltip Conjure Warning OFF', 'Tooltip Conjure Warning ON'],
- 'A warning when buying if it will put the bank under the amount needed for max "Conjure Baked Goods" rewards',
- true,
- ),
- ToolWarnConjureFrenzy: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Tooltip Conjure Frenzy Warning OFF', 'Tooltip Conjure Frenzy Warning ON'],
- 'A warning when buying if it will put the bank under the amount needed for max "Conjure Baked Goods" rewards with Frenzy active',
- true,
- ),
- ToolWarnEdifice: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Tooltip Edifice Warning OFF', 'Tooltip Edifice Warning ON'],
- 'A warning when buying if it will put the bank under the amount needed for "Spontaneous Edifice" to possibly give you your most expensive building',
- true,
- ),
- ToolWarnUser: new SettingInputNumber(
- 'numscale',
- 'Tooltip',
- 'Tooltip Warning At x times CPS: ',
- 'Use this to show a customized warning if buying it will put the bank under the amount equal to value times cps; setting to 0 disables the function altogether',
- 0,
- Infinity,
- ),
- ToolWarnPos: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Tooltip Warning Position (Left)', 'Tooltip Warning Position (Bottom)'],
- 'Placement of the warning boxes',
- false,
- function () { ToggleToolWarnPos(); },
- ),
- TooltipGrim: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Grimoire Tooltip Information OFF', 'Grimoire Tooltip Information ON'],
- 'Extra information in tooltip for grimoire',
- true,
- ),
- TooltipWrink: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Wrinkler Tooltip OFF', 'Wrinkler Tooltip ON'],
- 'Shows the amount of cookies a wrinkler will give when popping it',
- true,
- ),
- TooltipLump: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Sugar Lump Tooltip OFF', 'Sugar Lump Tooltip ON'],
- 'Shows the current Sugar Lump type in Sugar lump tooltip.',
- true,
- ),
- TooltipPlots: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Garden Plots Tooltip OFF', 'Garden Plots Tooltip ON'],
- 'Shows a tooltip for plants that have a cookie reward.',
- true,
- ),
- DragonAuraInfo: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Extra Dragon Aura Info OFF', 'Extra Dragon Aura Info ON'],
- 'Shows information about changes in CPS and costs in the dragon aura interface.',
- true,
- ),
- TooltipAscendButton: new SettingStandard(
- 'bool',
- 'Tooltip',
- ['Show Extra Info Ascend Tooltip OFF', 'Show Extra Info Ascend Tooltip ON'],
- 'Shows additional info in the ascend tooltip',
- true,
- ),
+ // Tooltip
+ TooltipBuildUpgrade: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ [
+ 'Building/Upgrade Tooltip Information OFF',
+ 'Building/Upgrade Tooltip Information ON',
+ ],
+ 'Extra information in Building/Upgrade tooltips',
+ true,
+ ),
+ TooltipAmor: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ [
+ 'Buildings Tooltip Amortization Information OFF',
+ 'Buildings Tooltip Amortization Information ON',
+ ],
+ 'Add amortization information to buildings tooltip',
+ true,
+ ),
+ ToolWarnLucky: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Tooltip Lucky Warning OFF', 'Tooltip Lucky Warning ON'],
+ 'A warning when buying if it will put the bank under the amount needed for max "Lucky!" rewards',
+ true,
+ ),
+ ToolWarnLuckyFrenzy: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Tooltip Lucky Frenzy Warning OFF', 'Tooltip Lucky Frenzy Warning ON'],
+ 'A warning when buying if it will put the bank under the amount needed for max "Lucky!" (Frenzy) rewards',
+ true,
+ ),
+ ToolWarnConjure: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Tooltip Conjure Warning OFF', 'Tooltip Conjure Warning ON'],
+ 'A warning when buying if it will put the bank under the amount needed for max "Conjure Baked Goods" rewards',
+ true,
+ ),
+ ToolWarnConjureFrenzy: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Tooltip Conjure Frenzy Warning OFF', 'Tooltip Conjure Frenzy Warning ON'],
+ 'A warning when buying if it will put the bank under the amount needed for max "Conjure Baked Goods" rewards with Frenzy active',
+ true,
+ ),
+ ToolWarnEdifice: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Tooltip Edifice Warning OFF', 'Tooltip Edifice Warning ON'],
+ 'A warning when buying if it will put the bank under the amount needed for "Spontaneous Edifice" to possibly give you your most expensive building',
+ true,
+ ),
+ ToolWarnUser: new SettingInputNumber(
+ 'numscale',
+ 'Tooltip',
+ 'Tooltip Warning At x times CPS: ',
+ 'Use this to show a customized warning if buying it will put the bank under the amount equal to value times cps; setting to 0 disables the function altogether',
+ 0,
+ Infinity,
+ ),
+ ToolWarnPos: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Tooltip Warning Position (Left)', 'Tooltip Warning Position (Bottom)'],
+ 'Placement of the warning boxes',
+ false,
+ function () {
+ ToggleToolWarnPos();
+ },
+ ),
+ TooltipGrim: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Grimoire Tooltip Information OFF', 'Grimoire Tooltip Information ON'],
+ 'Extra information in tooltip for grimoire',
+ true,
+ ),
+ TooltipWrink: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Wrinkler Tooltip OFF', 'Wrinkler Tooltip ON'],
+ 'Shows the amount of cookies a wrinkler will give when popping it',
+ true,
+ ),
+ TooltipLump: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Sugar Lump Tooltip OFF', 'Sugar Lump Tooltip ON'],
+ 'Shows the current Sugar Lump type in Sugar lump tooltip.',
+ true,
+ ),
+ TooltipPlots: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Garden Plots Tooltip OFF', 'Garden Plots Tooltip ON'],
+ 'Shows a tooltip for plants that have a cookie reward.',
+ true,
+ ),
+ DragonAuraInfo: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Extra Dragon Aura Info OFF', 'Extra Dragon Aura Info ON'],
+ 'Shows information about changes in CPS and costs in the dragon aura interface.',
+ true,
+ ),
+ TooltipAscendButton: new SettingStandard(
+ 'bool',
+ 'Tooltip',
+ ['Show Extra Info Ascend Tooltip OFF', 'Show Extra Info Ascend Tooltip ON'],
+ 'Shows additional info in the ascend tooltip',
+ true,
+ ),
- // Statistics
- Stats: new SettingStandard(
- 'bool',
- 'Statistics',
- ['Statistics OFF', 'Statistics ON'],
- 'Extra Cookie Monster statistics!',
- true,
- ),
- MissingUpgrades: new SettingStandard(
- 'bool',
- 'Statistics',
- ['Missing Upgrades OFF', 'Missing Upgrades ON'],
- 'Shows Missing upgrades in Stats Menu. This feature can be laggy for users with a low amount of unlocked achievements.',
- true,
- ),
- UpStats: new SettingStandard(
- 'bool',
- 'Statistics',
- ['Statistics Update Rate (Default)', 'Statistics Update Rate (1s)'],
- 'Default Game rate is once every 5 seconds',
- false,
- ),
- TimeFormat: new SettingStandard(
- 'bool',
- 'Statistics',
- ['Time XXd, XXh, XXm, XXs', 'Time XX:XX:XX:XX:XX'],
- 'Change the time format',
- false,
- ),
- DetailedTime: new SettingStandard(
- 'bool',
- 'Statistics',
- ['Detailed Time OFF', 'Detailed Time ON'],
- 'Change how time is displayed in certain statistics and tooltips',
- true,
- function () { ToggleDetailedTime(); },
- ),
- GrimoireBar: new SettingStandard(
- 'bool',
- 'Statistics',
- ['Grimoire Magic Meter Timer OFF', 'Grimoire Magic Meter Timer ON'],
- 'A timer on how long before the Grimoire magic meter is full',
- true,
- ),
- HeavenlyChipsTarget: new SettingInputNumber(
- 'numscale',
- 'Statistics',
- 'Heavenly Chips Target: ',
- 'Use this to set a Heavenly Chips target that will be counted towards in the "prestige" statsistics sections',
- 1,
- Infinity,
- ),
- ShowMissedGC: new SettingStandard(
- 'bool',
- 'Statistics',
- ['Missed GC OFF', 'Missed GC ON'],
- 'Show a stat in the statistics screen that counts how many Golden Cookies you have missed',
- true,
- ),
+ // Statistics
+ Stats: new SettingStandard(
+ 'bool',
+ 'Statistics',
+ ['Statistics OFF', 'Statistics ON'],
+ 'Extra Cookie Monster statistics!',
+ true,
+ ),
+ MissingUpgrades: new SettingStandard(
+ 'bool',
+ 'Statistics',
+ ['Missing Upgrades OFF', 'Missing Upgrades ON'],
+ 'Shows Missing upgrades in Stats Menu. This feature can be laggy for users with a low amount of unlocked achievements.',
+ true,
+ ),
+ UpStats: new SettingStandard(
+ 'bool',
+ 'Statistics',
+ ['Statistics Update Rate (Default)', 'Statistics Update Rate (1s)'],
+ 'Default Game rate is once every 5 seconds',
+ false,
+ ),
+ TimeFormat: new SettingStandard(
+ 'bool',
+ 'Statistics',
+ ['Time XXd, XXh, XXm, XXs', 'Time XX:XX:XX:XX:XX'],
+ 'Change the time format',
+ false,
+ ),
+ DetailedTime: new SettingStandard(
+ 'bool',
+ 'Statistics',
+ ['Detailed Time OFF', 'Detailed Time ON'],
+ 'Change how time is displayed in certain statistics and tooltips',
+ true,
+ function () {
+ ToggleDetailedTime();
+ },
+ ),
+ GrimoireBar: new SettingStandard(
+ 'bool',
+ 'Statistics',
+ ['Grimoire Magic Meter Timer OFF', 'Grimoire Magic Meter Timer ON'],
+ 'A timer on how long before the Grimoire magic meter is full',
+ true,
+ ),
+ HeavenlyChipsTarget: new SettingInputNumber(
+ 'numscale',
+ 'Statistics',
+ 'Heavenly Chips Target: ',
+ 'Use this to set a Heavenly Chips target that will be counted towards in the "prestige" statsistics sections',
+ 1,
+ Infinity,
+ ),
+ ShowMissedGC: new SettingStandard(
+ 'bool',
+ 'Statistics',
+ ['Missed GC OFF', 'Missed GC ON'],
+ 'Show a stat in the statistics screen that counts how many Golden Cookies you have missed',
+ true,
+ ),
- // Notation
- Scale: new SettingStandard(
- 'bool',
- 'Notation',
- ['Game\'s Setting Scale', 'Metric', 'Short Scale', 'Short Scale (Abbreviated)', 'Scientific Notation', 'Engineering Notation'],
- 'Change how long numbers are handled',
- false,
- function () { RefreshScale(); },
- ),
- ScaleDecimals: new SettingStandard(
- 'bool',
- 'Notation',
- ['1 decimals', '2 decimals', '3 decimals'],
- 'Set the number of decimals used when applicable',
- false,
- function () { RefreshScale(); },
- ),
- ScaleSeparator: new SettingStandard(
- 'bool',
- 'Notation',
- ['. for decimals (Standard)', '. for thousands'],
- 'Set the separator used for decimals and thousands',
- false,
- function () { RefreshScale(); },
- ),
- ScaleCutoff: new SettingInputNumber(
- 'numscale',
- 'Notation',
- 'Notation Cut-off Point: ',
- 'The number from which CookieMonster will start formatting numbers based on chosen scale. Standard is 999,999. Setting this above 999,999,999 might break certain notations',
- 1,
- 999999999,
- ),
+ // Notation
+ Scale: new SettingStandard(
+ 'bool',
+ 'Notation',
+ [
+ "Game's Setting Scale",
+ 'Metric',
+ 'Short Scale',
+ 'Short Scale (Abbreviated)',
+ 'Scientific Notation',
+ 'Engineering Notation',
+ ],
+ 'Change how long numbers are handled',
+ false,
+ function () {
+ RefreshScale();
+ },
+ ),
+ ScaleDecimals: new SettingStandard(
+ 'bool',
+ 'Notation',
+ ['1 decimals', '2 decimals', '3 decimals'],
+ 'Set the number of decimals used when applicable',
+ false,
+ function () {
+ RefreshScale();
+ },
+ ),
+ ScaleSeparator: new SettingStandard(
+ 'bool',
+ 'Notation',
+ ['. for decimals (Standard)', '. for thousands'],
+ 'Set the separator used for decimals and thousands',
+ false,
+ function () {
+ RefreshScale();
+ },
+ ),
+ ScaleCutoff: new SettingInputNumber(
+ 'numscale',
+ 'Notation',
+ 'Notation Cut-off Point: ',
+ 'The number from which CookieMonster will start formatting numbers based on chosen scale. Standard is 999,999. Setting this above 999,999,999 might break certain notations',
+ 1,
+ 999999999,
+ ),
- // Miscellaneous
- GCTimer: new SettingStandard(
- 'bool',
- 'Miscellaneous',
- ['Golden Cookie Timer OFF', 'Golden Cookie Timer ON'],
- 'A timer on the Golden Cookie when it has been spawned',
- true,
- function () { ToggleGCTimer(); },
- ),
- Favicon: new SettingStandard(
- 'bool',
- 'Miscellaneous',
- ['Favicon OFF', 'Favicon ON'],
- 'Update favicon with Golden/Wrath Cookie',
- true,
- function () { UpdateFavicon(); },
- ),
- WrinklerButtons: new SettingStandard(
- 'bool',
- 'Miscellaneous',
- ['Extra Buttons OFF', 'Extra Buttons ON'],
- 'Show buttons for popping wrinklers at bottom of cookie section',
- true,
- function () { ToggleWrinklerButtons(); },
- ),
- BulkBuyBlock: new SettingStandard(
- 'bool',
- 'Miscellaneous',
- ['Block Bulk Buying OFF', 'Block Bulk Buying ON'],
- "Block clicking bulk buying when you can't buy all. This prevents buying 7 of a building when you are in buy-10 or buy-100 mode.",
- true,
- ),
+ // Miscellaneous
+ GCTimer: new SettingStandard(
+ 'bool',
+ 'Miscellaneous',
+ ['Golden Cookie Timer OFF', 'Golden Cookie Timer ON'],
+ 'A timer on the Golden Cookie when it has been spawned',
+ true,
+ function () {
+ ToggleGCTimer();
+ },
+ ),
+ Favicon: new SettingStandard(
+ 'bool',
+ 'Miscellaneous',
+ ['Favicon OFF', 'Favicon ON'],
+ 'Update favicon with Golden/Wrath Cookie',
+ true,
+ function () {
+ UpdateFavicon();
+ },
+ ),
+ WrinklerButtons: new SettingStandard(
+ 'bool',
+ 'Miscellaneous',
+ ['Extra Buttons OFF', 'Extra Buttons ON'],
+ 'Show buttons for popping wrinklers at bottom of cookie section',
+ true,
+ function () {
+ ToggleWrinklerButtons();
+ },
+ ),
+ BulkBuyBlock: new SettingStandard(
+ 'bool',
+ 'Miscellaneous',
+ ['Block Bulk Buying OFF', 'Block Bulk Buying ON'],
+ "Block clicking bulk buying when you can't buy all. This prevents buying 7 of a building when you are in buy-10 or buy-100 mode.",
+ true,
+ ),
};
export default Config;
diff --git a/src/Data/SettingsDefault.js b/src/Data/SettingsDefault.js
index de84c31..65da2d4 100644
--- a/src/Data/SettingsDefault.js
+++ b/src/Data/SettingsDefault.js
@@ -1,97 +1,133 @@
/** This array describes all default settings */
const ConfigDefault = {
- BotBar: 1,
- TimerBar: 1,
- TimerBarPos: 0,
- TimerBarOverlay: 2,
- BuildColor: 1,
- BulkBuildColor: 0,
- UpBarColor: 1,
- UpgradeBarFixedPos: 1,
- CalcWrink: 0,
- CPSMode: 1,
- AvgCPSHist: 3,
- AvgClicksHist: 0,
- ColorPPBulkMode: 1,
- PPExcludeTop: 0,
- PPSecondsLowerLimit: 0,
- PPOnlyConsiderBuyable: 0,
- ToolWarnBon: 0,
- Title: 1,
- GeneralSound: 1,
- GCNotification: 0,
- GCFlash: 1,
- GCSound: 1,
- GCVolume: 100,
- GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3',
- FortuneNotification: 0,
- FortuneFlash: 1,
- FortuneSound: 1,
- FortuneVolume: 100,
- FortuneSoundURL: 'https://freesound.org/data/previews/174/174027_3242494-lq.mp3',
- SeaNotification: 0,
- SeaFlash: 1,
- SeaSound: 1,
- SeaVolume: 100,
- SeaSoundURL: 'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3',
- GardFlash: 1,
- GardSound: 1,
- GardVolume: 100,
- GardSoundURL: 'https://freesound.org/data/previews/103/103046_861714-lq.mp3',
- MagicNotification: 0,
- MagicFlash: 1,
- MagicSound: 1,
- MagicVolume: 100,
- MagicSoundURL: 'https://freesound.org/data/previews/221/221683_1015240-lq.mp3',
- WrinklerNotification: 0,
- WrinklerFlash: 1,
- WrinklerSound: 1,
- WrinklerVolume: 100,
- WrinklerSoundURL: 'https://freesound.org/data/previews/124/124186_8043-lq.mp3',
- WrinklerMaxNotification: 0,
- WrinklerMaxFlash: 1,
- WrinklerMaxSound: 1,
- WrinklerMaxVolume: 100,
- WrinklerMaxSoundURL: 'https://freesound.org/data/previews/152/152743_15663-lq.mp3',
- TooltipBuildUpgrade: 1,
- TooltipAmor: 0,
- ToolWarnLucky: 1,
- ToolWarnLuckyFrenzy: 1,
- ToolWarnConjure: 1,
- ToolWarnConjureFrenzy: 1,
- ToolWarnEdifice: 1,
- ToolWarnUser: 0,
- ToolWarnPos: 1,
- TooltipGrim: 1,
- TooltipWrink: 1,
- TooltipLump: 1,
- TooltipPlots: 1,
- DragonAuraInfo: 1,
- TooltipAscendButton: 1,
- Stats: 1,
- MissingUpgrades: 1,
- UpStats: 1,
- TimeFormat: 0,
- DetailedTime: 1,
- GrimoireBar: 1,
- HeavenlyChipsTarget: 1,
- ShowMissedGC: 1,
- Scale: 2,
- ScaleDecimals: 2,
- ScaleSeparator: 0,
- ScaleCutoff: 999999,
- Colors: {
- Blue: '#4bb8f0', Green: '#00ff00', Yellow: '#ffff00', Orange: '#ff7f00', Red: '#ff0000', Purple: '#ff00ff', Gray: '#b3b3b3', Pink: '#ff1493', Brown: '#8b4513',
- },
- SortBuildings: 0,
- SortUpgrades: 0,
- GCTimer: 1,
- Favicon: 1,
- WrinklerButtons: 1,
- BulkBuyBlock: 0,
- Header: {
- BarsColors: 1, Calculation: 1, Notification: 1, NotificationGeneral: 1, NotificationGC: 1, NotificationFC: 1, NotificationSea: 1, NotificationGard: 1, NotificationMagi: 1, NotificationWrink: 1, NotificationWrinkMax: 1, Tooltip: 1, Statistics: 1, Notation: 1, Miscellaneous: 1, Lucky: 1, Chain: 1, Spells: 1, Garden: 1, Prestige: 1, Wrink: 1, Sea: 1, Misc: 1, InfoTab: 1,
- },
+ BotBar: 1,
+ TimerBar: 1,
+ TimerBarPos: 0,
+ TimerBarOverlay: 2,
+ BuildColor: 1,
+ BulkBuildColor: 0,
+ UpBarColor: 1,
+ UpgradeBarFixedPos: 1,
+ CalcWrink: 0,
+ CPSMode: 1,
+ AvgCPSHist: 3,
+ AvgClicksHist: 0,
+ ColorPPBulkMode: 1,
+ PPExcludeTop: 0,
+ PPSecondsLowerLimit: 0,
+ PPOnlyConsiderBuyable: 0,
+ ToolWarnBon: 0,
+ Title: 1,
+ GeneralSound: 1,
+ GCNotification: 0,
+ GCFlash: 1,
+ GCSound: 1,
+ GCVolume: 100,
+ GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3',
+ FortuneNotification: 0,
+ FortuneFlash: 1,
+ FortuneSound: 1,
+ FortuneVolume: 100,
+ FortuneSoundURL:
+ 'https://freesound.org/data/previews/174/174027_3242494-lq.mp3',
+ SeaNotification: 0,
+ SeaFlash: 1,
+ SeaSound: 1,
+ SeaVolume: 100,
+ SeaSoundURL:
+ 'https://www.freesound.org/data/previews/121/121099_2193266-lq.mp3',
+ GardFlash: 1,
+ GardSound: 1,
+ GardVolume: 100,
+ GardSoundURL: 'https://freesound.org/data/previews/103/103046_861714-lq.mp3',
+ MagicNotification: 0,
+ MagicFlash: 1,
+ MagicSound: 1,
+ MagicVolume: 100,
+ MagicSoundURL:
+ 'https://freesound.org/data/previews/221/221683_1015240-lq.mp3',
+ WrinklerNotification: 0,
+ WrinklerFlash: 1,
+ WrinklerSound: 1,
+ WrinklerVolume: 100,
+ WrinklerSoundURL:
+ 'https://freesound.org/data/previews/124/124186_8043-lq.mp3',
+ WrinklerMaxNotification: 0,
+ WrinklerMaxFlash: 1,
+ WrinklerMaxSound: 1,
+ WrinklerMaxVolume: 100,
+ WrinklerMaxSoundURL:
+ 'https://freesound.org/data/previews/152/152743_15663-lq.mp3',
+ TooltipBuildUpgrade: 1,
+ TooltipAmor: 0,
+ ToolWarnLucky: 1,
+ ToolWarnLuckyFrenzy: 1,
+ ToolWarnConjure: 1,
+ ToolWarnConjureFrenzy: 1,
+ ToolWarnEdifice: 1,
+ ToolWarnUser: 0,
+ ToolWarnPos: 1,
+ TooltipGrim: 1,
+ TooltipWrink: 1,
+ TooltipLump: 1,
+ TooltipPlots: 1,
+ DragonAuraInfo: 1,
+ TooltipAscendButton: 1,
+ Stats: 1,
+ MissingUpgrades: 1,
+ UpStats: 1,
+ TimeFormat: 0,
+ DetailedTime: 1,
+ GrimoireBar: 1,
+ HeavenlyChipsTarget: 1,
+ ShowMissedGC: 1,
+ Scale: 2,
+ ScaleDecimals: 2,
+ ScaleSeparator: 0,
+ ScaleCutoff: 999999,
+ Colors: {
+ Blue: '#4bb8f0',
+ Green: '#00ff00',
+ Yellow: '#ffff00',
+ Orange: '#ff7f00',
+ Red: '#ff0000',
+ Purple: '#ff00ff',
+ Gray: '#b3b3b3',
+ Pink: '#ff1493',
+ Brown: '#8b4513',
+ },
+ SortBuildings: 0,
+ SortUpgrades: 0,
+ GCTimer: 1,
+ Favicon: 1,
+ WrinklerButtons: 1,
+ BulkBuyBlock: 0,
+ Header: {
+ BarsColors: 1,
+ Calculation: 1,
+ Notification: 1,
+ NotificationGeneral: 1,
+ NotificationGC: 1,
+ NotificationFC: 1,
+ NotificationSea: 1,
+ NotificationGard: 1,
+ NotificationMagi: 1,
+ NotificationWrink: 1,
+ NotificationWrinkMax: 1,
+ Tooltip: 1,
+ Statistics: 1,
+ Notation: 1,
+ Miscellaneous: 1,
+ Lucky: 1,
+ Chain: 1,
+ Spells: 1,
+ Garden: 1,
+ Prestige: 1,
+ Wrink: 1,
+ Sea: 1,
+ Misc: 1,
+ InfoTab: 1,
+ },
};
export default ConfigDefault;
diff --git a/src/Disp/BeautifyAndFormatting/BeautifyFormatting.js b/src/Disp/BeautifyAndFormatting/BeautifyFormatting.js
index 581a39f..976f679 100644
--- a/src/Disp/BeautifyAndFormatting/BeautifyFormatting.js
+++ b/src/Disp/BeautifyAndFormatting/BeautifyFormatting.js
@@ -4,7 +4,10 @@ import { CMOptions } from '../../Config/VariablesAndData';
import { metric, shortScale, shortScaleAbbreviated } from '../../Data/Scales';
import { BackupFunctions } from '../../Main/VariablesAndData';
import {
- ColorGreen, ColorOrange, ColorRed, ColorYellow,
+ ColorGreen,
+ ColorOrange,
+ ColorRed,
+ ColorYellow,
} from '../VariablesAndData';
/**
@@ -15,53 +18,70 @@ import {
* @returns {string} Formatted number
*/
export function Beautify(num, floats, forced) {
- const decimals = CMOptions.ScaleDecimals + 1;
- if (num === Infinity) {
- return 'Infinity';
- } if (typeof num === 'undefined') {
- return '0';
- } if (CMOptions.Scale === 0) {
- return BackupFunctions.Beautify(num, floats);
- } if (Number.isFinite(num)) {
- let answer = '';
- if (num === 0) {
- return num.toString();
- } if (num > 0.001 && num < CMOptions.ScaleCutoff) {
- if (CMOptions.ScaleSeparator) answer = num.toLocaleString('nl');
- else answer = num.toLocaleString('en');
- return answer;
- } if (CMOptions.Scale === 4 && !forced || forced === 4) { // Scientific notation, 123456789 => 1.235E+8
- answer = num.toExponential(decimals).toString().replace('e', 'E');
- } else {
- const exponential = num.toExponential().toString();
- const AmountOfTenPowerThree = Math.floor(exponential.slice(exponential.indexOf('e') + 1) / 3);
- answer = (num / Number(`1e${AmountOfTenPowerThree * 3}`)).toFixed(decimals);
- // answer is now "xxx.xx" (e.g., 123456789 would be 123.46)
- if (CMOptions.Scale === 1 && !forced || forced === 1) { // Metric scale, 123456789 => 123.457 M
- if (num >= 0.01 && num < Number(`1e${metric.length * 3}`)) {
- answer += ` ${metric[AmountOfTenPowerThree]}`;
- } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
- } else if (CMOptions.Scale === 2 && !forced || forced === 2) { // Short scale, 123456789 => 123.457 M
- if (num >= 0.01 && num < Number(`1e${shortScale.length * 3}`)) {
- answer += ` ${shortScale[AmountOfTenPowerThree]}`;
- } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
- } else if (CMOptions.Scale === 3 && !forced || forced === 3) { // Short scale, 123456789 => 123.457 M
- if (num >= 0.01 && num < Number(`1e${shortScaleAbbreviated.length * 3}`)) {
- answer += ` ${shortScaleAbbreviated[AmountOfTenPowerThree]}`;
- } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
- } else if (CMOptions.Scale === 5 && !forced || forced === 5) { // Engineering notation, 123456789 => 123.457E+6
- answer += `E${AmountOfTenPowerThree * 3}`;
- }
- }
- if (answer === '') {
- console.log(`Could not beautify number with CM.Disp.Beautify: ${num}`);
- answer = BackupFunctions.Beautify(num, floats);
- }
- if (CMOptions.ScaleSeparator) answer = answer.replace('.', ',');
- return answer;
- }
- console.log(`Could not beautify number with CM.Disp.Beautify: ${num}`);
- return BackupFunctions.Beautify(num, floats);
+ const decimals = CMOptions.ScaleDecimals + 1;
+ if (num === Infinity) {
+ return 'Infinity';
+ }
+ if (typeof num === 'undefined') {
+ return '0';
+ }
+ if (CMOptions.Scale === 0) {
+ return BackupFunctions.Beautify(num, floats);
+ }
+ if (Number.isFinite(num)) {
+ let answer = '';
+ if (num === 0) {
+ return num.toString();
+ }
+ if (num > 0.001 && num < CMOptions.ScaleCutoff) {
+ if (CMOptions.ScaleSeparator) answer = num.toLocaleString('nl');
+ else answer = num.toLocaleString('en');
+ return answer;
+ }
+ if ((CMOptions.Scale === 4 && !forced) || forced === 4) {
+ // Scientific notation, 123456789 => 1.235E+8
+ answer = num.toExponential(decimals).toString().replace('e', 'E');
+ } else {
+ const exponential = num.toExponential().toString();
+ const AmountOfTenPowerThree = Math.floor(
+ exponential.slice(exponential.indexOf('e') + 1) / 3,
+ );
+ answer = (num / Number(`1e${AmountOfTenPowerThree * 3}`)).toFixed(
+ decimals,
+ );
+ // answer is now "xxx.xx" (e.g., 123456789 would be 123.46)
+ if ((CMOptions.Scale === 1 && !forced) || forced === 1) {
+ // Metric scale, 123456789 => 123.457 M
+ if (num >= 0.01 && num < Number(`1e${metric.length * 3}`)) {
+ answer += ` ${metric[AmountOfTenPowerThree]}`;
+ } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
+ } else if ((CMOptions.Scale === 2 && !forced) || forced === 2) {
+ // Short scale, 123456789 => 123.457 M
+ if (num >= 0.01 && num < Number(`1e${shortScale.length * 3}`)) {
+ answer += ` ${shortScale[AmountOfTenPowerThree]}`;
+ } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
+ } else if ((CMOptions.Scale === 3 && !forced) || forced === 3) {
+ // Short scale, 123456789 => 123.457 M
+ if (
+ num >= 0.01 &&
+ num < Number(`1e${shortScaleAbbreviated.length * 3}`)
+ ) {
+ answer += ` ${shortScaleAbbreviated[AmountOfTenPowerThree]}`;
+ } else answer = Beautify(num, 0, 4); // If number is too large or little, revert to scientific notation
+ } else if ((CMOptions.Scale === 5 && !forced) || forced === 5) {
+ // Engineering notation, 123456789 => 123.457E+6
+ answer += `E${AmountOfTenPowerThree * 3}`;
+ }
+ }
+ if (answer === '') {
+ console.log(`Could not beautify number with CM.Disp.Beautify: ${num}`);
+ answer = BackupFunctions.Beautify(num, floats);
+ }
+ if (CMOptions.ScaleSeparator) answer = answer.replace('.', ',');
+ return answer;
+ }
+ console.log(`Could not beautify number with CM.Disp.Beautify: ${num}`);
+ return BackupFunctions.Beautify(num, floats);
}
/**
@@ -71,30 +91,36 @@ export function Beautify(num, floats, forced) {
* @returns {string} Formatted time
*/
export function FormatTime(time, longFormat) {
- if (time === Infinity) return time;
- time = Math.ceil(time);
- const y = Math.floor(time / 31557600);
- const d = Math.floor(time % 31557600 / 86400);
- const h = Math.floor(time % 86400 / 3600);
- const m = Math.floor(time % 3600 / 60);
- const s = Math.floor(time % 60);
- let str = '';
- if (CMOptions.TimeFormat) {
- if (time > 3155760000) return 'XX:XX:XX:XX:XX';
- str += `${(y < 10 ? '0' : '') + y}:`;
- str += `${(d < 10 ? '0' : '') + d}:`;
- str += `${(h < 10 ? '0' : '') + h}:`;
- str += `${(m < 10 ? '0' : '') + m}:`;
- str += (s < 10 ? '0' : '') + s;
- } else {
- if (time > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d';
- str += (y > 0 ? `${y + (longFormat ? (y === 1 ? ' year' : ' years') : 'y')}, ` : '');
- str += (d > 0 ? `${d + (longFormat ? (d === 1 ? ' day' : ' days') : 'd')}, ` : '');
- if (str.length > 0 || h > 0) str += `${h + (longFormat ? (h === 1 ? ' hour' : ' hours') : 'h')}, `;
- if (str.length > 0 || m > 0) str += `${m + (longFormat ? (m === 1 ? ' minute' : ' minutes') : 'm')}, `;
- str += s + (longFormat ? (s === 1 ? ' second' : ' seconds') : 's');
- }
- return str;
+ if (time === Infinity) return time;
+ time = Math.ceil(time);
+ const y = Math.floor(time / 31557600);
+ const d = Math.floor((time % 31557600) / 86400);
+ const h = Math.floor((time % 86400) / 3600);
+ const m = Math.floor((time % 3600) / 60);
+ const s = Math.floor(time % 60);
+ let str = '';
+ if (CMOptions.TimeFormat) {
+ if (time > 3155760000) return 'XX:XX:XX:XX:XX';
+ str += `${(y < 10 ? '0' : '') + y}:`;
+ str += `${(d < 10 ? '0' : '') + d}:`;
+ str += `${(h < 10 ? '0' : '') + h}:`;
+ str += `${(m < 10 ? '0' : '') + m}:`;
+ str += (s < 10 ? '0' : '') + s;
+ } else {
+ if (time > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d';
+ str +=
+ y > 0
+ ? `${y + (longFormat ? (y === 1 ? ' year' : ' years') : 'y')}, `
+ : '';
+ str +=
+ d > 0 ? `${d + (longFormat ? (d === 1 ? ' day' : ' days') : 'd')}, ` : '';
+ if (str.length > 0 || h > 0)
+ str += `${h + (longFormat ? (h === 1 ? ' hour' : ' hours') : 'h')}, `;
+ if (str.length > 0 || m > 0)
+ str += `${m + (longFormat ? (m === 1 ? ' minute' : ' minutes') : 'm')}, `;
+ str += s + (longFormat ? (s === 1 ? ' second' : ' seconds') : 's');
+ }
+ return str;
}
/**
@@ -103,17 +129,17 @@ export function FormatTime(time, longFormat) {
* @returns {{string, string}} {text, color} Both the formatted time and color as strings in an array
*/
export function GetTimeColor(time) {
- let color;
- let text;
- if (time <= 0) {
- if (CMOptions.TimeFormat) text = '00:00:00:00:00';
- else text = 'Done!';
- color = ColorGreen;
- } else {
- text = FormatTime(time);
- if (time > 300) color = ColorRed;
- else if (time > 60) color = ColorOrange;
- else color = ColorYellow;
- }
- return { text, color };
+ let color;
+ let text;
+ if (time <= 0) {
+ if (CMOptions.TimeFormat) text = '00:00:00:00:00';
+ else text = 'Done!';
+ color = ColorGreen;
+ } else {
+ text = FormatTime(time);
+ if (time > 300) color = ColorRed;
+ else if (time > 60) color = ColorOrange;
+ else color = ColorYellow;
+ }
+ return { text, color };
}
diff --git a/src/Disp/BuildingsUpgrades/Buildings.js b/src/Disp/BuildingsUpgrades/Buildings.js
index f2b9cca..2fef533 100644
--- a/src/Disp/BuildingsUpgrades/Buildings.js
+++ b/src/Disp/BuildingsUpgrades/Buildings.js
@@ -1,4 +1,8 @@
-import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
+import {
+ CacheObjects1,
+ CacheObjects10,
+ CacheObjects100,
+} from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
import BuildingSell from '../../Sim/SimulationEvents/SellBuilding';
import { Beautify } from '../BeautifyAndFormatting/BeautifyFormatting';
@@ -14,68 +18,79 @@ import { Colors, LastTargetBuildings } from '../VariablesAndData';
* And by changes in CM.Options.BuildColor, CM.Options.SortBuild & CM.Data.Config.BulkBuildColor
*/
export default function UpdateBuildings() {
- let target = Game.buyBulk;
- if (Game.buyMode === 1) {
- LastTargetBuildings = target;
- } else {
- target = LastTargetBuildings;
- }
- if (target === 1) target = CacheObjects1;
- else if (target === 10) target = CacheObjects10;
- else if (target === 100) target = CacheObjects100;
+ let target = Game.buyBulk;
+ if (Game.buyMode === 1) {
+ LastTargetBuildings = target;
+ } else {
+ target = LastTargetBuildings;
+ }
+ if (target === 1) target = CacheObjects1;
+ else if (target === 10) target = CacheObjects10;
+ else if (target === 100) target = CacheObjects100;
- if (Game.buyMode === 1) {
- if (CMOptions.BuildColor === 1) {
- for (const i of Object.keys(target)) {
- l(`productPrice${Game.Objects[i].id}`).style.color = CMOptions.Colors[target[i].color];
- }
- } else {
- for (const i of Object.keys(Game.Objects)) {
- l(`productPrice${Game.Objects[i].id}`).style.removeProperty('color');
- }
- }
- } else if (Game.buyMode === -1) {
- for (const i of Object.keys(CacheObjects1)) {
- const o = Game.Objects[i];
- l(`productPrice${o.id}`).style.color = '';
- /*
- * Fix sell price displayed in the object in the store.
- *
- * The buildings sell price displayed by the game itself (without any mod) is incorrect.
- * The following line of code fixes this issue, and can be safely removed when the game gets fixed.
- *
- * This issue is extensively detailed here: https://github.com/Aktanusa/CookieMonster/issues/359#issuecomment-735658262
- */
- l(`productPrice${o.id}`).innerHTML = Beautify(BuildingSell(o, o.basePrice, o.amount, o.free, Game.buyBulk, 1));
- }
- }
+ if (Game.buyMode === 1) {
+ if (CMOptions.BuildColor === 1) {
+ for (const i of Object.keys(target)) {
+ l(`productPrice${Game.Objects[i].id}`).style.color =
+ CMOptions.Colors[target[i].color];
+ }
+ } else {
+ for (const i of Object.keys(Game.Objects)) {
+ l(`productPrice${Game.Objects[i].id}`).style.removeProperty('color');
+ }
+ }
+ } else if (Game.buyMode === -1) {
+ for (const i of Object.keys(CacheObjects1)) {
+ const o = Game.Objects[i];
+ l(`productPrice${o.id}`).style.color = '';
+ /*
+ * Fix sell price displayed in the object in the store.
+ *
+ * The buildings sell price displayed by the game itself (without any mod) is incorrect.
+ * The following line of code fixes this issue, and can be safely removed when the game gets fixed.
+ *
+ * This issue is extensively detailed here: https://github.com/Aktanusa/CookieMonster/issues/359#issuecomment-735658262
+ */
+ l(`productPrice${o.id}`).innerHTML = Beautify(
+ BuildingSell(o, o.basePrice, o.amount, o.free, Game.buyBulk, 1),
+ );
+ }
+ }
- // Build array of pointers, sort by pp, use array index (+2) as the grid row number
- // (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
- // This regulates sorting of buildings
- if (Game.buyMode === 1 && CMOptions.SortBuildings) {
- const arr = Object.keys(target).map((k) => {
- const o = target[k];
- o.name = k;
- o.id = Game.Objects[k].id;
- return o;
- });
+ // Build array of pointers, sort by pp, use array index (+2) as the grid row number
+ // (grid rows are 1-based indexing, and row 1 is the bulk buy/sell options)
+ // This regulates sorting of buildings
+ if (Game.buyMode === 1 && CMOptions.SortBuildings) {
+ const arr = Object.keys(target).map((k) => {
+ const o = target[k];
+ o.name = k;
+ o.id = Game.Objects[k].id;
+ return o;
+ });
- arr.sort(function (a, b) { return (Colors.indexOf(a.color) > Colors.indexOf(b.color) ? 1 : (Colors.indexOf(a.color) < Colors.indexOf(b.color) ? -1 : (a.pp < b.pp) ? -1 : 0)); });
+ arr.sort(function (a, b) {
+ return Colors.indexOf(a.color) > Colors.indexOf(b.color)
+ ? 1
+ : Colors.indexOf(a.color) < Colors.indexOf(b.color)
+ ? -1
+ : a.pp < b.pp
+ ? -1
+ : 0;
+ });
- for (let x = 0; x < arr.length; x++) {
- Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
- }
- } else {
- const arr = Object.keys(CacheObjects1).map((k) => {
- const o = CacheObjects1[k];
- o.name = k;
- o.id = Game.Objects[k].id;
- return o;
- });
- arr.sort((a, b) => a.id - b.id);
- for (let x = 0; x < arr.length; x++) {
- Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
- }
- }
+ for (let x = 0; x < arr.length; x++) {
+ Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
+ }
+ } else {
+ const arr = Object.keys(CacheObjects1).map((k) => {
+ const o = CacheObjects1[k];
+ o.name = k;
+ o.id = Game.Objects[k].id;
+ return o;
+ });
+ arr.sort((a, b) => a.id - b.id);
+ for (let x = 0; x < arr.length; x++) {
+ Game.Objects[arr[x].name].l.style.gridRow = `${x + 2}/${x + 2}`;
+ }
+ }
}
diff --git a/src/Disp/BuildingsUpgrades/UpgradeBar.js b/src/Disp/BuildingsUpgrades/UpgradeBar.js
index cf12c0e..80e0eb3 100644
--- a/src/Disp/BuildingsUpgrades/UpgradeBar.js
+++ b/src/Disp/BuildingsUpgrades/UpgradeBar.js
@@ -1,5 +1,13 @@
import {
- ColorBackPre, ColorBlue, ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, ColorTextPre, ColorYellow,
+ ColorBackPre,
+ ColorBlue,
+ ColorGray,
+ ColorGreen,
+ ColorOrange,
+ ColorPurple,
+ ColorRed,
+ ColorTextPre,
+ ColorYellow,
} from '../VariablesAndData';
/**
@@ -7,73 +15,90 @@ import {
* @returns {object} legend The legend-object to be added
*/
function CreateUpgradeBarLegend() {
- const legend = document.createElement('div');
- legend.style.minWidth = '330px';
- legend.style.marginBottom = '4px';
- const title = document.createElement('div');
- title.className = 'name';
- title.style.marginBottom = '4px';
- title.textContent = 'Legend';
- legend.appendChild(title);
+ const legend = document.createElement('div');
+ legend.style.minWidth = '330px';
+ legend.style.marginBottom = '4px';
+ const title = document.createElement('div');
+ title.className = 'name';
+ title.style.marginBottom = '4px';
+ title.textContent = 'Legend';
+ legend.appendChild(title);
- const legendLine = function (color, text) {
- const div = document.createElement('div');
- div.style.verticalAlign = 'middle';
- const span = document.createElement('span');
- span.className = ColorBackPre + color;
- span.style.display = 'inline-block';
- span.style.height = '10px';
- span.style.width = '10px';
- span.style.marginRight = '4px';
- div.appendChild(span);
- div.appendChild(document.createTextNode(text));
- return div;
- };
+ const legendLine = function (color, text) {
+ const div = document.createElement('div');
+ div.style.verticalAlign = 'middle';
+ const span = document.createElement('span');
+ span.className = ColorBackPre + color;
+ span.style.display = 'inline-block';
+ span.style.height = '10px';
+ span.style.width = '10px';
+ span.style.marginRight = '4px';
+ div.appendChild(span);
+ div.appendChild(document.createTextNode(text));
+ return div;
+ };
- legend.appendChild(legendLine(ColorBlue, 'Better than best PP building'));
- legend.appendChild(legendLine(ColorGreen, 'Same as best PP building'));
- legend.appendChild(legendLine(ColorYellow, 'Between best and worst PP buildings closer to best'));
- legend.appendChild(legendLine(ColorOrange, 'Between best and worst PP buildings closer to worst'));
- legend.appendChild(legendLine(ColorRed, 'Same as worst PP building'));
- legend.appendChild(legendLine(ColorPurple, 'Worse than worst PP building'));
- legend.appendChild(legendLine(ColorGray, 'Negative or infinity PP'));
- return legend;
+ legend.appendChild(legendLine(ColorBlue, 'Better than best PP building'));
+ legend.appendChild(legendLine(ColorGreen, 'Same as best PP building'));
+ legend.appendChild(
+ legendLine(
+ ColorYellow,
+ 'Between best and worst PP buildings closer to best',
+ ),
+ );
+ legend.appendChild(
+ legendLine(
+ ColorOrange,
+ 'Between best and worst PP buildings closer to worst',
+ ),
+ );
+ legend.appendChild(legendLine(ColorRed, 'Same as worst PP building'));
+ legend.appendChild(legendLine(ColorPurple, 'Worse than worst PP building'));
+ legend.appendChild(legendLine(ColorGray, 'Negative or infinity PP'));
+ return legend;
}
/**
* This function creates the upgrade bar above the upgrade-section in the right section of the screen
*/
export default function CreateUpgradeBar() {
- const UpgradeBar = document.createElement('div');
- UpgradeBar.id = 'CMUpgradeBar';
- UpgradeBar.style.width = '100%';
- UpgradeBar.style.backgroundColor = 'black';
- UpgradeBar.style.textAlign = 'center';
- UpgradeBar.style.fontWeight = 'bold';
- UpgradeBar.style.display = 'none';
- UpgradeBar.style.zIndex = '21';
- UpgradeBar.onmouseout = function () { Game.tooltip.hide(); };
+ const UpgradeBar = document.createElement('div');
+ UpgradeBar.id = 'CMUpgradeBar';
+ UpgradeBar.style.width = '100%';
+ UpgradeBar.style.backgroundColor = 'black';
+ UpgradeBar.style.textAlign = 'center';
+ UpgradeBar.style.fontWeight = 'bold';
+ UpgradeBar.style.display = 'none';
+ UpgradeBar.style.zIndex = '21';
+ UpgradeBar.onmouseout = function () {
+ Game.tooltip.hide();
+ };
- const placeholder = document.createElement('div');
- placeholder.appendChild(CreateUpgradeBarLegend());
- UpgradeBar.onmouseover = function () { Game.tooltip.draw(this, escape(placeholder.innerHTML), 'store'); };
+ const placeholder = document.createElement('div');
+ placeholder.appendChild(CreateUpgradeBarLegend());
+ UpgradeBar.onmouseover = function () {
+ Game.tooltip.draw(this, escape(placeholder.innerHTML), 'store');
+ };
- const upgradeNumber = function (id, color) {
- const span = document.createElement('span');
- span.id = id;
- span.className = ColorTextPre + color;
- span.style.width = '14.28571428571429%';
- span.style.display = 'inline-block';
- span.textContent = '0';
- return span;
- };
- UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarBlue', ColorBlue));
- UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGreen', ColorGreen));
- UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarYellow', ColorYellow));
- UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarOrange', ColorOrange));
- UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarRed', ColorRed));
- UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarPurple', ColorPurple));
- UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGray', ColorGray));
+ const upgradeNumber = function (id, color) {
+ const span = document.createElement('span');
+ span.id = id;
+ span.className = ColorTextPre + color;
+ span.style.width = '14.28571428571429%';
+ span.style.display = 'inline-block';
+ span.textContent = '0';
+ return span;
+ };
+ UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarBlue', ColorBlue));
+ UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGreen', ColorGreen));
+ UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarYellow', ColorYellow));
+ UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarOrange', ColorOrange));
+ UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarRed', ColorRed));
+ UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarPurple', ColorPurple));
+ UpgradeBar.appendChild(upgradeNumber('CMUpgradeBarGray', ColorGray));
- l('upgrades').parentNode.insertBefore(UpgradeBar, l('upgrades').parentNode.childNodes[3]);
+ l('upgrades').parentNode.insertBefore(
+ UpgradeBar,
+ l('upgrades').parentNode.childNodes[3],
+ );
}
diff --git a/src/Disp/BuildingsUpgrades/Upgrades.js b/src/Disp/BuildingsUpgrades/Upgrades.js
index 36b5191..37792bb 100644
--- a/src/Disp/BuildingsUpgrades/Upgrades.js
+++ b/src/Disp/BuildingsUpgrades/Upgrades.js
@@ -1,7 +1,15 @@
import { CacheUpgrades } from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
import {
- ColorBackPre, ColorBlue, ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, Colors, ColorYellow,
+ ColorBackPre,
+ ColorBlue,
+ ColorGray,
+ ColorGreen,
+ ColorOrange,
+ ColorPurple,
+ ColorRed,
+ Colors,
+ ColorYellow,
} from '../VariablesAndData';
/**
@@ -11,72 +19,84 @@ import {
* And by changes in CM.Options.SortUpgrades
*/
export default function UpdateUpgrades() {
- // This counts the amount of upgrades for each pp group and updates the Upgrade Bar
- if (CMOptions.UpBarColor > 0) {
- let blue = 0;
- let green = 0;
- let yellow = 0;
- let orange = 0;
- let red = 0;
- let purple = 0;
- let gray = 0;
+ // This counts the amount of upgrades for each pp group and updates the Upgrade Bar
+ if (CMOptions.UpBarColor > 0) {
+ let blue = 0;
+ let green = 0;
+ let yellow = 0;
+ let orange = 0;
+ let red = 0;
+ let purple = 0;
+ let gray = 0;
- for (const i of Object.keys(Game.UpgradesInStore)) {
- const me = Game.UpgradesInStore[i];
- let addedColor = false;
- for (let j = 0; j < l(`upgrade${i}`).childNodes.length; j++) {
- if (l(`upgrade${i}`).childNodes[j].className.indexOf(ColorBackPre) !== -1) {
- l(`upgrade${i}`).childNodes[j].className = ColorBackPre + CacheUpgrades[me.name].color;
- addedColor = true;
- break;
- }
- }
- if (!addedColor) {
- const div = document.createElement('div');
- div.style.width = '10px';
- div.style.height = '10px';
- div.className = ColorBackPre + CacheUpgrades[me.name].color;
- l(`upgrade${i}`).appendChild(div);
- }
- if (CacheUpgrades[me.name].color === ColorBlue) blue++;
- else if (CacheUpgrades[me.name].color === ColorGreen) green++;
- else if (CacheUpgrades[me.name].color === ColorYellow) yellow++;
- else if (CacheUpgrades[me.name].color === ColorOrange) orange++;
- else if (CacheUpgrades[me.name].color === ColorRed) red++;
- else if (CacheUpgrades[me.name].color === ColorPurple) purple++;
- else if (CacheUpgrades[me.name].color === ColorGray) gray++;
- }
+ for (const i of Object.keys(Game.UpgradesInStore)) {
+ const me = Game.UpgradesInStore[i];
+ let addedColor = false;
+ for (let j = 0; j < l(`upgrade${i}`).childNodes.length; j++) {
+ if (
+ l(`upgrade${i}`).childNodes[j].className.indexOf(ColorBackPre) !== -1
+ ) {
+ l(`upgrade${i}`).childNodes[j].className =
+ ColorBackPre + CacheUpgrades[me.name].color;
+ addedColor = true;
+ break;
+ }
+ }
+ if (!addedColor) {
+ const div = document.createElement('div');
+ div.style.width = '10px';
+ div.style.height = '10px';
+ div.className = ColorBackPre + CacheUpgrades[me.name].color;
+ l(`upgrade${i}`).appendChild(div);
+ }
+ if (CacheUpgrades[me.name].color === ColorBlue) blue++;
+ else if (CacheUpgrades[me.name].color === ColorGreen) green++;
+ else if (CacheUpgrades[me.name].color === ColorYellow) yellow++;
+ else if (CacheUpgrades[me.name].color === ColorOrange) orange++;
+ else if (CacheUpgrades[me.name].color === ColorRed) red++;
+ else if (CacheUpgrades[me.name].color === ColorPurple) purple++;
+ else if (CacheUpgrades[me.name].color === ColorGray) gray++;
+ }
- l('CMUpgradeBarBlue').textContent = blue;
- l('CMUpgradeBarGreen').textContent = green;
- l('CMUpgradeBarYellow').textContent = yellow;
- l('CMUpgradeBarOrange').textContent = orange;
- l('CMUpgradeBarRed').textContent = red;
- l('CMUpgradeBarPurple').textContent = purple;
- l('CMUpgradeBarGray').textContent = gray;
- }
+ l('CMUpgradeBarBlue').textContent = blue;
+ l('CMUpgradeBarGreen').textContent = green;
+ l('CMUpgradeBarYellow').textContent = yellow;
+ l('CMUpgradeBarOrange').textContent = orange;
+ l('CMUpgradeBarRed').textContent = red;
+ l('CMUpgradeBarPurple').textContent = purple;
+ l('CMUpgradeBarGray').textContent = gray;
+ }
- const arr = [];
- // Build array of pointers, sort by pp, set flex positions
- // This regulates sorting of upgrades
- for (let x = 0; x < Game.UpgradesInStore.length; x++) {
- const o = {};
- o.name = Game.UpgradesInStore[x].name;
- o.price = Game.UpgradesInStore[x].basePrice;
- o.pp = CacheUpgrades[o.name].pp;
- arr.push(o);
- }
+ const arr = [];
+ // Build array of pointers, sort by pp, set flex positions
+ // This regulates sorting of upgrades
+ for (let x = 0; x < Game.UpgradesInStore.length; x++) {
+ const o = {};
+ o.name = Game.UpgradesInStore[x].name;
+ o.price = Game.UpgradesInStore[x].basePrice;
+ o.pp = CacheUpgrades[o.name].pp;
+ arr.push(o);
+ }
- if (CMOptions.SortUpgrades) {
- arr.sort(function (a, b) { return (Colors.indexOf(a.color) > Colors.indexOf(b.color) ? 1 : (Colors.indexOf(a.color) < Colors.indexOf(b.color) ? -1 : (a.pp < b.pp) ? -1 : 0)); });
- } else {
- arr.sort((a, b) => a.price - b.price);
- }
+ if (CMOptions.SortUpgrades) {
+ arr.sort(function (a, b) {
+ return Colors.indexOf(a.color) > Colors.indexOf(b.color)
+ ? 1
+ : Colors.indexOf(a.color) < Colors.indexOf(b.color)
+ ? -1
+ : a.pp < b.pp
+ ? -1
+ : 0;
+ });
+ } else {
+ arr.sort((a, b) => a.price - b.price);
+ }
- const nameChecker = function (arr2, upgrade) {
- return arr2.findIndex((e) => e.name === upgrade.name);
- };
- for (let x = 0; x < Game.UpgradesInStore.length; x++) {
- l(`upgrade${x}`).style.order = nameChecker(arr, Game.UpgradesInStore[x]) + 1;
- }
+ const nameChecker = function (arr2, upgrade) {
+ return arr2.findIndex((e) => e.name === upgrade.name);
+ };
+ for (let x = 0; x < Game.UpgradesInStore.length; x++) {
+ l(`upgrade${x}`).style.order =
+ nameChecker(arr, Game.UpgradesInStore[x]) + 1;
+ }
}
diff --git a/src/Disp/Dragon/Dragon.js b/src/Disp/Dragon/Dragon.js
index 2a81adf..b6b4a33 100644
--- a/src/Disp/Dragon/Dragon.js
+++ b/src/Disp/Dragon/Dragon.js
@@ -4,32 +4,40 @@ import CacheDragonCost from '../../Cache/Dragon/Dragon';
import { CacheCostDragonUpgrade } from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
import CalculateChangeAura from '../../Sim/SimulationEvents/AuraChange';
-import { Beautify, FormatTime } from '../BeautifyAndFormatting/BeautifyFormatting';
+import {
+ Beautify,
+ FormatTime,
+} from '../BeautifyAndFormatting/BeautifyFormatting';
/**
* This functions adds the two extra lines about CPS and time to recover to the aura picker infoscreen
* @param {number} aura The number of the aura currently selected by the mouse/user
*/
export function AddAuraInfo(aura) {
- if (CMOptions.DragonAuraInfo === 1) {
- const [bonusCPS, priceOfChange] = CalculateChangeAura(aura);
- const timeToRecover = FormatTime(priceOfChange / (bonusCPS + Game.cookiesPs));
- const bonusCPSPercentage = Beautify(bonusCPS / Game.cookiesPs);
+ if (CMOptions.DragonAuraInfo === 1) {
+ const [bonusCPS, priceOfChange] = CalculateChangeAura(aura);
+ const timeToRecover = FormatTime(
+ priceOfChange / (bonusCPS + Game.cookiesPs),
+ );
+ const bonusCPSPercentage = Beautify(bonusCPS / Game.cookiesPs);
- l('dragonAuraInfo').style.minHeight = '60px';
- l('dragonAuraInfo').style.margin = '8px';
- l('dragonAuraInfo').appendChild(document.createElement('div')).className = 'line';
- const div = document.createElement('div');
- div.style.minWidth = '200px';
- div.style.textAlign = 'center';
- div.textContent = `Picking this aura will change CPS by ${Beautify(bonusCPS)} (${bonusCPSPercentage}% of current CPS).`;
- l('dragonAuraInfo').appendChild(div);
- const div2 = document.createElement('div');
- div2.style.minWidth = '200px';
- div2.style.textAlign = 'center';
- div2.textContent = `It will take ${timeToRecover} to recover the cost.`;
- l('dragonAuraInfo').appendChild(div2);
- }
+ l('dragonAuraInfo').style.minHeight = '60px';
+ l('dragonAuraInfo').style.margin = '8px';
+ l('dragonAuraInfo').appendChild(document.createElement('div')).className =
+ 'line';
+ const div = document.createElement('div');
+ div.style.minWidth = '200px';
+ div.style.textAlign = 'center';
+ div.textContent = `Picking this aura will change CPS by ${Beautify(
+ bonusCPS,
+ )} (${bonusCPSPercentage}% of current CPS).`;
+ l('dragonAuraInfo').appendChild(div);
+ const div2 = document.createElement('div');
+ div2.style.minWidth = '200px';
+ div2.style.textAlign = 'center';
+ div2.textContent = `It will take ${timeToRecover} to recover the cost.`;
+ l('dragonAuraInfo').appendChild(div2);
+ }
}
/**
@@ -37,18 +45,27 @@ export function AddAuraInfo(aura) {
* It is called by Game.ToggleSpecialMenu() after CM.Main.ReplaceNative()
*/
export function AddDragonLevelUpTooltip() {
- // Check if it is the dragon popup that is on screen
- if ((l('specialPopup').className.match(/onScreen/) && l('specialPopup').children[0].style.background.match(/dragon/)) !== null) {
- for (let i = 0; i < l('specialPopup').childNodes.length; i++) {
- if (l('specialPopup').childNodes[i].className === 'optionBox') {
- l('specialPopup').children[i].onmouseover = function () {
- CacheDragonCost();
- Game.tooltip.dynamic = 1;
- Game.tooltip.draw(l('specialPopup'), `
${CacheCostDragonUpgrade}
`, 'this');
- Game.tooltip.wobble();
- };
- l('specialPopup').children[i].onmouseout = function () { Game.tooltip.shouldHide = 1; };
- }
- }
- }
+ // Check if it is the dragon popup that is on screen
+ if (
+ (l('specialPopup').className.match(/onScreen/) &&
+ l('specialPopup').children[0].style.background.match(/dragon/)) !== null
+ ) {
+ for (let i = 0; i < l('specialPopup').childNodes.length; i++) {
+ if (l('specialPopup').childNodes[i].className === 'optionBox') {
+ l('specialPopup').children[i].onmouseover = function () {
+ CacheDragonCost();
+ Game.tooltip.dynamic = 1;
+ Game.tooltip.draw(
+ l('specialPopup'),
+ `
${CacheCostDragonUpgrade}
`,
+ 'this',
+ );
+ Game.tooltip.wobble();
+ };
+ l('specialPopup').children[i].onmouseout = function () {
+ Game.tooltip.shouldHide = 1;
+ };
+ }
+ }
+ }
}
diff --git a/src/Disp/Draw.js b/src/Disp/Draw.js
index 111eb36..2d7261c 100644
--- a/src/Disp/Draw.js
+++ b/src/Disp/Draw.js
@@ -6,44 +6,55 @@ import { UpdateBotBar } from './InfoBars/BottomBar';
import { UpdateTimerBar } from './InfoBars/TimerBar';
import RefreshMenu from './MenuSections/Refreshmenu';
import { UpdateTooltips } from './Tooltips/Tooltip';
-import { CheckWrinklerTooltip, UpdateWrinklerTooltip } from './Tooltips/WrinklerTooltips';
+import {
+ CheckWrinklerTooltip,
+ UpdateWrinklerTooltip,
+} from './Tooltips/WrinklerTooltips';
/**
* This function handles all custom drawing for the Game.Draw() function.
* It is hooked on 'draw' by CM.RegisterHooks()
*/
export default function Draw() {
- // Draw autosave timer in stats menu, this must be done here to make it count down correctly
- if (
- (Game.prefs.autosave && Game.drawT % 10 === 0) // with autosave ON and every 10 ticks
- && (Game.onMenu === 'stats' && CMOptions.Stats) // while being on the stats menu only
- ) {
- const timer = document.getElementById('CMStatsAutosaveTimer');
- if (timer) {
- timer.innerText = Game.sayTime(Game.fps * 60 - (Game.T % (Game.fps * 60)), 4);
- }
- }
+ // Draw autosave timer in stats menu, this must be done here to make it count down correctly
+ if (
+ Game.prefs.autosave &&
+ Game.drawT % 10 === 0 && // with autosave ON and every 10 ticks
+ Game.onMenu === 'stats' &&
+ CMOptions.Stats // while being on the stats menu only
+ ) {
+ const timer = document.getElementById('CMStatsAutosaveTimer');
+ if (timer) {
+ timer.innerText = Game.sayTime(
+ Game.fps * 60 - (Game.T % (Game.fps * 60)),
+ 4,
+ );
+ }
+ }
- // Update colors
- UpdateBuildings();
- UpdateUpgrades();
+ // Update colors
+ UpdateBuildings();
+ UpdateUpgrades();
- // Redraw timers
- UpdateTimerBar();
+ // Redraw timers
+ UpdateTimerBar();
- // Update Bottom Bar
- UpdateBotBar();
+ // Update Bottom Bar
+ UpdateBotBar();
- // Update Tooltip
- UpdateTooltips();
+ // Update Tooltip
+ UpdateTooltips();
- // Update Wrinkler Tooltip
- CheckWrinklerTooltip();
- UpdateWrinklerTooltip();
+ // Update Wrinkler Tooltip
+ CheckWrinklerTooltip();
+ UpdateWrinklerTooltip();
- // Change menu refresh interval
- RefreshMenu();
+ // Change menu refresh interval
+ RefreshMenu();
- // Replace Cookies counter because Orteil uses very weird code to "pad" it...
- l('cookies').innerHTML = l('cookies').innerHTML.replace(/.*(?=
)/i, Beautify(Game.cookies));
+ // Replace Cookies counter because Orteil uses very weird code to "pad" it...
+ l('cookies').innerHTML = l('cookies').innerHTML.replace(
+ /.*(?=
)/i,
+ Beautify(Game.cookies),
+ );
}
diff --git a/src/Disp/GoldenCookieTimers/GoldenCookieTimers.js b/src/Disp/GoldenCookieTimers/GoldenCookieTimers.js
index b350058..dc34f2c 100644
--- a/src/Disp/GoldenCookieTimers/GoldenCookieTimers.js
+++ b/src/Disp/GoldenCookieTimers/GoldenCookieTimers.js
@@ -8,25 +8,35 @@ import { GCTimers } from '../VariablesAndData';
* @param {object} cookie A Golden Cookie object
*/
export default function CreateGCTimer(cookie) {
- const GCTimer = document.createElement('div');
- GCTimer.id = `GCTimer${cookie.id}`;
- GCTimer.style.width = '96px';
- GCTimer.style.height = '96px';
- GCTimer.style.position = 'absolute';
- GCTimer.style.zIndex = '10000000001';
- GCTimer.style.textAlign = 'center';
- GCTimer.style.lineHeight = '96px';
- GCTimer.style.fontFamily = '"Kavoon", Georgia, serif';
- GCTimer.style.fontSize = '35px';
- GCTimer.style.cursor = 'pointer';
- GCTimer.style.display = 'block';
- if (CMOptions.GCTimer === 0) GCTimer.style.display = 'none';
- GCTimer.style.left = cookie.l.style.left;
- GCTimer.style.top = cookie.l.style.top;
- GCTimer.onclick = function () { cookie.pop(); };
- GCTimer.onmouseover = function () { cookie.l.style.filter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; cookie.l.style.webkitFilter = 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))'; };
- GCTimer.onmouseout = function () { cookie.l.style.filter = ''; cookie.l.style.webkitFilter = ''; };
+ const GCTimer = document.createElement('div');
+ GCTimer.id = `GCTimer${cookie.id}`;
+ GCTimer.style.width = '96px';
+ GCTimer.style.height = '96px';
+ GCTimer.style.position = 'absolute';
+ GCTimer.style.zIndex = '10000000001';
+ GCTimer.style.textAlign = 'center';
+ GCTimer.style.lineHeight = '96px';
+ GCTimer.style.fontFamily = '"Kavoon", Georgia, serif';
+ GCTimer.style.fontSize = '35px';
+ GCTimer.style.cursor = 'pointer';
+ GCTimer.style.display = 'block';
+ if (CMOptions.GCTimer === 0) GCTimer.style.display = 'none';
+ GCTimer.style.left = cookie.l.style.left;
+ GCTimer.style.top = cookie.l.style.top;
+ GCTimer.onclick = function () {
+ cookie.pop();
+ };
+ GCTimer.onmouseover = function () {
+ cookie.l.style.filter =
+ 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))';
+ cookie.l.style.webkitFilter =
+ 'brightness(125%) drop-shadow(0px 0px 3px rgba(255,255,255,1))';
+ };
+ GCTimer.onmouseout = function () {
+ cookie.l.style.filter = '';
+ cookie.l.style.webkitFilter = '';
+ };
- GCTimers[cookie.id] = GCTimer;
- l('shimmers').appendChild(GCTimer);
+ GCTimers[cookie.id] = GCTimer;
+ l('shimmers').appendChild(GCTimer);
}
diff --git a/src/Disp/HelperFunctions/CalculateGrimoireRefillTime.js b/src/Disp/HelperFunctions/CalculateGrimoireRefillTime.js
index fa864ea..f7598ae 100644
--- a/src/Disp/HelperFunctions/CalculateGrimoireRefillTime.js
+++ b/src/Disp/HelperFunctions/CalculateGrimoireRefillTime.js
@@ -5,11 +5,16 @@
* @param {number} targetMagic The target magic level
* @returns {number} count / Game.fps The time it takes to reach targetMagic
*/
-export default function CalculateGrimoireRefillTime(currentMagic, maxMagic, targetMagic) {
- let count = 0;
- while (currentMagic < targetMagic) {
- currentMagic += Math.max(0.002, (currentMagic / Math.max(maxMagic, 100)) ** 0.5) * 0.002;
- count++;
- }
- return count / Game.fps;
+export default function CalculateGrimoireRefillTime(
+ currentMagic,
+ maxMagic,
+ targetMagic,
+) {
+ let count = 0;
+ while (currentMagic < targetMagic) {
+ currentMagic +=
+ Math.max(0.002, (currentMagic / Math.max(maxMagic, 100)) ** 0.5) * 0.002;
+ count++;
+ }
+ return count / Game.fps;
}
diff --git a/src/Disp/HelperFunctions/GetCPS.js b/src/Disp/HelperFunctions/GetCPS.js
index 2a495ae..f8522b5 100644
--- a/src/Disp/HelperFunctions/GetCPS.js
+++ b/src/Disp/HelperFunctions/GetCPS.js
@@ -1,5 +1,8 @@
import {
- CacheAverageCPS, CacheCurrWrinklerCount, CacheCurrWrinklerCPSMult, CacheWrinklersFattest,
+ CacheAverageCPS,
+ CacheCurrWrinklerCount,
+ CacheCurrWrinklerCPSMult,
+ CacheWrinklersFattest,
} from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
@@ -8,14 +11,31 @@ import { CMOptions } from '../../Config/VariablesAndData';
* @returns {number} The average or current cps
*/
export default function GetCPS() {
- if (CMOptions.CPSMode) {
- return CacheAverageCPS;
- } if (CMOptions.CalcWrink === 0) {
- return (Game.cookiesPs * (1 - Game.cpsSucked));
- } if (CMOptions.CalcWrink === 1) {
- return Game.cookiesPs * (CacheCurrWrinklerCPSMult + (1 - (CacheCurrWrinklerCount * 0.05)));
- } if (CMOptions.CalcWrink === 2 && Game.wrinklers[CacheWrinklersFattest[1]].type === 1) {
- return Game.cookiesPs * ((CacheCurrWrinklerCPSMult * 3 / CacheCurrWrinklerCount) + (1 - (CacheCurrWrinklerCount * 0.05)));
- }
- return Game.cookiesPs * ((CacheCurrWrinklerCPSMult / CacheCurrWrinklerCount) + (1 - (CacheCurrWrinklerCount * 0.05)));
+ if (CMOptions.CPSMode) {
+ return CacheAverageCPS;
+ }
+ if (CMOptions.CalcWrink === 0) {
+ return Game.cookiesPs * (1 - Game.cpsSucked);
+ }
+ if (CMOptions.CalcWrink === 1) {
+ return (
+ Game.cookiesPs *
+ (CacheCurrWrinklerCPSMult + (1 - CacheCurrWrinklerCount * 0.05))
+ );
+ }
+ if (
+ CMOptions.CalcWrink === 2 &&
+ Game.wrinklers[CacheWrinklersFattest[1]].type === 1
+ ) {
+ return (
+ Game.cookiesPs *
+ ((CacheCurrWrinklerCPSMult * 3) / CacheCurrWrinklerCount +
+ (1 - CacheCurrWrinklerCount * 0.05))
+ );
+ }
+ return (
+ Game.cookiesPs *
+ (CacheCurrWrinklerCPSMult / CacheCurrWrinklerCount +
+ (1 - CacheCurrWrinklerCount * 0.05))
+ );
}
diff --git a/src/Disp/HelperFunctions/GetLumpColor.js b/src/Disp/HelperFunctions/GetLumpColor.js
index 75d2606..8da19d6 100644
--- a/src/Disp/HelperFunctions/GetLumpColor.js
+++ b/src/Disp/HelperFunctions/GetLumpColor.js
@@ -1,5 +1,10 @@
import {
- ColorGray, ColorGreen, ColorOrange, ColorPurple, ColorRed, ColorYellow,
+ ColorGray,
+ ColorGreen,
+ ColorOrange,
+ ColorPurple,
+ ColorRed,
+ ColorYellow,
} from '../VariablesAndData';
/**
@@ -9,16 +14,20 @@ import {
* @returns {{string}, {string}} text, color An array containing the text and display-color of the sugar lump
*/
export default function GetLumpColor(type) {
- if (type === 0) {
- return { text: 'Normal', color: ColorGray };
- } if (type === 1) {
- return { text: 'Bifurcated', color: ColorGreen };
- } if (type === 2) {
- return { text: 'Golden', color: ColorYellow };
- } if (type === 3) {
- return { text: 'Meaty', color: ColorOrange };
- } if (type === 4) {
- return { text: 'Caramelized', color: ColorPurple };
- }
- return { text: 'Unknown Sugar Lump', color: ColorRed };
+ if (type === 0) {
+ return { text: 'Normal', color: ColorGray };
+ }
+ if (type === 1) {
+ return { text: 'Bifurcated', color: ColorGreen };
+ }
+ if (type === 2) {
+ return { text: 'Golden', color: ColorYellow };
+ }
+ if (type === 3) {
+ return { text: 'Meaty', color: ColorOrange };
+ }
+ if (type === 4) {
+ return { text: 'Caramelized', color: ColorPurple };
+ }
+ return { text: 'Unknown Sugar Lump', color: ColorRed };
}
diff --git a/src/Disp/HelperFunctions/GetWrinkConfigBank.js b/src/Disp/HelperFunctions/GetWrinkConfigBank.js
index effac3c..9c03987 100644
--- a/src/Disp/HelperFunctions/GetWrinkConfigBank.js
+++ b/src/Disp/HelperFunctions/GetWrinkConfigBank.js
@@ -1,4 +1,7 @@
-import { CacheWrinklersFattest, CacheWrinklersTotal } from '../../Cache/VariablesAndData';
+import {
+ CacheWrinklersFattest,
+ CacheWrinklersTotal,
+} from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
/**
@@ -7,10 +10,11 @@ import { CMOptions } from '../../Config/VariablesAndData';
* @returns {number} 0 or the amount of cookies stored (CM.Cache.WrinklersTotal)
*/
export default function GetWrinkConfigBank() {
- if (CMOptions.CalcWrink === 1) {
- return CacheWrinklersTotal;
- } if (CMOptions.CalcWrink === 2) {
- return CacheWrinklersFattest[0];
- }
- return 0;
+ if (CMOptions.CalcWrink === 1) {
+ return CacheWrinklersTotal;
+ }
+ if (CMOptions.CalcWrink === 2) {
+ return CacheWrinklersFattest[0];
+ }
+ return 0;
}
diff --git a/src/Disp/HelperFunctions/PopWrinklers.js b/src/Disp/HelperFunctions/PopWrinklers.js
index ebb980c..fb97fcf 100644
--- a/src/Disp/HelperFunctions/PopWrinklers.js
+++ b/src/Disp/HelperFunctions/PopWrinklers.js
@@ -3,9 +3,9 @@
* It is called by a click of the 'pop all' button created by CM.Disp.AddMenuStats()
*/
export default function PopAllNormalWrinklers() {
- for (const i of Object.keys(Game.wrinklers)) {
- if (Game.wrinklers[i].sucked > 0 && Game.wrinklers[i].type === 0) {
- Game.wrinklers[i].hp = 0;
- }
- }
+ for (const i of Object.keys(Game.wrinklers)) {
+ if (Game.wrinklers[i].sucked > 0 && Game.wrinklers[i].type === 0) {
+ Game.wrinklers[i].hp = 0;
+ }
+ }
}
diff --git a/src/Disp/HelperFunctions/RefreshScale.js b/src/Disp/HelperFunctions/RefreshScale.js
index 4a8d412..2346850 100644
--- a/src/Disp/HelperFunctions/RefreshScale.js
+++ b/src/Disp/HelperFunctions/RefreshScale.js
@@ -7,11 +7,11 @@ import { UpdateBotBar } from '../InfoBars/BottomBar';
* It is therefore called by a changes in CM.Options.Scale, CM.Options.ScaleDecimals, CM.Options.ScaleSeparator and CM.Options.ScaleCutoff
*/
export default function RefreshScale() {
- BeautifyAll();
- Game.RefreshStore();
- Game.RebuildUpgrades();
+ BeautifyAll();
+ Game.RefreshStore();
+ Game.RebuildUpgrades();
- UpdateBotBar();
- UpdateBuildings();
- UpdateUpgrades();
+ UpdateBotBar();
+ UpdateBuildings();
+ UpdateUpgrades();
}
diff --git a/src/Disp/HelperFunctions/UpdateAscendState.js b/src/Disp/HelperFunctions/UpdateAscendState.js
index c12cc66..afd6ebc 100644
--- a/src/Disp/HelperFunctions/UpdateAscendState.js
+++ b/src/Disp/HelperFunctions/UpdateAscendState.js
@@ -8,13 +8,13 @@ import UpdateBackground from './UpdateBackground';
* It is called by CM.Disp.Draw()
*/
export default function UpdateAscendState() {
- if (Game.OnAscend) {
- l('game').style.bottom = '0px';
- if (CMOptions.BotBar === 1) l('CMBotBar').style.display = 'none';
- if (CMOptions.TimerBar === 1) l('CMTimerBar').style.display = 'none';
- } else {
- ToggleBotBar();
- ToggleTimerBar();
- }
- UpdateBackground();
+ if (Game.OnAscend) {
+ l('game').style.bottom = '0px';
+ if (CMOptions.BotBar === 1) l('CMBotBar').style.display = 'none';
+ if (CMOptions.TimerBar === 1) l('CMTimerBar').style.display = 'none';
+ } else {
+ ToggleBotBar();
+ ToggleTimerBar();
+ }
+ UpdateBackground();
}
diff --git a/src/Disp/HelperFunctions/UpdateBackground.js b/src/Disp/HelperFunctions/UpdateBackground.js
index 5d5cd00..50a3336 100644
--- a/src/Disp/HelperFunctions/UpdateBackground.js
+++ b/src/Disp/HelperFunctions/UpdateBackground.js
@@ -4,8 +4,11 @@
* It is called by CM.Disp.UpdateAscendState() and CM.Disp.UpdateBotTimerBarPosition()
*/
export default function UpdateBackground() {
- Game.Background.canvas.width = Game.Background.canvas.parentNode.offsetWidth;
- Game.Background.canvas.height = Game.Background.canvas.parentNode.offsetHeight;
- Game.LeftBackground.canvas.width = Game.LeftBackground.canvas.parentNode.offsetWidth;
- Game.LeftBackground.canvas.height = Game.LeftBackground.canvas.parentNode.offsetHeight;
+ Game.Background.canvas.width = Game.Background.canvas.parentNode.offsetWidth;
+ Game.Background.canvas.height =
+ Game.Background.canvas.parentNode.offsetHeight;
+ Game.LeftBackground.canvas.width =
+ Game.LeftBackground.canvas.parentNode.offsetWidth;
+ Game.LeftBackground.canvas.height =
+ Game.LeftBackground.canvas.parentNode.offsetHeight;
}
diff --git a/src/Disp/HelperFunctions/UpdateColors.js b/src/Disp/HelperFunctions/UpdateColors.js
index b92813c..c80fa7c 100644
--- a/src/Disp/HelperFunctions/UpdateColors.js
+++ b/src/Disp/HelperFunctions/UpdateColors.js
@@ -1,7 +1,10 @@
import { CMOptions } from '../../Config/VariablesAndData';
import UpdateBuildings from '../BuildingsUpgrades/Buildings';
import {
- ColorBackPre, ColorBorderPre, Colors, ColorTextPre,
+ ColorBackPre,
+ ColorBorderPre,
+ Colors,
+ ColorTextPre,
} from '../VariablesAndData';
/**
@@ -9,16 +12,22 @@ import {
* The function is therefore called by a change in CM.Options.Colors
*/
export default function UpdateColors() {
- let str = '';
- for (let i = 0; i < Colors.length; i++) {
- str += `.${ColorTextPre}${Colors[i]} { color: ${CMOptions.Colors[Colors[i]]}; }\n`;
- }
- for (let i = 0; i < Colors.length; i++) {
- str += `.${ColorBackPre}${Colors[i]} { background-color: ${CMOptions.Colors[Colors[i]]}; }\n`;
- }
- for (let i = 0; i < Colors.length; i++) {
- str += `.${ColorBorderPre}${Colors[i]} { border: 1px solid ${CMOptions.Colors[Colors[i]]}; }\n`;
- }
- l('CMCSS').textContent = str;
- UpdateBuildings(); // Class has been already set
+ let str = '';
+ for (let i = 0; i < Colors.length; i++) {
+ str += `.${ColorTextPre}${Colors[i]} { color: ${
+ CMOptions.Colors[Colors[i]]
+ }; }\n`;
+ }
+ for (let i = 0; i < Colors.length; i++) {
+ str += `.${ColorBackPre}${Colors[i]} { background-color: ${
+ CMOptions.Colors[Colors[i]]
+ }; }\n`;
+ }
+ for (let i = 0; i < Colors.length; i++) {
+ str += `.${ColorBorderPre}${Colors[i]} { border: 1px solid ${
+ CMOptions.Colors[Colors[i]]
+ }; }\n`;
+ }
+ l('CMCSS').textContent = str;
+ UpdateBuildings(); // Class has been already set
}
diff --git a/src/Disp/InfoBars/BottomBar.js b/src/Disp/InfoBars/BottomBar.js
index 80527dd..2aee587 100644
--- a/src/Disp/InfoBars/BottomBar.js
+++ b/src/Disp/InfoBars/BottomBar.js
@@ -1,13 +1,23 @@
/** Functions related to the Bottom Bar */
-import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
+import {
+ CacheObjects1,
+ CacheObjects10,
+ CacheObjects100,
+} from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
import { VersionMajor, VersionMinor } from '../../Data/Moddata';
-import { Beautify, GetTimeColor } from '../BeautifyAndFormatting/BeautifyFormatting';
+import {
+ Beautify,
+ GetTimeColor,
+} from '../BeautifyAndFormatting/BeautifyFormatting';
import GetCPS from '../HelperFunctions/GetCPS';
import GetWrinkConfigBank from '../HelperFunctions/GetWrinkConfigBank';
import {
- ColorBlue, ColorTextPre, ColorYellow, LastTargetBotBar,
+ ColorBlue,
+ ColorTextPre,
+ ColorYellow,
+ LastTargetBotBar,
} from '../VariablesAndData';
import { CreateBotBarBuildingColumn } from './CreateDOMElements';
@@ -15,74 +25,96 @@ import { CreateBotBarBuildingColumn } from './CreateDOMElements';
* This function creates the bottom bar and appends it to l('wrapper')
*/
export function CreateBotBar() {
- const BotBar = document.createElement('div');
- BotBar.id = 'CMBotBar';
- BotBar.style.height = '69px';
- BotBar.style.width = '100%';
- BotBar.style.position = 'absolute';
- BotBar.style.display = 'none';
- BotBar.style.backgroundColor = '#262224';
- BotBar.style.backgroundImage = 'linear-gradient(to bottom, #4d4548, #000000)';
- BotBar.style.borderTop = '1px solid black';
- BotBar.style.overflow = 'auto';
- BotBar.style.textShadow = '-1px 0 black, 0 1px black, 1px 0 black, 0 -1px black';
+ const BotBar = document.createElement('div');
+ BotBar.id = 'CMBotBar';
+ BotBar.style.height = '69px';
+ BotBar.style.width = '100%';
+ BotBar.style.position = 'absolute';
+ BotBar.style.display = 'none';
+ BotBar.style.backgroundColor = '#262224';
+ BotBar.style.backgroundImage = 'linear-gradient(to bottom, #4d4548, #000000)';
+ BotBar.style.borderTop = '1px solid black';
+ BotBar.style.overflow = 'auto';
+ BotBar.style.textShadow =
+ '-1px 0 black, 0 1px black, 1px 0 black, 0 -1px black';
- const table = BotBar.appendChild(document.createElement('table'));
- table.style.width = '100%';
- table.style.textAlign = 'center';
- table.style.whiteSpace = 'nowrap';
- const tbody = table.appendChild(document.createElement('tbody'));
+ const table = BotBar.appendChild(document.createElement('table'));
+ table.style.width = '100%';
+ table.style.textAlign = 'center';
+ table.style.whiteSpace = 'nowrap';
+ const tbody = table.appendChild(document.createElement('tbody'));
- const firstCol = function (text, color) {
- const td = document.createElement('td');
- td.style.textAlign = 'right';
- td.className = ColorTextPre + color;
- td.textContent = text;
- return td;
- };
- const type = tbody.appendChild(document.createElement('tr'));
- type.style.fontWeight = 'bold';
- type.appendChild(firstCol(`CM ${VersionMajor}.${VersionMinor}`, ColorYellow));
- const bonus = tbody.appendChild(document.createElement('tr'));
- bonus.appendChild(firstCol('Bonus Income', ColorBlue));
- const pp = tbody.appendChild(document.createElement('tr'));
- pp.appendChild(firstCol('Payback Period', ColorBlue));
- const time = tbody.appendChild(document.createElement('tr'));
- time.appendChild(firstCol('Time Left', ColorBlue));
+ const firstCol = function (text, color) {
+ const td = document.createElement('td');
+ td.style.textAlign = 'right';
+ td.className = ColorTextPre + color;
+ td.textContent = text;
+ return td;
+ };
+ const type = tbody.appendChild(document.createElement('tr'));
+ type.style.fontWeight = 'bold';
+ type.appendChild(firstCol(`CM ${VersionMajor}.${VersionMinor}`, ColorYellow));
+ const bonus = tbody.appendChild(document.createElement('tr'));
+ bonus.appendChild(firstCol('Bonus Income', ColorBlue));
+ const pp = tbody.appendChild(document.createElement('tr'));
+ pp.appendChild(firstCol('Payback Period', ColorBlue));
+ const time = tbody.appendChild(document.createElement('tr'));
+ time.appendChild(firstCol('Time Left', ColorBlue));
- l('wrapper').appendChild(BotBar);
+ l('wrapper').appendChild(BotBar);
- for (const i of Object.keys(Game.Objects)) {
- CreateBotBarBuildingColumn(i);
- }
+ for (const i of Object.keys(Game.Objects)) {
+ CreateBotBarBuildingColumn(i);
+ }
}
/**
* This function updates the bonus-, pp-, and time-rows in the the bottom bar
*/
export function UpdateBotBar() {
- if (CMOptions.BotBar === 1 && CacheObjects1 && Game.buyMode === 1) {
- let count = 0;
- for (const i of Object.keys(CacheObjects1)) {
- let target = Game.buyBulk;
- if (Game.buyMode === 1) {
- LastTargetBotBar = target;
- } else {
- target = LastTargetBotBar;
- }
- if (target === 1) target = CacheObjects1;
- if (target === 10) target = CacheObjects10;
- if (target === 100) target = CacheObjects100;
- count++;
- l('CMBotBar').firstChild.firstChild.childNodes[0].childNodes[count].childNodes[1].textContent = Game.Objects[i].amount;
- l('CMBotBar').firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(target[i].bonus, 2);
- l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[count].className = ColorTextPre + target[i].color;
- l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[count].textContent = Beautify(target[i].pp, 2);
- const timeColor = GetTimeColor((Game.Objects[i].bulkPrice - (Game.cookies + GetWrinkConfigBank())) / GetCPS());
- l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].className = ColorTextPre + timeColor.color;
- if (timeColor.text === 'Done!' && Game.cookies < Game.Objects[i].bulkPrice) {
- l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].textContent = `${timeColor.text} (with Wrink)`;
- } else l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[count].textContent = timeColor.text;
- }
- }
+ if (CMOptions.BotBar === 1 && CacheObjects1 && Game.buyMode === 1) {
+ let count = 0;
+ for (const i of Object.keys(CacheObjects1)) {
+ let target = Game.buyBulk;
+ if (Game.buyMode === 1) {
+ LastTargetBotBar = target;
+ } else {
+ target = LastTargetBotBar;
+ }
+ if (target === 1) target = CacheObjects1;
+ if (target === 10) target = CacheObjects10;
+ if (target === 100) target = CacheObjects100;
+ count++;
+ l('CMBotBar').firstChild.firstChild.childNodes[0].childNodes[
+ count
+ ].childNodes[1].textContent = Game.Objects[i].amount;
+ l('CMBotBar').firstChild.firstChild.childNodes[1].childNodes[
+ count
+ ].textContent = Beautify(target[i].bonus, 2);
+ l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[
+ count
+ ].className = ColorTextPre + target[i].color;
+ l('CMBotBar').firstChild.firstChild.childNodes[2].childNodes[
+ count
+ ].textContent = Beautify(target[i].pp, 2);
+ const timeColor = GetTimeColor(
+ (Game.Objects[i].bulkPrice - (Game.cookies + GetWrinkConfigBank())) /
+ GetCPS(),
+ );
+ l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[
+ count
+ ].className = ColorTextPre + timeColor.color;
+ if (
+ timeColor.text === 'Done!' &&
+ Game.cookies < Game.Objects[i].bulkPrice
+ ) {
+ l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[
+ count
+ ].textContent = `${timeColor.text} (with Wrink)`;
+ } else
+ l('CMBotBar').firstChild.firstChild.childNodes[3].childNodes[
+ count
+ ].textContent = timeColor.text;
+ }
+ }
}
diff --git a/src/Disp/InfoBars/CreateDOMElements.js b/src/Disp/InfoBars/CreateDOMElements.js
index 0bad85f..15ced10 100644
--- a/src/Disp/InfoBars/CreateDOMElements.js
+++ b/src/Disp/InfoBars/CreateDOMElements.js
@@ -9,58 +9,58 @@ import { ColorBackPre, ColorBlue, ColorTextPre } from '../VariablesAndData';
* @param [{{string}, {string}}, ...] bars ([id, color]) The id and colours of individual parts of the timer
*/
export function CreateTimer(id, name, bars) {
- const timerBar = document.createElement('div');
- timerBar.id = id;
- timerBar.style.height = '12px';
- timerBar.style.margin = '0px 10px';
- timerBar.style.position = 'relative';
+ const timerBar = document.createElement('div');
+ timerBar.id = id;
+ timerBar.style.height = '12px';
+ timerBar.style.margin = '0px 10px';
+ timerBar.style.position = 'relative';
- const div = document.createElement('div');
- div.style.width = '100%';
- div.style.height = '10px';
- div.style.margin = 'auto';
- div.style.position = 'absolute';
- div.style.left = '0px';
- div.style.top = '0px';
- div.style.right = '0px';
- div.style.bottom = '0px';
+ const div = document.createElement('div');
+ div.style.width = '100%';
+ div.style.height = '10px';
+ div.style.margin = 'auto';
+ div.style.position = 'absolute';
+ div.style.left = '0px';
+ div.style.top = '0px';
+ div.style.right = '0px';
+ div.style.bottom = '0px';
- const type = document.createElement('span');
- type.style.display = 'inline-block';
- type.style.textAlign = 'right';
- type.style.fontSize = '10px';
- type.style.width = '108px';
- type.style.marginRight = '5px';
- type.style.verticalAlign = 'text-top';
- type.textContent = name;
- div.appendChild(type);
+ const type = document.createElement('span');
+ type.style.display = 'inline-block';
+ type.style.textAlign = 'right';
+ type.style.fontSize = '10px';
+ type.style.width = '108px';
+ type.style.marginRight = '5px';
+ type.style.verticalAlign = 'text-top';
+ type.textContent = name;
+ div.appendChild(type);
- for (let i = 0; i < bars.length; i++) {
- const colorBar = document.createElement('span');
- colorBar.id = bars[i].id;
- colorBar.style.display = 'inline-block';
- colorBar.style.height = '10px';
- colorBar.style.verticalAlign = 'text-top';
- colorBar.style.textAlign = 'center';
- if (bars.length - 1 === i) {
- colorBar.style.borderTopRightRadius = '10px';
- colorBar.style.borderBottomRightRadius = '10px';
- }
- if (typeof bars[i].color !== 'undefined') {
- colorBar.className = ColorBackPre + bars[i].color;
- }
- div.appendChild(colorBar);
- }
+ for (let i = 0; i < bars.length; i++) {
+ const colorBar = document.createElement('span');
+ colorBar.id = bars[i].id;
+ colorBar.style.display = 'inline-block';
+ colorBar.style.height = '10px';
+ colorBar.style.verticalAlign = 'text-top';
+ colorBar.style.textAlign = 'center';
+ if (bars.length - 1 === i) {
+ colorBar.style.borderTopRightRadius = '10px';
+ colorBar.style.borderBottomRightRadius = '10px';
+ }
+ if (typeof bars[i].color !== 'undefined') {
+ colorBar.className = ColorBackPre + bars[i].color;
+ }
+ div.appendChild(colorBar);
+ }
- const timer = document.createElement('span');
- timer.id = `${id}Time`;
- timer.style.marginLeft = '5px';
- timer.style.verticalAlign = 'text-top';
- div.appendChild(timer);
+ const timer = document.createElement('span');
+ timer.id = `${id}Time`;
+ timer.style.marginLeft = '5px';
+ timer.style.verticalAlign = 'text-top';
+ div.appendChild(timer);
- timerBar.appendChild(div);
+ timerBar.appendChild(div);
- return timerBar;
+ return timerBar;
}
/**
@@ -68,22 +68,26 @@ export function CreateTimer(id, name, bars) {
* @param {string} buildingName Objectname to be added (e.g., "Cursor")
*/
export function CreateBotBarBuildingColumn(buildingName) {
- if (l('CMBotBar') !== null) {
- const type = l('CMBotBar').firstChild.firstChild.childNodes[0];
- const bonus = l('CMBotBar').firstChild.firstChild.childNodes[1];
- const pp = l('CMBotBar').firstChild.firstChild.childNodes[2];
- const time = l('CMBotBar').firstChild.firstChild.childNodes[3];
+ if (l('CMBotBar') !== null) {
+ const type = l('CMBotBar').firstChild.firstChild.childNodes[0];
+ const bonus = l('CMBotBar').firstChild.firstChild.childNodes[1];
+ const pp = l('CMBotBar').firstChild.firstChild.childNodes[2];
+ const time = l('CMBotBar').firstChild.firstChild.childNodes[3];
- const i = buildingName;
- const header = type.appendChild(document.createElement('td'));
- header.appendChild(document.createTextNode(`${i.indexOf(' ') !== -1 ? i.substring(0, i.indexOf(' ')) : i} (`));
+ const i = buildingName;
+ const header = type.appendChild(document.createElement('td'));
+ header.appendChild(
+ document.createTextNode(
+ `${i.indexOf(' ') !== -1 ? i.substring(0, i.indexOf(' ')) : i} (`,
+ ),
+ );
- const span = header.appendChild(document.createElement('span'));
- span.className = ColorTextPre + ColorBlue;
+ const span = header.appendChild(document.createElement('span'));
+ span.className = ColorTextPre + ColorBlue;
- header.appendChild(document.createTextNode(')'));
- bonus.appendChild(document.createElement('td'));
- pp.appendChild(document.createElement('td'));
- time.appendChild(document.createElement('td'));
- }
+ header.appendChild(document.createTextNode(')'));
+ bonus.appendChild(document.createElement('td'));
+ pp.appendChild(document.createElement('td'));
+ time.appendChild(document.createElement('td'));
+ }
}
diff --git a/src/Disp/InfoBars/TimerBar.js b/src/Disp/InfoBars/TimerBar.js
index ac9f0db..fb0677c 100644
--- a/src/Disp/InfoBars/TimerBar.js
+++ b/src/Disp/InfoBars/TimerBar.js
@@ -3,8 +3,12 @@
import { UpdateBotTimerBarPosition } from '../../Config/SpecificToggles';
import { CMOptions } from '../../Config/VariablesAndData';
import {
- BuffColors,
- ColorBackPre, ColorGray, ColorOrange, ColorPurple, LastNumberOfTimers,
+ BuffColors,
+ ColorBackPre,
+ ColorGray,
+ ColorOrange,
+ ColorPurple,
+ LastNumberOfTimers,
} from '../VariablesAndData';
import { CreateTimer } from './CreateDOMElements';
@@ -12,111 +16,191 @@ import { CreateTimer } from './CreateDOMElements';
* This function creates the TimerBar and appends it to l('wrapper')
*/
export function CreateTimerBar() {
- const TimerBar = document.createElement('div');
- TimerBar.id = 'CMTimerBar';
- TimerBar.style.position = 'absolute';
- TimerBar.style.display = 'none';
- TimerBar.style.height = '0px';
- TimerBar.style.fontSize = '10px';
- TimerBar.style.fontWeight = 'bold';
- TimerBar.style.backgroundColor = 'black';
+ const TimerBar = document.createElement('div');
+ TimerBar.id = 'CMTimerBar';
+ TimerBar.style.position = 'absolute';
+ TimerBar.style.display = 'none';
+ TimerBar.style.height = '0px';
+ TimerBar.style.fontSize = '10px';
+ TimerBar.style.fontWeight = 'bold';
+ TimerBar.style.backgroundColor = 'black';
- // Create standard Golden Cookie bar
- const CMTimerBarGC = CreateTimer('CMTimerBarGC',
- 'Next Cookie',
- [{ id: 'CMTimerBarGCMinBar', color: ColorGray }, { id: 'CMTimerBarGCBar', color: ColorPurple }]);
- TimerBar.appendChild(CMTimerBarGC);
+ // Create standard Golden Cookie bar
+ const CMTimerBarGC = CreateTimer('CMTimerBarGC', 'Next Cookie', [
+ { id: 'CMTimerBarGCMinBar', color: ColorGray },
+ { id: 'CMTimerBarGCBar', color: ColorPurple },
+ ]);
+ TimerBar.appendChild(CMTimerBarGC);
- // Create standard Reindeer bar
- const CMTimerBarRen = CreateTimer('CMTimerBarRen',
- 'Next Reindeer',
- [{ id: 'CMTimerBarRenMinBar', color: ColorGray }, { id: 'CMTimerBarRenBar', color: ColorOrange }]);
- TimerBar.appendChild(CMTimerBarRen);
- const TimerBarBuffTimers = document.createElement('div');
- TimerBarBuffTimers.id = 'CMTimerBarBuffTimers';
- TimerBar.appendChild(TimerBarBuffTimers);
+ // Create standard Reindeer bar
+ const CMTimerBarRen = CreateTimer('CMTimerBarRen', 'Next Reindeer', [
+ { id: 'CMTimerBarRenMinBar', color: ColorGray },
+ { id: 'CMTimerBarRenBar', color: ColorOrange },
+ ]);
+ TimerBar.appendChild(CMTimerBarRen);
+ const TimerBarBuffTimers = document.createElement('div');
+ TimerBarBuffTimers.id = 'CMTimerBarBuffTimers';
+ TimerBar.appendChild(TimerBarBuffTimers);
- l('wrapper').appendChild(TimerBar);
+ l('wrapper').appendChild(TimerBar);
}
/**
* This function updates indivudual timers in the timer bar
*/
export function UpdateTimerBar() {
- if (CMOptions.TimerBar === 1) {
- // label width: 113, timer width: 30, div margin: 20
- const maxWidthTwoBar = l('CMTimerBar').offsetWidth - 163;
- // label width: 113, div margin: 20, calculate timer width at runtime
- const maxWidthOneBar = l('CMTimerBar').offsetWidth - 133;
- let numberOfTimers = 0;
+ if (CMOptions.TimerBar === 1) {
+ // label width: 113, timer width: 30, div margin: 20
+ const maxWidthTwoBar = l('CMTimerBar').offsetWidth - 163;
+ // label width: 113, div margin: 20, calculate timer width at runtime
+ const maxWidthOneBar = l('CMTimerBar').offsetWidth - 133;
+ let numberOfTimers = 0;
- // Regulates visibility of Golden Cookie timer
- if (Game.shimmerTypes.golden.spawned === 0 && !Game.Has('Golden switch [off]')) {
- l('CMTimerBarGC').style.display = '';
- l('CMTimerBarGCMinBar').style.width = `${Math.round(Math.max(0, Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) * maxWidthTwoBar / Game.shimmerTypes.golden.maxTime)}px`;
- if (CMOptions.TimerBarOverlay >= 1) l('CMTimerBarGCMinBar').textContent = Math.ceil((Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) / Game.fps);
- else l('CMTimerBarGCMinBar').textContent = '';
- if (Game.shimmerTypes.golden.minTime === Game.shimmerTypes.golden.maxTime) {
- l('CMTimerBarGCMinBar').style.borderTopRightRadius = '10px';
- l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '10px';
- } else {
- l('CMTimerBarGCMinBar').style.borderTopRightRadius = '';
- l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '';
- }
- l('CMTimerBarGCBar').style.width = `${Math.round(Math.min(Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.minTime, Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) * maxWidthTwoBar / Game.shimmerTypes.golden.maxTime)}px`;
- if (CMOptions.TimerBarOverlay >= 1) l('CMTimerBarGCBar').textContent = Math.ceil(Math.min(Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.minTime, Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) / Game.fps);
- else l('CMTimerBarGCBar').textContent = '';
- l('CMTimerBarGCTime').textContent = Math.ceil((Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) / Game.fps);
- numberOfTimers++;
- } else l('CMTimerBarGC').style.display = 'none';
+ // Regulates visibility of Golden Cookie timer
+ if (
+ Game.shimmerTypes.golden.spawned === 0 &&
+ !Game.Has('Golden switch [off]')
+ ) {
+ l('CMTimerBarGC').style.display = '';
+ l('CMTimerBarGCMinBar').style.width = `${Math.round(
+ (Math.max(
+ 0,
+ Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time,
+ ) *
+ maxWidthTwoBar) /
+ Game.shimmerTypes.golden.maxTime,
+ )}px`;
+ if (CMOptions.TimerBarOverlay >= 1)
+ l('CMTimerBarGCMinBar').textContent = Math.ceil(
+ (Game.shimmerTypes.golden.minTime - Game.shimmerTypes.golden.time) /
+ Game.fps,
+ );
+ else l('CMTimerBarGCMinBar').textContent = '';
+ if (
+ Game.shimmerTypes.golden.minTime === Game.shimmerTypes.golden.maxTime
+ ) {
+ l('CMTimerBarGCMinBar').style.borderTopRightRadius = '10px';
+ l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '10px';
+ } else {
+ l('CMTimerBarGCMinBar').style.borderTopRightRadius = '';
+ l('CMTimerBarGCMinBar').style.borderBottomRightRadius = '';
+ }
+ l('CMTimerBarGCBar').style.width = `${Math.round(
+ (Math.min(
+ Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.minTime,
+ Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time,
+ ) *
+ maxWidthTwoBar) /
+ Game.shimmerTypes.golden.maxTime,
+ )}px`;
+ if (CMOptions.TimerBarOverlay >= 1)
+ l('CMTimerBarGCBar').textContent = Math.ceil(
+ Math.min(
+ Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.minTime,
+ Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time,
+ ) / Game.fps,
+ );
+ else l('CMTimerBarGCBar').textContent = '';
+ l('CMTimerBarGCTime').textContent = Math.ceil(
+ (Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) /
+ Game.fps,
+ );
+ numberOfTimers++;
+ } else l('CMTimerBarGC').style.display = 'none';
- // Regulates visibility of Reindeer timer
- if (Game.season === 'christmas' && Game.shimmerTypes.reindeer.spawned === 0) {
- l('CMTimerBarRen').style.display = '';
- l('CMTimerBarRenMinBar').style.width = `${Math.round(Math.max(0, Game.shimmerTypes.reindeer.minTime - Game.shimmerTypes.reindeer.time) * maxWidthTwoBar / Game.shimmerTypes.reindeer.maxTime)}px`;
- if (CMOptions.TimerBarOverlay >= 1) l('CMTimerBarRenMinBar').textContent = Math.ceil((Game.shimmerTypes.reindeer.minTime - Game.shimmerTypes.reindeer.time) / Game.fps);
- else l('CMTimerBarRenMinBar').textContent = '';
- l('CMTimerBarRenBar').style.width = `${Math.round(Math.min(Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.minTime, Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) * maxWidthTwoBar / Game.shimmerTypes.reindeer.maxTime)}px`;
- if (CMOptions.TimerBarOverlay >= 1) l('CMTimerBarRenBar').textContent = Math.ceil(Math.min(Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.minTime, Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) / Game.fps);
- else l('CMTimerBarRenBar').textContent = '';
- l('CMTimerBarRenTime').textContent = Math.ceil((Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) / Game.fps);
- numberOfTimers++;
- } else {
- l('CMTimerBarRen').style.display = 'none';
- }
+ // Regulates visibility of Reindeer timer
+ if (
+ Game.season === 'christmas' &&
+ Game.shimmerTypes.reindeer.spawned === 0
+ ) {
+ l('CMTimerBarRen').style.display = '';
+ l('CMTimerBarRenMinBar').style.width = `${Math.round(
+ (Math.max(
+ 0,
+ Game.shimmerTypes.reindeer.minTime - Game.shimmerTypes.reindeer.time,
+ ) *
+ maxWidthTwoBar) /
+ Game.shimmerTypes.reindeer.maxTime,
+ )}px`;
+ if (CMOptions.TimerBarOverlay >= 1)
+ l('CMTimerBarRenMinBar').textContent = Math.ceil(
+ (Game.shimmerTypes.reindeer.minTime -
+ Game.shimmerTypes.reindeer.time) /
+ Game.fps,
+ );
+ else l('CMTimerBarRenMinBar').textContent = '';
+ l('CMTimerBarRenBar').style.width = `${Math.round(
+ (Math.min(
+ Game.shimmerTypes.reindeer.maxTime -
+ Game.shimmerTypes.reindeer.minTime,
+ Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time,
+ ) *
+ maxWidthTwoBar) /
+ Game.shimmerTypes.reindeer.maxTime,
+ )}px`;
+ if (CMOptions.TimerBarOverlay >= 1)
+ l('CMTimerBarRenBar').textContent = Math.ceil(
+ Math.min(
+ Game.shimmerTypes.reindeer.maxTime -
+ Game.shimmerTypes.reindeer.minTime,
+ Game.shimmerTypes.reindeer.maxTime -
+ Game.shimmerTypes.reindeer.time,
+ ) / Game.fps,
+ );
+ else l('CMTimerBarRenBar').textContent = '';
+ l('CMTimerBarRenTime').textContent = Math.ceil(
+ (Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) /
+ Game.fps,
+ );
+ numberOfTimers++;
+ } else {
+ l('CMTimerBarRen').style.display = 'none';
+ }
- // On every frame all buff-timers are deleted and re-created
- const BuffTimerBars = {};
- l('CMTimerBarBuffTimers').innerHTML = '';
- for (const i of Object.keys(Game.buffs)) {
- if (Game.buffs[i]) {
- const timer = CreateTimer(Game.buffs[i].name, Game.buffs[i].name, [{ id: `${Game.buffs[i].name}Bar` }]);
- timer.style.display = '';
- let classColor = '';
- // Gives specific timers specific colors
- if (typeof BuffColors[Game.buffs[i].name] !== 'undefined') {
- classColor = BuffColors[Game.buffs[i].name];
- } else classColor = ColorPurple;
- timer.lastChild.children[1].className = ColorBackPre + classColor;
- timer.lastChild.children[1].style.color = 'black';
- if (CMOptions.TimerBarOverlay === 2) timer.lastChild.children[1].textContent = `${Math.round(100 * (Game.buffs[i].time / Game.buffs[i].maxTime))}%`;
- else timer.lastChild.children[1].textContent = '';
- timer.lastChild.children[1].style.width = `${Math.round(Game.buffs[i].time * (maxWidthOneBar - Math.ceil(Game.buffs[i].time / Game.fps).toString().length * 8) / Game.buffs[i].maxTime)}px`;
- timer.lastChild.children[2].textContent = Math.ceil(Game.buffs[i].time / Game.fps);
- numberOfTimers++;
- BuffTimerBars[Game.buffs[i].name] = timer;
- }
- }
- for (const i of Object.keys(BuffTimerBars)) {
- l('CMTimerBarBuffTimers').appendChild(BuffTimerBars[i]);
- }
+ // On every frame all buff-timers are deleted and re-created
+ const BuffTimerBars = {};
+ l('CMTimerBarBuffTimers').innerHTML = '';
+ for (const i of Object.keys(Game.buffs)) {
+ if (Game.buffs[i]) {
+ const timer = CreateTimer(Game.buffs[i].name, Game.buffs[i].name, [
+ { id: `${Game.buffs[i].name}Bar` },
+ ]);
+ timer.style.display = '';
+ let classColor = '';
+ // Gives specific timers specific colors
+ if (typeof BuffColors[Game.buffs[i].name] !== 'undefined') {
+ classColor = BuffColors[Game.buffs[i].name];
+ } else classColor = ColorPurple;
+ timer.lastChild.children[1].className = ColorBackPre + classColor;
+ timer.lastChild.children[1].style.color = 'black';
+ if (CMOptions.TimerBarOverlay === 2)
+ timer.lastChild.children[1].textContent = `${Math.round(
+ 100 * (Game.buffs[i].time / Game.buffs[i].maxTime),
+ )}%`;
+ else timer.lastChild.children[1].textContent = '';
+ timer.lastChild.children[1].style.width = `${Math.round(
+ (Game.buffs[i].time *
+ (maxWidthOneBar -
+ Math.ceil(Game.buffs[i].time / Game.fps).toString().length * 8)) /
+ Game.buffs[i].maxTime,
+ )}px`;
+ timer.lastChild.children[2].textContent = Math.ceil(
+ Game.buffs[i].time / Game.fps,
+ );
+ numberOfTimers++;
+ BuffTimerBars[Game.buffs[i].name] = timer;
+ }
+ }
+ for (const i of Object.keys(BuffTimerBars)) {
+ l('CMTimerBarBuffTimers').appendChild(BuffTimerBars[i]);
+ }
- if (numberOfTimers !== 0) {
- l('CMTimerBar').style.height = `${numberOfTimers * 12 + 2}px`;
- }
- if (LastNumberOfTimers !== numberOfTimers) {
- LastNumberOfTimers = numberOfTimers;
- UpdateBotTimerBarPosition();
- }
- }
+ if (numberOfTimers !== 0) {
+ l('CMTimerBar').style.height = `${numberOfTimers * 12 + 2}px`;
+ }
+ if (LastNumberOfTimers !== numberOfTimers) {
+ LastNumberOfTimers = numberOfTimers;
+ UpdateBotTimerBarPosition();
+ }
+ }
}
diff --git a/src/Disp/Initialization/CreateWrinklerButton.js b/src/Disp/Initialization/CreateWrinklerButton.js
index 0d28691..3b783b7 100644
--- a/src/Disp/Initialization/CreateWrinklerButton.js
+++ b/src/Disp/Initialization/CreateWrinklerButton.js
@@ -5,16 +5,21 @@ import PopAllNormalWrinklers from '../HelperFunctions/PopWrinklers';
* This function creates two objects at the bottom of the left column that allowing popping of wrinklers
*/
export default function CreateWrinklerButtons() {
- const popAllA = document.createElement('a');
- popAllA.id = 'PopAllNormalWrinklerButton';
- popAllA.textContent = 'Pop All Normal';
- popAllA.className = 'option';
- popAllA.onclick = function () { PopAllNormalWrinklers(); };
- l('sectionLeftExtra').children[0].append(popAllA);
- const popFattestA = document.createElement('a');
- popFattestA.id = 'PopFattestWrinklerButton';
- popFattestA.textContent = 'Pop Single Fattest';
- popFattestA.className = 'option';
- popFattestA.onclick = function () { if (CacheWrinklersFattest[1] !== null) Game.wrinklers[CacheWrinklersFattest[1]].hp = 0; };
- l('sectionLeftExtra').children[0].append(popFattestA);
+ const popAllA = document.createElement('a');
+ popAllA.id = 'PopAllNormalWrinklerButton';
+ popAllA.textContent = 'Pop All Normal';
+ popAllA.className = 'option';
+ popAllA.onclick = function () {
+ PopAllNormalWrinklers();
+ };
+ l('sectionLeftExtra').children[0].append(popAllA);
+ const popFattestA = document.createElement('a');
+ popFattestA.id = 'PopFattestWrinklerButton';
+ popFattestA.textContent = 'Pop Single Fattest';
+ popFattestA.className = 'option';
+ popFattestA.onclick = function () {
+ if (CacheWrinklersFattest[1] !== null)
+ Game.wrinklers[CacheWrinklersFattest[1]].hp = 0;
+ };
+ l('sectionLeftExtra').children[0].append(popFattestA);
}
diff --git a/src/Disp/Initialization/CssArea.js b/src/Disp/Initialization/CssArea.js
index 8008aab..878d405 100644
--- a/src/Disp/Initialization/CssArea.js
+++ b/src/Disp/Initialization/CssArea.js
@@ -5,9 +5,9 @@ import { DispCSS } from '../VariablesAndData';
*/
export default function CreateCssArea() {
- DispCSS = document.createElement('style');
- DispCSS.type = 'text/css';
- DispCSS.id = 'CMCSS';
+ DispCSS = document.createElement('style');
+ DispCSS.type = 'text/css';
+ DispCSS.id = 'CMCSS';
- document.head.appendChild(DispCSS);
+ document.head.appendChild(DispCSS);
}
diff --git a/src/Disp/Initialization/UpdateBuildingUpgradeStyle.js b/src/Disp/Initialization/UpdateBuildingUpgradeStyle.js
index 32ffb4f..205b689 100644
--- a/src/Disp/Initialization/UpdateBuildingUpgradeStyle.js
+++ b/src/Disp/Initialization/UpdateBuildingUpgradeStyle.js
@@ -2,9 +2,9 @@
* This function updates the style of the building and upgrade sections to make these sortable
*/
export default function UpdateBuildingUpgradeStyle() {
- l('products').style.display = 'grid';
- l('storeBulk').style.gridRow = '1/1';
+ l('products').style.display = 'grid';
+ l('storeBulk').style.gridRow = '1/1';
- l('upgrades').style.display = 'flex';
- l('upgrades').style['flex-wrap'] = 'wrap';
+ l('upgrades').style.display = 'flex';
+ l('upgrades').style['flex-wrap'] = 'wrap';
}
diff --git a/src/Disp/Initialization/WhiteScreen.js b/src/Disp/Initialization/WhiteScreen.js
index 55ba72a..6a41828 100644
--- a/src/Disp/Initialization/WhiteScreen.js
+++ b/src/Disp/Initialization/WhiteScreen.js
@@ -2,13 +2,13 @@
* This function creates a white square over the full screen and appends it to l('wrapper')
*/
export default function CreateWhiteScreen() {
- const WhiteScreen = document.createElement('div');
- WhiteScreen.id = 'CMWhiteScreen';
- WhiteScreen.style.width = '100%';
- WhiteScreen.style.height = '100%';
- WhiteScreen.style.backgroundColor = 'white';
- WhiteScreen.style.display = 'none';
- WhiteScreen.style.zIndex = '9999999999';
- WhiteScreen.style.position = 'absolute';
- l('wrapper').appendChild(WhiteScreen);
+ const WhiteScreen = document.createElement('div');
+ WhiteScreen.id = 'CMWhiteScreen';
+ WhiteScreen.style.width = '100%';
+ WhiteScreen.style.height = '100%';
+ WhiteScreen.style.backgroundColor = 'white';
+ WhiteScreen.style.display = 'none';
+ WhiteScreen.style.zIndex = '9999999999';
+ WhiteScreen.style.position = 'absolute';
+ l('wrapper').appendChild(WhiteScreen);
}
diff --git a/src/Disp/MenuSections/AddMenus.js b/src/Disp/MenuSections/AddMenus.js
index e00f1cb..6146437 100644
--- a/src/Disp/MenuSections/AddMenus.js
+++ b/src/Disp/MenuSections/AddMenus.js
@@ -7,19 +7,19 @@ import AddMenuPref from './SettingsPage';
* This function adds the calll the functions to add extra info to the stats and options pages
*/
export default function AddMenu() {
- const title = document.createElement('div');
- title.className = 'title';
+ const title = document.createElement('div');
+ title.className = 'title';
- if (Game.onMenu === 'prefs') {
- title.textContent = 'Cookie Monster Settings';
- AddMenuPref(title);
- } else if (Game.onMenu === 'stats') {
- if (CMOptions.Stats) {
- title.textContent = 'Cookie Monster Statistics';
- AddMenuStats(title);
- }
- } else if (Game.onMenu === 'log') {
- title.textContent = 'Cookie Monster '; // To create space between name and button
- AddMenuInfo(title);
- }
+ if (Game.onMenu === 'prefs') {
+ title.textContent = 'Cookie Monster Settings';
+ AddMenuPref(title);
+ } else if (Game.onMenu === 'stats') {
+ if (CMOptions.Stats) {
+ title.textContent = 'Cookie Monster Statistics';
+ AddMenuStats(title);
+ }
+ } else if (Game.onMenu === 'log') {
+ title.textContent = 'Cookie Monster '; // To create space between name and button
+ AddMenuInfo(title);
+ }
}
diff --git a/src/Disp/MenuSections/AddStatsPage.js b/src/Disp/MenuSections/AddStatsPage.js
index 55e942c..0c7c518 100644
--- a/src/Disp/MenuSections/AddStatsPage.js
+++ b/src/Disp/MenuSections/AddStatsPage.js
@@ -7,7 +7,13 @@ import * as GameData from '../../Data/Gamedata';
import { CMOptions } from '../../Config/VariablesAndData';
import {
- CacheAverageClicks, CacheCentEgg, CacheLastChoEgg, CacheSeaSpec, CacheWrinklersFattest, CacheWrinklersNormal, CacheWrinklersTotal,
+ CacheAverageClicks,
+ CacheCentEgg,
+ CacheLastChoEgg,
+ CacheSeaSpec,
+ CacheWrinklersFattest,
+ CacheWrinklersNormal,
+ CacheWrinklersTotal,
} from '../../Cache/VariablesAndData';
import PopAllNormalWrinklers from '../HelperFunctions/PopWrinklers';
import { ClickTimes, CookieTimes } from '../VariablesAndData';
@@ -20,156 +26,285 @@ import { Beautify } from '../BeautifyAndFormatting/BeautifyFormatting';
* @param {object} title On object that includes the title of the menu
*/
export default function AddMenuStats(title) {
- const stats = document.createElement('div');
- stats.className = 'subsection';
- stats.appendChild(title);
+ const stats = document.createElement('div');
+ stats.className = 'subsection';
+ stats.appendChild(title);
- stats.appendChild(CreateElements.StatsHeader('Lucky Cookies', 'Lucky'));
- if (CMOptions.Header.Lucky) {
- stats.appendChild(CreateSections.LuckySection());
- }
+ stats.appendChild(CreateElements.StatsHeader('Lucky Cookies', 'Lucky'));
+ if (CMOptions.Header.Lucky) {
+ stats.appendChild(CreateSections.LuckySection());
+ }
- stats.appendChild(CreateElements.StatsHeader('Chain Cookies', 'Chain'));
- if (CMOptions.Header.Chain) {
- stats.appendChild(CreateSections.ChainSection());
- }
+ stats.appendChild(CreateElements.StatsHeader('Chain Cookies', 'Chain'));
+ if (CMOptions.Header.Chain) {
+ stats.appendChild(CreateSections.ChainSection());
+ }
- if (Game.Objects['Wizard tower'].minigameLoaded) {
- stats.appendChild(CreateElements.StatsHeader('Spells', 'Spells'));
- if (CMOptions.Header.Spells) {
- stats.appendChild(CreateSections.SpellsSection());
- }
- }
+ if (Game.Objects['Wizard tower'].minigameLoaded) {
+ stats.appendChild(CreateElements.StatsHeader('Spells', 'Spells'));
+ if (CMOptions.Header.Spells) {
+ stats.appendChild(CreateSections.SpellsSection());
+ }
+ }
- if (Game.Objects.Farm.minigameLoaded) {
- stats.appendChild(CreateElements.StatsHeader('Garden', 'Garden'));
- if (CMOptions.Header.Garden) {
- stats.appendChild(CreateSections.GardenSection());
- }
- }
+ if (Game.Objects.Farm.minigameLoaded) {
+ stats.appendChild(CreateElements.StatsHeader('Garden', 'Garden'));
+ if (CMOptions.Header.Garden) {
+ stats.appendChild(CreateSections.GardenSection());
+ }
+ }
- stats.appendChild(CreateElements.StatsHeader('Prestige', 'Prestige'));
- if (CMOptions.Header.Prestige) {
- stats.appendChild(CreateSections.PrestigeSection());
- }
+ stats.appendChild(CreateElements.StatsHeader('Prestige', 'Prestige'));
+ if (CMOptions.Header.Prestige) {
+ stats.appendChild(CreateSections.PrestigeSection());
+ }
- if (Game.cpsSucked > 0) {
- stats.appendChild(CreateElements.StatsHeader('Wrinklers', 'Wrink'));
- if (CMOptions.Header.Wrink) {
- const popAllFrag = document.createDocumentFragment();
- popAllFrag.appendChild(document.createTextNode(`${Beautify(CacheWrinklersTotal)} / ${Beautify(CacheWrinklersNormal)} `));
- const popAllA = document.createElement('a');
- popAllA.textContent = 'Pop All Normal';
- popAllA.className = 'option';
- popAllA.onclick = function () { PopAllNormalWrinklers(); };
- popAllFrag.appendChild(popAllA);
- stats.appendChild(CreateElements.StatsListing('basic', 'Rewards of Popping (All/Normal)', popAllFrag));
- const popFattestFrag = document.createDocumentFragment();
- popFattestFrag.appendChild(document.createTextNode(`${Beautify(CacheWrinklersFattest[0])} `));
- const popFattestA = document.createElement('a');
- popFattestA.textContent = 'Pop Single Fattest';
- popFattestA.className = 'option';
- popFattestA.onclick = function () { if (CacheWrinklersFattest[1] !== null) Game.wrinklers[CacheWrinklersFattest[1]].hp = 0; };
- popFattestFrag.appendChild(popFattestA);
- stats.appendChild(CreateElements.StatsListing('basic', `Rewards of Popping Single Fattest Non-Shiny Wrinkler (id: ${CacheWrinklersFattest[1] !== null ? CacheWrinklersFattest[1] : 'None'})`, popFattestFrag));
- }
- }
+ if (Game.cpsSucked > 0) {
+ stats.appendChild(CreateElements.StatsHeader('Wrinklers', 'Wrink'));
+ if (CMOptions.Header.Wrink) {
+ const popAllFrag = document.createDocumentFragment();
+ popAllFrag.appendChild(
+ document.createTextNode(
+ `${Beautify(CacheWrinklersTotal)} / ${Beautify(
+ CacheWrinklersNormal,
+ )} `,
+ ),
+ );
+ const popAllA = document.createElement('a');
+ popAllA.textContent = 'Pop All Normal';
+ popAllA.className = 'option';
+ popAllA.onclick = function () {
+ PopAllNormalWrinklers();
+ };
+ popAllFrag.appendChild(popAllA);
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Rewards of Popping (All/Normal)',
+ popAllFrag,
+ ),
+ );
+ const popFattestFrag = document.createDocumentFragment();
+ popFattestFrag.appendChild(
+ document.createTextNode(`${Beautify(CacheWrinklersFattest[0])} `),
+ );
+ const popFattestA = document.createElement('a');
+ popFattestA.textContent = 'Pop Single Fattest';
+ popFattestA.className = 'option';
+ popFattestA.onclick = function () {
+ if (CacheWrinklersFattest[1] !== null)
+ Game.wrinklers[CacheWrinklersFattest[1]].hp = 0;
+ };
+ popFattestFrag.appendChild(popFattestA);
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ `Rewards of Popping Single Fattest Non-Shiny Wrinkler (id: ${
+ CacheWrinklersFattest[1] !== null
+ ? CacheWrinklersFattest[1]
+ : 'None'
+ })`,
+ popFattestFrag,
+ ),
+ );
+ }
+ }
- let specDisp = false;
- const missingHalloweenCookies = [];
- for (const i of Object.keys(GameData.HalloCookies)) {
- if (!Game.Has(GameData.HalloCookies[i])) {
- missingHalloweenCookies.push(GameData.HalloCookies[i]);
- specDisp = true;
- }
- }
- const missingChristmasCookies = [];
- for (const i of Object.keys(GameData.ChristCookies)) {
- if (!Game.Has(GameData.ChristCookies[i])) {
- missingChristmasCookies.push(GameData.ChristCookies[i]);
- specDisp = true;
- }
- }
- const missingValentineCookies = [];
- for (const i of Object.keys(GameData.ValCookies)) {
- if (!Game.Has(GameData.ValCookies[i])) {
- missingValentineCookies.push(GameData.ValCookies[i]);
- specDisp = true;
- }
- }
- const missingNormalEggs = [];
- for (const i of Object.keys(Game.eggDrops)) {
- if (!Game.HasUnlocked(Game.eggDrops[i])) {
- missingNormalEggs.push(Game.eggDrops[i]);
- specDisp = true;
- }
- }
- const missingRareEggs = [];
- for (const i of Object.keys(Game.rareEggDrops)) {
- if (!Game.HasUnlocked(Game.rareEggDrops[i])) {
- missingRareEggs.push(Game.rareEggDrops[i]);
- specDisp = true;
- }
- }
- const missingPlantDrops = [];
- for (const i of Object.keys(GameData.PlantDrops)) {
- if (!Game.HasUnlocked(GameData.PlantDrops[i])) {
- missingPlantDrops.push(GameData.PlantDrops[i]);
- specDisp = true;
- }
- }
- const choEgg = (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg'));
- const centEgg = Game.Has('Century egg');
+ let specDisp = false;
+ const missingHalloweenCookies = [];
+ for (const i of Object.keys(GameData.HalloCookies)) {
+ if (!Game.Has(GameData.HalloCookies[i])) {
+ missingHalloweenCookies.push(GameData.HalloCookies[i]);
+ specDisp = true;
+ }
+ }
+ const missingChristmasCookies = [];
+ for (const i of Object.keys(GameData.ChristCookies)) {
+ if (!Game.Has(GameData.ChristCookies[i])) {
+ missingChristmasCookies.push(GameData.ChristCookies[i]);
+ specDisp = true;
+ }
+ }
+ const missingValentineCookies = [];
+ for (const i of Object.keys(GameData.ValCookies)) {
+ if (!Game.Has(GameData.ValCookies[i])) {
+ missingValentineCookies.push(GameData.ValCookies[i]);
+ specDisp = true;
+ }
+ }
+ const missingNormalEggs = [];
+ for (const i of Object.keys(Game.eggDrops)) {
+ if (!Game.HasUnlocked(Game.eggDrops[i])) {
+ missingNormalEggs.push(Game.eggDrops[i]);
+ specDisp = true;
+ }
+ }
+ const missingRareEggs = [];
+ for (const i of Object.keys(Game.rareEggDrops)) {
+ if (!Game.HasUnlocked(Game.rareEggDrops[i])) {
+ missingRareEggs.push(Game.rareEggDrops[i]);
+ specDisp = true;
+ }
+ }
+ const missingPlantDrops = [];
+ for (const i of Object.keys(GameData.PlantDrops)) {
+ if (!Game.HasUnlocked(GameData.PlantDrops[i])) {
+ missingPlantDrops.push(GameData.PlantDrops[i]);
+ specDisp = true;
+ }
+ }
+ const choEgg =
+ Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg');
+ const centEgg = Game.Has('Century egg');
- if (Game.season === 'christmas' || specDisp || choEgg || centEgg) {
- stats.appendChild(CreateElements.StatsHeader('Season Specials', 'Sea'));
- if (CMOptions.Header.Sea) {
- if (missingHalloweenCookies.length !== 0) stats.appendChild(CreateElements.StatsListing('basic', 'Halloween Cookies Left to Buy', CreateElements.StatsMissDisp(missingHalloweenCookies)));
- if (missingChristmasCookies.length !== 0) stats.appendChild(CreateElements.StatsListing('basic', 'Christmas Cookies Left to Buy', CreateElements.StatsMissDisp(missingChristmasCookies)));
- if (missingValentineCookies.length !== 0) stats.appendChild(CreateElements.StatsListing('basic', 'Valentine Cookies Left to Buy', CreateElements.StatsMissDisp(missingValentineCookies)));
- if (missingNormalEggs.length !== 0) stats.appendChild(CreateElements.StatsListing('basic', 'Normal Easter Eggs Left to Unlock', CreateElements.StatsMissDisp(missingNormalEggs)));
- if (missingRareEggs.length !== 0) stats.appendChild(CreateElements.StatsListing('basic', 'Rare Easter Eggs Left to Unlock', CreateElements.StatsMissDisp(missingRareEggs)));
- if (missingPlantDrops.length !== 0) stats.appendChild(CreateElements.StatsListing('basic', 'Rare Plant Drops Left to Unlock', CreateElements.StatsMissDisp(missingPlantDrops)));
+ if (Game.season === 'christmas' || specDisp || choEgg || centEgg) {
+ stats.appendChild(CreateElements.StatsHeader('Season Specials', 'Sea'));
+ if (CMOptions.Header.Sea) {
+ if (missingHalloweenCookies.length !== 0)
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Halloween Cookies Left to Buy',
+ CreateElements.StatsMissDisp(missingHalloweenCookies),
+ ),
+ );
+ if (missingChristmasCookies.length !== 0)
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Christmas Cookies Left to Buy',
+ CreateElements.StatsMissDisp(missingChristmasCookies),
+ ),
+ );
+ if (missingValentineCookies.length !== 0)
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Valentine Cookies Left to Buy',
+ CreateElements.StatsMissDisp(missingValentineCookies),
+ ),
+ );
+ if (missingNormalEggs.length !== 0)
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Normal Easter Eggs Left to Unlock',
+ CreateElements.StatsMissDisp(missingNormalEggs),
+ ),
+ );
+ if (missingRareEggs.length !== 0)
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Rare Easter Eggs Left to Unlock',
+ CreateElements.StatsMissDisp(missingRareEggs),
+ ),
+ );
+ if (missingPlantDrops.length !== 0)
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Rare Plant Drops Left to Unlock',
+ CreateElements.StatsMissDisp(missingPlantDrops),
+ ),
+ );
- if (Game.season === 'christmas') stats.appendChild(CreateElements.StatsListing('basic', 'Reindeer Reward', document.createTextNode(Beautify(CacheSeaSpec))));
- if (choEgg) {
- stats.appendChild(CreateElements.StatsListing('withTooltip', 'Chocolate Egg Cookies', document.createTextNode(Beautify(CacheLastChoEgg)), 'ChoEggTooltipPlaceholder'));
- }
- if (centEgg) {
- stats.appendChild(CreateElements.StatsListing('basic', 'Century Egg Multiplier', document.createTextNode(`${Math.round((CacheCentEgg - 1) * 10000) / 100}%`)));
- }
- }
- }
+ if (Game.season === 'christmas')
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Reindeer Reward',
+ document.createTextNode(Beautify(CacheSeaSpec)),
+ ),
+ );
+ if (choEgg) {
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'withTooltip',
+ 'Chocolate Egg Cookies',
+ document.createTextNode(Beautify(CacheLastChoEgg)),
+ 'ChoEggTooltipPlaceholder',
+ ),
+ );
+ }
+ if (centEgg) {
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Century Egg Multiplier',
+ document.createTextNode(
+ `${Math.round((CacheCentEgg - 1) * 10000) / 100}%`,
+ ),
+ ),
+ );
+ }
+ }
+ }
- stats.appendChild(CreateElements.StatsHeader('Miscellaneous', 'Misc'));
- if (CMOptions.Header.Misc) {
- stats.appendChild(CreateElements.StatsListing('basic',
- `Average Cookies Per Second (Past ${CookieTimes[CMOptions.AvgCPSHist] < 60 ? (`${CookieTimes[CMOptions.AvgCPSHist]} seconds`) : ((CookieTimes[CMOptions.AvgCPSHist] / 60) + (CMOptions.AvgCPSHist === 3 ? ' minute' : ' minutes'))})`,
- document.createTextNode(Beautify(GetCPS(), 3))));
- stats.appendChild(CreateElements.StatsListing('basic', `Average Cookie Clicks Per Second (Past ${ClickTimes[CMOptions.AvgClicksHist]}${CMOptions.AvgClicksHist === 0 ? ' second' : ' seconds'})`, document.createTextNode(Beautify(CacheAverageClicks, 1))));
- if (Game.Has('Fortune cookies')) {
- const fortunes = [];
- for (const i of Object.keys(GameData.Fortunes)) {
- if (!Game.Has(GameData.Fortunes[i])) {
- fortunes.push(GameData.Fortunes[i]);
- }
- }
- if (fortunes.length !== 0) stats.appendChild(CreateElements.StatsListing('basic', 'Fortune Upgrades Left to Buy', CreateElements.StatsMissDisp(fortunes)));
- }
- if (CMOptions.ShowMissedGC) {
- stats.appendChild(CreateElements.StatsListing('basic', 'Missed Golden Cookies', document.createTextNode(Beautify(Game.missedGoldenClicks))));
- }
- if (Game.prefs.autosave) {
- const timer = document.createElement('span');
- timer.id = 'CMStatsAutosaveTimer';
- timer.innerText = Game.sayTime(Game.fps * 60 - (Game.OnAscend ? 0 : (Game.T % (Game.fps * 60))), 4);
- stats.appendChild(CreateElements.StatsListing('basic', 'Time till autosave', timer));
- }
- }
+ stats.appendChild(CreateElements.StatsHeader('Miscellaneous', 'Misc'));
+ if (CMOptions.Header.Misc) {
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ `Average Cookies Per Second (Past ${
+ CookieTimes[CMOptions.AvgCPSHist] < 60
+ ? `${CookieTimes[CMOptions.AvgCPSHist]} seconds`
+ : CookieTimes[CMOptions.AvgCPSHist] / 60 +
+ (CMOptions.AvgCPSHist === 3 ? ' minute' : ' minutes')
+ })`,
+ document.createTextNode(Beautify(GetCPS(), 3)),
+ ),
+ );
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ `Average Cookie Clicks Per Second (Past ${
+ ClickTimes[CMOptions.AvgClicksHist]
+ }${CMOptions.AvgClicksHist === 0 ? ' second' : ' seconds'})`,
+ document.createTextNode(Beautify(CacheAverageClicks, 1)),
+ ),
+ );
+ if (Game.Has('Fortune cookies')) {
+ const fortunes = [];
+ for (const i of Object.keys(GameData.Fortunes)) {
+ if (!Game.Has(GameData.Fortunes[i])) {
+ fortunes.push(GameData.Fortunes[i]);
+ }
+ }
+ if (fortunes.length !== 0)
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Fortune Upgrades Left to Buy',
+ CreateElements.StatsMissDisp(fortunes),
+ ),
+ );
+ }
+ if (CMOptions.ShowMissedGC) {
+ stats.appendChild(
+ CreateElements.StatsListing(
+ 'basic',
+ 'Missed Golden Cookies',
+ document.createTextNode(Beautify(Game.missedGoldenClicks)),
+ ),
+ );
+ }
+ if (Game.prefs.autosave) {
+ const timer = document.createElement('span');
+ timer.id = 'CMStatsAutosaveTimer';
+ timer.innerText = Game.sayTime(
+ Game.fps * 60 - (Game.OnAscend ? 0 : Game.T % (Game.fps * 60)),
+ 4,
+ );
+ stats.appendChild(
+ CreateElements.StatsListing('basic', 'Time till autosave', timer),
+ );
+ }
+ }
- l('menu').insertBefore(stats, l('menu').childNodes[2]);
+ l('menu').insertBefore(stats, l('menu').childNodes[2]);
- if (CMOptions.MissingUpgrades) {
- AddMissingUpgrades();
- }
+ if (CMOptions.MissingUpgrades) {
+ AddMissingUpgrades();
+ }
}
diff --git a/src/Disp/MenuSections/CreateDOMElements.js b/src/Disp/MenuSections/CreateDOMElements.js
index 02809de..84ded84 100644
--- a/src/Disp/MenuSections/CreateDOMElements.js
+++ b/src/Disp/MenuSections/CreateDOMElements.js
@@ -12,28 +12,31 @@ import { TooltipText } from '../VariablesAndData';
* @returns {object} div The header object
*/
export function StatsHeader(text, config) {
- const div = document.createElement('div');
- div.className = 'title';
- div.style.padding = '0px 16px';
- div.style.opacity = '0.7';
- div.style.fontSize = '17px';
- div.style.fontFamily = '"Kavoon", Georgia, serif';
- div.appendChild(document.createTextNode(`${text} `));
- const span = document.createElement('span');
- span.style.cursor = 'pointer';
- span.style.display = 'inline-block';
- span.style.height = '14px';
- span.style.width = '14px';
- span.style.borderRadius = '7px';
- span.style.textAlign = 'center';
- span.style.backgroundColor = '#C0C0C0';
- span.style.color = 'black';
- span.style.fontSize = '13px';
- span.style.verticalAlign = 'middle';
- span.textContent = CMOptions.Header[config] ? '-' : '+';
- span.onclick = function () { ToggleHeader(config); Game.UpdateMenu(); };
- div.appendChild(span);
- return div;
+ const div = document.createElement('div');
+ div.className = 'title';
+ div.style.padding = '0px 16px';
+ div.style.opacity = '0.7';
+ div.style.fontSize = '17px';
+ div.style.fontFamily = '"Kavoon", Georgia, serif';
+ div.appendChild(document.createTextNode(`${text} `));
+ const span = document.createElement('span');
+ span.style.cursor = 'pointer';
+ span.style.display = 'inline-block';
+ span.style.height = '14px';
+ span.style.width = '14px';
+ span.style.borderRadius = '7px';
+ span.style.textAlign = 'center';
+ span.style.backgroundColor = '#C0C0C0';
+ span.style.color = 'black';
+ span.style.fontSize = '13px';
+ span.style.verticalAlign = 'middle';
+ span.textContent = CMOptions.Header[config] ? '-' : '+';
+ span.onclick = function () {
+ ToggleHeader(config);
+ Game.UpdateMenu();
+ };
+ div.appendChild(span);
+ return div;
}
/**
@@ -46,35 +49,39 @@ export function StatsHeader(text, config) {
* @returns {object} div The option object
*/
export function StatsListing(type, name, text, placeholder) {
- const div = document.createElement('div');
- div.className = 'listing';
+ const div = document.createElement('div');
+ div.className = 'listing';
- const listingName = document.createElement('b');
- listingName.textContent = name;
- div.appendChild(listingName);
- if (type === 'withTooltip') {
- div.className = 'listing';
- div.appendChild(document.createTextNode(' '));
+ const listingName = document.createElement('b');
+ listingName.textContent = name;
+ div.appendChild(listingName);
+ if (type === 'withTooltip') {
+ div.className = 'listing';
+ div.appendChild(document.createTextNode(' '));
- const tooltip = document.createElement('span');
- tooltip.onmouseout = function () { Game.tooltip.hide(); };
- tooltip.onmouseover = function () { Game.tooltip.draw(this, escape(TooltipText[placeholder].innerHTML)); };
- tooltip.style.cursor = 'default';
- tooltip.style.display = 'inline-block';
- tooltip.style.height = '10px';
- tooltip.style.width = '10px';
- tooltip.style.borderRadius = '5px';
- tooltip.style.textAlign = 'center';
- tooltip.style.backgroundColor = '#C0C0C0';
- tooltip.style.color = 'black';
- tooltip.style.fontSize = '9px';
- tooltip.style.verticalAlign = 'bottom';
- tooltip.textContent = '?';
- div.appendChild(tooltip);
- }
- div.appendChild(document.createTextNode(': '));
- div.appendChild(text);
- return div;
+ const tooltip = document.createElement('span');
+ tooltip.onmouseout = function () {
+ Game.tooltip.hide();
+ };
+ tooltip.onmouseover = function () {
+ Game.tooltip.draw(this, escape(TooltipText[placeholder].innerHTML));
+ };
+ tooltip.style.cursor = 'default';
+ tooltip.style.display = 'inline-block';
+ tooltip.style.height = '10px';
+ tooltip.style.width = '10px';
+ tooltip.style.borderRadius = '5px';
+ tooltip.style.textAlign = 'center';
+ tooltip.style.backgroundColor = '#C0C0C0';
+ tooltip.style.color = 'black';
+ tooltip.style.fontSize = '9px';
+ tooltip.style.verticalAlign = 'bottom';
+ tooltip.textContent = '?';
+ div.appendChild(tooltip);
+ }
+ div.appendChild(document.createTextNode(': '));
+ div.appendChild(text);
+ return div;
}
/**
@@ -83,39 +90,43 @@ export function StatsListing(type, name, text, placeholder) {
* @returns {object} frag The tooltip object
*/
export function StatsMissDisp(theMissDisp) {
- const frag = document.createDocumentFragment();
- frag.appendChild(document.createTextNode(`${theMissDisp.length} `));
- const span = document.createElement('span');
- span.onmouseout = function () { Game.tooltip.hide(); };
- const placeholder = document.createElement('div');
- const missing = document.createElement('div');
- missing.style.minWidth = '140px';
- missing.style.marginBottom = '4px';
- const title = document.createElement('div');
- title.className = 'name';
- title.style.marginBottom = '4px';
- title.style.textAlign = 'center';
- title.textContent = 'Missing';
- missing.appendChild(title);
- for (const i of Object.keys(theMissDisp)) {
- const div = document.createElement('div');
- div.style.textAlign = 'center';
- div.appendChild(document.createTextNode(theMissDisp[i]));
- missing.appendChild(div);
- }
- placeholder.appendChild(missing);
- span.onmouseover = function () { Game.tooltip.draw(this, escape(placeholder.innerHTML)); };
- span.style.cursor = 'default';
- span.style.display = 'inline-block';
- span.style.height = '10px';
- span.style.width = '10px';
- span.style.borderRadius = '5px';
- span.style.textAlign = 'center';
- span.style.backgroundColor = '#C0C0C0';
- span.style.color = 'black';
- span.style.fontSize = '9px';
- span.style.verticalAlign = 'bottom';
- span.textContent = '?';
- frag.appendChild(span);
- return frag;
+ const frag = document.createDocumentFragment();
+ frag.appendChild(document.createTextNode(`${theMissDisp.length} `));
+ const span = document.createElement('span');
+ span.onmouseout = function () {
+ Game.tooltip.hide();
+ };
+ const placeholder = document.createElement('div');
+ const missing = document.createElement('div');
+ missing.style.minWidth = '140px';
+ missing.style.marginBottom = '4px';
+ const title = document.createElement('div');
+ title.className = 'name';
+ title.style.marginBottom = '4px';
+ title.style.textAlign = 'center';
+ title.textContent = 'Missing';
+ missing.appendChild(title);
+ for (const i of Object.keys(theMissDisp)) {
+ const div = document.createElement('div');
+ div.style.textAlign = 'center';
+ div.appendChild(document.createTextNode(theMissDisp[i]));
+ missing.appendChild(div);
+ }
+ placeholder.appendChild(missing);
+ span.onmouseover = function () {
+ Game.tooltip.draw(this, escape(placeholder.innerHTML));
+ };
+ span.style.cursor = 'default';
+ span.style.display = 'inline-block';
+ span.style.height = '10px';
+ span.style.width = '10px';
+ span.style.borderRadius = '5px';
+ span.style.textAlign = 'center';
+ span.style.backgroundColor = '#C0C0C0';
+ span.style.color = 'black';
+ span.style.fontSize = '9px';
+ span.style.verticalAlign = 'bottom';
+ span.textContent = '?';
+ frag.appendChild(span);
+ return frag;
}
diff --git a/src/Disp/MenuSections/CreateMissingUpgrades.js b/src/Disp/MenuSections/CreateMissingUpgrades.js
index 7c7281b..bdd0d45 100644
--- a/src/Disp/MenuSections/CreateMissingUpgrades.js
+++ b/src/Disp/MenuSections/CreateMissingUpgrades.js
@@ -1,58 +1,88 @@
/** Functions related to displaying the missing upgrades in the Statistics page */
-import { CacheMissingUpgrades, CacheMissingUpgradesCookies, CacheMissingUpgradesPrestige } from '../../Cache/VariablesAndData';
+import {
+ CacheMissingUpgrades,
+ CacheMissingUpgradesCookies,
+ CacheMissingUpgradesPrestige,
+} from '../../Cache/VariablesAndData';
/**
* This function creates the missing upgrades sections for prestige, normal and cookie upgrades
*/
export function AddMissingUpgrades() {
- for (const menuSection of (l('menu').children)) {
- if (menuSection.children[0]) {
- if (menuSection.children[0].innerHTML === 'Prestige' && CacheMissingUpgradesPrestige) {
- const prestigeUpgradesMissing = CacheMissingUpgradesPrestige.match(new RegExp('div', 'g') || []).length / 2;
- const title = document.createElement('div');
- title.id = 'CMMissingUpgradesPrestigeTitle';
- title.className = 'listing';
- const titlefrag = document.createElement('div');
- titlefrag.innerHTML = `
Missing Prestige upgrades: ${prestigeUpgradesMissing}/${Game.PrestigeUpgrades.length} (${Math.floor((prestigeUpgradesMissing / Game.PrestigeUpgrades.length) * 100)}%)`;
- title.appendChild(titlefrag);
- menuSection.appendChild(title);
- const upgrades = document.createElement('div');
- upgrades.className = 'listing crateBox';
- upgrades.innerHTML = CacheMissingUpgradesPrestige;
- menuSection.appendChild(upgrades);
- } else if (menuSection.children[0].innerHTML === 'Upgrades') {
- if (CacheMissingUpgrades) {
- const normalUpgradesMissing = CacheMissingUpgrades.match(new RegExp('div', 'g') || []).length / 2;
- const title = document.createElement('div');
- title.id = 'CMMissingUpgradesTitle';
- title.className = 'listing';
- const titlefrag = document.createElement('div');
- titlefrag.innerHTML = `
Missing normal upgrades: ${normalUpgradesMissing}/${Game.UpgradesByPool[''].length + Game.UpgradesByPool.tech.length} (${Math.floor((normalUpgradesMissing / (Game.UpgradesByPool[''].length + Game.UpgradesByPool.tech.length)) * 100)}%)`;
- title.appendChild(titlefrag);
- menuSection.insertBefore(title, menuSection.childNodes[3]);
- const upgrades = document.createElement('div');
- upgrades.className = 'listing crateBox';
- upgrades.innerHTML = CacheMissingUpgrades;
- menuSection.insertBefore(upgrades, document.getElementById('CMMissingUpgradesTitle').nextSibling);
- }
- if (CacheMissingUpgradesCookies) {
- const cookieUpgradesMissing = CacheMissingUpgradesCookies.match(new RegExp('div', 'g') || []).length / 2;
- const title = document.createElement('div');
- title.id = 'CMMissingUpgradesCookiesTitle';
- title.className = 'listing';
- const titlefrag = document.createElement('div');
- titlefrag.innerHTML = `
Missing Cookie upgrades: ${cookieUpgradesMissing}/${Game.UpgradesByPool.cookie.length} (${Math.floor((cookieUpgradesMissing / Game.UpgradesByPool.cookie.length) * 100)}%)`;
- title.appendChild(titlefrag);
- menuSection.appendChild(title);
- const upgrades = document.createElement('div');
- upgrades.className = 'listing crateBox';
- upgrades.innerHTML = CacheMissingUpgradesCookies;
- menuSection.appendChild(upgrades);
- }
- }
- }
- }
+ for (const menuSection of l('menu').children) {
+ if (menuSection.children[0]) {
+ if (
+ menuSection.children[0].innerHTML === 'Prestige' &&
+ CacheMissingUpgradesPrestige
+ ) {
+ const prestigeUpgradesMissing =
+ CacheMissingUpgradesPrestige.match(new RegExp('div', 'g') || [])
+ .length / 2;
+ const title = document.createElement('div');
+ title.id = 'CMMissingUpgradesPrestigeTitle';
+ title.className = 'listing';
+ const titlefrag = document.createElement('div');
+ titlefrag.innerHTML = `
Missing Prestige upgrades: ${prestigeUpgradesMissing}/${
+ Game.PrestigeUpgrades.length
+ } (${Math.floor(
+ (prestigeUpgradesMissing / Game.PrestigeUpgrades.length) * 100,
+ )}%)`;
+ title.appendChild(titlefrag);
+ menuSection.appendChild(title);
+ const upgrades = document.createElement('div');
+ upgrades.className = 'listing crateBox';
+ upgrades.innerHTML = CacheMissingUpgradesPrestige;
+ menuSection.appendChild(upgrades);
+ } else if (menuSection.children[0].innerHTML === 'Upgrades') {
+ if (CacheMissingUpgrades) {
+ const normalUpgradesMissing =
+ CacheMissingUpgrades.match(new RegExp('div', 'g') || []).length / 2;
+ const title = document.createElement('div');
+ title.id = 'CMMissingUpgradesTitle';
+ title.className = 'listing';
+ const titlefrag = document.createElement('div');
+ titlefrag.innerHTML = `
Missing normal upgrades: ${normalUpgradesMissing}/${
+ Game.UpgradesByPool[''].length + Game.UpgradesByPool.tech.length
+ } (${Math.floor(
+ (normalUpgradesMissing /
+ (Game.UpgradesByPool[''].length +
+ Game.UpgradesByPool.tech.length)) *
+ 100,
+ )}%)`;
+ title.appendChild(titlefrag);
+ menuSection.insertBefore(title, menuSection.childNodes[3]);
+ const upgrades = document.createElement('div');
+ upgrades.className = 'listing crateBox';
+ upgrades.innerHTML = CacheMissingUpgrades;
+ menuSection.insertBefore(
+ upgrades,
+ document.getElementById('CMMissingUpgradesTitle').nextSibling,
+ );
+ }
+ if (CacheMissingUpgradesCookies) {
+ const cookieUpgradesMissing =
+ CacheMissingUpgradesCookies.match(new RegExp('div', 'g') || [])
+ .length / 2;
+ const title = document.createElement('div');
+ title.id = 'CMMissingUpgradesCookiesTitle';
+ title.className = 'listing';
+ const titlefrag = document.createElement('div');
+ titlefrag.innerHTML = `
Missing Cookie upgrades: ${cookieUpgradesMissing}/${
+ Game.UpgradesByPool.cookie.length
+ } (${Math.floor(
+ (cookieUpgradesMissing / Game.UpgradesByPool.cookie.length) * 100,
+ )}%)`;
+ title.appendChild(titlefrag);
+ menuSection.appendChild(title);
+ const upgrades = document.createElement('div');
+ upgrades.className = 'listing crateBox';
+ upgrades.innerHTML = CacheMissingUpgradesCookies;
+ menuSection.appendChild(upgrades);
+ }
+ }
+ }
+ }
}
/**
@@ -62,18 +92,20 @@ export function AddMissingUpgrades() {
* @returns {string} ? The HTML string that creates the icon.
*/
export function crateMissing(me) {
- let classes = 'crate upgrade missing';
- if (me.pool === 'prestige') classes += ' heavenly';
+ let classes = 'crate upgrade missing';
+ if (me.pool === 'prestige') classes += ' heavenly';
- let noFrame = 0;
- if (!Game.prefs.crates) noFrame = 1;
- if (noFrame) classes += ' noFrame';
+ let noFrame = 0;
+ if (!Game.prefs.crates) noFrame = 1;
+ if (noFrame) classes += ' noFrame';
- let icon = me.icon;
- if (me.iconFunction) icon = me.iconFunction();
- const tooltip = `function() {return Game.crateTooltip(Game.UpgradesById[${me.id}], 'stats');}`;
- return `
+ style = "${`${
+ icon[2] ? `background-image: url(${icon[2]});` : ''
+ }background-position:${-icon[0] * 48}px ${-icon[1] * 48}px`};">
`;
}
diff --git a/src/Disp/MenuSections/CreateStatsSections.js b/src/Disp/MenuSections/CreateStatsSections.js
index 789b43e..e5ce1e4 100644
--- a/src/Disp/MenuSections/CreateStatsSections.js
+++ b/src/Disp/MenuSections/CreateStatsSections.js
@@ -2,29 +2,43 @@
import { MaxChainCookieReward } from '../../Cache/Stats/ChainCookies';
import {
- CacheAvgCPSWithChoEgg,
- CacheChainFrenzyMaxReward,
- CacheChainFrenzyRequired,
- CacheChainFrenzyRequiredNext,
- CacheChainFrenzyWrathRequired,
- CacheChainFrenzyWrathRequiredNext,
- CacheChainMaxReward,
- CacheChainRequired,
- CacheChainRequiredNext,
- CacheChainWrathMaxReward,
- CacheChainWrathRequired,
- CacheChainWrathRequiredNext,
- CacheConjure,
- CacheConjureReward,
- CacheDragonsFortuneMultAdjustment,
- CacheEdifice,
- CacheEdificeBuilding,
- CacheGoldenCookiesMult,
- CacheHCPerSecond, CacheLastChoEgg, CacheLucky, CacheLuckyFrenzy, CacheLuckyReward, CacheLuckyRewardFrenzy, CacheLuckyWrathReward, CacheLuckyWrathRewardFrenzy, CacheNoGoldSwitchCookiesPS, CacheRealCookiesEarned, CacheWrathCookiesMult, CacheWrinklersTotal,
+ CacheAvgCPSWithChoEgg,
+ CacheChainFrenzyMaxReward,
+ CacheChainFrenzyRequired,
+ CacheChainFrenzyRequiredNext,
+ CacheChainFrenzyWrathRequired,
+ CacheChainFrenzyWrathRequiredNext,
+ CacheChainMaxReward,
+ CacheChainRequired,
+ CacheChainRequiredNext,
+ CacheChainWrathMaxReward,
+ CacheChainWrathRequired,
+ CacheChainWrathRequiredNext,
+ CacheConjure,
+ CacheConjureReward,
+ CacheDragonsFortuneMultAdjustment,
+ CacheEdifice,
+ CacheEdificeBuilding,
+ CacheGoldenCookiesMult,
+ CacheHCPerSecond,
+ CacheLastChoEgg,
+ CacheLucky,
+ CacheLuckyFrenzy,
+ CacheLuckyReward,
+ CacheLuckyRewardFrenzy,
+ CacheLuckyWrathReward,
+ CacheLuckyWrathRewardFrenzy,
+ CacheNoGoldSwitchCookiesPS,
+ CacheRealCookiesEarned,
+ CacheWrathCookiesMult,
+ CacheWrinklersTotal,
} from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
import ResetBonus from '../../Sim/SimulationEvents/ResetAscension';
-import { Beautify, FormatTime } from '../BeautifyAndFormatting/BeautifyFormatting';
+import {
+ Beautify,
+ FormatTime,
+} from '../BeautifyAndFormatting/BeautifyFormatting';
import GetCPS from '../HelperFunctions/GetCPS';
import GetWrinkConfigBank from '../HelperFunctions/GetWrinkConfigBank';
@@ -36,63 +50,124 @@ import { StatsListing } from './CreateDOMElements';
* @returns {object} section The object contating the Lucky section
*/
export function LuckySection() {
- // This sets which tooltip to display for certain stats
- const goldCookTooltip = Game.auraMult('Dragon\'s Fortune') ? 'GoldCookDragonsFortuneTooltipPlaceholder' : 'GoldCookTooltipPlaceholder';
+ // This sets which tooltip to display for certain stats
+ const goldCookTooltip = Game.auraMult("Dragon's Fortune")
+ ? 'GoldCookDragonsFortuneTooltipPlaceholder'
+ : 'GoldCookTooltipPlaceholder';
- const section = document.createElement('div');
- section.className = 'CMStatsLuckySection';
+ const section = document.createElement('div');
+ section.className = 'CMStatsLuckySection';
- const luckyColor = ((Game.cookies + GetWrinkConfigBank()) < CacheLucky) ? ColorRed : ColorGreen;
- const luckyTime = ((Game.cookies + GetWrinkConfigBank()) < CacheLucky) ? FormatTime((CacheLucky - (Game.cookies + GetWrinkConfigBank())) / GetCPS()) : '';
- const luckyReqFrag = document.createDocumentFragment();
- const luckyReqSpan = document.createElement('span');
- luckyReqSpan.style.fontWeight = 'bold';
- luckyReqSpan.className = ColorTextPre + luckyColor;
- luckyReqSpan.textContent = Beautify(CacheLucky);
- luckyReqFrag.appendChild(luckyReqSpan);
- if (luckyTime !== '') {
- const luckyReqSmall = document.createElement('small');
- luckyReqSmall.textContent = ` (${luckyTime})`;
- luckyReqFrag.appendChild(luckyReqSmall);
- }
- section.appendChild(StatsListing('withTooltip', '"Lucky!" Cookies Required', luckyReqFrag, goldCookTooltip));
+ const luckyColor =
+ Game.cookies + GetWrinkConfigBank() < CacheLucky ? ColorRed : ColorGreen;
+ const luckyTime =
+ Game.cookies + GetWrinkConfigBank() < CacheLucky
+ ? FormatTime(
+ (CacheLucky - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
+ )
+ : '';
+ const luckyReqFrag = document.createDocumentFragment();
+ const luckyReqSpan = document.createElement('span');
+ luckyReqSpan.style.fontWeight = 'bold';
+ luckyReqSpan.className = ColorTextPre + luckyColor;
+ luckyReqSpan.textContent = Beautify(CacheLucky);
+ luckyReqFrag.appendChild(luckyReqSpan);
+ if (luckyTime !== '') {
+ const luckyReqSmall = document.createElement('small');
+ luckyReqSmall.textContent = ` (${luckyTime})`;
+ luckyReqFrag.appendChild(luckyReqSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Lucky!" Cookies Required',
+ luckyReqFrag,
+ goldCookTooltip,
+ ),
+ );
- const luckyColorFrenzy = ((Game.cookies + GetWrinkConfigBank()) < CacheLuckyFrenzy) ? ColorRed : ColorGreen;
- const luckyTimeFrenzy = ((Game.cookies + GetWrinkConfigBank()) < CacheLuckyFrenzy) ? FormatTime((CacheLuckyFrenzy - (Game.cookies + GetWrinkConfigBank())) / GetCPS()) : '';
- const luckyReqFrenFrag = document.createDocumentFragment();
- const luckyReqFrenSpan = document.createElement('span');
- luckyReqFrenSpan.style.fontWeight = 'bold';
- luckyReqFrenSpan.className = ColorTextPre + luckyColorFrenzy;
- luckyReqFrenSpan.textContent = Beautify(CacheLuckyFrenzy);
- luckyReqFrenFrag.appendChild(luckyReqFrenSpan);
- if (luckyTimeFrenzy !== '') {
- const luckyReqFrenSmall = document.createElement('small');
- luckyReqFrenSmall.textContent = ` (${luckyTimeFrenzy})`;
- luckyReqFrenFrag.appendChild(luckyReqFrenSmall);
- }
- section.appendChild(StatsListing('withTooltip', '"Lucky!" Cookies Required (Frenzy)', luckyReqFrenFrag, goldCookTooltip));
+ const luckyColorFrenzy =
+ Game.cookies + GetWrinkConfigBank() < CacheLuckyFrenzy
+ ? ColorRed
+ : ColorGreen;
+ const luckyTimeFrenzy =
+ Game.cookies + GetWrinkConfigBank() < CacheLuckyFrenzy
+ ? FormatTime(
+ (CacheLuckyFrenzy - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
+ )
+ : '';
+ const luckyReqFrenFrag = document.createDocumentFragment();
+ const luckyReqFrenSpan = document.createElement('span');
+ luckyReqFrenSpan.style.fontWeight = 'bold';
+ luckyReqFrenSpan.className = ColorTextPre + luckyColorFrenzy;
+ luckyReqFrenSpan.textContent = Beautify(CacheLuckyFrenzy);
+ luckyReqFrenFrag.appendChild(luckyReqFrenSpan);
+ if (luckyTimeFrenzy !== '') {
+ const luckyReqFrenSmall = document.createElement('small');
+ luckyReqFrenSmall.textContent = ` (${luckyTimeFrenzy})`;
+ luckyReqFrenFrag.appendChild(luckyReqFrenSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Lucky!" Cookies Required (Frenzy)',
+ luckyReqFrenFrag,
+ goldCookTooltip,
+ ),
+ );
- const luckySplit = CacheLuckyReward !== CacheLuckyWrathReward;
+ const luckySplit = CacheLuckyReward !== CacheLuckyWrathReward;
- const luckyRewardMaxSpan = document.createElement('span');
- luckyRewardMaxSpan.style.fontWeight = 'bold';
- luckyRewardMaxSpan.className = ColorTextPre + CacheLuckyReward;
- luckyRewardMaxSpan.textContent = Beautify(CacheLuckyReward) + (luckySplit ? (` / ${Beautify(CacheLuckyWrathReward)}`) : '');
- section.appendChild(StatsListing('withTooltip', `"Lucky!" Reward (MAX)${luckySplit ? ' (Golden / Wrath)' : ''}`, luckyRewardMaxSpan, goldCookTooltip));
+ const luckyRewardMaxSpan = document.createElement('span');
+ luckyRewardMaxSpan.style.fontWeight = 'bold';
+ luckyRewardMaxSpan.className = ColorTextPre + CacheLuckyReward;
+ luckyRewardMaxSpan.textContent =
+ Beautify(CacheLuckyReward) +
+ (luckySplit ? ` / ${Beautify(CacheLuckyWrathReward)}` : '');
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ `"Lucky!" Reward (MAX)${luckySplit ? ' (Golden / Wrath)' : ''}`,
+ luckyRewardMaxSpan,
+ goldCookTooltip,
+ ),
+ );
- const luckyRewardFrenzyMaxSpan = document.createElement('span');
- luckyRewardFrenzyMaxSpan.style.fontWeight = 'bold';
- luckyRewardFrenzyMaxSpan.className = ColorTextPre + luckyRewardFrenzyMaxSpan;
- luckyRewardFrenzyMaxSpan.textContent = Beautify(CacheLuckyRewardFrenzy) + (luckySplit ? (` / ${Beautify(CacheLuckyWrathRewardFrenzy)}`) : '');
- section.appendChild(StatsListing('withTooltip', `"Lucky!" Reward (MAX) (Frenzy)${luckySplit ? ' (Golden / Wrath)' : ''}`, luckyRewardFrenzyMaxSpan, goldCookTooltip));
+ const luckyRewardFrenzyMaxSpan = document.createElement('span');
+ luckyRewardFrenzyMaxSpan.style.fontWeight = 'bold';
+ luckyRewardFrenzyMaxSpan.className = ColorTextPre + luckyRewardFrenzyMaxSpan;
+ luckyRewardFrenzyMaxSpan.textContent =
+ Beautify(CacheLuckyRewardFrenzy) +
+ (luckySplit ? ` / ${Beautify(CacheLuckyWrathRewardFrenzy)}` : '');
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ `"Lucky!" Reward (MAX) (Frenzy)${luckySplit ? ' (Golden / Wrath)' : ''}`,
+ luckyRewardFrenzyMaxSpan,
+ goldCookTooltip,
+ ),
+ );
- const luckyCurBase = Math.min((Game.cookies + GetWrinkConfigBank()) * 0.15, CacheNoGoldSwitchCookiesPS * CacheDragonsFortuneMultAdjustment * 60 * 15) + 13;
- const luckyCurSpan = document.createElement('span');
- luckyCurSpan.style.fontWeight = 'bold';
- luckyCurSpan.className = ColorTextPre + luckyCurSpan;
- luckyCurSpan.textContent = Beautify(CacheGoldenCookiesMult * luckyCurBase) + (luckySplit ? (` / ${Beautify(CacheWrathCookiesMult * luckyCurBase)}`) : '');
- section.appendChild(StatsListing('withTooltip', `"Lucky!" Reward (CUR)${luckySplit ? ' (Golden / Wrath)' : ''}`, luckyCurSpan, goldCookTooltip));
- return section;
+ const luckyCurBase =
+ Math.min(
+ (Game.cookies + GetWrinkConfigBank()) * 0.15,
+ CacheNoGoldSwitchCookiesPS * CacheDragonsFortuneMultAdjustment * 60 * 15,
+ ) + 13;
+ const luckyCurSpan = document.createElement('span');
+ luckyCurSpan.style.fontWeight = 'bold';
+ luckyCurSpan.className = ColorTextPre + luckyCurSpan;
+ luckyCurSpan.textContent =
+ Beautify(CacheGoldenCookiesMult * luckyCurBase) +
+ (luckySplit ? ` / ${Beautify(CacheWrathCookiesMult * luckyCurBase)}` : '');
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ `"Lucky!" Reward (CUR)${luckySplit ? ' (Golden / Wrath)' : ''}`,
+ luckyCurSpan,
+ goldCookTooltip,
+ ),
+ );
+ return section;
}
/**
@@ -100,84 +175,215 @@ export function LuckySection() {
* @returns {object} section The object contating the Chain section
*/
export function ChainSection() {
- // This sets which tooltip to display for certain stats
- const goldCookTooltip = Game.auraMult('Dragon\'s Fortune') ? 'GoldCookDragonsFortuneTooltipPlaceholder' : 'GoldCookTooltipPlaceholder';
+ // This sets which tooltip to display for certain stats
+ const goldCookTooltip = Game.auraMult("Dragon's Fortune")
+ ? 'GoldCookDragonsFortuneTooltipPlaceholder'
+ : 'GoldCookTooltipPlaceholder';
- const section = document.createElement('div');
- section.className = 'CMStatsChainSection';
+ const section = document.createElement('div');
+ section.className = 'CMStatsChainSection';
- const chainColor = ((Game.cookies + GetWrinkConfigBank()) < CacheChainRequired) ? ColorRed : ColorGreen;
- const chainTime = ((Game.cookies + GetWrinkConfigBank()) < CacheChainRequired) ? FormatTime((CacheChainRequired - (Game.cookies + GetWrinkConfigBank())) / GetCPS()) : '';
- const chainReqFrag = document.createDocumentFragment();
- const chainReqSpan = document.createElement('span');
- chainReqSpan.style.fontWeight = 'bold';
- chainReqSpan.className = ColorTextPre + chainColor;
- chainReqSpan.textContent = Beautify(CacheChainRequired);
- chainReqFrag.appendChild(chainReqSpan);
- if (chainTime !== '') {
- const chainReqSmall = document.createElement('small');
- chainReqSmall.textContent = ` (${chainTime})`;
- chainReqFrag.appendChild(chainReqSmall);
- }
- section.appendChild(StatsListing('withTooltip', '"Chain" Cookies Required', chainReqFrag, goldCookTooltip));
+ const chainColor =
+ Game.cookies + GetWrinkConfigBank() < CacheChainRequired
+ ? ColorRed
+ : ColorGreen;
+ const chainTime =
+ Game.cookies + GetWrinkConfigBank() < CacheChainRequired
+ ? FormatTime(
+ (CacheChainRequired - (Game.cookies + GetWrinkConfigBank())) /
+ GetCPS(),
+ )
+ : '';
+ const chainReqFrag = document.createDocumentFragment();
+ const chainReqSpan = document.createElement('span');
+ chainReqSpan.style.fontWeight = 'bold';
+ chainReqSpan.className = ColorTextPre + chainColor;
+ chainReqSpan.textContent = Beautify(CacheChainRequired);
+ chainReqFrag.appendChild(chainReqSpan);
+ if (chainTime !== '') {
+ const chainReqSmall = document.createElement('small');
+ chainReqSmall.textContent = ` (${chainTime})`;
+ chainReqFrag.appendChild(chainReqSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Chain" Cookies Required',
+ chainReqFrag,
+ goldCookTooltip,
+ ),
+ );
- const chainWrathColor = ((Game.cookies + GetWrinkConfigBank()) < CacheChainWrathRequired) ? ColorRed : ColorGreen;
- const chainWrathTime = ((Game.cookies + GetWrinkConfigBank()) < CacheChainWrathRequired) ? FormatTime((CacheChainWrathRequired - (Game.cookies + GetWrinkConfigBank())) / GetCPS()) : '';
- const chainWrathReqFrag = document.createDocumentFragment();
- const chainWrathReqSpan = document.createElement('span');
- chainWrathReqSpan.style.fontWeight = 'bold';
- chainWrathReqSpan.className = ColorTextPre + chainWrathColor;
- chainWrathReqSpan.textContent = Beautify(CacheChainWrathRequired);
- chainWrathReqFrag.appendChild(chainWrathReqSpan);
- if (chainWrathTime !== '') {
- const chainWrathReqSmall = document.createElement('small');
- chainWrathReqSmall.textContent = ` (${chainWrathTime})`;
- chainWrathReqFrag.appendChild(chainWrathReqSmall);
- }
- section.appendChild(StatsListing('withTooltip', '"Chain" Cookies Required (Wrath)', chainWrathReqFrag, goldCookTooltip));
+ const chainWrathColor =
+ Game.cookies + GetWrinkConfigBank() < CacheChainWrathRequired
+ ? ColorRed
+ : ColorGreen;
+ const chainWrathTime =
+ Game.cookies + GetWrinkConfigBank() < CacheChainWrathRequired
+ ? FormatTime(
+ (CacheChainWrathRequired - (Game.cookies + GetWrinkConfigBank())) /
+ GetCPS(),
+ )
+ : '';
+ const chainWrathReqFrag = document.createDocumentFragment();
+ const chainWrathReqSpan = document.createElement('span');
+ chainWrathReqSpan.style.fontWeight = 'bold';
+ chainWrathReqSpan.className = ColorTextPre + chainWrathColor;
+ chainWrathReqSpan.textContent = Beautify(CacheChainWrathRequired);
+ chainWrathReqFrag.appendChild(chainWrathReqSpan);
+ if (chainWrathTime !== '') {
+ const chainWrathReqSmall = document.createElement('small');
+ chainWrathReqSmall.textContent = ` (${chainWrathTime})`;
+ chainWrathReqFrag.appendChild(chainWrathReqSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Chain" Cookies Required (Wrath)',
+ chainWrathReqFrag,
+ goldCookTooltip,
+ ),
+ );
- const chainColorFrenzy = ((Game.cookies + GetWrinkConfigBank()) < CacheChainFrenzyRequired) ? ColorRed : ColorGreen;
- const chainTimeFrenzy = ((Game.cookies + GetWrinkConfigBank()) < CacheChainFrenzyRequired) ? FormatTime((CacheChainFrenzyRequired - (Game.cookies + GetWrinkConfigBank())) / GetCPS()) : '';
- const chainReqFrenFrag = document.createDocumentFragment();
- const chainReqFrenSpan = document.createElement('span');
- chainReqFrenSpan.style.fontWeight = 'bold';
- chainReqFrenSpan.className = ColorTextPre + chainColorFrenzy;
- chainReqFrenSpan.textContent = Beautify(CacheChainFrenzyRequired);
- chainReqFrenFrag.appendChild(chainReqFrenSpan);
- if (chainTimeFrenzy !== '') {
- const chainReqFrenSmall = document.createElement('small');
- chainReqFrenSmall.textContent = ` (${chainTimeFrenzy})`;
- chainReqFrenFrag.appendChild(chainReqFrenSmall);
- }
- section.appendChild(StatsListing('withTooltip', '"Chain" Cookies Required (Frenzy)', chainReqFrenFrag, goldCookTooltip));
+ const chainColorFrenzy =
+ Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyRequired
+ ? ColorRed
+ : ColorGreen;
+ const chainTimeFrenzy =
+ Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyRequired
+ ? FormatTime(
+ (CacheChainFrenzyRequired - (Game.cookies + GetWrinkConfigBank())) /
+ GetCPS(),
+ )
+ : '';
+ const chainReqFrenFrag = document.createDocumentFragment();
+ const chainReqFrenSpan = document.createElement('span');
+ chainReqFrenSpan.style.fontWeight = 'bold';
+ chainReqFrenSpan.className = ColorTextPre + chainColorFrenzy;
+ chainReqFrenSpan.textContent = Beautify(CacheChainFrenzyRequired);
+ chainReqFrenFrag.appendChild(chainReqFrenSpan);
+ if (chainTimeFrenzy !== '') {
+ const chainReqFrenSmall = document.createElement('small');
+ chainReqFrenSmall.textContent = ` (${chainTimeFrenzy})`;
+ chainReqFrenFrag.appendChild(chainReqFrenSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Chain" Cookies Required (Frenzy)',
+ chainReqFrenFrag,
+ goldCookTooltip,
+ ),
+ );
- const chainWrathColorFrenzy = ((Game.cookies + GetWrinkConfigBank()) < CacheChainFrenzyWrathRequired) ? ColorRed : ColorGreen;
- const chainWrathTimeFrenzy = ((Game.cookies + GetWrinkConfigBank()) < CacheChainFrenzyWrathRequired) ? FormatTime((CacheChainFrenzyWrathRequired - (Game.cookies + GetWrinkConfigBank())) / GetCPS()) : '';
- const chainWrathReqFrenFrag = document.createDocumentFragment();
- const chainWrathReqFrenSpan = document.createElement('span');
- chainWrathReqFrenSpan.style.fontWeight = 'bold';
- chainWrathReqFrenSpan.className = ColorTextPre + chainWrathColorFrenzy;
- chainWrathReqFrenSpan.textContent = Beautify(CacheChainFrenzyWrathRequired);
- chainWrathReqFrenFrag.appendChild(chainWrathReqFrenSpan);
- if (chainWrathTimeFrenzy !== '') {
- const chainWrathReqFrenSmall = document.createElement('small');
- chainWrathReqFrenSmall.textContent = ` (${chainWrathTimeFrenzy})`;
- chainWrathReqFrenFrag.appendChild(chainWrathReqFrenSmall);
- }
- section.appendChild(StatsListing('withTooltip', '"Chain" Cookies Required (Frenzy) (Wrath)', chainWrathReqFrenFrag, goldCookTooltip));
+ const chainWrathColorFrenzy =
+ Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyWrathRequired
+ ? ColorRed
+ : ColorGreen;
+ const chainWrathTimeFrenzy =
+ Game.cookies + GetWrinkConfigBank() < CacheChainFrenzyWrathRequired
+ ? FormatTime(
+ (CacheChainFrenzyWrathRequired -
+ (Game.cookies + GetWrinkConfigBank())) /
+ GetCPS(),
+ )
+ : '';
+ const chainWrathReqFrenFrag = document.createDocumentFragment();
+ const chainWrathReqFrenSpan = document.createElement('span');
+ chainWrathReqFrenSpan.style.fontWeight = 'bold';
+ chainWrathReqFrenSpan.className = ColorTextPre + chainWrathColorFrenzy;
+ chainWrathReqFrenSpan.textContent = Beautify(CacheChainFrenzyWrathRequired);
+ chainWrathReqFrenFrag.appendChild(chainWrathReqFrenSpan);
+ if (chainWrathTimeFrenzy !== '') {
+ const chainWrathReqFrenSmall = document.createElement('small');
+ chainWrathReqFrenSmall.textContent = ` (${chainWrathTimeFrenzy})`;
+ chainWrathReqFrenFrag.appendChild(chainWrathReqFrenSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Chain" Cookies Required (Frenzy) (Wrath)',
+ chainWrathReqFrenFrag,
+ goldCookTooltip,
+ ),
+ );
- section.appendChild(StatsListing('withTooltip', '"Chain" Reward (MAX) (Golden / Wrath)', document.createTextNode(`${Beautify(CacheChainMaxReward[0])} / ${Beautify(CacheChainWrathMaxReward[0])}`), goldCookTooltip));
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Chain" Reward (MAX) (Golden / Wrath)',
+ document.createTextNode(
+ `${Beautify(CacheChainMaxReward[0])} / ${Beautify(
+ CacheChainWrathMaxReward[0],
+ )}`,
+ ),
+ goldCookTooltip,
+ ),
+ );
- section.appendChild(StatsListing('withTooltip', '"Chain" Reward (MAX) (Frenzy) (Golden / Wrath)', document.createTextNode((`${Beautify(CacheChainFrenzyMaxReward[0])} / ${Beautify(CacheChainFrenzyMaxReward[0])}`)), goldCookTooltip));
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Chain" Reward (MAX) (Frenzy) (Golden / Wrath)',
+ document.createTextNode(
+ `${Beautify(CacheChainFrenzyMaxReward[0])} / ${Beautify(
+ CacheChainFrenzyMaxReward[0],
+ )}`,
+ ),
+ goldCookTooltip,
+ ),
+ );
- const chainCurMax = Math.min(Game.cookiesPs * 60 * 60 * 6 * CacheDragonsFortuneMultAdjustment, Game.cookies * 0.5);
- const chainCur = MaxChainCookieReward(7, chainCurMax, CacheGoldenCookiesMult)[0];
- const chainCurWrath = MaxChainCookieReward(6, chainCurMax, CacheWrathCookiesMult)[0];
- section.appendChild(StatsListing('withTooltip', '"Chain" Reward (CUR) (Golden / Wrath)', document.createTextNode((`${Beautify(chainCur)} / ${Beautify(chainCurWrath)}`)), goldCookTooltip));
+ const chainCurMax = Math.min(
+ Game.cookiesPs * 60 * 60 * 6 * CacheDragonsFortuneMultAdjustment,
+ Game.cookies * 0.5,
+ );
+ const chainCur = MaxChainCookieReward(
+ 7,
+ chainCurMax,
+ CacheGoldenCookiesMult,
+ )[0];
+ const chainCurWrath = MaxChainCookieReward(
+ 6,
+ chainCurMax,
+ CacheWrathCookiesMult,
+ )[0];
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Chain" Reward (CUR) (Golden / Wrath)',
+ document.createTextNode(
+ `${Beautify(chainCur)} / ${Beautify(chainCurWrath)}`,
+ ),
+ goldCookTooltip,
+ ),
+ );
- section.appendChild(StatsListing('withTooltip', 'CPS Needed For Next Level (G / W)', document.createTextNode((`${Beautify(CacheChainRequiredNext)} / ${Beautify(CacheChainWrathRequiredNext)}`)), 'ChainNextLevelPlaceholder'));
- section.appendChild(StatsListing('withTooltip', 'CPS Needed For Next Level (Frenzy) (G / W)', document.createTextNode((`${Beautify(CacheChainFrenzyRequiredNext)} / ${Beautify(CacheChainFrenzyWrathRequiredNext)}`)), 'ChainNextLevelPlaceholder'));
- return section;
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ 'CPS Needed For Next Level (G / W)',
+ document.createTextNode(
+ `${Beautify(CacheChainRequiredNext)} / ${Beautify(
+ CacheChainWrathRequiredNext,
+ )}`,
+ ),
+ 'ChainNextLevelPlaceholder',
+ ),
+ );
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ 'CPS Needed For Next Level (Frenzy) (G / W)',
+ document.createTextNode(
+ `${Beautify(CacheChainFrenzyRequiredNext)} / ${Beautify(
+ CacheChainFrenzyWrathRequiredNext,
+ )}`,
+ ),
+ 'ChainNextLevelPlaceholder',
+ ),
+ );
+ return section;
}
/**
@@ -185,48 +391,109 @@ export function ChainSection() {
* @returns {object} section The object contating the Spells section
*/
export function SpellsSection() {
- const section = document.createElement('div');
- section.className = 'CMStatsSpellsSection';
+ const section = document.createElement('div');
+ section.className = 'CMStatsSpellsSection';
- const conjureColor = ((Game.cookies + GetWrinkConfigBank()) < CacheConjure) ? ColorRed : ColorGreen;
- const conjureTime = ((Game.cookies + GetWrinkConfigBank()) < CacheConjure) ? FormatTime((CacheConjure - (Game.cookies + GetWrinkConfigBank())) / GetCPS()) : '';
+ const conjureColor =
+ Game.cookies + GetWrinkConfigBank() < CacheConjure ? ColorRed : ColorGreen;
+ const conjureTime =
+ Game.cookies + GetWrinkConfigBank() < CacheConjure
+ ? FormatTime(
+ (CacheConjure - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
+ )
+ : '';
- const conjureReqFrag = document.createDocumentFragment();
- const conjureReqSpan = document.createElement('span');
- conjureReqSpan.style.fontWeight = 'bold';
- conjureReqSpan.className = ColorTextPre + conjureColor;
- conjureReqSpan.textContent = Beautify(CacheConjure);
- conjureReqFrag.appendChild(conjureReqSpan);
- if (conjureTime !== '') {
- const conjureReqSmall = document.createElement('small');
- conjureReqSmall.textContent = ` (${conjureTime})`;
- conjureReqFrag.appendChild(conjureReqSmall);
- }
- section.appendChild(StatsListing('withTooltip', '"Conjure Baked Goods" Cookies Required', conjureReqFrag, 'GoldCookTooltipPlaceholder'));
- section.appendChild(StatsListing('withTooltip', '"Conjure Baked Goods" Reward (MAX)', document.createTextNode(Beautify(CacheConjureReward)), 'GoldCookTooltipPlaceholder'));
+ const conjureReqFrag = document.createDocumentFragment();
+ const conjureReqSpan = document.createElement('span');
+ conjureReqSpan.style.fontWeight = 'bold';
+ conjureReqSpan.className = ColorTextPre + conjureColor;
+ conjureReqSpan.textContent = Beautify(CacheConjure);
+ conjureReqFrag.appendChild(conjureReqSpan);
+ if (conjureTime !== '') {
+ const conjureReqSmall = document.createElement('small');
+ conjureReqSmall.textContent = ` (${conjureTime})`;
+ conjureReqFrag.appendChild(conjureReqSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Conjure Baked Goods" Cookies Required',
+ conjureReqFrag,
+ 'GoldCookTooltipPlaceholder',
+ ),
+ );
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Conjure Baked Goods" Reward (MAX)',
+ document.createTextNode(Beautify(CacheConjureReward)),
+ 'GoldCookTooltipPlaceholder',
+ ),
+ );
- const conjureFrenzyColor = ((Game.cookies + GetWrinkConfigBank()) < CacheConjure * 7) ? ColorRed : ColorGreen;
- const conjureFrenzyCur = Math.min((Game.cookies + GetWrinkConfigBank()) * 0.15, CacheNoGoldSwitchCookiesPS * 60 * 30);
- const conjureFrenzyTime = ((Game.cookies + GetWrinkConfigBank()) < CacheConjure * 7) ? FormatTime((CacheConjure * 7 - (Game.cookies + GetWrinkConfigBank())) / GetCPS()) : '';
+ const conjureFrenzyColor =
+ Game.cookies + GetWrinkConfigBank() < CacheConjure * 7
+ ? ColorRed
+ : ColorGreen;
+ const conjureFrenzyCur = Math.min(
+ (Game.cookies + GetWrinkConfigBank()) * 0.15,
+ CacheNoGoldSwitchCookiesPS * 60 * 30,
+ );
+ const conjureFrenzyTime =
+ Game.cookies + GetWrinkConfigBank() < CacheConjure * 7
+ ? FormatTime(
+ (CacheConjure * 7 - (Game.cookies + GetWrinkConfigBank())) / GetCPS(),
+ )
+ : '';
- const conjureFrenzyReqFrag = document.createDocumentFragment();
- const conjureFrenzyReqSpan = document.createElement('span');
- conjureFrenzyReqSpan.style.fontWeight = 'bold';
- conjureFrenzyReqSpan.className = ColorTextPre + conjureFrenzyColor;
- conjureFrenzyReqSpan.textContent = Beautify(CacheConjure * 7);
- conjureFrenzyReqFrag.appendChild(conjureFrenzyReqSpan);
- if (conjureFrenzyTime !== '') {
- const conjureFrenzyReqSmall = document.createElement('small');
- conjureFrenzyReqSmall.textContent = ` (${conjureFrenzyTime})`;
- conjureFrenzyReqFrag.appendChild(conjureFrenzyReqSmall);
- }
- section.appendChild(StatsListing('withTooltip', '"Conjure Baked Goods" Cookies Required (Frenzy)', conjureFrenzyReqFrag, 'GoldCookTooltipPlaceholder'));
- section.appendChild(StatsListing('withTooltip', '"Conjure Baked Goods" Reward (MAX) (Frenzy)', document.createTextNode(Beautify(CacheConjureReward * 7)), 'GoldCookTooltipPlaceholder'));
- section.appendChild(StatsListing('withTooltip', '"Conjure Baked Goods" Reward (CUR)', document.createTextNode(Beautify(conjureFrenzyCur)), 'GoldCookTooltipPlaceholder'));
- if (CacheEdifice) {
- section.appendChild(StatsListing('withTooltip', '"Spontaneous Edifice" Cookies Required (most expensive building)', document.createTextNode(`${Beautify(CacheEdifice)} (${CacheEdificeBuilding})`), 'GoldCookTooltipPlaceholder'));
- }
- return section;
+ const conjureFrenzyReqFrag = document.createDocumentFragment();
+ const conjureFrenzyReqSpan = document.createElement('span');
+ conjureFrenzyReqSpan.style.fontWeight = 'bold';
+ conjureFrenzyReqSpan.className = ColorTextPre + conjureFrenzyColor;
+ conjureFrenzyReqSpan.textContent = Beautify(CacheConjure * 7);
+ conjureFrenzyReqFrag.appendChild(conjureFrenzyReqSpan);
+ if (conjureFrenzyTime !== '') {
+ const conjureFrenzyReqSmall = document.createElement('small');
+ conjureFrenzyReqSmall.textContent = ` (${conjureFrenzyTime})`;
+ conjureFrenzyReqFrag.appendChild(conjureFrenzyReqSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Conjure Baked Goods" Cookies Required (Frenzy)',
+ conjureFrenzyReqFrag,
+ 'GoldCookTooltipPlaceholder',
+ ),
+ );
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Conjure Baked Goods" Reward (MAX) (Frenzy)',
+ document.createTextNode(Beautify(CacheConjureReward * 7)),
+ 'GoldCookTooltipPlaceholder',
+ ),
+ );
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Conjure Baked Goods" Reward (CUR)',
+ document.createTextNode(Beautify(conjureFrenzyCur)),
+ 'GoldCookTooltipPlaceholder',
+ ),
+ );
+ if (CacheEdifice) {
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ '"Spontaneous Edifice" Cookies Required (most expensive building)',
+ document.createTextNode(
+ `${Beautify(CacheEdifice)} (${CacheEdificeBuilding})`,
+ ),
+ 'GoldCookTooltipPlaceholder',
+ ),
+ );
+ }
+ return section;
}
/**
@@ -234,37 +501,65 @@ export function SpellsSection() {
* @returns {object} section The object contating the Spells section
*/
export function GardenSection() {
- const section = document.createElement('div');
- section.className = 'CMStatsGardenSection';
+ const section = document.createElement('div');
+ section.className = 'CMStatsGardenSection';
- const bakeberryColor = (Game.cookies < Game.cookiesPs * 60 * 30) ? ColorRed : ColorGreen;
- const bakeberryFrag = document.createElement('span');
- bakeberryFrag.style.fontWeight = 'bold';
- bakeberryFrag.className = ColorTextPre + bakeberryColor;
- bakeberryFrag.textContent = Beautify(Game.cookiesPs * 60 * 30);
- section.appendChild(StatsListing('basic', 'Cookies required for max reward of Bakeberry: ', bakeberryFrag));
+ const bakeberryColor =
+ Game.cookies < Game.cookiesPs * 60 * 30 ? ColorRed : ColorGreen;
+ const bakeberryFrag = document.createElement('span');
+ bakeberryFrag.style.fontWeight = 'bold';
+ bakeberryFrag.className = ColorTextPre + bakeberryColor;
+ bakeberryFrag.textContent = Beautify(Game.cookiesPs * 60 * 30);
+ section.appendChild(
+ StatsListing(
+ 'basic',
+ 'Cookies required for max reward of Bakeberry: ',
+ bakeberryFrag,
+ ),
+ );
- const chocorootColor = (Game.cookies < Game.cookiesPs * 60 * 3) ? ColorRed : ColorGreen;
- const chocorootFrag = document.createElement('span');
- chocorootFrag.style.fontWeight = 'bold';
- chocorootFrag.className = ColorTextPre + chocorootColor;
- chocorootFrag.textContent = Beautify(Game.cookiesPs * 60 * 3);
- section.appendChild(StatsListing('basic', 'Cookies required for max reward of Chocoroot: ', chocorootFrag));
+ const chocorootColor =
+ Game.cookies < Game.cookiesPs * 60 * 3 ? ColorRed : ColorGreen;
+ const chocorootFrag = document.createElement('span');
+ chocorootFrag.style.fontWeight = 'bold';
+ chocorootFrag.className = ColorTextPre + chocorootColor;
+ chocorootFrag.textContent = Beautify(Game.cookiesPs * 60 * 3);
+ section.appendChild(
+ StatsListing(
+ 'basic',
+ 'Cookies required for max reward of Chocoroot: ',
+ chocorootFrag,
+ ),
+ );
- const queenbeetColor = (Game.cookies < Game.cookiesPs * 60 * 60) ? ColorRed : ColorGreen;
- const queenbeetFrag = document.createElement('span');
- queenbeetFrag.style.fontWeight = 'bold';
- queenbeetFrag.className = ColorTextPre + queenbeetColor;
- queenbeetFrag.textContent = Beautify(Game.cookiesPs * 60 * 60);
- section.appendChild(StatsListing('basic', 'Cookies required for max reward of Queenbeet: ', queenbeetFrag));
+ const queenbeetColor =
+ Game.cookies < Game.cookiesPs * 60 * 60 ? ColorRed : ColorGreen;
+ const queenbeetFrag = document.createElement('span');
+ queenbeetFrag.style.fontWeight = 'bold';
+ queenbeetFrag.className = ColorTextPre + queenbeetColor;
+ queenbeetFrag.textContent = Beautify(Game.cookiesPs * 60 * 60);
+ section.appendChild(
+ StatsListing(
+ 'basic',
+ 'Cookies required for max reward of Queenbeet: ',
+ queenbeetFrag,
+ ),
+ );
- const duketaterColor = (Game.cookies < Game.cookiesPs * 60 * 120) ? ColorRed : ColorGreen;
- const duketaterFrag = document.createElement('span');
- duketaterFrag.style.fontWeight = 'bold';
- duketaterFrag.className = ColorTextPre + duketaterColor;
- duketaterFrag.textContent = Beautify(Game.cookiesPs * 60 * 120);
- section.appendChild(StatsListing('basic', 'Cookies required for max reward of Duketater: ', duketaterFrag));
- return section;
+ const duketaterColor =
+ Game.cookies < Game.cookiesPs * 60 * 120 ? ColorRed : ColorGreen;
+ const duketaterFrag = document.createElement('span');
+ duketaterFrag.style.fontWeight = 'bold';
+ duketaterFrag.className = ColorTextPre + duketaterColor;
+ duketaterFrag.textContent = Beautify(Game.cookiesPs * 60 * 120);
+ section.appendChild(
+ StatsListing(
+ 'basic',
+ 'Cookies required for max reward of Duketater: ',
+ duketaterFrag,
+ ),
+ );
+ return section;
}
/**
@@ -272,78 +567,175 @@ export function GardenSection() {
* @returns {object} section The object contating the Prestige section
*/
export function PrestigeSection() {
- const section = document.createElement('div');
- section.className = 'CMStatsPrestigeSection';
+ const section = document.createElement('div');
+ section.className = 'CMStatsPrestigeSection';
- const possiblePresMax = Math.floor(Game.HowMuchPrestige(CacheRealCookiesEarned
- + Game.cookiesReset + CacheWrinklersTotal
- + (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg') ? CacheLastChoEgg : 0)));
- section.appendChild(StatsListing('withTooltip', 'Prestige Level (CUR / MAX)', document.createTextNode(`${Beautify(Game.prestige)} / ${Beautify(possiblePresMax)}`), 'PrestMaxTooltipPlaceholder'));
+ const possiblePresMax = Math.floor(
+ Game.HowMuchPrestige(
+ CacheRealCookiesEarned +
+ Game.cookiesReset +
+ CacheWrinklersTotal +
+ (Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')
+ ? CacheLastChoEgg
+ : 0),
+ ),
+ );
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ 'Prestige Level (CUR / MAX)',
+ document.createTextNode(
+ `${Beautify(Game.prestige)} / ${Beautify(possiblePresMax)}`,
+ ),
+ 'PrestMaxTooltipPlaceholder',
+ ),
+ );
- const neededCook = Game.HowManyCookiesReset(possiblePresMax + 1) - (CacheRealCookiesEarned + Game.cookiesReset + CacheWrinklersTotal + ((Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg') ? CacheLastChoEgg : 0) ? CacheLastChoEgg : 0));
- const cookiesNextFrag = document.createDocumentFragment();
- cookiesNextFrag.appendChild(document.createTextNode(Beautify(neededCook)));
- const cookiesNextSmall = document.createElement('small');
- cookiesNextSmall.textContent = ` (${FormatTime(neededCook / CacheAvgCPSWithChoEgg, 1)})`;
- cookiesNextFrag.appendChild(cookiesNextSmall);
- section.appendChild(StatsListing('withTooltip', 'Cookies To Next Level', cookiesNextFrag, 'NextPrestTooltipPlaceholder'));
+ const neededCook =
+ Game.HowManyCookiesReset(possiblePresMax + 1) -
+ (CacheRealCookiesEarned +
+ Game.cookiesReset +
+ CacheWrinklersTotal +
+ ((
+ Game.HasUnlocked('Chocolate egg') && !Game.Has('Chocolate egg')
+ ? CacheLastChoEgg
+ : 0
+ )
+ ? CacheLastChoEgg
+ : 0));
+ const cookiesNextFrag = document.createDocumentFragment();
+ cookiesNextFrag.appendChild(document.createTextNode(Beautify(neededCook)));
+ const cookiesNextSmall = document.createElement('small');
+ cookiesNextSmall.textContent = ` (${FormatTime(
+ neededCook / CacheAvgCPSWithChoEgg,
+ 1,
+ )})`;
+ cookiesNextFrag.appendChild(cookiesNextSmall);
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ 'Cookies To Next Level',
+ cookiesNextFrag,
+ 'NextPrestTooltipPlaceholder',
+ ),
+ );
- section.appendChild(StatsListing('withTooltip', 'Heavenly Chips (CUR / MAX)', document.createTextNode(`${Beautify(Game.heavenlyChips)} / ${Beautify((possiblePresMax - Game.prestige) + Game.heavenlyChips)}`), 'HeavenChipMaxTooltipPlaceholder'));
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ 'Heavenly Chips (CUR / MAX)',
+ document.createTextNode(
+ `${Beautify(Game.heavenlyChips)} / ${Beautify(
+ possiblePresMax - Game.prestige + Game.heavenlyChips,
+ )}`,
+ ),
+ 'HeavenChipMaxTooltipPlaceholder',
+ ),
+ );
- section.appendChild(StatsListing('basic', 'Heavenly Chips Per Second (last 5 seconds)', document.createTextNode(Beautify(CacheHCPerSecond, 2))));
+ section.appendChild(
+ StatsListing(
+ 'basic',
+ 'Heavenly Chips Per Second (last 5 seconds)',
+ document.createTextNode(Beautify(CacheHCPerSecond, 2)),
+ ),
+ );
- const HCTarget = Number(CMOptions.HeavenlyChipsTarget);
- if (!Number.isNaN(HCTarget)) {
- const CookiesTillTarget = HCTarget - Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
- if (CookiesTillTarget > 0) {
- section.appendChild(StatsListing('basic', 'Heavenly Chips To Target Set In Settings (CUR)', document.createTextNode(Beautify(CookiesTillTarget))));
- section.appendChild(StatsListing('basic', 'Time To Target (CUR, Current 5 Second Average)', document.createTextNode(FormatTime(CookiesTillTarget / CacheHCPerSecond))));
- }
- }
+ const HCTarget = Number(CMOptions.HeavenlyChipsTarget);
+ if (!Number.isNaN(HCTarget)) {
+ const CookiesTillTarget =
+ HCTarget -
+ Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
+ if (CookiesTillTarget > 0) {
+ section.appendChild(
+ StatsListing(
+ 'basic',
+ 'Heavenly Chips To Target Set In Settings (CUR)',
+ document.createTextNode(Beautify(CookiesTillTarget)),
+ ),
+ );
+ section.appendChild(
+ StatsListing(
+ 'basic',
+ 'Time To Target (CUR, Current 5 Second Average)',
+ document.createTextNode(
+ FormatTime(CookiesTillTarget / CacheHCPerSecond),
+ ),
+ ),
+ );
+ }
+ }
- const resetBonus = ResetBonus(possiblePresMax);
- const resetFrag = document.createDocumentFragment();
- resetFrag.appendChild(document.createTextNode(Beautify(resetBonus)));
- const increase = Math.round(resetBonus / Game.cookiesPs * 10000);
- if (Number.isFinite(increase) && increase !== 0) {
- const resetSmall = document.createElement('small');
- resetSmall.textContent = ` (${increase / 100}% of income)`;
- resetFrag.appendChild(resetSmall);
- }
- section.appendChild(StatsListing('withTooltip', 'Reset Bonus Income', resetFrag, 'ResetTooltipPlaceholder'));
+ const resetBonus = ResetBonus(possiblePresMax);
+ const resetFrag = document.createDocumentFragment();
+ resetFrag.appendChild(document.createTextNode(Beautify(resetBonus)));
+ const increase = Math.round((resetBonus / Game.cookiesPs) * 10000);
+ if (Number.isFinite(increase) && increase !== 0) {
+ const resetSmall = document.createElement('small');
+ resetSmall.textContent = ` (${increase / 100}% of income)`;
+ resetFrag.appendChild(resetSmall);
+ }
+ section.appendChild(
+ StatsListing(
+ 'withTooltip',
+ 'Reset Bonus Income',
+ resetFrag,
+ 'ResetTooltipPlaceholder',
+ ),
+ );
- const currentPrestige = Math.floor(Game.HowMuchPrestige(Game.cookiesReset));
- const willHave = Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned));
- const willGet = willHave - currentPrestige;
- if (!Game.Has('Lucky digit')) {
- let delta7 = 7 - (willHave % 10);
- if (delta7 < 0) delta7 += 10;
- const next7Reset = willGet + delta7;
- const next7Total = willHave + delta7;
- const frag7 = document.createDocumentFragment();
- frag7.appendChild(document.createTextNode(`${next7Total.toLocaleString()} / ${next7Reset.toLocaleString()} (+${delta7})`));
- section.appendChild(StatsListing('basic', 'Next "Lucky Digit" (total / reset)', frag7));
- }
+ const currentPrestige = Math.floor(Game.HowMuchPrestige(Game.cookiesReset));
+ const willHave = Math.floor(
+ Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned),
+ );
+ const willGet = willHave - currentPrestige;
+ if (!Game.Has('Lucky digit')) {
+ let delta7 = 7 - (willHave % 10);
+ if (delta7 < 0) delta7 += 10;
+ const next7Reset = willGet + delta7;
+ const next7Total = willHave + delta7;
+ const frag7 = document.createDocumentFragment();
+ frag7.appendChild(
+ document.createTextNode(
+ `${next7Total.toLocaleString()} / ${next7Reset.toLocaleString()} (+${delta7})`,
+ ),
+ );
+ section.appendChild(
+ StatsListing('basic', 'Next "Lucky Digit" (total / reset)', frag7),
+ );
+ }
- if (!Game.Has('Lucky number')) {
- let delta777 = 777 - (willHave % 1000);
- if (delta777 < 0) delta777 += 1000;
- const next777Reset = willGet + delta777;
- const next777Total = willHave + delta777;
- const frag777 = document.createDocumentFragment();
- frag777.appendChild(document.createTextNode(`${next777Total.toLocaleString()} / ${next777Reset.toLocaleString()} (+${delta777})`));
- section.appendChild(StatsListing('basic', 'Next "Lucky Number" (total / reset)', frag777));
- }
+ if (!Game.Has('Lucky number')) {
+ let delta777 = 777 - (willHave % 1000);
+ if (delta777 < 0) delta777 += 1000;
+ const next777Reset = willGet + delta777;
+ const next777Total = willHave + delta777;
+ const frag777 = document.createDocumentFragment();
+ frag777.appendChild(
+ document.createTextNode(
+ `${next777Total.toLocaleString()} / ${next777Reset.toLocaleString()} (+${delta777})`,
+ ),
+ );
+ section.appendChild(
+ StatsListing('basic', 'Next "Lucky Number" (total / reset)', frag777),
+ );
+ }
- if (!Game.Has('Lucky payout')) {
- let delta777777 = 777777 - (willHave % 1000000);
- if (delta777777 < 0) delta777777 += 1000000;
- const next777777Reset = willGet + delta777777;
- const next777777Total = willHave + delta777777;
- const frag777777 = document.createDocumentFragment();
- frag777777.appendChild(document.createTextNode(`${next777777Total.toLocaleString()} / ${next777777Reset.toLocaleString()} (+${delta777777})`));
- section.appendChild(StatsListing('basic', 'Next "Lucky Payout" (total / reset)', frag777777));
- }
+ if (!Game.Has('Lucky payout')) {
+ let delta777777 = 777777 - (willHave % 1000000);
+ if (delta777777 < 0) delta777777 += 1000000;
+ const next777777Reset = willGet + delta777777;
+ const next777777Total = willHave + delta777777;
+ const frag777777 = document.createDocumentFragment();
+ frag777777.appendChild(
+ document.createTextNode(
+ `${next777777Total.toLocaleString()} / ${next777777Reset.toLocaleString()} (+${delta777777})`,
+ ),
+ );
+ section.appendChild(
+ StatsListing('basic', 'Next "Lucky Payout" (total / reset)', frag777777),
+ );
+ }
- return section;
+ return section;
}
diff --git a/src/Disp/MenuSections/InfoPage.js b/src/Disp/MenuSections/InfoPage.js
index 653edac..3c1cd3b 100644
--- a/src/Disp/MenuSections/InfoPage.js
+++ b/src/Disp/MenuSections/InfoPage.js
@@ -9,34 +9,37 @@ import { LatestReleaseNotes, ModDescription } from '../../Data/Moddata';
* @param {object} title On object that includes the title of the menu
*/
export default function AddMenuInfo(title) {
- const info = document.createElement('div');
- info.className = 'subsection';
+ const info = document.createElement('div');
+ info.className = 'subsection';
- const span = document.createElement('span');
- span.style.cursor = 'pointer';
- span.style.display = 'inline-block';
- span.style.height = '14px';
- span.style.width = '14px';
- span.style.borderRadius = '7px';
- span.style.textAlign = 'center';
- span.style.backgroundColor = '#C0C0C0';
- span.style.color = 'black';
- span.style.fontSize = '13px';
- span.style.verticalAlign = 'middle';
- span.textContent = CMOptions.Header.InfoTab ? '-' : '+';
- span.onclick = function () { ToggleHeader('InfoTab'); Game.UpdateMenu(); };
- title.appendChild(span);
- info.appendChild(title);
+ const span = document.createElement('span');
+ span.style.cursor = 'pointer';
+ span.style.display = 'inline-block';
+ span.style.height = '14px';
+ span.style.width = '14px';
+ span.style.borderRadius = '7px';
+ span.style.textAlign = 'center';
+ span.style.backgroundColor = '#C0C0C0';
+ span.style.color = 'black';
+ span.style.fontSize = '13px';
+ span.style.verticalAlign = 'middle';
+ span.textContent = CMOptions.Header.InfoTab ? '-' : '+';
+ span.onclick = function () {
+ ToggleHeader('InfoTab');
+ Game.UpdateMenu();
+ };
+ title.appendChild(span);
+ info.appendChild(title);
- if (CMOptions.Header.InfoTab) {
- const description = document.createElement('div');
- description.innerHTML = ModDescription;
- info.appendChild(description);
- const notes = document.createElement('div');
- notes.innerHTML = LatestReleaseNotes;
- info.appendChild(notes);
- }
+ if (CMOptions.Header.InfoTab) {
+ const description = document.createElement('div');
+ description.innerHTML = ModDescription;
+ info.appendChild(description);
+ const notes = document.createElement('div');
+ notes.innerHTML = LatestReleaseNotes;
+ info.appendChild(notes);
+ }
- const menu = l('menu').children[1];
- menu.insertBefore(info, menu.children[1]);
+ const menu = l('menu').children[1];
+ menu.insertBefore(info, menu.children[1]);
}
diff --git a/src/Disp/MenuSections/Refreshmenu.js b/src/Disp/MenuSections/Refreshmenu.js
index 445f9a3..492fb66 100644
--- a/src/Disp/MenuSections/Refreshmenu.js
+++ b/src/Disp/MenuSections/Refreshmenu.js
@@ -5,5 +5,11 @@ import { CMOptions } from '../../Config/VariablesAndData';
* It is called by CM.Disp.Draw()
*/
export default function RefreshMenu() {
- if (CMOptions.UpStats && Game.onMenu === 'stats' && (Game.drawT - 1) % (Game.fps * 5) !== 0 && (Game.drawT - 1) % Game.fps === 0) Game.UpdateMenu();
+ if (
+ CMOptions.UpStats &&
+ Game.onMenu === 'stats' &&
+ (Game.drawT - 1) % (Game.fps * 5) !== 0 &&
+ (Game.drawT - 1) % Game.fps === 0
+ )
+ Game.UpdateMenu();
}
diff --git a/src/Disp/MenuSections/SettingsPage.js b/src/Disp/MenuSections/SettingsPage.js
index 2f1dd48..669b0c9 100644
--- a/src/Disp/MenuSections/SettingsPage.js
+++ b/src/Disp/MenuSections/SettingsPage.js
@@ -1,12 +1,21 @@
/** Functions related to the Options/Preferences page */
import jscolor, * as JsColor from '@eastdesire/jscolor';
-import { LoadConfig, SaveConfig } from '../../Config/SaveLoadReload/SaveLoadReloadSettings';
import {
- ConfigPrefix, ToggleConfig, ToggleConfigVolume, ToggleHeader,
+ LoadConfig,
+ SaveConfig,
+} from '../../Config/SaveLoadReload/SaveLoadReloadSettings';
+import {
+ ConfigPrefix,
+ ToggleConfig,
+ ToggleConfigVolume,
+ ToggleHeader,
} from '../../Config/ToggleSetting';
import { CMOptions } from '../../Config/VariablesAndData';
-import { ConfigGroups, ConfigGroupsNotification } from '../../Data/Sectionheaders';
+import {
+ ConfigGroups,
+ ConfigGroupsNotification,
+} from '../../Data/Sectionheaders';
import Config from '../../Data/SettingsData';
import ConfigDefault from '../../Data/SettingsDefault';
import RefreshScale from '../HelperFunctions/RefreshScale';
@@ -20,27 +29,30 @@ import { Colors } from '../VariablesAndData';
* @returns {object} div The header object
*/
function CreatePrefHeader(config, text) {
- const div = document.createElement('div');
- div.className = 'title';
+ const div = document.createElement('div');
+ div.className = 'title';
- div.style.opacity = '0.7';
- div.style.fontSize = '17px';
- div.appendChild(document.createTextNode(`${text} `));
- const span = document.createElement('span'); // Creates the +/- button
- span.style.cursor = 'pointer';
- span.style.display = 'inline-block';
- span.style.height = '14px';
- span.style.width = '14px';
- span.style.borderRadius = '7px';
- span.style.textAlign = 'center';
- span.style.backgroundColor = '#C0C0C0';
- span.style.color = 'black';
- span.style.fontSize = '13px';
- span.style.verticalAlign = 'middle';
- span.textContent = CMOptions.Header[config] ? '-' : '+';
- span.onclick = function () { ToggleHeader(config); Game.UpdateMenu(); };
- div.appendChild(span);
- return div;
+ div.style.opacity = '0.7';
+ div.style.fontSize = '17px';
+ div.appendChild(document.createTextNode(`${text} `));
+ const span = document.createElement('span'); // Creates the +/- button
+ span.style.cursor = 'pointer';
+ span.style.display = 'inline-block';
+ span.style.height = '14px';
+ span.style.width = '14px';
+ span.style.borderRadius = '7px';
+ span.style.textAlign = 'center';
+ span.style.backgroundColor = '#C0C0C0';
+ span.style.color = 'black';
+ span.style.fontSize = '13px';
+ span.style.verticalAlign = 'middle';
+ span.textContent = CMOptions.Header[config] ? '-' : '+';
+ span.onclick = function () {
+ ToggleHeader(config);
+ Game.UpdateMenu();
+ };
+ div.appendChild(span);
+ return div;
}
/**
@@ -49,129 +61,150 @@ function CreatePrefHeader(config, text) {
* @returns {object} div The option object
*/
function CreatePrefOption(config) {
- const div = document.createElement('div');
- div.className = 'listing';
- if (Config[config].type === 'bool') {
- const a = document.createElement('a');
- if (Config[config].toggle && CMOptions[config] === 0) {
- a.className = 'option off';
- } else {
- a.className = 'option';
- }
- a.id = ConfigPrefix + config;
- a.onclick = function () { ToggleConfig(config); };
- a.textContent = Config[config].label[CMOptions[config]];
- div.appendChild(a);
- const label = document.createElement('label');
- label.textContent = Config[config].desc;
- div.appendChild(label);
- return div;
- } if (Config[config].type === 'vol') {
- const volume = document.createElement('div');
- volume.className = 'sliderBox';
- const title = document.createElement('div');
- title.style.float = 'left';
- title.innerHTML = Config[config].desc;
- volume.appendChild(title);
- const percent = document.createElement('div');
- percent.id = `slider${config}right`;
- percent.style.float = 'right';
- percent.innerHTML = `${CMOptions[config]}%`;
- volume.appendChild(percent);
- const slider = document.createElement('input');
- slider.className = 'slider';
- slider.id = `slider${config}`;
- slider.style.clear = 'both';
- slider.type = 'range';
- slider.min = '0';
- slider.max = '100';
- slider.step = '1';
- slider.value = CMOptions[config];
- slider.oninput = function () { ToggleConfigVolume(config); };
- slider.onchange = function () { ToggleConfigVolume(config); };
- volume.appendChild(slider);
- div.appendChild(volume);
- return div;
- } if (Config[config].type === 'url') {
- const span = document.createElement('span');
- span.className = 'option';
- span.textContent = `${Config[config].label} `;
- div.appendChild(span);
- const input = document.createElement('input');
- input.id = ConfigPrefix + config;
- input.className = 'option';
- input.type = 'text';
- input.readOnly = true;
- input.setAttribute('value', CMOptions[config]);
- input.style.width = '300px';
- div.appendChild(input);
- div.appendChild(document.createTextNode(' '));
- const inputPrompt = document.createElement('input');
- inputPrompt.id = `${ConfigPrefix + config}Prompt`;
- inputPrompt.className = 'option';
- inputPrompt.type = 'text';
- inputPrompt.setAttribute('value', CMOptions[config]);
- const a = document.createElement('a');
- a.className = 'option';
- a.onclick = function () {
- Game.Prompt(inputPrompt.outerHTML, [['Save', function () { CMOptions[`${config}`] = l(`${ConfigPrefix}${config}Prompt`).value; SaveConfig(); Game.ClosePrompt(); Game.UpdateMenu(); }], 'Cancel']);
- };
- a.textContent = 'Edit';
- div.appendChild(a);
- const label = document.createElement('label');
- label.textContent = Config[config].desc;
- div.appendChild(label);
- return div;
- } if (Config[config].type === 'color') {
- div.className = '';
- for (let i = 0; i < Colors.length; i++) {
- const innerDiv = document.createElement('div');
- innerDiv.className = 'listing';
- const input = document.createElement('input');
- input.id = Colors[i];
- input.style.width = '65px';
- input.setAttribute('value', CMOptions.Colors[Colors[i]]);
- innerDiv.appendChild(input);
- const change = function () {
- CMOptions.Colors[this.targetElement.id] = this.toHEXString();
- UpdateColors();
- SaveConfig();
- Game.UpdateMenu();
- };
- new JsColor(input, { hash: true, position: 'right', onInput: change });
- const label = document.createElement('label');
- label.textContent = Config.Colors.desc[Colors[i]];
- innerDiv.appendChild(label);
- div.appendChild(innerDiv);
- }
- jscolor.init();
- return div;
- } if (Config[config].type === 'numscale') {
- const span = document.createElement('span');
- span.className = 'option';
- span.textContent = `${Config[config].label} `;
- div.appendChild(span);
- const input = document.createElement('input');
- input.id = ConfigPrefix + config;
- input.className = 'option';
- input.type = 'number';
- input.value = (CMOptions[config]);
- input.min = Config[config].min;
- input.max = Config[config].max;
- input.oninput = function () {
- if (this.value > this.max) console.log('TEST');
- CMOptions[config] = this.value;
- SaveConfig();
- RefreshScale();
- };
- div.appendChild(input);
- div.appendChild(document.createTextNode(' '));
- const label = document.createElement('label');
- label.textContent = Config[config].desc;
- div.appendChild(label);
- return div;
- }
- return div;
+ const div = document.createElement('div');
+ div.className = 'listing';
+ if (Config[config].type === 'bool') {
+ const a = document.createElement('a');
+ if (Config[config].toggle && CMOptions[config] === 0) {
+ a.className = 'option off';
+ } else {
+ a.className = 'option';
+ }
+ a.id = ConfigPrefix + config;
+ a.onclick = function () {
+ ToggleConfig(config);
+ };
+ a.textContent = Config[config].label[CMOptions[config]];
+ div.appendChild(a);
+ const label = document.createElement('label');
+ label.textContent = Config[config].desc;
+ div.appendChild(label);
+ return div;
+ }
+ if (Config[config].type === 'vol') {
+ const volume = document.createElement('div');
+ volume.className = 'sliderBox';
+ const title = document.createElement('div');
+ title.style.float = 'left';
+ title.innerHTML = Config[config].desc;
+ volume.appendChild(title);
+ const percent = document.createElement('div');
+ percent.id = `slider${config}right`;
+ percent.style.float = 'right';
+ percent.innerHTML = `${CMOptions[config]}%`;
+ volume.appendChild(percent);
+ const slider = document.createElement('input');
+ slider.className = 'slider';
+ slider.id = `slider${config}`;
+ slider.style.clear = 'both';
+ slider.type = 'range';
+ slider.min = '0';
+ slider.max = '100';
+ slider.step = '1';
+ slider.value = CMOptions[config];
+ slider.oninput = function () {
+ ToggleConfigVolume(config);
+ };
+ slider.onchange = function () {
+ ToggleConfigVolume(config);
+ };
+ volume.appendChild(slider);
+ div.appendChild(volume);
+ return div;
+ }
+ if (Config[config].type === 'url') {
+ const span = document.createElement('span');
+ span.className = 'option';
+ span.textContent = `${Config[config].label} `;
+ div.appendChild(span);
+ const input = document.createElement('input');
+ input.id = ConfigPrefix + config;
+ input.className = 'option';
+ input.type = 'text';
+ input.readOnly = true;
+ input.setAttribute('value', CMOptions[config]);
+ input.style.width = '300px';
+ div.appendChild(input);
+ div.appendChild(document.createTextNode(' '));
+ const inputPrompt = document.createElement('input');
+ inputPrompt.id = `${ConfigPrefix + config}Prompt`;
+ inputPrompt.className = 'option';
+ inputPrompt.type = 'text';
+ inputPrompt.setAttribute('value', CMOptions[config]);
+ const a = document.createElement('a');
+ a.className = 'option';
+ a.onclick = function () {
+ Game.Prompt(inputPrompt.outerHTML, [
+ [
+ 'Save',
+ function () {
+ CMOptions[`${config}`] = l(`${ConfigPrefix}${config}Prompt`).value;
+ SaveConfig();
+ Game.ClosePrompt();
+ Game.UpdateMenu();
+ },
+ ],
+ 'Cancel',
+ ]);
+ };
+ a.textContent = 'Edit';
+ div.appendChild(a);
+ const label = document.createElement('label');
+ label.textContent = Config[config].desc;
+ div.appendChild(label);
+ return div;
+ }
+ if (Config[config].type === 'color') {
+ div.className = '';
+ for (let i = 0; i < Colors.length; i++) {
+ const innerDiv = document.createElement('div');
+ innerDiv.className = 'listing';
+ const input = document.createElement('input');
+ input.id = Colors[i];
+ input.style.width = '65px';
+ input.setAttribute('value', CMOptions.Colors[Colors[i]]);
+ innerDiv.appendChild(input);
+ const change = function () {
+ CMOptions.Colors[this.targetElement.id] = this.toHEXString();
+ UpdateColors();
+ SaveConfig();
+ Game.UpdateMenu();
+ };
+ new JsColor(input, { hash: true, position: 'right', onInput: change });
+ const label = document.createElement('label');
+ label.textContent = Config.Colors.desc[Colors[i]];
+ innerDiv.appendChild(label);
+ div.appendChild(innerDiv);
+ }
+ jscolor.init();
+ return div;
+ }
+ if (Config[config].type === 'numscale') {
+ const span = document.createElement('span');
+ span.className = 'option';
+ span.textContent = `${Config[config].label} `;
+ div.appendChild(span);
+ const input = document.createElement('input');
+ input.id = ConfigPrefix + config;
+ input.className = 'option';
+ input.type = 'number';
+ input.value = CMOptions[config];
+ input.min = Config[config].min;
+ input.max = Config[config].max;
+ input.oninput = function () {
+ if (this.value > this.max) console.log('TEST');
+ CMOptions[config] = this.value;
+ SaveConfig();
+ RefreshScale();
+ };
+ div.appendChild(input);
+ div.appendChild(document.createTextNode(' '));
+ const label = document.createElement('label');
+ label.textContent = Config[config].desc;
+ div.appendChild(label);
+ return div;
+ }
+ return div;
}
/**
@@ -180,42 +213,55 @@ function CreatePrefOption(config) {
* @param {object} title On object that includes the title of the menu
*/
export default function AddMenuPref(title) {
- const frag = document.createDocumentFragment();
- frag.appendChild(title);
+ const frag = document.createDocumentFragment();
+ frag.appendChild(title);
- for (const group of Object.keys(ConfigGroups)) {
- const groupObject = CreatePrefHeader(group, ConfigGroups[group]); // (group, display-name of group)
- frag.appendChild(groupObject);
- if (CMOptions.Header[group]) { // 0 is show, 1 is collapsed
- // Make sub-sections of Notification section
- if (group === 'Notification') {
- for (const subGroup of Object.keys(ConfigGroupsNotification)) {
- const subGroupObject = CreatePrefHeader(subGroup, ConfigGroupsNotification[subGroup]); // (group, display-name of group)
- subGroupObject.style.fontSize = '15px';
- subGroupObject.style.opacity = '0.5';
- frag.appendChild(subGroupObject);
- if (CMOptions.Header[subGroup]) {
- for (const option in Config) {
- if (Config[option].group === subGroup) frag.appendChild(CreatePrefOption(option));
- }
- }
- }
- } else {
- for (const option of Object.keys(Config)) {
- if (Config[option].group === group) frag.appendChild(CreatePrefOption(option));
- }
- }
- }
- }
+ for (const group of Object.keys(ConfigGroups)) {
+ const groupObject = CreatePrefHeader(group, ConfigGroups[group]); // (group, display-name of group)
+ frag.appendChild(groupObject);
+ if (CMOptions.Header[group]) {
+ // 0 is show, 1 is collapsed
+ // Make sub-sections of Notification section
+ if (group === 'Notification') {
+ for (const subGroup of Object.keys(ConfigGroupsNotification)) {
+ const subGroupObject = CreatePrefHeader(
+ subGroup,
+ ConfigGroupsNotification[subGroup],
+ ); // (group, display-name of group)
+ subGroupObject.style.fontSize = '15px';
+ subGroupObject.style.opacity = '0.5';
+ frag.appendChild(subGroupObject);
+ if (CMOptions.Header[subGroup]) {
+ for (const option in Config) {
+ if (Config[option].group === subGroup)
+ frag.appendChild(CreatePrefOption(option));
+ }
+ }
+ }
+ } else {
+ for (const option of Object.keys(Config)) {
+ if (Config[option].group === group)
+ frag.appendChild(CreatePrefOption(option));
+ }
+ }
+ }
+ }
- const resDef = document.createElement('div');
- resDef.className = 'listing';
- const resDefBut = document.createElement('a');
- resDefBut.className = 'option';
- resDefBut.onclick = function () { LoadConfig(ConfigDefault); };
- resDefBut.textContent = 'Restore Default';
- resDef.appendChild(resDefBut);
- frag.appendChild(resDef);
+ const resDef = document.createElement('div');
+ resDef.className = 'listing';
+ const resDefBut = document.createElement('a');
+ resDefBut.className = 'option';
+ resDefBut.onclick = function () {
+ LoadConfig(ConfigDefault);
+ };
+ resDefBut.textContent = 'Restore Default';
+ resDef.appendChild(resDefBut);
+ frag.appendChild(resDef);
- l('menu').childNodes[2].insertBefore(frag, l('menu').childNodes[2].childNodes[l('menu').childNodes[2].childNodes.length - 1]);
+ l('menu').childNodes[2].insertBefore(
+ frag,
+ l('menu').childNodes[2].childNodes[
+ l('menu').childNodes[2].childNodes.length - 1
+ ],
+ );
}
diff --git a/src/Disp/Notifications/Flash.js b/src/Disp/Notifications/Flash.js
index d185681..ad258da 100644
--- a/src/Disp/Notifications/Flash.js
+++ b/src/Disp/Notifications/Flash.js
@@ -9,17 +9,26 @@ import { isInitializing } from '../../InitSaveLoad/Variables';
* @param {string} config The setting in CM.Options that is checked before creating the flash
*/
export default function Flash(mode, config) {
- // The arguments check makes the sound not play upon initialization of the mod
- if ((CMOptions[config] === 1 && mode === 3 && isInitializing === false) || mode === 1) {
- l('CMWhiteScreen').style.opacity = '0.5';
- if (mode === 3) {
- l('CMWhiteScreen').style.display = 'inline';
- setTimeout(function () { Flash(2, config); }, 1000 / Game.fps);
- } else {
- setTimeout(function () { Flash(0, config); }, 1000 / Game.fps);
- }
- } else if (mode === 2) {
- l('CMWhiteScreen').style.opacity = '1';
- setTimeout(function () { Flash(1, config); }, 1000 / Game.fps);
- } else if (mode === 0) l('CMWhiteScreen').style.display = 'none';
+ // The arguments check makes the sound not play upon initialization of the mod
+ if (
+ (CMOptions[config] === 1 && mode === 3 && isInitializing === false) ||
+ mode === 1
+ ) {
+ l('CMWhiteScreen').style.opacity = '0.5';
+ if (mode === 3) {
+ l('CMWhiteScreen').style.display = 'inline';
+ setTimeout(function () {
+ Flash(2, config);
+ }, 1000 / Game.fps);
+ } else {
+ setTimeout(function () {
+ Flash(0, config);
+ }, 1000 / Game.fps);
+ }
+ } else if (mode === 2) {
+ l('CMWhiteScreen').style.opacity = '1';
+ setTimeout(function () {
+ Flash(1, config);
+ }, 1000 / Game.fps);
+ } else if (mode === 0) l('CMWhiteScreen').style.display = 'none';
}
diff --git a/src/Disp/Notifications/Notification.js b/src/Disp/Notifications/Notification.js
index 3ef602e..7f64697 100644
--- a/src/Disp/Notifications/Notification.js
+++ b/src/Disp/Notifications/Notification.js
@@ -11,9 +11,13 @@ import { isInitializing } from '../../InitSaveLoad/Variables';
* @param {string} message The text of the to-be created notifications
*/
export default function Notification(notifyConfig, title, message) {
- // The arguments check makes the sound not play upon initialization of the mod
- if (CMOptions[notifyConfig] === 1 && document.visibilityState === 'hidden' && isInitializing === false) {
- const CookieIcon = 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
- new Notification(title, { body: message, badge: CookieIcon });
- }
+ // The arguments check makes the sound not play upon initialization of the mod
+ if (
+ CMOptions[notifyConfig] === 1 &&
+ document.visibilityState === 'hidden' &&
+ isInitializing === false
+ ) {
+ const CookieIcon = 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
+ new Notification(title, { body: message, badge: CookieIcon });
+ }
}
diff --git a/src/Disp/Notifications/Sound.js b/src/Disp/Notifications/Sound.js
index 0d0f9d1..e406392 100644
--- a/src/Disp/Notifications/Sound.js
+++ b/src/Disp/Notifications/Sound.js
@@ -9,12 +9,13 @@ import { isInitializing } from '../../InitSaveLoad/Variables';
* @param {string} volConfig The setting in CM.Options that is checked to determine volume
*/
export default function PlaySound(url, sndConfig, volConfig) {
- // The arguments check makes the sound not play upon initialization of the mod
- if (CMOptions[sndConfig] === 1 && isInitializing === false) {
- // eslint-disable-next-line new-cap
- const sound = new realAudio(url);
- if (CMOptions.GeneralSound) sound.volume = (CMOptions[volConfig] / 100) * (Game.volume / 100);
- else sound.volume = (CMOptions[volConfig] / 100);
- sound.play();
- }
+ // The arguments check makes the sound not play upon initialization of the mod
+ if (CMOptions[sndConfig] === 1 && isInitializing === false) {
+ // eslint-disable-next-line new-cap
+ const sound = new realAudio(url);
+ if (CMOptions.GeneralSound)
+ sound.volume = (CMOptions[volConfig] / 100) * (Game.volume / 100);
+ else sound.volume = CMOptions[volConfig] / 100;
+ sound.play();
+ }
}
diff --git a/src/Disp/TabTitle/FavIcon.js b/src/Disp/TabTitle/FavIcon.js
index dcecaba..f80bc24 100644
--- a/src/Disp/TabTitle/FavIcon.js
+++ b/src/Disp/TabTitle/FavIcon.js
@@ -6,11 +6,11 @@ import { LastGoldenCookieState } from '../../Main/VariablesAndData';
* This function creates the Favicon, it is called by CM.Main.DelayInit()
*/
export function CreateFavicon() {
- const Favicon = document.createElement('link');
- Favicon.id = 'CMFavicon';
- Favicon.rel = 'shortcut icon';
- Favicon.href = 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
- document.getElementsByTagName('head')[0].appendChild(Favicon);
+ const Favicon = document.createElement('link');
+ Favicon.id = 'CMFavicon';
+ Favicon.rel = 'shortcut icon';
+ Favicon.href = 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
+ document.getElementsByTagName('head')[0].appendChild(Favicon);
}
/**
@@ -18,8 +18,14 @@ export function CreateFavicon() {
* By relying on CM.Cache.spawnedGoldenShimmer it only changes for non-user spawned cookie
*/
export function UpdateFavicon() {
- if (CMOptions.Favicon === 1 && LastGoldenCookieState > 0) {
- if (CacheSpawnedGoldenShimmer.wrath) l('CMFavicon').href = 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
- else l('CMFavicon').href = 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
- } else l('CMFavicon').href = 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
+ if (CMOptions.Favicon === 1 && LastGoldenCookieState > 0) {
+ if (CacheSpawnedGoldenShimmer.wrath)
+ l('CMFavicon').href =
+ 'https://aktanusa.github.io/CookieMonster/favicon/wrathCookie.ico';
+ else
+ l('CMFavicon').href =
+ 'https://aktanusa.github.io/CookieMonster/favicon/goldenCookie.ico';
+ } else
+ l('CMFavicon').href =
+ 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
}
diff --git a/src/Disp/TabTitle/TabTitle.js b/src/Disp/TabTitle/TabTitle.js
index ec227ef..8dd4259 100644
--- a/src/Disp/TabTitle/TabTitle.js
+++ b/src/Disp/TabTitle/TabTitle.js
@@ -1,8 +1,14 @@
/** Functions related to updating the tab in the browser's tab-bar */
-import { CacheSeasonPopShimmer, CacheSpawnedGoldenShimmer } from '../../Cache/VariablesAndData';
+import {
+ CacheSeasonPopShimmer,
+ CacheSpawnedGoldenShimmer,
+} from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
-import { LastSeasonPopupState, LastTickerFortuneState } from '../../Main/VariablesAndData';
+import {
+ LastSeasonPopupState,
+ LastTickerFortuneState,
+} from '../../Main/VariablesAndData';
import { Title } from '../VariablesAndData';
/**
@@ -10,61 +16,78 @@ import { Title } from '../VariablesAndData';
* It is called on every loop by Game.Logic() which also sets CM.Disp.Title to Game.cookies
*/
export default function UpdateTitle() {
- if (Game.OnAscend || CMOptions.Title === 0) {
- document.title = Title;
- } else if (CMOptions.Title === 1) {
- let addFC = false;
- let addSP = false;
- let titleGC;
- let titleFC;
- let titleSP;
+ if (Game.OnAscend || CMOptions.Title === 0) {
+ document.title = Title;
+ } else if (CMOptions.Title === 1) {
+ let addFC = false;
+ let addSP = false;
+ let titleGC;
+ let titleFC;
+ let titleSP;
- if (CacheSpawnedGoldenShimmer) {
- if (CacheSpawnedGoldenShimmer.wrath) titleGC = `[W${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
- else titleGC = `[G${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
- } else if (!Game.Has('Golden switch [off]')) {
- titleGC = `[${Number(l('CMTimerBarGCMinBar').textContent) < 0 ? '!' : ''}${Math.ceil((Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) / Game.fps)}]`;
- } else titleGC = '[GS]';
+ if (CacheSpawnedGoldenShimmer) {
+ if (CacheSpawnedGoldenShimmer.wrath)
+ titleGC = `[W${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
+ else
+ titleGC = `[G${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
+ } else if (!Game.Has('Golden switch [off]')) {
+ titleGC = `[${
+ Number(l('CMTimerBarGCMinBar').textContent) < 0 ? '!' : ''
+ }${Math.ceil(
+ (Game.shimmerTypes.golden.maxTime - Game.shimmerTypes.golden.time) /
+ Game.fps,
+ )}]`;
+ } else titleGC = '[GS]';
- if (LastTickerFortuneState) {
- addFC = true;
- titleFC = '[F]';
- }
+ if (LastTickerFortuneState) {
+ addFC = true;
+ titleFC = '[F]';
+ }
- if (Game.season === 'christmas') {
- addSP = true;
- if (LastSeasonPopupState) titleSP = `[R${Math.ceil(CacheSeasonPopShimmer.life / Game.fps)}]`;
- else {
- titleSP = `[${Number(l('CMTimerBarRenMinBar').textContent) < 0 ? '!' : ''}${Math.ceil((Game.shimmerTypes.reindeer.maxTime - Game.shimmerTypes.reindeer.time) / Game.fps)}]`;
- }
- }
+ if (Game.season === 'christmas') {
+ addSP = true;
+ if (LastSeasonPopupState)
+ titleSP = `[R${Math.ceil(CacheSeasonPopShimmer.life / Game.fps)}]`;
+ else {
+ titleSP = `[${
+ Number(l('CMTimerBarRenMinBar').textContent) < 0 ? '!' : ''
+ }${Math.ceil(
+ (Game.shimmerTypes.reindeer.maxTime -
+ Game.shimmerTypes.reindeer.time) /
+ Game.fps,
+ )}]`;
+ }
+ }
- // Remove previous timers and add current cookies
- let str = Title;
- if (str.charAt(0) === '[') {
- str = str.substring(str.lastIndexOf(']') + 1);
- }
- document.title = `${titleGC + (addFC ? titleFC : '') + (addSP ? titleSP : '')} ${str}`;
- } else if (CMOptions.Title === 2) {
- let str = '';
- let spawn = false;
- if (CacheSpawnedGoldenShimmer) {
- spawn = true;
- if (CacheSpawnedGoldenShimmer.wrath) str += `[W${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
- else str += `[G${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
- }
- if (LastTickerFortuneState) {
- spawn = true;
- str += '[F]';
- }
- if (Game.season === 'christmas' && LastSeasonPopupState) {
- str += `[R${Math.ceil(CacheSeasonPopShimmer.life / Game.fps)}]`;
- spawn = true;
- }
- if (spawn) str += ' - ';
- let title = 'Cookie Clicker';
- if (Game.season === 'fools') title = 'Cookie Baker';
- str += title;
- document.title = str;
- }
+ // Remove previous timers and add current cookies
+ let str = Title;
+ if (str.charAt(0) === '[') {
+ str = str.substring(str.lastIndexOf(']') + 1);
+ }
+ document.title = `${
+ titleGC + (addFC ? titleFC : '') + (addSP ? titleSP : '')
+ } ${str}`;
+ } else if (CMOptions.Title === 2) {
+ let str = '';
+ let spawn = false;
+ if (CacheSpawnedGoldenShimmer) {
+ spawn = true;
+ if (CacheSpawnedGoldenShimmer.wrath)
+ str += `[W${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
+ else str += `[G${Math.ceil(CacheSpawnedGoldenShimmer.life / Game.fps)}]`;
+ }
+ if (LastTickerFortuneState) {
+ spawn = true;
+ str += '[F]';
+ }
+ if (Game.season === 'christmas' && LastSeasonPopupState) {
+ str += `[R${Math.ceil(CacheSeasonPopShimmer.life / Game.fps)}]`;
+ spawn = true;
+ }
+ if (spawn) str += ' - ';
+ let title = 'Cookie Clicker';
+ if (Game.season === 'fools') title = 'Cookie Baker';
+ str += title;
+ document.title = str;
+ }
}
diff --git a/src/Disp/Tooltips/AscendButton.js b/src/Disp/Tooltips/AscendButton.js
index 8c0530a..c4f6cc9 100644
--- a/src/Disp/Tooltips/AscendButton.js
+++ b/src/Disp/Tooltips/AscendButton.js
@@ -1,4 +1,7 @@
-import { CacheHCPerSecond, CacheTimeTillNextPrestige } from '../../Cache/VariablesAndData';
+import {
+ CacheHCPerSecond,
+ CacheTimeTillNextPrestige,
+} from '../../Cache/VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
import { Beautify } from '../BeautifyAndFormatting/BeautifyFormatting';
@@ -8,21 +11,53 @@ import { Beautify } from '../BeautifyAndFormatting/BeautifyFormatting';
* @returns {object} div An object containing the stylized header
*/
export default function ReplaceAscendTooltip() {
- const ascendNowToGet = Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) - Math.floor(Game.HowMuchPrestige(Game.cookiesReset));
- const cookiesToNext = Game.HowManyCookiesReset(Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) + 1) - (Game.cookiesEarned + Game.cookiesReset);
- const startDate = Game.sayTime(((Date.now() - Game.startDate) / 1000) * Game.fps, -1);
- let str = '';
- str += `You've been on this run for
${startDate === '' ? 'not very long' : (startDate)}.
`;
- str += '
';
- if (Game.prestige > 0) {
- str += `Your prestige level is currently
${Beautify(Game.prestige)}.
(CpS +${Beautify(Game.prestige)}%)`;
- str += '
';
- }
- if (ascendNowToGet < 1) str += 'Ascending now would grant you no prestige.';
- else if (ascendNowToGet < 2) str += 'Ascending now would grant you
1 prestige level (+1% CpS)
and
1 heavenly chip to spend.';
- else str += `Ascending now would grant you
${Beautify(ascendNowToGet)} prestige levels (+${Beautify(ascendNowToGet)}% CpS)
and
${Beautify(ascendNowToGet)} heavenly chips to spend.`;
- str += '
';
- str += `You need
${Beautify(cookiesToNext)} more cookies for the next level.
`;
- str += `${CMOptions.TooltipAscendButton ? `
It takes ${CacheTimeTillNextPrestige} to reach the next level and you are making ${Beautify(CacheHCPerSecond, 2)} chips on average in the last 5 seconds.
` : ''}`;
- l('ascendTooltip').innerHTML = str;
+ const ascendNowToGet =
+ Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) -
+ Math.floor(Game.HowMuchPrestige(Game.cookiesReset));
+ const cookiesToNext =
+ Game.HowManyCookiesReset(
+ Math.floor(Game.HowMuchPrestige(Game.cookiesReset + Game.cookiesEarned)) +
+ 1,
+ ) -
+ (Game.cookiesEarned + Game.cookiesReset);
+ const startDate = Game.sayTime(
+ ((Date.now() - Game.startDate) / 1000) * Game.fps,
+ -1,
+ );
+ let str = '';
+ str += `You've been on this run for
${
+ startDate === '' ? 'not very long' : startDate
+ }.
`;
+ str += '
';
+ if (Game.prestige > 0) {
+ str += `Your prestige level is currently
${Beautify(
+ Game.prestige,
+ )}.
(CpS +${Beautify(Game.prestige)}%)`;
+ str += '
';
+ }
+ if (ascendNowToGet < 1) str += 'Ascending now would grant you no prestige.';
+ else if (ascendNowToGet < 2)
+ str +=
+ 'Ascending now would grant you
1 prestige level (+1% CpS)
and
1 heavenly chip to spend.';
+ else
+ str += `Ascending now would grant you
${Beautify(
+ ascendNowToGet,
+ )} prestige levels (+${Beautify(
+ ascendNowToGet,
+ )}% CpS)
and
${Beautify(
+ ascendNowToGet,
+ )} heavenly chips to spend.`;
+ str += '
';
+ str += `You need
${Beautify(
+ cookiesToNext,
+ )} more cookies for the next level.
`;
+ str += `${
+ CMOptions.TooltipAscendButton
+ ? `
It takes ${CacheTimeTillNextPrestige} to reach the next level and you are making ${Beautify(
+ CacheHCPerSecond,
+ 2,
+ )} chips on average in the last 5 seconds.
`
+ : ''
+ }`;
+ l('ascendTooltip').innerHTML = str;
}
diff --git a/src/Disp/Tooltips/CreateTooltip.js b/src/Disp/Tooltips/CreateTooltip.js
index 607a101..cb18d6a 100644
--- a/src/Disp/Tooltips/CreateTooltip.js
+++ b/src/Disp/Tooltips/CreateTooltip.js
@@ -1,6 +1,13 @@
import { CMOptions } from '../../Config/VariablesAndData';
import {
- ColorTextPre, ColorBorderPre, ColorGray, ColorBlue, ColorRed, ColorYellow, ColorPurple, TooltipType,
+ ColorTextPre,
+ ColorBorderPre,
+ ColorGray,
+ ColorBlue,
+ ColorRed,
+ ColorYellow,
+ ColorPurple,
+ TooltipType,
} from '../VariablesAndData';
/** Creates various sections of tooltips */
@@ -10,14 +17,14 @@ import {
* @returns {object} div An object containing the stylized box
*/
export function TooltipCreateTooltipBox() {
- l('tooltip').firstChild.style.paddingBottom = '4px'; // Sets padding on base-tooltip
- const tooltipBox = document.createElement('div');
- tooltipBox.style.border = '1px solid';
- tooltipBox.style.padding = '4px';
- tooltipBox.style.margin = '0px -4px';
- tooltipBox.id = 'CMTooltipBorder';
- tooltipBox.className = ColorTextPre + ColorGray;
- return tooltipBox;
+ l('tooltip').firstChild.style.paddingBottom = '4px'; // Sets padding on base-tooltip
+ const tooltipBox = document.createElement('div');
+ tooltipBox.style.border = '1px solid';
+ tooltipBox.style.padding = '4px';
+ tooltipBox.style.margin = '0px -4px';
+ tooltipBox.id = 'CMTooltipBorder';
+ tooltipBox.className = ColorTextPre + ColorGray;
+ return tooltipBox;
}
/**
@@ -26,12 +33,12 @@ export function TooltipCreateTooltipBox() {
* @returns {object} div An object containing the stylized header
*/
export function TooltipCreateHeader(text) {
- const div = document.createElement('div');
- div.style.fontWeight = 'bold';
- div.id = `${text}Title`;
- div.className = ColorTextPre + ColorBlue;
- div.textContent = text;
- return div;
+ const div = document.createElement('div');
+ div.style.fontWeight = 'bold';
+ div.id = `${text}Title`;
+ div.className = ColorTextPre + ColorBlue;
+ div.textContent = text;
+ return div;
}
/**
@@ -40,51 +47,105 @@ export function TooltipCreateHeader(text) {
* @returns {object} TooltipWarn The Warnings-tooltip object
*/
export function TooltipCreateWarningSection() {
- const TooltipWarn = document.createElement('div');
- TooltipWarn.style.position = 'absolute';
- TooltipWarn.style.display = 'block';
- TooltipWarn.style.left = 'auto';
- TooltipWarn.style.bottom = 'auto';
- TooltipWarn.id = 'CMDispTooltipWarningParent';
+ const TooltipWarn = document.createElement('div');
+ TooltipWarn.style.position = 'absolute';
+ TooltipWarn.style.display = 'block';
+ TooltipWarn.style.left = 'auto';
+ TooltipWarn.style.bottom = 'auto';
+ TooltipWarn.id = 'CMDispTooltipWarningParent';
- const create = function (boxId, color, labelTextFront, labelTextBack, deficitId) {
- const box = document.createElement('div');
- box.id = boxId;
- box.style.display = 'none';
- box.style.transition = 'opacity 0.1s ease-out';
- box.className = ColorBorderPre + color;
- box.style.padding = '2px';
- box.style.background = '#000 url(img/darkNoise.png)';
- const labelDiv = document.createElement('div');
- box.appendChild(labelDiv);
- const labelSpan = document.createElement('span');
- labelSpan.className = ColorTextPre + color;
- labelSpan.style.fontWeight = 'bold';
- labelSpan.textContent = labelTextFront;
- labelDiv.appendChild(labelSpan);
- labelDiv.appendChild(document.createTextNode(labelTextBack));
- const deficitDiv = document.createElement('div');
- box.appendChild(deficitDiv);
- const deficitSpan = document.createElement('span');
- deficitSpan.id = deficitId;
- deficitDiv.appendChild(document.createTextNode('Deficit: '));
- deficitDiv.appendChild(deficitSpan);
- return box;
- };
+ const create = function (
+ boxId,
+ color,
+ labelTextFront,
+ labelTextBack,
+ deficitId,
+ ) {
+ const box = document.createElement('div');
+ box.id = boxId;
+ box.style.display = 'none';
+ box.style.transition = 'opacity 0.1s ease-out';
+ box.className = ColorBorderPre + color;
+ box.style.padding = '2px';
+ box.style.background = '#000 url(img/darkNoise.png)';
+ const labelDiv = document.createElement('div');
+ box.appendChild(labelDiv);
+ const labelSpan = document.createElement('span');
+ labelSpan.className = ColorTextPre + color;
+ labelSpan.style.fontWeight = 'bold';
+ labelSpan.textContent = labelTextFront;
+ labelDiv.appendChild(labelSpan);
+ labelDiv.appendChild(document.createTextNode(labelTextBack));
+ const deficitDiv = document.createElement('div');
+ box.appendChild(deficitDiv);
+ const deficitSpan = document.createElement('span');
+ deficitSpan.id = deficitId;
+ deficitDiv.appendChild(document.createTextNode('Deficit: '));
+ deficitDiv.appendChild(deficitSpan);
+ return box;
+ };
- TooltipWarn.appendChild(create('CMDispTooltipWarnLucky', ColorRed, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!"', 'CMDispTooltipWarnLuckyText'));
- TooltipWarn.firstChild.style.marginBottom = '4px';
- TooltipWarn.appendChild(create('CMDispTooltipWarnLuckyFrenzy', ColorYellow, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Lucky!" (Frenzy)', 'CMDispTooltipWarnLuckyFrenzyText'));
- TooltipWarn.lastChild.style.marginBottom = '4px';
- TooltipWarn.appendChild(create('CMDispTooltipWarnConjure', ColorPurple, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods"', 'CMDispTooltipWarnConjureText'));
- TooltipWarn.lastChild.style.marginBottom = '4px';
- TooltipWarn.appendChild(create('CMDispTooltipWarnConjureFrenzy', ColorPurple, 'Warning: ', 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods" (Frenzy)', 'CMDispTooltipWarnConjureFrenzyText'));
- TooltipWarn.lastChild.style.marginBottom = '4px';
- TooltipWarn.appendChild(create('CMDispTooltipWarnEdifice', ColorPurple, 'Warning: ', 'Purchase of this item will put you under the number of Cookies needed for "Spontaneous Edifice" to possibly give you your most expensive building"', 'CMDispTooltipWarnEdificeText'));
- TooltipWarn.lastChild.style.marginBottom = '4px';
- TooltipWarn.appendChild(create('CMDispTooltipWarnUser', ColorRed, 'Warning: ', `Purchase of this item will put you under the number of Cookies equal to ${CMOptions.ToolWarnUser} seconds of CPS`, 'CMDispTooltipWarnUserText'));
+ TooltipWarn.appendChild(
+ create(
+ 'CMDispTooltipWarnLucky',
+ ColorRed,
+ 'Warning: ',
+ 'Purchase of this item will put you under the number of Cookies required for "Lucky!"',
+ 'CMDispTooltipWarnLuckyText',
+ ),
+ );
+ TooltipWarn.firstChild.style.marginBottom = '4px';
+ TooltipWarn.appendChild(
+ create(
+ 'CMDispTooltipWarnLuckyFrenzy',
+ ColorYellow,
+ 'Warning: ',
+ 'Purchase of this item will put you under the number of Cookies required for "Lucky!" (Frenzy)',
+ 'CMDispTooltipWarnLuckyFrenzyText',
+ ),
+ );
+ TooltipWarn.lastChild.style.marginBottom = '4px';
+ TooltipWarn.appendChild(
+ create(
+ 'CMDispTooltipWarnConjure',
+ ColorPurple,
+ 'Warning: ',
+ 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods"',
+ 'CMDispTooltipWarnConjureText',
+ ),
+ );
+ TooltipWarn.lastChild.style.marginBottom = '4px';
+ TooltipWarn.appendChild(
+ create(
+ 'CMDispTooltipWarnConjureFrenzy',
+ ColorPurple,
+ 'Warning: ',
+ 'Purchase of this item will put you under the number of Cookies required for "Conjure Baked Goods" (Frenzy)',
+ 'CMDispTooltipWarnConjureFrenzyText',
+ ),
+ );
+ TooltipWarn.lastChild.style.marginBottom = '4px';
+ TooltipWarn.appendChild(
+ create(
+ 'CMDispTooltipWarnEdifice',
+ ColorPurple,
+ 'Warning: ',
+ 'Purchase of this item will put you under the number of Cookies needed for "Spontaneous Edifice" to possibly give you your most expensive building"',
+ 'CMDispTooltipWarnEdificeText',
+ ),
+ );
+ TooltipWarn.lastChild.style.marginBottom = '4px';
+ TooltipWarn.appendChild(
+ create(
+ 'CMDispTooltipWarnUser',
+ ColorRed,
+ 'Warning: ',
+ `Purchase of this item will put you under the number of Cookies equal to ${CMOptions.ToolWarnUser} seconds of CPS`,
+ 'CMDispTooltipWarnUserText',
+ ),
+ );
- return TooltipWarn;
+ return TooltipWarn;
}
/**
@@ -93,38 +154,40 @@ export function TooltipCreateWarningSection() {
* @param {object} tooltip Object of a TooltipBox, normally created by a call to CM.Disp.TooltipCreateTooltipBox()
*/
export function TooltipCreateCalculationSection(tooltip) {
- tooltip.appendChild(TooltipCreateHeader('Bonus Income'));
- const income = document.createElement('div');
- income.style.marginBottom = '4px';
- income.style.color = 'white';
- income.id = 'CMTooltipIncome';
- tooltip.appendChild(income);
+ tooltip.appendChild(TooltipCreateHeader('Bonus Income'));
+ const income = document.createElement('div');
+ income.style.marginBottom = '4px';
+ income.style.color = 'white';
+ income.id = 'CMTooltipIncome';
+ tooltip.appendChild(income);
- tooltip.appendChild(TooltipCreateHeader('Bonus Cookies per Click'));
- tooltip.lastChild.style.display = 'none';
- const click = document.createElement('div');
- click.style.marginBottom = '4px';
- click.style.color = 'white';
- click.style.display = 'none';
- click.id = 'CMTooltipCookiePerClick';
- tooltip.appendChild(click);
+ tooltip.appendChild(TooltipCreateHeader('Bonus Cookies per Click'));
+ tooltip.lastChild.style.display = 'none';
+ const click = document.createElement('div');
+ click.style.marginBottom = '4px';
+ click.style.color = 'white';
+ click.style.display = 'none';
+ click.id = 'CMTooltipCookiePerClick';
+ tooltip.appendChild(click);
- tooltip.appendChild(TooltipCreateHeader('Payback Period'));
- const pp = document.createElement('div');
- pp.style.marginBottom = '4px';
- pp.id = 'CMTooltipPP';
- tooltip.appendChild(pp);
+ tooltip.appendChild(TooltipCreateHeader('Payback Period'));
+ const pp = document.createElement('div');
+ pp.style.marginBottom = '4px';
+ pp.id = 'CMTooltipPP';
+ tooltip.appendChild(pp);
- tooltip.appendChild(TooltipCreateHeader('Time Left'));
- const time = document.createElement('div');
- time.id = 'CMTooltipTime';
- tooltip.appendChild(time);
+ tooltip.appendChild(TooltipCreateHeader('Time Left'));
+ const time = document.createElement('div');
+ time.id = 'CMTooltipTime';
+ tooltip.appendChild(time);
- if (TooltipType === 'b') {
- tooltip.appendChild(TooltipCreateHeader('Production left till next achievement'));
- tooltip.lastChild.id = 'CMTooltipProductionHeader'; // Assign a id in order to hid when no achiev's are left
- const production = document.createElement('div');
- production.id = 'CMTooltipProduction';
- tooltip.appendChild(production);
- }
+ if (TooltipType === 'b') {
+ tooltip.appendChild(
+ TooltipCreateHeader('Production left till next achievement'),
+ );
+ tooltip.lastChild.id = 'CMTooltipProductionHeader'; // Assign a id in order to hid when no achiev's are left
+ const production = document.createElement('div');
+ production.id = 'CMTooltipProduction';
+ tooltip.appendChild(production);
+ }
}
diff --git a/src/Disp/Tooltips/PositionLocation.js b/src/Disp/Tooltips/PositionLocation.js
index f35b9f0..cfaed6d 100644
--- a/src/Disp/Tooltips/PositionLocation.js
+++ b/src/Disp/Tooltips/PositionLocation.js
@@ -5,15 +5,26 @@ import { CMOptions } from '../../Config/VariablesAndData';
* It is called by Game.tooltip.update() because of CM.Main.ReplaceNative()
*/
export default function UpdateTooltipLocation() {
- if (Game.tooltip.origin === 'store') {
- let warnOffset = 0;
- if (CMOptions.ToolWarnLucky === 1 && CMOptions.ToolWarnPos === 1 && l('CMDispTooltipWarningParent') !== null) {
- warnOffset = l('CMDispTooltipWarningParent').clientHeight - 4;
- }
- Game.tooltip.tta.style.top = `${Math.min(parseInt(Game.tooltip.tta.style.top, 10), (l('game').clientHeight + l('topBar').clientHeight) - Game.tooltip.tt.clientHeight - warnOffset - 46)}px`;
- }
- // Kept for future possible use if the code changes again
- /* else if (!Game.onCrate && !Game.OnAscend && CM.Options.TimerBar === 1 && CM.Options.TimerBarPos === 0) {
+ if (Game.tooltip.origin === 'store') {
+ let warnOffset = 0;
+ if (
+ CMOptions.ToolWarnLucky === 1 &&
+ CMOptions.ToolWarnPos === 1 &&
+ l('CMDispTooltipWarningParent') !== null
+ ) {
+ warnOffset = l('CMDispTooltipWarningParent').clientHeight - 4;
+ }
+ Game.tooltip.tta.style.top = `${Math.min(
+ parseInt(Game.tooltip.tta.style.top, 10),
+ l('game').clientHeight +
+ l('topBar').clientHeight -
+ Game.tooltip.tt.clientHeight -
+ warnOffset -
+ 46,
+ )}px`;
+ }
+ // Kept for future possible use if the code changes again
+ /* else if (!Game.onCrate && !Game.OnAscend && CM.Options.TimerBar === 1 && CM.Options.TimerBarPos === 0) {
Game.tooltip.tta.style.top = (parseInt(Game.tooltip.tta.style.top) + parseInt(CM.Disp.TimerBar.style.height)) + 'px';
} */
}
diff --git a/src/Disp/Tooltips/Tooltip.js b/src/Disp/Tooltips/Tooltip.js
index 42957a1..cd044da 100644
--- a/src/Disp/Tooltips/Tooltip.js
+++ b/src/Disp/Tooltips/Tooltip.js
@@ -1,7 +1,10 @@
/* eslint-disable no-unused-vars */
import * as UpdateTooltip from './UpdateTooltips';
import { TooltipCreateTooltipBox } from './CreateTooltip';
-import { Beautify, GetTimeColor } from '../BeautifyAndFormatting/BeautifyFormatting';
+import {
+ Beautify,
+ GetTimeColor,
+} from '../BeautifyAndFormatting/BeautifyFormatting';
import CopyData from '../../Sim/SimulationData/CopyData';
import { TooltipName, TooltipType } from '../VariablesAndData';
import { CMOptions } from '../../Config/VariablesAndData';
@@ -17,47 +20,48 @@ import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
* @param {string} minWidth The minimum width of the tooltip
*/
export function CreateSimpleTooltip(placeholder, text, minWidth) {
- const Tooltip = document.createElement('div');
- Tooltip.id = placeholder;
- const desc = document.createElement('div');
- desc.style.minWidth = minWidth;
- desc.style.marginBottom = '4px';
- const div = document.createElement('div');
- div.style.textAlign = 'left';
- div.textContent = text;
- desc.appendChild(div);
- Tooltip.appendChild(desc);
+ const Tooltip = document.createElement('div');
+ Tooltip.id = placeholder;
+ const desc = document.createElement('div');
+ desc.style.minWidth = minWidth;
+ desc.style.marginBottom = '4px';
+ const div = document.createElement('div');
+ div.style.textAlign = 'left';
+ div.textContent = text;
+ desc.appendChild(div);
+ Tooltip.appendChild(desc);
}
/**
* This function updates the sections of the tooltips created by CookieMonster
*/
export function UpdateTooltips() {
- CopyData();
- if (l('tooltipAnchor').style.display !== 'none' && l('CMTooltipArea')) {
- l('CMTooltipArea').innerHTML = '';
- const tooltipBox = TooltipCreateTooltipBox();
- l('CMTooltipArea').appendChild(tooltipBox);
+ CopyData();
+ if (l('tooltipAnchor').style.display !== 'none' && l('CMTooltipArea')) {
+ l('CMTooltipArea').innerHTML = '';
+ const tooltipBox = TooltipCreateTooltipBox();
+ l('CMTooltipArea').appendChild(tooltipBox);
- if (TooltipType === 'b') {
- UpdateTooltip.Building();
- } else if (TooltipType === 'u') {
- UpdateTooltip.Upgrade();
- } else if (TooltipType === 's') {
- UpdateTooltip.SugarLump();
- } else if (TooltipType === 'g') {
- UpdateTooltip.Grimoire();
- } else if (TooltipType === 'p') {
- UpdateTooltip.GardenPlots();
- } else if (TooltipType === 'ha') {
- UpdateTooltip.HarvestAll();
- }
- UpdateTooltip.Warnings();
- } else if (l('CMTooltipArea') === null) { // Remove warnings if its a basic tooltip
- if (l('CMDispTooltipWarningParent') !== null) {
- l('CMDispTooltipWarningParent').remove();
- }
- }
+ if (TooltipType === 'b') {
+ UpdateTooltip.Building();
+ } else if (TooltipType === 'u') {
+ UpdateTooltip.Upgrade();
+ } else if (TooltipType === 's') {
+ UpdateTooltip.SugarLump();
+ } else if (TooltipType === 'g') {
+ UpdateTooltip.Grimoire();
+ } else if (TooltipType === 'p') {
+ UpdateTooltip.GardenPlots();
+ } else if (TooltipType === 'ha') {
+ UpdateTooltip.HarvestAll();
+ }
+ UpdateTooltip.Warnings();
+ } else if (l('CMTooltipArea') === null) {
+ // Remove warnings if its a basic tooltip
+ if (l('CMDispTooltipWarningParent') !== null) {
+ l('CMDispTooltipWarningParent').remove();
+ }
+ }
}
/**
@@ -68,49 +72,98 @@ export function UpdateTooltips() {
* @returns {string} l('tooltip').innerHTML The HTML of the l('tooltip')-object
*/
export function CreateTooltip(type, name) {
- if (type === 'b') { // Buildings
- l('tooltip').innerHTML = Game.Objects[name].tooltip();
- // Adds amortization info to the list of info per building
- if (CMOptions.TooltipAmor === 1) {
- const buildPrice = BuildingGetPrice(Game.Objects[name], Game.Objects[name].basePrice, 0, Game.Objects[name].free, Game.Objects[name].amount);
- const amortizeAmount = buildPrice - Game.Objects[name].totalCookies;
- if (amortizeAmount > 0) {
- l('tooltip').innerHTML = l('tooltip').innerHTML
- .split('so far