[Automated] Merge dev into gh-pages

.eslintrc.json

@@ -14,18 +14,6 @@
   "parserOptions": {
     "ecmaVersion": 12
   },
-  "plugins": ["@typescript-eslint"],
-  "overrides": [
-    {
-      "files": ["src/**/*.{ts,tsx}"],
-      "extends": ["plugin:@typescript-eslint/recommended"],
-      "parser": "@typescript-eslint/parser",
-      "rules": {
-        "import/extensions": "off", // To allow importing .ts without errors
-        "import/no-unresolved": "off" // To allow importing .ts without errors
-      }
-    }
-  ],
   "ignorePatterns": ["*CookieMonster*.js", "dist/*", "node_modules/*"],
   "rules": {
     "import/no-mutable-exports": "off", // We need to this throughout Cookie Monster

.mocharc.json

@@ -1,4 +1,4 @@
 {
   "recursive": true,
-  "require": ["esm", "ts-node/register"]
+  "require": ["esm"]
 }

package.json

@@ -46,8 +46,6 @@
   "devDependencies": {
     "@types/chai": "^4.3.1",
     "@types/mocha": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
     "chai": "^4.3.6",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
@@ -57,9 +55,6 @@
     "mocha": "^8.4.0",
     "npm-run-all": "^4.1.5",
     "prettier": "2.7.1",
-    "ts-loader": "^9.3.0",
-    "ts-node": "^10.8.1",
-    "typescript": "^4.7.3",
     "webpack": "^5.73.0",
     "webpack-cli": "^4.10.0"
   },

src/Data/Gamedata.js

@@ -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: string[] = [
+export const Fortunes = [
   'Fortune #001',
   'Fortune #002',
   'Fortune #003',
@@ -29,7 +29,7 @@ export const Fortunes: string[] = [
 ];
 
 /** Array of the names of all Halloween cookies */
-export const HalloCookies: string[] = [
+export const HalloCookies = [
   'Skull cookies',
   'Ghost cookies',
   'Bat cookies',
@@ -40,7 +40,7 @@ export const HalloCookies: string[] = [
 ];
 
 /** Array of the names of all Christmas cookies */
-export const ChristCookies: string[] = [
+export const ChristCookies = [
   'Christmas tree biscuits',
   'Snowflake biscuits',
   'Snowman biscuits',
@@ -51,7 +51,7 @@ export const ChristCookies: string[] = [
 ];
 
 /** Array of the names of all Valentine cookies */
-export const ValCookies: string[] = [
+export const ValCookies = [
   'Pure heart biscuits',
   'Ardent heart biscuits',
   'Sour heart biscuits',
@@ -62,7 +62,7 @@ export const ValCookies: string[] = [
 ];
 
 /** Array of the names of all plant drops */
-export const PlantDrops: string[] = [
+export const PlantDrops = [
   'Elderwort biscuits',
   'Bakeberry cookies',
   'Duketater cookies',
@@ -73,7 +73,7 @@ export const PlantDrops: string[] = [
 ];
 
 /** All possible effects plants and other items can have with a display-title */
-export const Effects: { [index: string]: string } = {
+export const Effects = {
   buildingCost: 'Building prices',
   click: 'Cookies per click',
   cps: 'Total CPS',

src/Data/Scales.js

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

src/Data/Sectionheaders.js

@@ -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: { [index: string]: string } = {
+export const ConfigGroups = {
   Favourite: 'Favourite Settings',
   Calculation: 'Calculation',
   Notation: 'Notation',
@@ -14,7 +14,7 @@ export const ConfigGroups: { [index: string]: string } = {
 };
 
 /** Display titles of the headers of the notification section of the Cookie Monster settings */
-export const ConfigGroupsNotification: { [index: string]: string } = {
+export const ConfigGroupsNotification = {
   NotificationGeneral: 'General Notifications',
   NotificationGC: 'Golden Cookie',
   NotificationFC: 'Fortune Cookie',

src/Disp/BeautifyAndFormatting/Beautify.js

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

src/Disp/InfoBars/BottomBar.js

@@ -1,7 +1,7 @@
 /** Functions related to the Bottom Bar */
 
 import { CacheObjects1, CacheObjects10, CacheObjects100 } from '../../Cache/VariablesAndData';
-import { VersionMajor, VersionMinor } from '../../Data/Moddata.ts';
+import { VersionMajor, VersionMinor } from '../../Data/Moddata';
 import Beautify from '../BeautifyAndFormatting/Beautify';
 import FormatTime from '../BeautifyAndFormatting/FormatTime';
 import GetTimeColour from '../BeautifyAndFormatting/GetTimeColour';

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.ts';
+import * as GameData from '../../../Data/Gamedata';
 
 import {
   CacheAverageClicks,

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.ts';
+import * as GameData from '../../../Data/Gamedata';
 import { MaxChainCookieReward } from '../../../Cache/Stats/ChainCookies';
 import {
   CacheAvgCPSWithChoEgg,

src/Disp/MenuSections/createMenuInfo.js

@@ -1,5 +1,5 @@
 import { menuFunctions } from '@cookiemonsterteam/cookiemonsterframework';
-import { LatestReleaseNotes, ModDescription } from '../../Data/Moddata.ts';
+import { LatestReleaseNotes, ModDescription } from '../../Data/Moddata';
 
 /**
  * Creates the <div> to be added to the Info section

src/Disp/MenuSections/createMenuOptions.js

@@ -1,5 +1,5 @@
 import { menuFunctions as mF } from '@cookiemonsterteam/cookiemonsterframework';
-import { ConfigGroups, ConfigGroupsNotification } from '../../Data/Sectionheaders.ts';
+import { ConfigGroups, ConfigGroupsNotification } from '../../Data/Sectionheaders';
 import settings from '../../Data/settings';
 import UpdateColours from '../HelperFunctions/UpdateColours';
 import RefreshScale from '../HelperFunctions/RefreshScale';

src/InitSaveLoad/init.js

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

src/InitSaveLoad/load.js

@@ -1,7 +1,7 @@
 import { saveAndLoadingFunctions } from '@cookiemonsterteam/cookiemonsterframework/src/index';
 
 import headers from '../Data/headers';
-import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
+import { VersionMajor, VersionMinor } from '../Data/Moddata';
 import settings from '../Data/settings';
 import UpdateColours from '../Disp/HelperFunctions/UpdateColours';
 import CMLoopHook from '../Main/LoopHook';

src/InitSaveLoad/save.js

@@ -1,4 +1,4 @@
-import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
+import { VersionMajor, VersionMinor } from '../Data/Moddata';
 
 /**
  * This creates a save function to the CM object. Per Game code/comments:

src/Main/Initialization.js

@@ -1,6 +1,6 @@
 import InitCache from '../Cache/CacheInit';
 import { CacheStatsCookies } from '../Cache/Stats/Stats';
-import { VersionMajor, VersionMinor } from '../Data/Moddata.ts';
+import { VersionMajor, VersionMinor } from '../Data/Moddata';
 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.ts';
+import { ChristCookies, HalloCookies } from '../../Data/Gamedata';
 import SimHas from '../ReplacedGameFunctions/SimHas';
 import SimHasAchiev from '../ReplacedGameFunctions/SimHasAchiev';
 import SimWin from '../SimulationData/SimWin';
@@ -65,8 +65,8 @@ export default function CheckOtherAchiev() {
   if (SimUpgradesOwned >= 200) SimWin('Lord of Progress');
   if (SimUpgradesOwned >= 300) SimWin('The full picture');
   if (SimUpgradesOwned >= 400) SimWin("When there's nothing left to add");
-  if (SimUpgradesOwned >= 500) SimWin("Kaizen");
-  if (SimUpgradesOwned >= 600) SimWin("Beyond quality");
+  if (SimUpgradesOwned >= 500) SimWin('Kaizen');
+  if (SimUpgradesOwned >= 600) SimWin('Beyond quality');
 
   if (buildingsOwned >= 4000 && SimUpgradesOwned >= 300) SimWin('Polymath');
   if (buildingsOwned >= 8000 && SimUpgradesOwned >= 400) SimWin('Renaissance baker');

tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "ES2020",
-    "noImplicitAny": true,
-    "sourceMap": true,
-    "target": "ES6",
-    "strictNullChecks": true
-  }
-}

webpack.config.js

@@ -10,16 +10,7 @@ module.exports = function (env) {
     },
     entry: './src/CookieMonster.js',
     resolve: {
-      extensions: ['.ts', '.js'],
-    },
-    module: {
-      rules: [
-        {
-          test: /\.tsx?/,
-          use: 'ts-loader',
-          exclude: /node_modules/,
-        },
-      ],
+      extensions: ['.js'],
     },
     output: {
       filename: env.finalfile ? 'CookieMonster.js' : 'CookieMonsterDev.js',