Merge pull request #758 from DanielNoord/hotfix

Hotfix

src/Config/SaveLoadReload/SaveLoadReloadSettings.js

@@ -1,4 +1,4 @@
-import ConfigDefault from '../../Data/SettingsDefault';
+import ConfigDefault from '../../Data/SettingsDefault.ts';
 import ConfigData from '../../Data/SettingsData';
 import { CMOptions } from '../VariablesAndData';
 import save from '../../InitSaveLoad/save';

src/Data/Gamedata.ts

@@ -1,7 +1,7 @@
 /** Data copied directly from the game */
 
 /** Array of the names of all fortune cookies obtainable from the ticker */
-export const Fortunes = [
+export const Fortunes: string[] = [
   'Fortune #001',
   'Fortune #002',
   'Fortune #003',
@@ -28,7 +28,7 @@ export const Fortunes = [
 ];
 
 /** Array of the names of all Halloween cookies */
-export const HalloCookies = [
+export const HalloCookies: string[] = [
   'Skull cookies',
   'Ghost cookies',
   'Bat cookies',
@@ -39,7 +39,7 @@ export const HalloCookies = [
 ];
 
 /** Array of the names of all Christmas cookies */
-export const ChristCookies = [
+export const ChristCookies: string[] = [
   'Christmas tree biscuits',
   'Snowflake biscuits',
   'Snowman biscuits',
@@ -50,7 +50,7 @@ export const ChristCookies = [
 ];
 
 /** Array of the names of all Valentine cookies */
-export const ValCookies = [
+export const ValCookies: string[] = [
   'Pure heart biscuits',
   'Ardent heart biscuits',
   'Sour heart biscuits',
@@ -61,7 +61,7 @@ export const ValCookies = [
 ];
 
 /** Array of the names of all plant drops */
-export const PlantDrops = [
+export const PlantDrops: string[] = [
   'Elderwort biscuits',
   'Bakeberry cookies',
   'Duketater cookies',
@@ -72,7 +72,7 @@ export const PlantDrops = [
 ];
 
 /** All possible effects plants and other items can have with a display-title */
-export const Effects = {
+export const Effects: { [index: string]: string } = {
   buildingCost: 'Building prices',
   click: 'Cookies per click',
   cps: 'Total CPS',

src/Data/Scales.ts

@@ -1,10 +1,10 @@
 /** 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: string[] = ['', '', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
 
 /** Array of abbreviations used in the "Short" scale */
-export const shortScale = [
+export const shortScale: string[] = [
   '',
   '',
   'M',
@@ -34,7 +34,7 @@ export const shortScale = [
 ];
 
 /** Array of abbreviations used in the "Abbreviated Short" scale */
-export const shortScaleAbbreviated = [
+export const shortScaleAbbreviated: string[] = [
   '',
   'K',
   'M',

src/Data/Sectionheaders.ts

@@ -1,7 +1,7 @@
 /** Data related to the display titles of certain sections in menu screens */
 
 /** Display titles of the headers of the Cookie Monster settings section */
-export const ConfigGroups = {
+export const ConfigGroups: { [index: string]: string } = {
   Favourite: 'Favourite Settings',
   Calculation: 'Calculation',
   Notation: 'Notation',
@@ -14,7 +14,7 @@ export const ConfigGroups = {
 };
 
 /** Display titles of the headers of the notification section of the Cookie Monster settings */
-export const ConfigGroupsNotification = {
+export const ConfigGroupsNotification: { [index: string]: string } = {
   NotificationGeneral: 'General Notifications',
   NotificationGC: 'Golden Cookie',
   NotificationFC: 'Fortune Cookie',

src/Data/SettingsDefault.ts

@@ -1,5 +1,7 @@
 /** This array describes all default settings */
-const ConfigDefault = {
+const ConfigDefault: {
+  [index: string]: string | number | { [index: string]: number };
+} = {
   CPSMode: 1,
   AvgCPSHist: 3,
   AvgClicksHist: 0,

src/Disp/BeautifyAndFormatting/BeautifyFormatting.js

@@ -1,7 +1,11 @@
 /** General functions to format or beautify strings */
 
 import { CMOptions } from '../../Config/VariablesAndData';
-import { metric, shortScale, shortScaleAbbreviated } from '../../Data/Scales';
+import {
+  metric,
+  shortScale,
+  shortScaleAbbreviated,
+} from '../../Data/Scales.ts';
 import { BackupFunctions } from '../../Main/VariablesAndData';
 import {
   ColourGreen,

src/Disp/InfoBars/BottomBar.js

@@ -6,7 +6,7 @@ import {
   CacheObjects100,
 } from '../../Cache/VariablesAndData';
 import { CMOptions } from '../../Config/VariablesAndData';
-import { VersionMajor, VersionMinor } from '../../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../../Data/Moddata.ts';
 import {
   Beautify,
   FormatTime,

src/Disp/MenuSections/Info/InfoPage.js

@@ -2,7 +2,7 @@
 
 import { ToggleHeader } from '../../../Config/ToggleSetting';
 import { CMOptions } from '../../../Config/VariablesAndData';
-import { LatestReleaseNotes, ModDescription } from '../../../Data/Moddata';
+import { LatestReleaseNotes, ModDescription } from '../../../Data/Moddata.ts';
 
 /**
  * This function adds stats created by CookieMonster to the stats page

src/Disp/MenuSections/Settings/CreateOption.js

@@ -7,7 +7,7 @@ import {
   ToggleConfigVolume,
 } from '../../../Config/ToggleSetting';
 import { CMOptions } from '../../../Config/VariablesAndData';
-import {} from '../../../Data/Sectionheaders';
+import {} from '../../../Data/Sectionheaders.ts';
 import Config from '../../../Data/SettingsData';
 import RefreshScale from '../../HelperFunctions/RefreshScale';
 import UpdateColours from '../../HelperFunctions/UpdateColours';

src/Disp/MenuSections/Settings/SettingsPage.js

@@ -3,9 +3,9 @@ import { CMOptions } from '../../../Config/VariablesAndData';
 import {
   ConfigGroups,
   ConfigGroupsNotification,
-} from '../../../Data/Sectionheaders';
+} from '../../../Data/Sectionheaders.ts';
 import Config from '../../../Data/SettingsData';
-import ConfigDefault from '../../../Data/SettingsDefault';
+import ConfigDefault from '../../../Data/SettingsDefault.ts';
 import { FavouriteSettings } from '../../VariablesAndData';
 import CreatePrefHeader from './CreateHeader';
 import CreatePrefOption from './CreateOption';

src/Disp/MenuSections/Statistics/AddStatsPage.js

@@ -3,7 +3,7 @@
 import { AddMissingUpgrades } from './CreateMissingUpgrades';
 import * as CreateSections from './CreateStatsSections';
 import * as CreateElements from './CreateDOMElements';
-import * as GameData from '../../../Data/Gamedata';
+import * as GameData from '../../../Data/Gamedata.ts';
 import { CMOptions } from '../../../Config/VariablesAndData';
 
 import {

src/Disp/MenuSections/Statistics/CreateMissingAchievements.js

@@ -55,7 +55,7 @@ export default function AddMissingAchievements() {
   if (CMOptions.MissingAchievements) {
     Object.values(achievs.children).forEach((achievsCrate) => {
       if (!achievsCrate.className.includes('enabled')) {
-        const id = achievsCrate.onclick.toString().match(/(?<=\[).*(?=\])/g)[0];
+        const id = achievsCrate.onclick.toString().split(/\[(.*)\]/gi)[1];
         const { icon } = Game.AchievementsById[id];
         // eslint-disable-next-line no-param-reassign
         achievsCrate.style.backgroundPosition = `${-icon[0] * 48}px ${

src/Disp/MenuSections/Statistics/CreateStatsSections.js

@@ -1,6 +1,6 @@
 /** Functions to create the individual sections of the Statistics page */
 
-import * as GameData from '../../../Data/Gamedata';
+import * as GameData from '../../../Data/Gamedata.ts';
 import { MaxChainCookieReward } from '../../../Cache/Stats/ChainCookies';
 import {
   CacheAvgCPSWithChoEgg,

src/InitSaveLoad/init.js

@@ -1,4 +1,4 @@
-import { VersionMajor, VersionMinor } from '../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
 import CMDrawHook from '../Disp/DrawHook';
 import CMClickHook from '../Main/ClickHook';
 import InitializeCookieMonster from '../Main/Initialization';

src/InitSaveLoad/load.js

@@ -1,5 +1,5 @@
 import { LoadConfig } from '../Config/SaveLoadReload/SaveLoadReloadSettings';
-import { VersionMajor, VersionMinor } from '../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
 import { FavouriteSettings } from '../Disp/VariablesAndData';
 import InitData from '../Sim/InitializeData/InitData';
 

src/InitSaveLoad/save.js

@@ -1,5 +1,5 @@
 import { CMOptions } from '../Config/VariablesAndData';
-import { VersionMajor, VersionMinor } from '../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
 import { FavouriteSettings } from '../Disp/VariablesAndData';
 
 /**

src/Main/Initialization.js

@@ -1,7 +1,7 @@
 import InitCache from '../Cache/CacheInit';
 import { CacheStatsCookies } from '../Cache/Stats/Stats';
 import { LoadConfig } from '../Config/SaveLoadReload/SaveLoadReloadSettings';
-import { VersionMajor, VersionMinor } from '../Data/Moddata';
+import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
 import CreateUpgradeBar from '../Disp/BuildingsUpgrades/UpgradeBar';
 import { CreateBotBar } from '../Disp/InfoBars/BottomBar';
 import { CreateTimerBar } from '../Disp/InfoBars/TimerBar';

src/Sim/Calculations/CheckOtherAchiev.js

@@ -1,4 +1,4 @@
-import { ChristCookies, HalloCookies } from '../../Data/Gamedata';
+import { ChristCookies, HalloCookies } from '../../Data/Gamedata.ts';
 import SimHas from '../ReplacedGameFunctions/SimHas';
 import SimHasAchiev from '../ReplacedGameFunctions/SimHasAchiev';
 import SimWin from '../SimulationData/SimWin';