From b45e8f08144d43a2039ef1b07153048b7e3d18a8 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Fri, 10 Jan 2020 18:56:23 +0100 Subject: [PATCH 1/7] Update script.js --- Applications/Games/Subnautica/Steam/script.js | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Applications/Games/Subnautica/Steam/script.js b/Applications/Games/Subnautica/Steam/script.js index aa24b10be1..729bff95e5 100644 --- a/Applications/Games/Subnautica/Steam/script.js +++ b/Applications/Games/Subnautica/Steam/script.js @@ -1,6 +1,7 @@ const SteamScript = include("engines.wine.quick_script.steam_script"); -const { getLatestStableVersion } = include("engines.wine.engine.versions"); - +const { getLatestDevelopmentVersion } = include("engines.wine.engine.versions"); +const OverrideDLL = include("engines.wine.plugins.override_dll"); +const { touch, writeToFile } = include("utils.functions.filesystem.files"); const VirtualDesktop = include("engines.wine.plugins.virtual_desktop"); const Vcrun2013 = include("engines.wine.verbs.vcrun2013"); const Corefonts = include("engines.wine.verbs.corefonts"); @@ -12,29 +13,29 @@ new SteamScript() .author("Zemogiter") .applicationHomepage("https://unknownworlds.com/subnautica/") .wineDistribution("upstream") - .wineVersion(getLatestStableVersion) + .wineVersion(getLatestDevelopmentVersion) .wineArchitecture("amd64") .appId(264710) .preInstall((wine) => { - const wizard = wine.wizard(); - - wizard.message( - tr("You can make the game smoother by using this: https://github.com/lutris/lutris/wiki/How-to:-Esync") - ); - new Vcrun2013(wine).go(); new Corefonts(wine).go(); new DXVK(wine).go(); - + new OverrideDLL(wine) + .withMode("disabled", ["nvapi", "nvapi64"]) + .go(); new VirtualDesktop(wine).go(); + const dxvkConfigFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; + touch(dxvkConfigFile); + writeToFile(dxvkConfigFile, "dxgi.nvapiHack = False"); }) .postInstall((wine) => { const wizard = wine.wizard(); wizard.message( tr( - "Due to a potential conflict with Vulkan, shader mods break the game (the executable file works but no window is displayed)." + "Due to a potential conflict with Vulkan, shader mods may break the game (the executable file works but no window is displayed)." ) ); }) - .gameOverlay(false); + .gameOverlay(false) + .environment('{"DXVK_CONFIG_FILE": "configFile", "STAGING_SHARED_MEMORY": "0", "WINEESYNC": "1"}') From 3c5eab46810fe9b8b8f84cc2a92577bf1b0c8772 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Fri, 10 Jan 2020 19:02:26 +0100 Subject: [PATCH 2/7] Update script.js --- Applications/Games/Subnautica/Steam/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/Subnautica/Steam/script.js b/Applications/Games/Subnautica/Steam/script.js index 729bff95e5..5855fc5ddf 100644 --- a/Applications/Games/Subnautica/Steam/script.js +++ b/Applications/Games/Subnautica/Steam/script.js @@ -38,4 +38,4 @@ new SteamScript() ); }) .gameOverlay(false) - .environment('{"DXVK_CONFIG_FILE": "configFile", "STAGING_SHARED_MEMORY": "0", "WINEESYNC": "1"}') + .environment('{"DXVK_CONFIG_FILE": "dxvkConfigFile", "STAGING_SHARED_MEMORY": "0", "WINEESYNC": "1"}') From 184237fe94c5d31c75e4ada438cfa611ca4df207 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 14 Jan 2020 12:36:07 +0100 Subject: [PATCH 3/7] Update script.js Added a proper variable reading in environment --- Applications/Games/Subnautica/Steam/script.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Applications/Games/Subnautica/Steam/script.js b/Applications/Games/Subnautica/Steam/script.js index 5855fc5ddf..3cb7a392e4 100644 --- a/Applications/Games/Subnautica/Steam/script.js +++ b/Applications/Games/Subnautica/Steam/script.js @@ -38,4 +38,8 @@ new SteamScript() ); }) .gameOverlay(false) - .environment('{"DXVK_CONFIG_FILE": "dxvkConfigFile", "STAGING_SHARED_MEMORY": "0", "WINEESYNC": "1"}') + .environment((wine) => { + const dxvkConfigFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; + + return '{"DXVK_CONFIG_FILE": "${dxvkConfigFile}", "STAGING_SHARED_MEMORY": "0", "WINEESYNC": "1"}'; + }) From 2bc17e9c2714cf9a43c22b172991537ec7305a6a Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 14 Jan 2020 12:53:37 +0100 Subject: [PATCH 4/7] Update script.js --- Applications/Games/Subnautica/Steam/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/Subnautica/Steam/script.js b/Applications/Games/Subnautica/Steam/script.js index 3cb7a392e4..cece37477d 100644 --- a/Applications/Games/Subnautica/Steam/script.js +++ b/Applications/Games/Subnautica/Steam/script.js @@ -40,6 +40,6 @@ new SteamScript() .gameOverlay(false) .environment((wine) => { const dxvkConfigFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; - + return '{"DXVK_CONFIG_FILE": "${dxvkConfigFile}", "STAGING_SHARED_MEMORY": "0", "WINEESYNC": "1"}'; }) From 6bc51ad0a6cefde4a123301f09ced3ca23e3f593 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sat, 15 Feb 2020 20:36:36 +0100 Subject: [PATCH 5/7] Update script.js --- Applications/Games/Subnautica/Steam/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/Subnautica/Steam/script.js b/Applications/Games/Subnautica/Steam/script.js index cece37477d..1b57943b34 100644 --- a/Applications/Games/Subnautica/Steam/script.js +++ b/Applications/Games/Subnautica/Steam/script.js @@ -41,5 +41,5 @@ new SteamScript() .environment((wine) => { const dxvkConfigFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; - return '{"DXVK_CONFIG_FILE": "${dxvkConfigFile}", "STAGING_SHARED_MEMORY": "0", "WINEESYNC": "1"}'; + return '{"DXVK_CONFIG_FILE"="${dxvkConfigFile}", "STAGING_SHARED_MEMORY"="0", "WINEESYNC"="1"}'; }) From ff5746145a1e9a25b38682d0f58dc20e513a3ce5 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 6 Apr 2020 12:17:50 +0200 Subject: [PATCH 6/7] Update script.js Using proper json format --- Applications/Games/Subnautica/Steam/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/Subnautica/Steam/script.js b/Applications/Games/Subnautica/Steam/script.js index 1b57943b34..cece37477d 100644 --- a/Applications/Games/Subnautica/Steam/script.js +++ b/Applications/Games/Subnautica/Steam/script.js @@ -41,5 +41,5 @@ new SteamScript() .environment((wine) => { const dxvkConfigFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; - return '{"DXVK_CONFIG_FILE"="${dxvkConfigFile}", "STAGING_SHARED_MEMORY"="0", "WINEESYNC"="1"}'; + return '{"DXVK_CONFIG_FILE": "${dxvkConfigFile}", "STAGING_SHARED_MEMORY": "0", "WINEESYNC": "1"}'; }) From 9c8173b1dd8d6877ff5fe4c76f8b4d72d1a2c5b1 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 25 Jan 2021 00:51:11 +0100 Subject: [PATCH 7/7] Update script.js --- Applications/Games/Subnautica/Steam/script.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Applications/Games/Subnautica/Steam/script.js b/Applications/Games/Subnautica/Steam/script.js index cece37477d..52df25410c 100644 --- a/Applications/Games/Subnautica/Steam/script.js +++ b/Applications/Games/Subnautica/Steam/script.js @@ -30,7 +30,6 @@ new SteamScript() }) .postInstall((wine) => { const wizard = wine.wizard(); - wizard.message( tr( "Due to a potential conflict with Vulkan, shader mods may break the game (the executable file works but no window is displayed)."