Introduce the Module System to the Verbs

Applications/Games/Age of Empires III: Complete Collection/Steam/script.js

@@ -1,16 +1,16 @@
 const SteamScript = include("engines.wine.quick_script.steam_script");
 include("engines.wine.plugins.override_dll");
-include("engines.wine.verbs.mfc42");
+const Mfc42 = include("engines.wine.verbs.mfc42");
 
 new SteamScript()
     .name("Age of Empires® III: Complete Collection")
     .editor("Microsoft Studios")
     .author("Quentin PARIS")
     .appId(105450)
     .postInstall(function (wine /*, wizard*/) {
-        wine.mfc42();
-        wine
-            .overrideDLL()
+        new Mfc42(wine).go();
+
+        wine.overrideDLL()
             .set("native, builtin", ["pidgen"])
             .do();
     });

Applications/Games/Anno 2070/Local/script.js

@@ -1,11 +1,11 @@
 const LocalInstallerScript = include("engines.wine.quick_script.local_installer_script");
-const {touch, writeToFile, chmod} = include("utils.functions.filesystem.files");
+const { touch, writeToFile, chmod } = include("utils.functions.filesystem.files");
 
 include("engines.wine.plugins.virtual_desktop");
 include("engines.wine.plugins.override_dll");
-include("engines.wine.verbs.corefonts");
-include("engines.wine.verbs.crypt32");
-include("engines.wine.verbs.d3dx10");
+const Corefonts = include("engines.wine.verbs.corefonts");
+const Crypt32 = include("engines.wine.verbs.crypt32");
+const D3DX10 = include("engines.wine.verbs.d3dx10");
 
 new LocalInstallerScript()
     .name("Anno 2070")
@@ -18,11 +18,10 @@ new LocalInstallerScript()
     .wineDistribution("upstream")
     .preInstall(function (wine) {
         wine.setVirtualDesktop();
-        wine.crypt32();
-        wine.corefonts();
-        wine.d3dx10();
-        wine
-            .overrideDLL()
+        new Crypt32(wine).go();
+        new Corefonts(wine).go();
+        new D3DX10(wine).go();
+        wine.overrideDLL()
             .set("native, builtin", ["winhttp", "msvcrt40", "msvcr100", "crypt32"])
             .do();
     })

Applications/Games/Anno 2070/Uplay/script.js

@@ -1,6 +1,6 @@
 const UplayScript = include("engines.wine.quick_script.uplay_script");
 
-include("engines.wine.verbs.corefonts");
+const Corefonts = include("engines.wine.verbs.corefonts");
 include("engines.wine.plugins.virtual_desktop");
 
 new UplayScript()
@@ -13,5 +13,5 @@ new UplayScript()
     .appId(22)
     .preInstall(function (wine /*, wizard*/) {
         wine.setVirtualDesktop();
-        wine.corefonts();
+        new Corefonts(wine).go();
     });

Applications/Games/Assassin's Creed IV Black Flag/Steam/script.js

@@ -1,7 +1,7 @@
 const SteamScript = include("engines.wine.quick_script.steam_script");
 const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
 
-include("engines.wine.verbs.uplay");
+const Uplay = include("engines.wine.verbs.uplay");
 
 new SteamScript()
     .name("Assassin’s Creed® IV Black Flag™")
@@ -12,5 +12,5 @@ new SteamScript()
     .wineDistribution("staging")
     .postInstall(function (wine /*, wizard*/) {
         // the automatically installed Uplay version does not update properly
-        wine.uplay();
+        new Uplay(wine).go();
     });

Applications/Games/Assassin's Creed Revelations/Steam/script.js

@@ -1,7 +1,7 @@
 const SteamScript = include("engines.wine.quick_script.steam_script");
 const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
 
-include("engines.wine.verbs.uplay");
+const Uplay = include("engines.wine.verbs.uplay");
 
 new SteamScript()
     .name("Assassin's Creed® Revelations")
@@ -11,5 +11,5 @@ new SteamScript()
     .wineVersion(LATEST_STAGING_VERSION)
     .wineDistribution("staging")
     .postInstall(function (wine /*, wizard*/) {
-        wine.uplay();
+        new Uplay(wine).go();
     });

