From 1af6a45d1d0247f89b212ea6b5601ed5e45b6aaf Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <77750390+ethanaobrien@users.noreply.github.com>
Date: Mon, 3 Jul 2023 11:25:22 -0500
Subject: [PATCH] Cheat on load

---
 data/emulator.js | 31 ++++++++++++++++++++++++++++---
 data/loader.js   |  1 +
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/data/emulator.js b/data/emulator.js
index a056901..6843cbc 100644
--- a/data/emulator.js
+++ b/data/emulator.js
@@ -180,6 +180,19 @@ class EmulatorJS {
         
         this.game.classList.add("ejs_game");
         
+        if (Array.isArray(this.config.cheats)) {
+            for (let i=0; i<this.config.cheats.length; i++) {
+                const cheat = this.config.cheats[i];
+                if (Array.isArray(cheat) && cheat[0] && cheat[1]) {
+                    this.cheats.push({
+                        desc: cheat[0],
+                        checked: false,
+                        code: cheat[1]
+                    })
+                }
+            }
+        }
+        
         this.createStartButton();
         
         console.log(this)
@@ -2080,13 +2093,26 @@ class EmulatorJS {
         if (coreSpecific) {
             try {
                 coreSpecific = JSON.parse(coreSpecific);
-                if (!(coreSpecific.controlSettings instanceof Object) || !(coreSpecific.settings instanceof Object) || !(coreSpecific.cheats instanceof Object)) return;
+                if (!(coreSpecific.controlSettings instanceof Object) || !(coreSpecific.settings instanceof Object) || !Array.isArray(coreSpecific.cheats)) return;
                 this.controls = coreSpecific.controlSettings;
                 this.checkGamepadInputs();
                 for (const k in coreSpecific.settings) {
                     this.changeSettingOption(k, coreSpecific.settings[k]);
                 }
-                this.cheats = coreSpecific.cheats;
+                for (let i=0; i<coreSpecific.cheats.length; i++) {
+                    const cheat = coreSpecific.cheats[i];
+                    let includes = false;
+                    for (let j=0; j<this.cheats.length; j++) {
+                        if (this.cheats[j].desc === cheat.desc && this.cheats[j].code === cheat.code) {
+                            this.cheats[j].checked = cheat.checked;
+                            includes = true;
+                            break;
+                        }
+                    }
+                    if (includes) continue;
+                    this.cheats.push(cheat);
+                }
+                
             } catch(e) {
                 console.warn("Could not load previous settings", e);
             }
@@ -2400,7 +2426,6 @@ class EmulatorJS {
         this.elements.cheatRows = rows;
     }
     updateCheatUI() {
-        if (!this.cheats) this.cheats = [];
         this.elements.cheatRows.innerHTML = "";
         
         const addToMenu = (desc, checked, code, i) => {
diff --git a/data/loader.js b/data/loader.js
index b086804..527a1c8 100644
--- a/data/loader.js
+++ b/data/loader.js
@@ -59,6 +59,7 @@
     config.filePaths = window.EJS_paths;
     config.loadState = window.EJS_loadStateURL;
     config.cacheLimit = window.EJS_CacheLimit;
+    config.cheats = window.EJS_cheats;
     
     new EmulatorJS(EJS_player, config);