From 459853cca180ddc0c6c122769d0087c1b24df97b Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 17 Jun 2022 19:32:37 +0200
Subject: [PATCH] Added configuration for the Tangerine Computer Systems Oric
 (oric) system.

---
 es-app/assets/Windows_Portable_README.txt            |  1 +
 resources/systems/macos/es_find_rules.xml            |  6 ++++++
 resources/systems/macos/es_systems.xml               |  4 ++--
 resources/systems/unix/es_find_rules.xml             | 11 +++++++++++
 resources/systems/unix/es_systems.xml                |  4 ++--
 resources/systems/windows/es_find_rules.xml          | 11 +++++++++++
 resources/systems/windows/es_find_rules_portable.xml |  8 ++++++++
 resources/systems/windows/es_systems.xml             |  4 ++--
 8 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index a37c2d49b..742283431 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -40,6 +40,7 @@ Emulators\melonDS\melonDS.exe
 Emulators\mGBA\mGBA.exe
 Emulators\Model2\EMULATOR.EXE
 Emulators\mupen64plus\mupen64plus-ui-console.exe
+Emulators\Oricutron\oricutron.exe
 Emulators\PCSX2\pcsx2.exe
 Emulators\PCSX2-Qt\pcsx2-qtx64.exe
 Emulators\PCSX2-wxWidgets\pcsx2x64.exe
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index ae8e6bb83..5abd93478 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -118,6 +118,12 @@
             <entry>/usr/local/bin/mupen64plus</entry>
         </rule>
     </emulator>
+    <emulator name="ORICUTRON">
+        <!-- Tangerine Computer Systems emulator Oricutron -->
+        <rule type="staticpath">
+            <entry>/Applications/Oricutron.app/Contents/MacOS/Oricutron</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index add5b33d5..bf4a7f37d 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -916,8 +916,8 @@
         <name>oric</name>
         <fullname>Tangerine Computer Systems Oric</fullname>
         <path>%ROMPATH%/oric</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.dsk .DSK .ort .ORT .tap .TAP .wav .WAV</extension>
+        <command label="Oricutron (Standalone)">%EMULATOR_ORICUTRON% %STARTDIR%=%EMUDIR% %ROM%</command>
         <platform>oric</platform>
         <theme>oric</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 13969e025..b0545f0be 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -234,6 +234,17 @@
             <entry>~/.local/share/flatpak/exports/bin/ca._0ldsk00l.Nestopia</entry>
         </rule>
     </emulator>
+    <emulator name="ORICUTRON">
+        <!-- Tangerine Computer Systems emulator Oricutron -->
+        <rule type="systempath">
+            <entry>Oricutron</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/oricutron/Oricutron</entry>
+            <entry>~/.local/bin/oricutron/Oricutron</entry>
+            <entry>~/bin/oricutron/Oricutron</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 4df3922ac..81dadb168 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -925,8 +925,8 @@
         <name>oric</name>
         <fullname>Tangerine Computer Systems Oric</fullname>
         <path>%ROMPATH%/oric</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.dsk .DSK .ort .ORT .tap .TAP .wav .WAV</extension>
+        <command label="Oricutron (Standalone)">%EMULATOR_ORICUTRON% %STARTDIR%=%EMUDIR% %ROM%</command>
         <platform>oric</platform>
         <theme>oric</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 5fe6c0c9b..4343b4de9 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -237,6 +237,17 @@
             <entry>%ESPATH%\..\mupen64plus\mupen64plus-ui-console.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ORICUTRON">
+        <!-- Tangerine Computer Systems emulator Oricutron -->
+        <rule type="systempath">
+            <entry>oricutron.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\Oricutron\oricutron.exe</entry>
+            <entry>%ESPATH%\Oricutron\oricutron.exe</entry>
+            <entry>%ESPATH%\..\Oricutron\oricutron.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
         <rule type="winregistryvalue">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index f60f067f9..c4f22d7c4 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -157,6 +157,14 @@
             <entry>%ESPATH%\..\mupen64plus\mupen64plus-ui-console.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ORICUTRON">
+        <!-- Tangerine Computer Systems emulator Oricutron -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\Oricutron\oricutron.exe</entry>
+            <entry>%ESPATH%\Oricutron\oricutron.exe</entry>
+            <entry>%ESPATH%\..\Oricutron\oricutron.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index cc54c00aa..a8b2e0c13 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -922,8 +922,8 @@
         <name>oric</name>
         <fullname>Tangerine Computer Systems Oric</fullname>
         <path>%ROMPATH%\oric</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.dsk .DSK .ort .ORT .tap .TAP .wav .WAV</extension>
+        <command label="Oricutron (Standalone)">%EMULATOR_ORICUTRON% %STARTDIR%=%EMUDIR% %ROM%</command>
         <platform>oric</platform>
         <theme>oric</theme>
     </system>