From 773233ba9b547ea0f1dc3ce99e109657b68ba2b0 Mon Sep 17 00:00:00 2001 From: the-sane <3657071+the-sane@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:49:33 -0400 Subject: [PATCH] EAC compatibility --- lib/lutris-starcitizen.json | 5 ++--- lib/sc-launch.sh | 2 +- lug-helper.sh | 22 ++++++++++++++++++---- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/lib/lutris-starcitizen.json b/lib/lutris-starcitizen.json index 0cecd70..0878879 100644 --- a/lib/lutris-starcitizen.json +++ b/lib/lutris-starcitizen.json @@ -14,10 +14,10 @@ "slug": "star-citizen-liveptu", "version": "LIVE/PTU", "description": "Welcome to the Star Citizen installer maintained by the Star Citizen LUG!\r\nBefore continuing, please see our Quick Start Guide:\r\nhttps://starcitizen-lug.github.io\r\n\r\nFor help with the installer or to just hang out, we invite Linux Star Citizen players to join us:\r\nhttps://robertsspaceindustries.com/orgs/LUG/", - "notes": "Performance may be choppy for the first couple minutes after visiting a new place or performing a new activity while shaders compile. Subsequent arrival should not be choppy.\r\n\r\nPlease make sure you have all Wine dependencies properly installed or your game may crash during start up. To prevent crashes in areas with lots of geometry, the game needs a resource limit named \"vm.max_map_count\" increased. See our wiki's Quick Start Guide for more information and instructions.\r\n\r\nSee you in the 'verse!", + "notes": "Performance may be choppy for the first couple minutes after visiting a new place or performing a new activity while shaders compile. Subsequent arrival should not be choppy.\r\n\r\nTo prevent crashes in areas with lots of geometry, the game needs a resource limit named \"vm.max_map_count\" increased. See our wiki's Quick Start Guide for more information and instructions.\r\n\r\nSee you in the 'verse!", "credits": "", "created_at": "2023-03-24T06:40:19.908354Z", - "updated_at": "2024-10-01T21:00:30.247112Z", + "updated_at": "2024-10-04T16:48:06.773052Z", "draft": false, "published": true, "published_by": null, @@ -74,7 +74,6 @@ "DXVK_HUD": 0, "__GL_SHADER_DISK_CACHE": 1, "__GL_SHADER_DISK_CACHE_SIZE": 1073741824, - "EOS_USE_ANTICHEATCLIENTNULL": 1, "GAMEID": "umu-starcitizen", "STORE": "none", "PROTONPATH": "GE-Proton" diff --git a/lib/sc-launch.sh b/lib/sc-launch.sh index 84350d8..7612570 100755 --- a/lib/sc-launch.sh +++ b/lib/sc-launch.sh @@ -20,7 +20,7 @@ ##################################################### export WINEPREFIX="$HOME/Games/star-citizen" export WINEDLLOVERRIDES=winemenubuilder.exe=d # Prevent updates from overwriting our .desktop entries -export EOS_USE_ANTICHEATCLIENTNULL=1 +#export EOS_USE_ANTICHEATCLIENTNULL=1 export __GL_SHADER_DISK_CACHE=1 export __GL_SHADER_DISK_CACHE_SIZE=1073741824 # Extra Nvidia cache options diff --git a/lug-helper.sh b/lug-helper.sh index a4e7955..0093940 100755 --- a/lug-helper.sh +++ b/lug-helper.sh @@ -750,6 +750,8 @@ getdirs() { dxvk_cache="$game_path/$game_version/StarCitizen.dxvk-cache" # Where to store backed up keybinds backup_path="$conf_dir/$conf_subdir" + # Windows-formatted path to the RSI directory on wine's Z:\ drive + rsi_path="Z:$(dirname "$game_path" | sed 's|/|\\|g')" return "$retval" } @@ -2486,7 +2488,14 @@ install_game_lutris() { debug_print exit "Script error: Unknown condition for install_version in install_game_lutris() function. Aborting." fi - message info "The installation will continue in Lutris. The debug log will be written to $tmp_install_log" + eacfix_path="Z:\home\\${USER}\Games\star-citizen\drive_c\Program Files\Roberts Space Industries" + + # Format eacfix_path for zenity. Double backslashes + if [ "$use_zenity" -eq 1 ]; then + eacfix_path="$(echo "$eacfix_path" | sed 's|\\|\\\\|g')" + fi + + message info "The installation will continue in Lutris. The debug log will be written to $tmp_install_log\n\nEasy Anticheat Fix:\n\nAfter installation, paste the following Game Location into your RSI Launcher's settings\nEdit the path as needed if you installed to a different directory:\n\n$eacfix_path" fi } @@ -2578,11 +2587,11 @@ install_game_wine() { wine reg add "HKEY_CURRENT_USER\Software\Wine\FileOpenAssociations" /v Enable /d N /f >"$tmp_install_log" 2>&1 # Install powershell - debug_print continue "Installing wine components. Please wait, this may take a moment..." + debug_print continue "Installing wine components. Please wait; this will take a moment..." winetricks -q arial tahoma dxvk powershell >>"$tmp_install_log" 2>&1 # Run the installer - debug_print continue "Installing the launcher. Please wait, this may take a moment..." + debug_print continue "Installing the launcher. Please wait; this will take a moment..." wine "$tmp_dir/$rsi_installer" /S >>"$tmp_install_log" 2>&1 if [ "$?" -eq 1 ]; then @@ -2661,7 +2670,12 @@ install_game_wine() { update-desktop-database "$HOME/.local/share/applications" fi - message info "Installation has finished. The install log was written to "$tmp_install_log"\n\nTo launch the game, run the following launch script in a terminal\nEdit the environment variables in the script as needed:\n$installed_launch_script\n\nYou may also use the following .desktop files if wine installed them:\n$home_desktop_file\n$localshare_desktop_file" + # Format rsi_path for zenity. Double backslashes + if [ "$use_zenity" -eq 1 ]; then + rsi_path="$(echo "$rsi_path" | sed 's|\\|\\\\|g')" + fi + + message info "Installation has finished. The install log was written to "$tmp_install_log"\n\nNext Steps:\n\n1. Easy Anticheat Fix: Paste this Game Location into the RSI Launcher's settings:\n $rsi_path\n\n2. To start the RSI Launcher, run the following launch script in a terminal\n Edit the environment variables in the script as needed:\n $installed_launch_script\n\n3. You may also use the following .desktop files if wine installed them:\n $home_desktop_file\n $localshare_desktop_file" fi }