Applications/Games/Assassin's Creed: Brotherhood/Steam/script.js

@@ -1,7 +1,7 @@
 const SteamScript = include("engines.wine.quick_script.steam_script");
 const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
 
-include("engines.wine.verbs.uplay");
+const Uplay = include("engines.wine.verbs.uplay");
 
 new SteamScript()
     .name("Assassin’s Creed® Brotherhood")
@@ -11,5 +11,5 @@ new SteamScript()
     .wineVersion(LATEST_STAGING_VERSION)
     .wineDistribution("staging")
     .postInstall(function (wine /*, wizard*/) {
-        wine.uplay();
+        new Uplay(wine).go();
     });

Applications/Games/Audiosurf/Steam/script.js

@@ -1,15 +1,16 @@
 const SteamScript = include("engines.wine.quick_script.steam_script");
-include("engines.wine.verbs.quicktime76");
-include("engines.wine.verbs.corefonts");
-include("engines.wine.verbs.tahoma");
+
+const QuickTime76 = include("engines.wine.verbs.quicktime76");
+const Corefonts = include("engines.wine.verbs.corefonts");
+const Tahoma = include("engines.wine.verbs.tahoma");
 
 new SteamScript()
     .name("Audiosurf")
     .editor("Dylan Fitterer")
     .author("Brainzyy")
     .appId(12900)
     .preInstall(function (wine /*, wizard*/) {
-        wine.quicktime76();
-        wine.corefonts();
-        wine.tahoma();
+        new QuickTime76(wine).go();
+        new Corefonts(wine).go();
+        new Tahoma(wine).go();
     });

Applications/Games/Blizzard app/Online/script.js

@@ -1,6 +1,7 @@
 const OnlineInstallerScript = include("engines.wine.quick_script.online_installer_script");
-include("engines.wine.verbs.vcrun2015");
-include("engines.wine.verbs.corefonts");
+
+const Vcrun2015 = include("engines.wine.verbs.vcrun2015");
+const Corefonts = include("engines.wine.verbs.corefonts");
 
 new OnlineInstallerScript()
     .name("Blizzard app")
@@ -15,6 +16,6 @@ new OnlineInstallerScript()
     .wineVersion("3.19")
     .wineDistribution("staging")
     .preInstall(function (wine /*, wizard*/) {
-        wine.vcrun2015();
-        wine.corefonts();
+        new Vcrun2015(wine).go();
+        new Corefonts(wine).go();
     });

Applications/Games/Command and Conquer - Tiberium Wars/Local/script.js

@@ -3,7 +3,7 @@ const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
 
 include("engines.wine.plugins.csmt");
 include("engines.wine.plugins.windows_version");
-include("engines.wine.verbs.d3dx9");
+const D3DX9 = include("engines.wine.verbs.d3dx9");
 
 new LocalInstallerScript()
     .name("Command and Conquer - Tiberium Wars")
@@ -15,6 +15,6 @@ new LocalInstallerScript()
     .wineDistribution("staging")
     .preInstall(function (wine /*, wizard*/) {
         wine.windowsVersion("winxp");
-        wine.d3dx9();
+        new D3DX9(wine).go();
         wine.enableCSMT();
     });

Applications/Games/DC Universe Online/Online/script.js

@@ -1,6 +1,7 @@
 const OnlineInstallerScript = include("engines.wine.quick_script.online_installer_script");
-include("engines.wine.verbs.vcrun2012");
-include("engines.wine.verbs.d3dx9");
+
+const Vcrun2012 = include("engines.wine.verbs.vcrun2012");
+const D3DX9 = include("engines.wine.verbs.d3dx9");
 
 new OnlineInstallerScript()
     .name("DC Universe Online")
@@ -11,6 +12,6 @@ new OnlineInstallerScript()
     .category("Games")
     .executable("LaunchPad.exe")
     .preInstall(function (wine /*, wizard*/) {
-        wine.vcrun2012();
-        wine.d3dx9();
+        new Vcrun2012(wine).go();
+        new D3DX9(wine).go();
     });

Applications/Games/Earth Eternal - Valkal's Shadow/Online/script.js

