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

[Automated] Merge dev into gh-pages

Browse Source
This commit is contained in:
github-actions[bot]
2021-09-29 19:10:49 +00:00
committed by GitHub
parent aa2e866cc5 65754bc29d
commit a0b4d5eecb
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/CookieMonster.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonster.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonsterDev.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonsterDev.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
src/Disp/MenuSections/AddMenus.js
View File

@@ -1,3 +1,4 @@
import createMenuOptions from './createMenuOptions';
import AddMenuStats from './Statistics/AddStatsPage'; import AddMenuStats from './Statistics/AddStatsPage';
/** /**
@@ -12,5 +13,10 @@ export default function AddMenu() {
title.textContent = 'Cookie Monster Statistics'; title.textContent = 'Cookie Monster Statistics';
AddMenuStats(title); AddMenuStats(title);
} }
} else if (Game.onMenu === 'prefs') { // Added because Framework is broken
l('menu').childNodes[2].insertBefore(
createMenuOptions(),
l('menu').childNodes[2].childNodes[l('menu').childNodes[2].childNodes.length - 1],
);
} }
} }

5
src/Main/Initialization.js
View File

@@ -18,7 +18,7 @@ import ReplaceNative from './ReplaceGameFunctions/ReplaceNative';
import { LastModCount } from './VariablesAndData'; // eslint-disable-line no-unused-vars import { LastModCount } from './VariablesAndData'; // eslint-disable-line no-unused-vars
import AddWrinklerAreaDetect from './WrinklerArea/AddDetectArea'; import AddWrinklerAreaDetect from './WrinklerArea/AddDetectArea';
import createBuildingLockButtons from '../Disp/buildingTiles/createBuildingLockButtons'; import createBuildingLockButtons from '../Disp/buildingTiles/createBuildingLockButtons';
import createMenuInfo from '../Disp/MenuSections/createMenuInfo'; // import createMenuInfo from '../Disp/MenuSections/createMenuInfo';
import createMenuOptions from '../Disp/MenuSections/createMenuOptions'; import createMenuOptions from '../Disp/MenuSections/createMenuOptions';
/** /**
@@ -29,7 +29,8 @@ export default function InitializeCookieMonster() {
window.CookieMonsterData = {}; window.CookieMonsterData = {};
// Register listeners in Cookie Monster Mod Framework // Register listeners in Cookie Monster Mod Framework
Game.mods.cookieMonsterFramework.listeners.infoMenu.push(createMenuInfo); // Commented because Framework is currently broken
// Game.mods.cookieMonsterFramework.listeners.infoMenu.push(createMenuInfo);
Game.mods.cookieMonsterFramework.listeners.optionsMenu.push(createMenuOptions); Game.mods.cookieMonsterFramework.listeners.optionsMenu.push(createMenuOptions);
InitData(); InitData();