From ec4110fa8e1904acac0889923812ef3ba3e1e11f Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Wed, 5 Jun 2019 18:39:54 -0500 Subject: [PATCH 01/11] Add Uplay option for AC3 --- .../Games/Assassin's Creed III/Uplay/script.js | 15 +++++++++++++++ .../Games/Assassin's Creed III/Uplay/script.json | 10 ++++++++++ 2 files changed, 25 insertions(+) create mode 100644 Applications/Games/Assassin's Creed III/Uplay/script.js create mode 100644 Applications/Games/Assassin's Creed III/Uplay/script.json diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js new file mode 100644 index 0000000000..634ad79917 --- /dev/null +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -0,0 +1,15 @@ +include("engines.wine.quick_script.uplay_script"); + +var installerImplementation = { + run: function () { + new UplayScript() + .name("Assassin's Creed III") + .editor("Ubisoft, Gameloft, Ubisoft Montreal, Blue Byte, MORE") + .applicationHomepage("https://www.ubisoft.com/en-us/game/assassins-creed") + .author("KREYREN") + .appId(54) + .go(); +}; + +/* exported Installer */ +var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.json b/Applications/Games/Assassin's Creed III/Uplay/script.json new file mode 100644 index 0000000000..2292f9de09 --- /dev/null +++ b/Applications/Games/Assassin's Creed III/Uplay/script.json @@ -0,0 +1,10 @@ +{ + "scriptName" : "Uplay", + "id" : "applications.games.assassins_creed_3.uplay", + "compatibleOperatingSystems" : [ + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : false, + "requiresPatch" : false +} From 0d9275ced0d6843c0fd0b86fecaff5ef48edf78a Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Wed, 5 Jun 2019 19:24:06 -0500 Subject: [PATCH 02/11] Added DXVK --- Applications/Games/Assassin's Creed III/Steam/script.js | 4 ++++ Applications/Games/Assassin's Creed III/Uplay/script.js | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Applications/Games/Assassin's Creed III/Steam/script.js b/Applications/Games/Assassin's Creed III/Steam/script.js index b46a91a670..8d5f15dcfa 100644 --- a/Applications/Games/Assassin's Creed III/Steam/script.js +++ b/Applications/Games/Assassin's Creed III/Steam/script.js @@ -1,4 +1,5 @@ include("engines.wine.quick_script.steam_script"); +include("engines.wine.verbs.dxvk"); var installerImplementation = { run: function () { @@ -9,6 +10,9 @@ var installerImplementation = { .appId(208480) .wineVersion(LATEST_STAGING_VERSION) .wineDistribution("staging") + .preInstall(function (wine/*, wizard*/) { + wine.DXVK(); + }) .go(); } }; diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index 634ad79917..c3921a1895 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -1,13 +1,17 @@ include("engines.wine.quick_script.uplay_script"); +include("engines.wine.verbs.dxvk"); var installerImplementation = { run: function () { new UplayScript() - .name("Assassin's Creed III") + .name("Assassin's Creed") .editor("Ubisoft, Gameloft, Ubisoft Montreal, Blue Byte, MORE") .applicationHomepage("https://www.ubisoft.com/en-us/game/assassins-creed") .author("KREYREN") - .appId(54) + .appId(273) + .preInstall(function (wine/*, wizard*/) { + wine.DXVK(); + }) .go(); }; From ecf1443c75f379fc868a6ddee13884f41a87c983 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 06:02:11 -0500 Subject: [PATCH 03/11] Fixed syntax err --- Applications/Games/Assassin's Creed III/Uplay/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index c3921a1895..93d0b09a58 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -13,6 +13,7 @@ var installerImplementation = { wine.DXVK(); }) .go(); + } }; /* exported Installer */ From e2cd4c0733ef941f50a8d17cf532cc39c8ba2062 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 06:07:06 -0500 Subject: [PATCH 04/11] Fixed name --- Applications/Games/Assassin's Creed III/Steam/script.js | 2 +- Applications/Games/Assassin's Creed III/Uplay/script.js | 2 +- Applications/Games/Assassin's Creed III/application.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Applications/Games/Assassin's Creed III/Steam/script.js b/Applications/Games/Assassin's Creed III/Steam/script.js index 8d5f15dcfa..6ac0c67fad 100644 --- a/Applications/Games/Assassin's Creed III/Steam/script.js +++ b/Applications/Games/Assassin's Creed III/Steam/script.js @@ -4,7 +4,7 @@ include("engines.wine.verbs.dxvk"); var installerImplementation = { run: function () { new SteamScript() - .name("Assassin’s Creed® III") + .name("Assassin’s Creed III") .editor("Ubisoft Montreal") .author("Plata") .appId(208480) diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index 93d0b09a58..4c82264c63 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -4,7 +4,7 @@ include("engines.wine.verbs.dxvk"); var installerImplementation = { run: function () { new UplayScript() - .name("Assassin's Creed") + .name("Assassin's Creed III") .editor("Ubisoft, Gameloft, Ubisoft Montreal, Blue Byte, MORE") .applicationHomepage("https://www.ubisoft.com/en-us/game/assassins-creed") .author("KREYREN") diff --git a/Applications/Games/Assassin's Creed III/application.json b/Applications/Games/Assassin's Creed III/application.json index 37afe08629..6a9e3e3084 100644 --- a/Applications/Games/Assassin's Creed III/application.json +++ b/Applications/Games/Assassin's Creed III/application.json @@ -1,5 +1,5 @@ { - "name" : "Assassin’s Creed® III", + "name" : "Assassin’s Creed III", "id" : "applications.games.assassins_creed_3", "description" : "The American Colonies, 1775. It’s a time of civil unrest and political upheaval in the Americas. As a Native American assassin fights to protect his land and his people, he will ignite the flames of a young nation’s revolution.
Assassin’s Creed® III takes you back to the American Revolutionary War, but not the one you’ve read about in history books..." } From 11376522ea20e495ed2ea7f68d6270766ccd4e3a Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 06:07:43 -0500 Subject: [PATCH 05/11] Fixed Uplay ID --- Applications/Games/Assassin's Creed III/Uplay/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index 4c82264c63..80c5a58a6f 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -8,7 +8,7 @@ var installerImplementation = { .editor("Ubisoft, Gameloft, Ubisoft Montreal, Blue Byte, MORE") .applicationHomepage("https://www.ubisoft.com/en-us/game/assassins-creed") .author("KREYREN") - .appId(273) + .appId(54) .preInstall(function (wine/*, wizard*/) { wine.DXVK(); }) From 8c3e46f202eb48392d691d4d0497060ea8e5837a Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 06:40:18 -0500 Subject: [PATCH 06/11] Added corefonts, vcrun2008 and switched on staging --- Applications/Games/Assassin's Creed III/Uplay/script.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index 80c5a58a6f..805c118ca5 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -1,5 +1,7 @@ include("engines.wine.quick_script.uplay_script"); include("engines.wine.verbs.dxvk"); +include("engines.wine.verbs.corefonts"); +include("engines.wine.verbs.vcrun2008"); var installerImplementation = { run: function () { @@ -9,8 +11,12 @@ var installerImplementation = { .applicationHomepage("https://www.ubisoft.com/en-us/game/assassins-creed") .author("KREYREN") .appId(54) + .wineDistribution("staging") + .wineVersion(LATEST_STAGING_VERSION) .preInstall(function (wine/*, wizard*/) { wine.DXVK(); + wine.corefonts(); + wine.vcrun2008(); }) .go(); } From 97403d9c34f70e46408ba4ce95d6b33087e074b4 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 07:09:45 -0500 Subject: [PATCH 07/11] Trying amd64 arch --- Applications/Games/Assassin's Creed III/Uplay/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index 805c118ca5..6e8ae69408 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -13,6 +13,7 @@ var installerImplementation = { .appId(54) .wineDistribution("staging") .wineVersion(LATEST_STAGING_VERSION) + .wineArchitecture("amd64") .preInstall(function (wine/*, wizard*/) { wine.DXVK(); wine.corefonts(); From 38332738d84d5bc80a3064c74c069120570495a0 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 07:34:25 -0500 Subject: [PATCH 08/11] wine arch is irelevant --- Applications/Games/Assassin's Creed III/Uplay/script.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index 6e8ae69408..805c118ca5 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -13,7 +13,6 @@ var installerImplementation = { .appId(54) .wineDistribution("staging") .wineVersion(LATEST_STAGING_VERSION) - .wineArchitecture("amd64") .preInstall(function (wine/*, wizard*/) { wine.DXVK(); wine.corefonts(); From 5ac384246c41c9bedb64104d05b9533235b8c9c3 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 07:36:51 -0500 Subject: [PATCH 09/11] Added proton option --- .../Assassin's Creed III/Uplay/script.js | 3 +-- .../Uplay_proton/script.js | 26 +++++++++++++++++++ .../Uplay_proton/script.json | 10 +++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Applications/Games/Assassin's Creed III/Uplay_proton/script.js create mode 100644 Applications/Games/Assassin's Creed III/Uplay_proton/script.json diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index 805c118ca5..3f1be304a8 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -11,8 +11,7 @@ var installerImplementation = { .applicationHomepage("https://www.ubisoft.com/en-us/game/assassins-creed") .author("KREYREN") .appId(54) - .wineDistribution("staging") - .wineVersion(LATEST_STAGING_VERSION) + .wineDistribution("proton") .preInstall(function (wine/*, wizard*/) { wine.DXVK(); wine.corefonts(); diff --git a/Applications/Games/Assassin's Creed III/Uplay_proton/script.js b/Applications/Games/Assassin's Creed III/Uplay_proton/script.js new file mode 100644 index 0000000000..805c118ca5 --- /dev/null +++ b/Applications/Games/Assassin's Creed III/Uplay_proton/script.js @@ -0,0 +1,26 @@ +include("engines.wine.quick_script.uplay_script"); +include("engines.wine.verbs.dxvk"); +include("engines.wine.verbs.corefonts"); +include("engines.wine.verbs.vcrun2008"); + +var installerImplementation = { + run: function () { + new UplayScript() + .name("Assassin's Creed III") + .editor("Ubisoft, Gameloft, Ubisoft Montreal, Blue Byte, MORE") + .applicationHomepage("https://www.ubisoft.com/en-us/game/assassins-creed") + .author("KREYREN") + .appId(54) + .wineDistribution("staging") + .wineVersion(LATEST_STAGING_VERSION) + .preInstall(function (wine/*, wizard*/) { + wine.DXVK(); + wine.corefonts(); + wine.vcrun2008(); + }) + .go(); + } +}; + +/* exported Installer */ +var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); diff --git a/Applications/Games/Assassin's Creed III/Uplay_proton/script.json b/Applications/Games/Assassin's Creed III/Uplay_proton/script.json new file mode 100644 index 0000000000..62ce57feca --- /dev/null +++ b/Applications/Games/Assassin's Creed III/Uplay_proton/script.json @@ -0,0 +1,10 @@ +{ + "scriptName" : "Uplay (Proton+DXVK)", + "id" : "applications.games.assassins_creed_3.uplay_proton_dxvk", + "compatibleOperatingSystems" : [ + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : false, + "requiresPatch" : false +} From 4f653a1a336210239480bb929239633c1681ba6f Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 07:46:55 -0500 Subject: [PATCH 10/11] Both wine-staging and proton are CTD on startup --- Applications/Games/Assassin's Creed III/Uplay/script.js | 2 ++ Applications/Games/Assassin's Creed III/Uplay_proton/script.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Applications/Games/Assassin's Creed III/Uplay/script.js b/Applications/Games/Assassin's Creed III/Uplay/script.js index 3f1be304a8..f000aee5b2 100644 --- a/Applications/Games/Assassin's Creed III/Uplay/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay/script.js @@ -3,6 +3,8 @@ include("engines.wine.verbs.dxvk"); include("engines.wine.verbs.corefonts"); include("engines.wine.verbs.vcrun2008"); +// STATUS: crash on startup + var installerImplementation = { run: function () { new UplayScript() diff --git a/Applications/Games/Assassin's Creed III/Uplay_proton/script.js b/Applications/Games/Assassin's Creed III/Uplay_proton/script.js index 805c118ca5..081d56968f 100644 --- a/Applications/Games/Assassin's Creed III/Uplay_proton/script.js +++ b/Applications/Games/Assassin's Creed III/Uplay_proton/script.js @@ -3,6 +3,8 @@ include("engines.wine.verbs.dxvk"); include("engines.wine.verbs.corefonts"); include("engines.wine.verbs.vcrun2008"); +// STATUS: crash on startup + var installerImplementation = { run: function () { new UplayScript() From 58d8cb97aa60d60c680235aad4b2b8e3c4d01056 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Thu, 6 Jun 2019 08:28:52 -0500 Subject: [PATCH 11/11] Added stub --- Applications/Games/Assassin's Creed III/Steam/script.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Applications/Games/Assassin's Creed III/Steam/script.js b/Applications/Games/Assassin's Creed III/Steam/script.js index 6ac0c67fad..28a1b1c381 100644 --- a/Applications/Games/Assassin's Creed III/Steam/script.js +++ b/Applications/Games/Assassin's Creed III/Steam/script.js @@ -1,17 +1,23 @@ include("engines.wine.quick_script.steam_script"); include("engines.wine.verbs.dxvk"); +include("engines.wine.verbs.corefonts"); +include("engines.wine.verbs.vcrun2008"); + +// Doesn't work! - https://github.com/PhoenicisOrg/scripts/pull/967#issuecomment-499492492 var installerImplementation = { run: function () { new SteamScript() .name("Assassin’s Creed III") .editor("Ubisoft Montreal") - .author("Plata") + .author("Plata, KREYREN") .appId(208480) .wineVersion(LATEST_STAGING_VERSION) .wineDistribution("staging") .preInstall(function (wine/*, wizard*/) { wine.DXVK(); + wine.corefonts(); + wine.vcrun2008(); }) .go(); }