@@ -1,10 +1,10 @@
 const OnlineInstallerScript = include("engines.wine.quick_script.online_installer_script");
-const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
+const { LATEST_STAGING_VERSION } = include("engines.wine.engine.versions");
 
 include("engines.wine.plugins.windows_version");
-include("engines.wine.verbs.corefonts");
-include("engines.wine.verbs.d3dx9");
-include("engines.wine.verbs.vcrun2008");
+const Corefonts = include("engines.wine.verbs.corefonts");
+const D3DX9 = include("engines.wine.verbs.d3dx9");
+const Vcrun2008 = include("engines.wine.verbs.vcrun2008");
 
 new OnlineInstallerScript()
     .name("Earth Eternal - Valkal's Shadow")
@@ -19,7 +19,7 @@ new OnlineInstallerScript()
     .wineDistribution("staging")
     .preInstall(function (wine /*, wizard*/) {
         wine.windowsVersion("winxp");
-        wine.corefonts();
-        wine.d3dx9();
-        wine.vcrun2008();
+        new Corefonts(wine).go();
+        new D3DX9(wine).go();
+        new Vcrun2008(wine).go();
     });

Applications/Games/Elite:Dangerous/Steam/script.js

@@ -1,19 +1,19 @@
 const SteamScript = include("engines.wine.quick_script.steam_script");
 
-include("engines.wine.verbs.corefonts");
-include("engines.wine.verbs.dotnet45");
-include("engines.wine.verbs.vcrun2015");
-include("engines.wine.verbs.dxvk");
+const Corefonts = include("engines.wine.verbs.corefonts");
+const DotNET45 = include("engines.wine.verbs.dotnet45");
+const Vcrun2015 = include("engines.wine.verbs.vcrun2015");
+const DXVK = include("engines.wine.verbs.dxvk");
 
 new SteamScript()
     .name("Elite:Dangerous")
     .editor("Frontier Developments")
     .author("ImperatorS79")
     .wineArchitecture("amd64")
     .preInstall(function (wine /*, wizard*/) {
-        wine.dotnet45();
-        wine.corefonts();
-        wine.vcrun2015();
-        wine.DXVK();
+        new DotNET45(wine).go();
+        new Corefonts(wine).go();
+        new Vcrun2015(wine).go();
+        new DXVK(wine).go();
     })
     .appId(359320);

Applications/Games/Far Cry 2/Steam/script.js

@@ -1,8 +1,8 @@
 const SteamScript = include("engines.wine.quick_script.steam_script");
-const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
+const { LATEST_STAGING_VERSION } = include("engines.wine.engine.versions");
 
 include("engines.wine.plugins.csmt");
-include("engines.wine.verbs.secur32");
+const Secur32 = include("engines.wine.verbs.secur32");
 
 new SteamScript()
     .name("Far Cry® 2")
@@ -12,6 +12,6 @@ new SteamScript()
     .wineDistribution("staging")
     .appId(19900)
     .preInstall(function (wine /*, wizard*/) {
-        wine.secur32();
+        new Secur32(wine).go();
         wine.enableCSMT();
     });

Applications/Games/GOG Galaxy/Online/script.js

@@ -1,10 +1,10 @@
 const OnlineInstallerScript = include("engines.wine.quick_script.online_installer_script");
-const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
-const {remove, lns} = include("utils.functions.filesystem.files");
+const { LATEST_STAGING_VERSION } = include("engines.wine.engine.versions");
+const { remove, lns } = include("utils.functions.filesystem.files");
 
-include("engines.wine.verbs.corefonts");
-include("engines.wine.verbs.vcrun2017");
-include("engines.wine.verbs.xact");
+const Corefonts = include("engines.wine.verbs.corefonts");
+const Vcrun2017 = include("engines.wine.verbs.vcrun2017");
+const Xact = include("engines.wine.verbs.xact");
 
 new OnlineInstallerScript()
     .name("GOG Galaxy")
