From 7e8679151b2ea24abd374a1a0640e7dcd359b1e3 Mon Sep 17 00:00:00 2001
From: Michael Green <84688932+michael-j-green@users.noreply.github.com>
Date: Mon, 15 Apr 2024 13:05:18 +1000
Subject: [PATCH] Integrate EJS 4.0.12 - Adds a new Master System core, and a
 new DS core (#343)

Closes #340
---
 Dockerfile                              |  4 ++--
 gaseous-server/Support/PlatformMap.json | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7db4a87..c78760b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,8 @@ RUN dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime
 # download and unzip EmulatorJS from CDN
 RUN apt-get update && apt-get install -y p7zip-full
 RUN mkdir -p out/wwwroot/emulators/EmulatorJS
-RUN wget https://cdn.emulatorjs.org/releases/4.0.11.7z
-RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.11.7z
+RUN wget https://cdn.emulatorjs.org/releases/4.0.12.7z
+RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.12.7z
 
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
diff --git a/gaseous-server/Support/PlatformMap.json b/gaseous-server/Support/PlatformMap.json
index dbd9bdd..155c0d6 100644
--- a/gaseous-server/Support/PlatformMap.json
+++ b/gaseous-server/Support/PlatformMap.json
@@ -1232,6 +1232,9 @@
                             "alternateCoreName": "melonds",
                             "default": true
                         },
+                        {
+                            "core": "desmume"
+                        },
                         {
                             "core": "desmume2015"
                         }
@@ -1590,18 +1593,21 @@
         "retroPieDirectoryName": "mastersystem",
         "webEmulator": {
             "type": "EmulatorJS",
-            "core": "picodrive",
+            "core": "smsplus",
             "availableWebEmulators": [
                 {
                     "emulatorType": "EmulatorJS",
                     "availableWebEmulatorCores": [
                         {
-                            "core": "picodrive",
+                            "core": "segaMS",
+                            "alternateCoreName": "smsplus",
                             "default": true
                         },
                         {
-                            "core": "segaMS",
-                            "alternateCoreName": "genesis_plus_gx"
+                            "core": "picodrive"
+                        },
+                        {
+                            "core": "genesis_plus_gx"
                         }
                     ]
                 }