From 1d10f5299daee7645c2ad23a915733fc104becd5 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Fri, 25 Jan 2019 01:36:22 +0100 Subject: [PATCH 1/9] Games/Dishonored 2 : Add Dishonored 2 STATUS : Testing TODO : Update 'Dishonored 2/miniatures/main.png' TODO : Steam verb Sane? 'Dishonored 2/Online/script.js', expected winesteam, seems not included. TODO : Sane? 'Dishonored 2/Online/script.json' Signed-off-by: Jacob Hrbek --- .../Games/Dishonored 2/Online/script.js | 35 +++++++++++++++++++ .../Games/Dishonored 2/Online/script.json | 12 +++++++ .../Games/Dishonored 2/application.json | 5 +++ 3 files changed, 52 insertions(+) create mode 100644 Applications/Games/Dishonored 2/Online/script.js create mode 100644 Applications/Games/Dishonored 2/Online/script.json create mode 100644 Applications/Games/Dishonored 2/application.json diff --git a/Applications/Games/Dishonored 2/Online/script.js b/Applications/Games/Dishonored 2/Online/script.js new file mode 100644 index 0000000000..0370d81d42 --- /dev/null +++ b/Applications/Games/Dishonored 2/Online/script.js @@ -0,0 +1,35 @@ +include(["engines", "wine", "plugins", "windows_version"]); +include(["engines", "wine", "verbs", "xact"]); +include(["engines", "wine", "verbs", "corefonts"]); +include(["engines", "wine", "verbs", "steam"]); // Sane? Expected winesteam +include(["engines", "wine", "shortcuts", "wine"]); // Sane? Dunno + +// TODO : Executable on the game to prevent openning steam. +// TODO : Add `+com_showLoadingScreen 0` in launch options to prevent annoying loading screens + +// Installs Dishonored 2 + +var installerImplementation = { + run: function () { + new CustomInstallerScript() + .name("Dishonored 2") + .editor("Arkane Studios") + .applicationHomepage("https://dishonored.bethesda.net/") + .author("kreyren") + .appId(403640) + .category("Games") + .wineDistribution("staging") + .wineVersion(LATEST_STAGING_VERSION) + .preInstall(function (wine /*, wizard*/) { + wine.windowsVersion("win7"); + wine.xact(); + wine.dxvk(); + wine.coreconts(); + wine.steam(); + }) + .go(); + } +}; + +/* exported Installer */ +var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); \ No newline at end of file diff --git a/Applications/Games/Dishonored 2/Online/script.json b/Applications/Games/Dishonored 2/Online/script.json new file mode 100644 index 0000000000..4e9fe2453b --- /dev/null +++ b/Applications/Games/Dishonored 2/Online/script.json @@ -0,0 +1,12 @@ +{ + "scriptName" : "Online", // Sane? + "id" : "online", // Sane? + "compatibleOperatingSystems" : [], + "testingOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "free" : true, + "testing" : true, + "requiresPatch" : false +} \ No newline at end of file diff --git a/Applications/Games/Dishonored 2/application.json b/Applications/Games/Dishonored 2/application.json new file mode 100644 index 0000000000..3658800117 --- /dev/null +++ b/Applications/Games/Dishonored 2/application.json @@ -0,0 +1,5 @@ +{ + "name" : "Dishonored 2", + "id" : "dishonored_2", + "description" : "Dishonored 2 is an action-adventure video game developed by Arkane Studios and published by Bethesda Softworks. The game takes place in the fictional city of Karnaca. After Empress Emily Kaldwin is deposed by the witch Delilah Copperspoon, the player may choose between playing as either Emily or her Royal Protector and father Corvo Attano as they attempt to reclaim the throne. Both Emily and Corvo employ their own array of supernatural abilities, though the player can alternatively decide to forfeit these abilities altogether. There is a multitude of ways to complete missions, from stealth to purposeful violent conflict, navigated through a sandbox environment." +} \ No newline at end of file From 60cf3ae36a00a635ad36c63b924219fb486d8f23 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Fri, 25 Jan 2019 17:14:49 +0100 Subject: [PATCH 2/9] update --- .../Games/Dishonored 2/Online/script.js | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Applications/Games/Dishonored 2/Online/script.js b/Applications/Games/Dishonored 2/Online/script.js index 0370d81d42..5e57ee7154 100644 --- a/Applications/Games/Dishonored 2/Online/script.js +++ b/Applications/Games/Dishonored 2/Online/script.js @@ -1,34 +1,30 @@ -include(["engines", "wine", "plugins", "windows_version"]); +include(["engines", "wine", "quick_script", "steam_script"]); include(["engines", "wine", "verbs", "xact"]); include(["engines", "wine", "verbs", "corefonts"]); -include(["engines", "wine", "verbs", "steam"]); // Sane? Expected winesteam -include(["engines", "wine", "shortcuts", "wine"]); // Sane? Dunno - -// TODO : Executable on the game to prevent openning steam. -// TODO : Add `+com_showLoadingScreen 0` in launch options to prevent annoying loading screens - -// Installs Dishonored 2 +include(["engines", "wine", "verbs", "dxvk"]); +include(["engines", "wine", "plugins", "windows_version"]); +// Expected to run winesteam on wine-staging (wine untested) on 3.21+ (untested) with xact,dxvk,coreconts dependencies +// Has complicated shaders which are causing an issues (on AMDGPU?) (https://github.com/ValveSoftware/Proton/issues/823) var installerImplementation = { run: function () { - new CustomInstallerScript() + new SteamScript() .name("Dishonored 2") + .category("Games") .editor("Arkane Studios") .applicationHomepage("https://dishonored.bethesda.net/") - .author("kreyren") + .publisher("Bethesda Softworks") // Not mensioned, but seems sane + .author("Kreyren") .appId(403640) - .category("Games") + .executable("Steam.exe", ["-silent", "-applaunch", 123456, "+com_showLoadingScreen 0"]) // Verify .wineDistribution("staging") .wineVersion(LATEST_STAGING_VERSION) .preInstall(function (wine /*, wizard*/) { wine.windowsVersion("win7"); wine.xact(); wine.dxvk(); - wine.coreconts(); - wine.steam(); - }) + wine.corefonts(); .go(); - } }; /* exported Installer */ From 0e89ab15efdb112ca2065a4b9b982db57f798873 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Fri, 25 Jan 2019 17:17:00 +0100 Subject: [PATCH 3/9] update --- .../Games/Dishonored 2/Online/script.js | 31 ------------------- .../Games/Dishonored 2/Online/script.json | 12 ------- 2 files changed, 43 deletions(-) delete mode 100644 Applications/Games/Dishonored 2/Online/script.js delete mode 100644 Applications/Games/Dishonored 2/Online/script.json diff --git a/Applications/Games/Dishonored 2/Online/script.js b/Applications/Games/Dishonored 2/Online/script.js deleted file mode 100644 index 5e57ee7154..0000000000 --- a/Applications/Games/Dishonored 2/Online/script.js +++ /dev/null @@ -1,31 +0,0 @@ -include(["engines", "wine", "quick_script", "steam_script"]); -include(["engines", "wine", "verbs", "xact"]); -include(["engines", "wine", "verbs", "corefonts"]); -include(["engines", "wine", "verbs", "dxvk"]); -include(["engines", "wine", "plugins", "windows_version"]); - -// Expected to run winesteam on wine-staging (wine untested) on 3.21+ (untested) with xact,dxvk,coreconts dependencies -// Has complicated shaders which are causing an issues (on AMDGPU?) (https://github.com/ValveSoftware/Proton/issues/823) -var installerImplementation = { - run: function () { - new SteamScript() - .name("Dishonored 2") - .category("Games") - .editor("Arkane Studios") - .applicationHomepage("https://dishonored.bethesda.net/") - .publisher("Bethesda Softworks") // Not mensioned, but seems sane - .author("Kreyren") - .appId(403640) - .executable("Steam.exe", ["-silent", "-applaunch", 123456, "+com_showLoadingScreen 0"]) // Verify - .wineDistribution("staging") - .wineVersion(LATEST_STAGING_VERSION) - .preInstall(function (wine /*, wizard*/) { - wine.windowsVersion("win7"); - wine.xact(); - wine.dxvk(); - wine.corefonts(); - .go(); -}; - -/* exported Installer */ -var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); \ No newline at end of file diff --git a/Applications/Games/Dishonored 2/Online/script.json b/Applications/Games/Dishonored 2/Online/script.json deleted file mode 100644 index 4e9fe2453b..0000000000 --- a/Applications/Games/Dishonored 2/Online/script.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "scriptName" : "Online", // Sane? - "id" : "online", // Sane? - "compatibleOperatingSystems" : [], - "testingOperatingSystems" : [ - "MACOSX", - "LINUX" - ], - "free" : true, - "testing" : true, - "requiresPatch" : false -} \ No newline at end of file From 1a945bda09dcf6ba84ba22917fd33b39b8aca7c7 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Sat, 2 Feb 2019 09:42:14 +0100 Subject: [PATCH 4/9] Dealing with gremlins --- .../Games/Dishonored 2/Steam/script.js | 31 +++++++++++++++++++ .../Games/Dishonored 2/Steam/script.json | 15 +++++++++ 2 files changed, 46 insertions(+) create mode 100644 Applications/Games/Dishonored 2/Steam/script.js create mode 100644 Applications/Games/Dishonored 2/Steam/script.json diff --git a/Applications/Games/Dishonored 2/Steam/script.js b/Applications/Games/Dishonored 2/Steam/script.js new file mode 100644 index 0000000000..5e57ee7154 --- /dev/null +++ b/Applications/Games/Dishonored 2/Steam/script.js @@ -0,0 +1,31 @@ +include(["engines", "wine", "quick_script", "steam_script"]); +include(["engines", "wine", "verbs", "xact"]); +include(["engines", "wine", "verbs", "corefonts"]); +include(["engines", "wine", "verbs", "dxvk"]); +include(["engines", "wine", "plugins", "windows_version"]); + +// Expected to run winesteam on wine-staging (wine untested) on 3.21+ (untested) with xact,dxvk,coreconts dependencies +// Has complicated shaders which are causing an issues (on AMDGPU?) (https://github.com/ValveSoftware/Proton/issues/823) +var installerImplementation = { + run: function () { + new SteamScript() + .name("Dishonored 2") + .category("Games") + .editor("Arkane Studios") + .applicationHomepage("https://dishonored.bethesda.net/") + .publisher("Bethesda Softworks") // Not mensioned, but seems sane + .author("Kreyren") + .appId(403640) + .executable("Steam.exe", ["-silent", "-applaunch", 123456, "+com_showLoadingScreen 0"]) // Verify + .wineDistribution("staging") + .wineVersion(LATEST_STAGING_VERSION) + .preInstall(function (wine /*, wizard*/) { + wine.windowsVersion("win7"); + wine.xact(); + wine.dxvk(); + wine.corefonts(); + .go(); +}; + +/* exported Installer */ +var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); \ No newline at end of file diff --git a/Applications/Games/Dishonored 2/Steam/script.json b/Applications/Games/Dishonored 2/Steam/script.json new file mode 100644 index 0000000000..dec69cd242 --- /dev/null +++ b/Applications/Games/Dishonored 2/Steam/script.json @@ -0,0 +1,15 @@ +{ + "scriptName" : "Steam", + "id" : "steam", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "free" : true, + "testing" : true, + "requiresPatch" : false +} \ No newline at end of file From 5b8ed1a3024a952edd4538e4dcc802ba79636d80 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 6 Feb 2019 21:11:47 +0100 Subject: [PATCH 5/9] Fix json alignement --- Applications/Games/Dishonored 2/Steam/script.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Applications/Games/Dishonored 2/Steam/script.json b/Applications/Games/Dishonored 2/Steam/script.json index dec69cd242..df3d0bb9fd 100644 --- a/Applications/Games/Dishonored 2/Steam/script.json +++ b/Applications/Games/Dishonored 2/Steam/script.json @@ -1,15 +1,14 @@ { "scriptName" : "Steam", - "id" : "steam", + "id" : "steam", "compatibleOperatingSystems" : [ - "MACOSX", + "MACOSX", "LINUX" ], "testingOperatingSystems" : [ - "MACOSX", + "MACOSX", "LINUX" ], - "free" : true, - "testing" : true, - "requiresPatch" : false -} \ No newline at end of file + "free" : false, + "requiresPatch" : false +} From d6363f68b9f30c1bb5e6b9731b78742e41cf7827 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 6 Feb 2019 21:18:02 +0100 Subject: [PATCH 6/9] Update script.json From f01e708da5925bd5095525911802001e27f0d786 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Wed, 6 Feb 2019 21:18:20 +0100 Subject: [PATCH 7/9] Update script.json From 7dd05c161e117eb444ec1242c693f150970bd741 Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sat, 29 Jun 2019 17:25:20 +0200 Subject: [PATCH 8/9] Quick fixes. --- Applications/Games/Dishonored 2/Steam/script.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Applications/Games/Dishonored 2/Steam/script.js b/Applications/Games/Dishonored 2/Steam/script.js index 5e57ee7154..91acc927d9 100644 --- a/Applications/Games/Dishonored 2/Steam/script.js +++ b/Applications/Games/Dishonored 2/Steam/script.js @@ -13,7 +13,6 @@ var installerImplementation = { .category("Games") .editor("Arkane Studios") .applicationHomepage("https://dishonored.bethesda.net/") - .publisher("Bethesda Softworks") // Not mensioned, but seems sane .author("Kreyren") .appId(403640) .executable("Steam.exe", ["-silent", "-applaunch", 123456, "+com_showLoadingScreen 0"]) // Verify @@ -22,10 +21,12 @@ var installerImplementation = { .preInstall(function (wine /*, wizard*/) { wine.windowsVersion("win7"); wine.xact(); - wine.dxvk(); + wine.DXVK(); wine.corefonts(); + }) .go(); + } }; /* exported Installer */ -var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); \ No newline at end of file +var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); From 9b761af2e10f6465ec52f5cb506903c742e46a9b Mon Sep 17 00:00:00 2001 From: ImperatorS79 Date: Sat, 29 Jun 2019 17:26:03 +0200 Subject: [PATCH 9/9] Quick fixes 2 --- Applications/Games/Dishonored 2/Steam/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Applications/Games/Dishonored 2/Steam/script.js b/Applications/Games/Dishonored 2/Steam/script.js index 91acc927d9..09a7c0e84c 100644 --- a/Applications/Games/Dishonored 2/Steam/script.js +++ b/Applications/Games/Dishonored 2/Steam/script.js @@ -17,6 +17,7 @@ var installerImplementation = { .appId(403640) .executable("Steam.exe", ["-silent", "-applaunch", 123456, "+com_showLoadingScreen 0"]) // Verify .wineDistribution("staging") + .wineArchitecture("amd64") .wineVersion(LATEST_STAGING_VERSION) .preInstall(function (wine /*, wizard*/) { wine.windowsVersion("win7");