@@ -19,9 +19,11 @@ new OnlineInstallerScript()
     .wineVersion(LATEST_STAGING_VERSION)
     .wineDistribution("staging")
     .preInstall(function (wine /*, wizard*/) {
-        wine.corefonts();
-        wine.vcrun2017(); // Probably needed for self-updater
-        wine.xact(); // Required by a couple of games
+        new Corefonts(wine).go();
+        // Probably needed for self-updater
+        new Vcrun2017(wine).go();
+        // Required by a couple of games
+        new Xact(wine).go();
 
         // GOG Galaxy doesn't properly install without a symlink between
         // drive_c/ProgramData and drive_c/users/Public

Applications/Games/Hearthstone/Online/script.js

@@ -1,8 +1,8 @@
 const OnlineInstallerScript = include("engines.wine.quick_script.online_installer_script");
-const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
+const { LATEST_STAGING_VERSION } = include("engines.wine.engine.versions");
 
-include("engines.wine.verbs.vcrun2015");
-include("engines.wine.verbs.corefonts");
+const Vcrun2015 = include("engines.wine.verbs.vcrun2015");
+const Corefonts = include("engines.wine.verbs.corefonts");
 
 new OnlineInstallerScript()
     .name("Hearthstone")
@@ -15,6 +15,6 @@ new OnlineInstallerScript()
     .wineVersion(LATEST_STAGING_VERSION)
     .wineDistribution("staging")
     .preInstall(function (wine /*, wizard*/) {
-        wine.vcrun2015();
-        wine.corefonts();
+        new Vcrun2015(wine).go();
+        new Corefonts(wine).go();
     });

Applications/Games/Heroes of the Storm/Online/script.js

@@ -1,9 +1,9 @@
 const OnlineInstallerScript = include("engines.wine.quick_script.online_installer_script");
-const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions");
+const { LATEST_STAGING_VERSION } = include("engines.wine.engine.versions");
 
 include("engines.wine.plugins.windows_version");
-include("engines.wine.verbs.vcrun2015");
-include("engines.wine.verbs.corefonts");
+const Vcrun2015 = include("engines.wine.verbs.vcrun2015");
+const Corefonts = include("engines.wine.verbs.corefonts");
 
 new OnlineInstallerScript()
     .name("Heroes of the Storm")
@@ -13,11 +13,12 @@ new OnlineInstallerScript()
     .url("https://eu.battle.net/download/getInstaller?os=win&installer=Heroes-of-the-Storm-Setup.exe")
     .category("Games")
     .executable("Heroes of the Storm.exe")
-//The checksum is different each time you download
+    //The checksum is different each time you download
     .wineVersion(LATEST_STAGING_VERSION)
     .wineDistribution("staging")
     .preInstall(function (wine /*, wizard*/) {
         wine.windowsVersion("winxp");
-        wine.vcrun2015();
-        wine.corefonts();
+
+        new Vcrun2015(wine).go();
+        new Corefonts(wine).go();
     });

Applications/Games/It came from space and ate our brains/Steam/script.js

@@ -1,12 +1,12 @@
 const SteamScript = include("engines.wine.quick_script.steam_script");
 
-include("engines.wine.verbs.d3dx10");
+const D3DX10 = include("engines.wine.verbs.d3dx10");
 
 new SteamScript()
     .name("It came from space, and ate our brains")
     .editor("Triangle Studios")
     .author("madoar")
     .appId(342620)
     .preInstall(function (wine /*, wizard*/) {
-        wine.d3dx10();
+        new D3DX10(wine).go();
     });

Applications/Games/League of Legends/Online/script.js

@@ -6,8 +6,7 @@ const Resource = include("utils.functions.net.resource");
 include("engines.wine.plugins.csmt");
 include("engines.wine.plugins.override_dll");
 include("engines.wine.plugins.windows_version");
-include("engines.wine.verbs.sandbox");
-include("engines.wine.verbs.d3dx9");
+const D3DX9 = include("engines.wine.verbs.d3dx9");
 
 // Installs League of Legends
 
@@ -100,7 +99,7 @@ new CustomInstallerScript()
     .wineVersion(LATEST_STAGING_VERSION)
     .preInstall(function (wine /*, wizard*/) {
         wine.windowsVersion("winxp");
-        wine.d3dx9();
+        new D3DX9(wine).go();
         wine
             .overrideDLL()
             .set("native, builtin", ["atl120", "msvcp120", "msvcr120", "vcomp120", "msvcp140"])