Merge branch 'beta'

dragoonDorise · Dec 30, 2024 · 2b6b561 · 2b6b561
2 parents 19bb019 + 7b23f83
commit 2b6b561
Show file tree

Hide file tree

Showing 60 changed files with 7,010 additions and 725 deletions.
diff --git a/chimeraOS/configs/emulationstation/custom_systems/es_find_rules.xml b/chimeraOS/configs/emulationstation/custom_systems/es_find_rules.xml
@@ -41,6 +41,12 @@
             <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
+    <emulator name="SHADPS4">
+        <!-- PS4 emulator ShadPS4 -->
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/shadps4.sh</entry>
+        </rule>
+    </emulator>
     <emulator name="YUZU">
         <!-- Nintendo Switch emulator Yuzu -->
         <rule type="systempath">

diff --git a/configs/emulationstation/custom_systems/es_find_rules.xml b/configs/emulationstation/custom_systems/es_find_rules.xml
@@ -33,6 +33,12 @@
             <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
+    <emulator name="SHADPS4">
+        <!-- PS4 emulator ShadPS4 -->
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/shadps4.sh</entry>
+        </rule>
+    </emulator>
     <emulator name="YUZU">
         <!-- Nintendo Switch emulator Yuzu -->
         <rule type="systempath">

diff --git a/configs/emulationstation/custom_systems/es_systems.xml b/configs/emulationstation/custom_systems/es_systems.xml
@@ -58,4 +58,22 @@
 	<platform>xbox360</platform>
 	<theme>xbox360</theme>
   </system>
+  <system>
+	  <name>ps4</name>
+	  <fullname>Sony PlayStation 4</fullname>
+	  <path>%ROMPATH%/ps4/shortcuts</path>
+	  <extension>.desktop</extension>
+	  <command label="ShadPS4 Shortcuts (Standalone)">%EMULATOR_SHADPS4% %ROM%</command>
+	  <platform>ps4</platform>
+	  <theme>ps4</theme>
+  </system>
+  <!-- <system>
+		<name>ps4-pkg</name>
+		<fullname>Sony PlayStation 4</fullname>
+		<path>%ROMPATH%\ps4</path>
+		<extension>.desktop</extension>
+		<command label="ShadPS4 PKG (Standalone)">%EMULATOR_SHADPS4% %ROM%</command>
+		<platform>ps4</platform>
+		<theme>ps4</theme>
+	</system> -->
 </systemList>
diff --git a/configs/rclone/rclone.conf b/configs/rclone/rclone.conf
@@ -46,8 +46,7 @@ user =
 pass =
 
 [Emudeck-cloud]
-type = sftp
-host =
-user =
-pass =
-port =
+type = b2
+account =
+key =
+hard_delete = false
diff --git a/configs/shadps4/config.toml b/configs/shadps4/config.toml
@@ -0,0 +1,68 @@
+[General]
+logType = "async"
+separateUpdateEnabled = false
+showSplash = false
+Fullscreen = true
+checkCompatibilityOnStartup = false
+updateChannel = "Nightly"
+logFilter = ""
+enableDiscordRPC = false
+compatibilityEnabled = true
+autoUpdate = false
+userName = "shadPS4"
+isTrophyPopupDisabled = false
+playBGM = false
+isPS4Pro = false
+BGMvolume = 50
+
+[Input]
+cursorState = 1
+cursorHideTimeout = 5
+backButtonBehavior = "left"
+specialPadClass = 1
+useSpecialPad = false
+
+[GPU]
+screenWidth = 1280
+screenHeight = 720
+nullGpu = false
+copyGPUBuffers = false
+vblankDivider = 1
+dumpShaders = false
+patchShaders = true
+
+[Vulkan]
+gpuId = -1
+validation = false
+rdocMarkersEnable = false
+validation_sync = false
+validation_gpu = false
+rdocEnable = false
+crashDiagnostic = false
+
+[Debug]
+DebugDump = false
+CollectShader = false
+
+[GUI]
+gameTableMode = 0
+mw_width = 1280
+geometry_x = 0
+iconSize = 36
+emulatorLanguage = "en"
+iconSizeGrid = 69
+elfDirs = []
+mw_height = 718
+addonInstallDir = "/run/media/mmcblk0p1/Emulation/storage/shadps4/dlc"
+pkgDirs = []
+sliderPosGrid = 0
+geometry_h = 718
+geometry_y = 28
+recentFiles = []
+sliderPos = 0
+installDirs = ["/run/media/mmcblk0p1/Emulation/storage/shadps4/games"]
+theme = 0
+geometry_w = 1280
+
+[Settings]
+consoleLanguage = 1
diff --git a/configs/shadps4/inputConfig/default.ini b/configs/shadps4/inputConfig/default.ini
@@ -0,0 +1,67 @@
+# Default input configuration file, each game may have per-game files too, e.g.
+    ;~/config/shadps4/
+    ;└── inputConfig/
+    ;    ├── default.ini
+    ;    └── [game_id].ini
+
+# Keyboard bindings
+triangle = f
+circle = space
+cross = e
+square = r
+
+pad_up = w, lalt
+pad_up = mousewheelup
+pad_down = s, lalt
+pad_down = mousewheeldown
+pad_left = a, lalt
+pad_left = mousewheelleft
+pad_right = d, lalt
+pad_right = mousewheelright
+
+l1 = rightbutton, lshift
+r1 = leftbutton
+l2 = rightbutton
+r2 = leftbutton, lshift
+l3 = x
+r3 = q
+r3 = middlebutton
+
+options = escape
+touchpad = g
+
+key_toggle = i, lalt
+mouse_to_joystick = right
+mouse_movement_params = 0.5, 1, 0.125
+leftjoystick_halfmode = lctrl
+
+axis_left_x_minus = a
+axis_left_x_plus = d
+axis_left_y_minus = w
+axis_left_y_plus = s
+
+# Controller bindings
+triangle = triangle
+cross = cross
+square = square
+circle = circle
+
+l1 = l1
+l2 = l2
+l3 = l3
+r1 = r1
+r2 = r2
+r3 = r3
+
+pad_up = pad_up
+pad_down = pad_down
+pad_left = pad_left
+pad_right = pad_right
+
+options = options
+touchpad = back
+
+axis_left_x = axis_left_x
+axis_left_y = axis_left_y
+axis_right_x = axis_right_x
+axis_right_y = axis_right_y
diff --git a/configs/steam-deck-romate/userConfigurations.json b/configs/steam-deck-romate/userConfigurations.json
@@ -1203,6 +1203,22 @@
       "category":"PlayStation 3",
       "name":"PlayStation 3"
    },
