From e270094435475f8d87e3b7cd2b532cb42aeae60e Mon Sep 17 00:00:00 2001 From: the-sane <3657071+the-sane@users.noreply.github.com> Date: Thu, 10 Oct 2024 12:29:04 -0400 Subject: [PATCH] Revert PTU EAC fix for now --- lib/lutris-starcitizen.json | 3 ++- lib/sc-launch.sh | 2 +- lug-helper.sh | 18 ++---------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/lib/lutris-starcitizen.json b/lib/lutris-starcitizen.json index a93e715..3afad3b 100644 --- a/lib/lutris-starcitizen.json +++ b/lib/lutris-starcitizen.json @@ -17,7 +17,7 @@ "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-04T16:48:06.773052Z", + "updated_at": "2024-10-10T16:20:45.454396Z", "draft": false, "published": true, "published_by": null, @@ -74,6 +74,7 @@ "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 e33cfc1..2d04e0e 100755 --- a/lib/sc-launch.sh +++ b/lib/sc-launch.sh @@ -21,7 +21,7 @@ export WINEPREFIX="$HOME/Games/star-citizen" export WINEDLLOVERRIDES=winemenubuilder.exe=d # Prevent updates from overwriting our .desktop entries export WINEDEBUG=-all # Cut down on console debug messages -#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 d98143b..f835d47 100755 --- a/lug-helper.sh +++ b/lug-helper.sh @@ -765,8 +765,6 @@ 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" } @@ -2578,14 +2576,7 @@ install_game_lutris() { debug_print exit "Script error: Unknown condition for install_version in install_game_lutris() function. Aborting." fi - 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" + message info "The installation will continue in Lutris. The debug log will be written to $tmp_install_log" fi } @@ -2809,12 +2800,7 @@ install_game_wine() { update-desktop-database "$HOME/.local/share/applications" fi - # 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" + message info "Installation has finished. The install log was written to $tmp_install_log\n\nTo start the RSI Launcher, 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 start the RSI Launcher using the following .desktop files:\n $home_desktop_file\n $localshare_desktop_file" fi }