+   {
+      "id": "12345678901234567",
+      "executable": {
+        "path": "\"/usr/bin/flatpak\" run net.shadps4.shadPS4 --no-gui \"${filePath}\"",
+        "arguments": ""
+      },
+      "romDirectory": "roms/ps4",
+      "supportedFileTypes": [
+        "iso",
+        "ISO",
+        "pkg",
+        "PKG"
+      ],
+      "category": "PlayStation 4",
+      "name": "PlayStation 4"
+   },
    {
       "id":"164785656634747068",
       "executable":{

diff --git a/configs/steam-rom-manager/userData/userConfigurations.json b/configs/steam-rom-manager/userData/userConfigurations.json
@@ -9215,6 +9215,90 @@
             "Sony PlayStation 3"
         ]
     },
+    {
+        "parserType": "Glob",
+        "configTitle": "Sony PlayStation 4 - ShadPS4 (Shortcut)",
+        "steamDirectory": "${steamdirglobal}",
+        "romDirectory": "${romsdirglobal}/ps4/shortcuts",
+        "executableArgs": "\"${filePath}\"",
+        "executableModifier": "\"${exePath}\"",
+        "startInDirectory": "",
+        "titleModifier": "${fuzzyTitle}",
+        "imageProviders": [
+            "sgdb",
+            "steamCDN"
+        ],
+        "onlineImageQueries": "${${fuzzyTitle}}",
+        "imagePool": "${fuzzyTitle}",
+        "disabled": false,
+        "userAccounts": {
+            "specifiedAccounts": [
+                "Global"
+            ]
+        },
+        "executable": {
+            "path": "/run/media/mmcblk0p1/Emulation/tools/launchers/shadps4.sh",
+            "shortcutPassthrough": false,
+            "appendArgsToExecutable": false
+        },
+        "parserInputs": {
+            "glob": "**/${title}@(.desktop)"
+        },
+        "titleFromVariable": {
+            "limitToGroups": "",
+            "caseInsensitiveVariables": false,
+            "skipFileIfVariableWasNotFound": false
+        },
+        "fuzzyMatch": {
+            "replaceDiacritics": true,
+            "removeCharacters": true,
+            "removeBrackets": true
+        },
+        "imageProviderAPIs": {
+            "sgdb": {
+                "nsfw": false,
+                "humor": false,
+                "styles": [],
+                "stylesHero": [],
+                "stylesLogo": [],
+                "stylesIcon": [],
+                "imageMotionTypes": [
+                    "static"
+                ]
+            }
+        },
+        "parserId": "164712748872922785",
+        "version": 22,
+        "controllers": {
+            "ps4": null,
+            "ps5": null,
+            "xbox360": null,
+            "xboxone": null,
+            "switch_joycon_left": null,
+            "switch_joycon_right": null,
+            "switch_pro": null,
+            "neptune": null
+        },
+        "defaultImage": {
+            "long": "",
+            "tall": "",
+            "hero": "",
+            "logo": "",
+            "icon": "/home/deck/.config/EmuDeck/backend/configs/steam-rom-manager/userData/img/default/icon.png"
+        },
+        "localImages": {
+            "long": "",
+            "tall": "",
+            "hero": "",
+            "logo": "",
+            "icon": ""
+        },
+        "steamInputEnabled": "1",
+        "drmProtect": false,
+        "steamCategories": [
+            "Sony PlayStation 4"
+        ]
+    },
     {
         "parserType": "Glob",
         "configTitle": "Sony PlayStation Portable - PPSSPP (Standalone)",