From 1791c28ddb26f8e758d46fd64b63463f260decb2 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 1 May 2019 11:48:14 +0200 Subject: [PATCH 01/40] Add files via upload --- Engines/Wine/Verbs/atmlib/script.js | 50 +++++++++++++++++++++++++++ Engines/Wine/Verbs/atmlib/script.json | 11 ++++++ 2 files changed, 61 insertions(+) create mode 100644 Engines/Wine/Verbs/atmlib/script.js create mode 100644 Engines/Wine/Verbs/atmlib/script.json diff --git a/Engines/Wine/Verbs/atmlib/script.js b/Engines/Wine/Verbs/atmlib/script.js new file mode 100644 index 0000000000..8b8070d03c --- /dev/null +++ b/Engines/Wine/Verbs/atmlib/script.js @@ -0,0 +1,50 @@ +include("engines.wine.engine.object"); +include("utils.functions.net.resource"); +include("utils.functions.filesystem.files"); + +/** +* Verb to install atmlib +* @returns {Wine} Wine object +*/ +Wine.prototype.atmlib = function () { + var setupFile = new Resource() + .wizard(this.wizard()) + .url("https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/win2000/Service_Packs/usa/W2KSP4_EN.EXE") + .checksum("fadea6d94a014b039839fecc6e6a11c20afa4fa8") + .name("W2ksp4_EN.exe") + .get(); + + new CabExtract() + .archive(setupFile) + .wizard(this.wizard()) + .to(this.system32directory()) + .extract(); + + new CabExtract() + .archive(this.system32directory() + "/i386/atmlib.dl_") + .wizard(this.wizard()) + .to(this.system32directory()) + .extract(); + + remove(this.system32directory() + "/i386/"); + + return this; +}; + +/** + * Verb to install atmlib +*/ +var verbImplementation = { + install: function (container) { + var wine = new Wine(); + wine.prefix(container); + var wizard = SetupWizard(InstallationType.VERBS, "atmlib", java.util.Optional.empty()); + wine.wizard(wizard); + wine.atmlib(); + wizard.close(); + } +}; + +/* exported Verb */ +var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); + diff --git a/Engines/Wine/Verbs/atmlib/script.json b/Engines/Wine/Verbs/atmlib/script.json new file mode 100644 index 0000000000..70cc4b033e --- /dev/null +++ b/Engines/Wine/Verbs/atmlib/script.json @@ -0,0 +1,11 @@ +{ + "scriptName" : "atmlib", + "id" : "engines.wine.verbs.atmlib", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : true, + "requiresPatch" : false +} From 1b29e02967224ccab0cf455fa50e95c5361aeef1 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 15 May 2019 17:27:51 +0200 Subject: [PATCH 02/40] Add files via upload --- Applications/Games/The Sims 4/Local/script.js | 37 +++++++++++++++ .../Games/The Sims 4/Local/script.json | 11 +++++ .../Games/The Sims 4/Origin/script.js | 42 ++++++++++++++++++ .../Games/The Sims 4/Origin/script.json | 11 +++++ .../Games/The Sims 4/application.json | 5 +++ .../Games/The Sims 4/miniatures/main.png | Bin 0 -> 46847 bytes 6 files changed, 106 insertions(+) create mode 100644 Applications/Games/The Sims 4/Local/script.js create mode 100644 Applications/Games/The Sims 4/Local/script.json create mode 100644 Applications/Games/The Sims 4/Origin/script.js create mode 100644 Applications/Games/The Sims 4/Origin/script.json create mode 100644 Applications/Games/The Sims 4/application.json create mode 100644 Applications/Games/The Sims 4/miniatures/main.png diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js new file mode 100644 index 0000000000..05ae158e30 --- /dev/null +++ b/Applications/Games/The Sims 4/Local/script.js @@ -0,0 +1,37 @@ +include("engines.wine.quick_script.local_installer_script"); +include("engines.wine.verbs.vcrun6sp6"); +include("engines.wine.verbs.mfc42"); +include("engines.wine.verbs.dotnet20sp2"); +include("utils.functions.net.download"); +include("utils.functions.filesystem.files"); + +var installerImplementation = { + run: function () { + new LocalInstallerScript() + .name("The Sims 4") + .editor("Electronic Arts") + .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") + .author("ZemoScripter") + .category("Games") + .executable("TS4_x64.exe") + .wineArchitecture("amd64") + .wineVersion(4.7) + .wineDistribution("staging") + .preInstall(function(wine, wizard) { + new Downloader() + .wizard(wizard) + .url("http://www.dll-found.com/dll-8d/u/unarc.dll") + .checksum("5faa19aa1629e401915001a3392e3d916be38578") + .to(wine.system32directory() + "/unarc.dll") + .get(); + wine.dotnet20sp2(); + wine.vcrun6sp6(); + wine.mfc42(); + }) + .go(); + } +}; + +/* exported Installer */ +var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); + diff --git a/Applications/Games/The Sims 4/Local/script.json b/Applications/Games/The Sims 4/Local/script.json new file mode 100644 index 0000000000..a25f6d537b --- /dev/null +++ b/Applications/Games/The Sims 4/Local/script.json @@ -0,0 +1,11 @@ +{ + "scriptName" : "Local", + "id" : "applications.games.the_sims_4.local", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : false, + "requiresPatch" : false +} diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js new file mode 100644 index 0000000000..dc732e5dfc --- /dev/null +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -0,0 +1,42 @@ +include("engines.wine.quick_script.origin_script"); +include("engines.wine.verbs.vcrun6sp6"); +include("engines.wine.verbs.mfc42"); +include("engines.wine.verbs.dotnet20sp2"); +include("engines.wine.verbs.vcrun2010"); +include("engines.wine.verbs.vcrun2013"); +include("engines.wine.verbs.d9vk"); +include("utils.functions.net.download"); +include("utils.functions.filesystem.files"); + +var installerImplementation = { + run: function () { + new OriginScript() + .name("The Sims 4") + .editor("Electronic Arts") + .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") + .author("ZemoScripter") + .category("Games") + .wineVersion("4.0") + .wineDistribution("staging") + .wineArchitecture("amd64") + .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") + .preInstall(function(wine, wizard) { + new Downloader() + .wizard(wizard) + .url("http://www.dll-found.com/dll-8d/u/unarc.dll") + .checksum("5faa19aa1629e401915001a3392e3d916be38578") + .to(wine.system32directory() + "/unarc.dll") + .get(); + wine.dotnet20sp2(); + wine.vcrun6sp6(); + wine.mfc42(); + wine.vcrun2010(); + wine.vcrun2013(); + wine.D9VK(); + }) + .go(); + } +}; + +/* exported Installer */ +var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); diff --git a/Applications/Games/The Sims 4/Origin/script.json b/Applications/Games/The Sims 4/Origin/script.json new file mode 100644 index 0000000000..aeb0f8719f --- /dev/null +++ b/Applications/Games/The Sims 4/Origin/script.json @@ -0,0 +1,11 @@ +{ + "scriptName" : "Origin", + "id" : "applications.games.the_sims_4.origin", + "compatibleOperatingSystems" : [ + "MACOSX", + "LINUX" + ], + "testingOperatingSystems" : [], + "free" : false, + "requiresPatch" : false +} diff --git a/Applications/Games/The Sims 4/application.json b/Applications/Games/The Sims 4/application.json new file mode 100644 index 0000000000..a9d16e5d6a --- /dev/null +++ b/Applications/Games/The Sims 4/application.json @@ -0,0 +1,5 @@ +{ + "name" : "The Sims 4", + "id" : "applications.games.the_sims_4", + "description" : "Enjoy the power to create and control people in a virtual world where there are no rules. Express your creativity as you customize your Sims distinct appearances and unique personalities. Choose their fashions, select their hairstyles, and give them life aspirations. Effortlessly build your Sims the perfect homes with the all-new room-based Build Mode, choosing your favorite designs and décor. Develop your Sims’ relationships, pursue new careers, and shape the rich and entertaining moments of their lives. Explore beautiful worlds with unique environments and travel to neighborhoods where you can visit venues and meet other interesting Sims. Be powerful and free, have fun, and play with life!
Create Unique Sims Create a variety of unique Sims with distinct appearances, big personalities, and all-new emotions. Sculpt your Sims’ body shape using the powerful new Create A Sim tool then choose their hairstyles, walk-styles, and fashions. Give their lives purpose by selecting their traits and aspirations that give you control over their mind, body, and heart.
Build the Perfect Home Effortlessly build and design homes for your Sims using the new room-based Build Mode. Construct the home of your dreams by designing its layout, choosing its furnishings, and altering the landscape.
Explore Vibrant Worlds Travel between worlds, explore unique neighborhoods, and discover interesting venues. Your Sims can visit new communities to expand their social circle, hangout with friends in parks, or find and collect fun new objects.
Add New Experiences The all-new Gallery gives you the power to discover amazing community content to add to your game, or share your own creations with the world. Download, like, and comment on your favorite Sims, complete homes, and fully designed rooms." +} diff --git a/Applications/Games/The Sims 4/miniatures/main.png b/Applications/Games/The Sims 4/miniatures/main.png new file mode 100644 index 0000000000000000000000000000000000000000..571fcdfb519a3a13b9de7913b1f5d68a66577d64 GIT binary patch literal 46847 zcmb??19K)kwD42gwrzWB+qP}%sjaQuZnw5=+qSv2vAz4=JKsO}CX>wMWF~V?4w8dJ zDJe)Iz~aIJ000DODKQlQ03`8Wr-z382l>-_Jn(N4YAq_NBrPgR?BwETVQps)08l6S zCkaRm3gHhMs>T$n5nK@;Bo^{&BV)KP(V`cMlw;_)Gq*p&WwDdfFvbVl_V*_YSA@hg z)*#jd6TgBS99;Z9Bc=GuMAH;`x7S8=b1iVa10qs1pw?&$uf#DaMRj1p*-GotOA15| z&XA}blJjRwl^JmL+a4TU?ZlqF|M7BqrhHEc=0|!*zlady72;*HxWIFRCaEQ@5;+?s ziO@lON49F7zRQh8fazs1H1_*6ifqWFKI9nDfQ4>O5C-%gat&{NYbS?LBLT4p+)#G1*hz9f$2g7Tn6YD}L6egxWTDCHH~0%()wdr$ zihMgNE9g95uBR$yemq^dd4}n7<=pO|0aH|DXo~-T4?$52j8fKXO>ZkjA|iiQjIIrn zjy>4}9u2Kaf2XL>3aR)o&*kY}`xDl8P+z-qR6ojW+vL_Z-f;%=q6uBL<Hh;4 z5a-5jM=@DkClk?xrmD!41EkM|MZn!94s0=6!y^5Ii|@()9TdpVg^=)Pc(b53X>IF- zlK-Q|NsCwt(b)Uncq}PHliQLq67>711Q+P&rA5KkGD`*6+BXi$2*8Z=GRllLzpMwe zfW0QrVj#I_KusDEgu?(-3HM-t@hEMnh|2%41SKzampZxMH(aH%(02j3AsMLM=y_KJ z%z7C59+?J)F=&2C23xrxtVOsJ^zIxz&C8XL6 z!US1<&)@CY!mVskj(ER!HIl^?H5jTC zmYKgkHR*kGCNH_MlIRx)t={Z ztWf}V0U_nOPwvdLqc+Z;n}3MtMQ(GpjK|Q!TtR1?Loh^)&f8oz^3U(U z(TuJ90CAUpCEf4#UiS-7HQ&vgX-MH@{d1HmxVYZ6lkkN$mSj2;5dOgxNFu^alIQn# zUGK3t#AW95(28c-iW1@%@{ds6a7-G!vg`pmyVuYdPO( zw>{K7GIBugQ~qN2&D^A?-J1SbWv|yxhyCUi1JzKC?)7(SPQ{l{-IHz+8evVpnR~d| zq5k1YRBbFrI@4YnOhq#)QPe`>>$K&FF!P1KeHu5~1b|*5z+4(@NVBu1l14o67y1{0 z-ZL_aq0$TvlI*&Y3|{Jq+8lrSB-wd&KX2m5MhGj*8NrM8`Exz3wtyxgoVGs@ zW6x^_hU!uV9yBzYcdM%`3>-4u2(T-%U1LB+*k=7W-C7*h#%}72Nvh7B zFE{)&@S$!OpXTzS0^11CR1dLiD&7c#Hv%d)MfY;d9u#Br{MljjR*~12!MUOkq@VQr z>@qMeDW=gRy1fTpSJv`A8OYDGnjfGukV`;eAhp+!E-1{*#EJCvlfL2QZ71Q-3`6(S zkw;b)OvKkm_VLwp^w^3KBu=k*{Nf=m=cy8?euIJoZnHXPQac><4alErFNJ|qepXTc zq@8uVT9C}i!#^`)B^5$_o3d|KL*ve=3r3QF(_-0=dlEhJvHvCTuQq;n1YG6 zGa*diI}>%P&n~ic1_$8OcK} z;$R1b9c?|#m}PgR!M@l@_G``^1O({e1T&=7Bv7%e)t?RmtZ+xCTC$D2HPdC2Ge78n zBGl57UssmFi_7~+89gDdJav40SxW>ZFFFK(D8a^*HV{0tGFqEA-+PR&&`DHCJN0>9 zdDa~gw-8noK9!SRB+G#P!r$hKF6>CG)Cb>k{O)!SJk&DO1%WodAhx^g#@e;l(jfrI z9NP3Ee?opt(uI6?d8h?6&rkf`qAo@dH=iE*rPC8zV8Lw#ldy-)Y0nLP+5D12C%kej z0>~ONVa*9}%4#>4Mpr+U0J#hsY^7Tt?jGk;_t8t&)OH3mY`K+95_`R8^*MA@Ls1<$q!a^FRqa ze9=Ga5eJf>!kWAriV+-ea;%3%D=S`+l);O=7csusNk7BoQ+>)|2M+*8+F%AX+fR3!lB@U< zF;dlRK_%v(zxJOQpO?V;;ly6#dbtfq|ClSL9_aT(=23$d+a)~wo3N7(J$|Aqdk_Sd zE#HWwebGpJB|r~InjMa#64XQS1gX-EzFhy*X1JuJ>P|<6ySaF}WSub1q zUw&En`w@LqrOJXYtt5AQ|EQ3EL?9E&yVqTubMH~1DX7Fo6B>#+CB*jcYwbFspmzGR zJanO~VBAMIKqBW8DxIc~m^*rYbmzJ2*BECwPf#c^JUU+9`4?`5+Jazo@hgQ7@-%g0CZzhx(Gc5M0y!&BU=C-#R z+$&MS*p(Z;+H(ocLP;fEcFvvovSsrOj0H@oerIBIQf4XbyxwdicEk{EZ-I3Ar{R%V zo50C8e3k!1S1MuaPV~y*uUliNPlxFtUd^{Dp*~!$?|b$aUp#h?`vzR%8_g3qpI`He zw%D5H7+bFA(^*yG`AfbKWVIleD+%I+7-tNyEq^_k3herO_jvBINo7vZ)Cz&HK~&tK zKWxV{xVkj%Zo-jWN8Yh;j!H`eT)q!W#k&a%*f3`j_OW$MUFD^%K8;6@+sa*Al%+#N zW6!)0Rd0La%VN4*3(`m^4k7OnpWwi&0%s=bWqfP_-7%u+b4NwOEWlTMViPkgn%;X8 zTgab);SRAB`1e=<`*0Z!X2slNqzCfYtKIq|tmG9AzU6B>=Is^}-(!WJf0Vy}g~+^O zRB$vijHq3p0e==LJ8H_nD(Ary>4wAgg}*PAs8GM9<;8W-&;0@9!Ql*4LY>sH8SUMH z_VZ>XpOeVPa3W7d=X+%|At~Jub)l)|;Q+B;*2bP|9xlR&2=Q>*-wRyDOcXki>+_5R zH>qPQfh-|?`Nz+Lxlf+KATD}UP=e*YNuegndgzh# zZ~`jVQA1`F6hT z|4hq&ZDDh2-0s#rh^?Uj ziHrt4f6i6~18$~F@e{_fn&pj3_7TzS5B5`X70-o*;31@Aw|xbH1W)fxp+1O>NU#`9 zf61gke2vtJedLfDq};RtGrc|%WQBQX)J5gFYR*;!Lw&jV0>Sm8Ri8hBKA!-Y?pf*3 zSLG|P*SD~8ikX{x-d2YyLOwrbmeu_X=OrAEul_3pXK%6ARm;-2SXRfd0<290vV~y` zK+TzNI69WO2NqU+FcIHL+;SFSg%TBH{l)-obxyX*5Y12@S<7~i+#MTsC1*ZU#=~~; z*?k>3;u_mAHtz{dfjfgxjo%{w$V8W6;^IfetOwbZDy6W^;5@P>BF^i%XipH0R&8{T zqJUL=QU;_H{zr-^;q*)d^3q>?TrAK`CQ2VJi$Jg(eP_039WwZ`tUDwV`VUgE2W0ey z9PjcLvo5`)Ixb_zEVc2F@h zARJ?EFy-csrf{q}?3ClWnLH6ceLTY9x@W*O^#~E8Ckoyyp--!CIht~)u$iJxt3AHu zyA#zNBLi3BhlVploVuae&+qO?QBWubx;lsx&jdfghqbT-p>(J&!|6<%jLhokh@KO> z!94rMyS=Gf*QjNSA`j-{SQ_zP{>c%E4F0H=OSB0;?Q*koV&FTH_d}zI*g=n?xu%8F ziYdi5KPGI6R-ZF1D3{k?h|&xR9@|p~8MdBVAfLC)dP4hjr~?&Pse=akkX)lxb3z8Y z3qfm3bfuzU)l6?a;Wmbz&wAf`{>*96_A*eqDuT?56+9Vf?P@^L)vA}cz}2r8R@#I@ zXj2~!Avwymo5~c@`_2yUNzw_zx%u1e0d--p{I~gKGK4ZQ zk$um2HgiBL>IKcXhfZh@ez3`OA&WETK;`@6&2-IeG1nWkmsv&Pr_>g;LksTa?$k`5 zpwW@EBYIPIqZx4~R5G95ihWQ47Tmy2oW6Q-zVmV$;*|`<4YT@^;!^)aV{FKiO(2@r z4qZA}7`T5;u_1}B9^%u07uUIk!S5@UVrHM$G;^~_BqP^BT3HRv7nSReHMqNHZmO~IcG?>Qacwc1xmxFGjAf?2~u9xyb%JDSEx-eUZ9fO10X{p>(P z;h;**SKIo4_DWKxd*O!sxW2=R*?VKike<%qg;sL>eGGACbabNd;vYz|{uAGMaz@xz zS-ZlEpKLWvJ?H4el)}yg440)=8Tlc`{%e<<)wR3dEH&);aH<6EVVktfos{mv*h0_(Y2|`uaMv~_|Z>$Ocr*3Lxq<59( zVv!(1RJTS1TXj@5q?FPHT5DfWV9GnSlx_mqZ6saEe3{T>JjvWgw7MdAjkgJci09Xb z^VIh-0kYK=GA;ubK#U#r!iU5A^})T=!%JN>+-o#r$88IkeUe@9%3-u63bDOc0>in1 zvd^9dVWx<*Z~DYkV13=-!1o@5&#Je}2^srRf>X6tY|mt49Ru&h=Ow zwfk5;)PEhmXkF%HLYL2C4=>Oczw>X8J7vAkKnF6kbHop&GVyk(WrVYvS?+2iC)w?A z4c*1l4!YaU6cDqU!>GWowf?tlMbYpsSB+*&PpAEl7p7w|#6%#hlM5S{d~krvuJKm$ z{i;91G)!5^@k_FDwrQ~X#e`E2(`%&2gBHwx$l#9+|#3U@}n zIP8=+>wc9Z(1QdZ|LAWBw?2B-;*wQ$W^3n3n8CoVBb8l`$17_w`tEDJ;K1$^UU}AwAT`e* zB^UX|5DuJbb0}E`N$;NF+e0Hv`ffeDkI9y=!CHP?w*$Z!bmhXyMb<6mkpcWJgwI{Q z;>s_Gt;PUzM`a;XirF549#D2 zQRH%-P>ji#3UEt@+gBIyuiwmd&FYWIS(prak)b4TRDkHGBS9DwMrT#`Az|AF{5oR8 zGA0UZ*8Y`xpn${a&li6e3pPcib}`|!{U!$UWSTc+IB>X7f|ZNnA^yvJ;dCEFylWr9 z9>%{%3;6cCFBH7Rc?-7Rf#BnBE4cs?twa?*WSdFvTT&7)Wk3`wrZtj3WXAGx)CNAO zZdaz@%bJBDIrk>MG!CKaNF!$?-+oaey!~llZ@1eoPs|4S<2Ef8C2NN=@f?;5IMH#J zn;GNXw0l>YY`O6S8-ST?$jk{sz;mxA2ow}kk!a^h70dFnd>dhzxY}B zHC=0?^{k`MR@x4zhgvx4p@M*+XAu3TFony@rC=Z+s-o7X=CXicsE7!AjaBwb2Jl^BvzQrOf5E&ky-82PD z_AVvY1a)Htvt#hrH;q3ubnzTe*oL|s|0vda53$tIkKoVv$V||v-k<0vVyjMHhEHpL zk6t~ zu|h#8Ws0w6vPDXA!;YRIgG>)z1*G1twF!S#Mn@(Isn>GwE-Ku$I=j4akx)i&+u3VB zcuOq;U44o5mi>A>XT@zfVOFxXS6UHX?14)@tg=WzG&6gUu!rrNPZ5`_yRalm zSa=l;Gm15z8fl4LUxQVWM!^8D%%Wi%%^WH$N&Dal(o~@THnY;XPtoX10?OJwe2M}* z2!<;ep@7cLqrXyC3^7{upO%cfZ@S)UN?|l~|M;$4^;d$5cKx!*mrA5dku(aaq67Ik zeUH}9Z<&rW1yA~og>|I&+7T}f*kvI*!_YZxsdTq*0iFy(Vu1@!3Bq~`zTpan?5NIg z!H+)BRV(#(2e8mLBX=;1>Y)Y)vpiH!oTvf8t^WEN#0M{D%uSC_1XstDd-w^m+yJ;+ zH86ENIy9-#z@1vut6ArB!>-c4jeh3W9F6n_`<1Xr@!=xj|D^-&q+`YHR#sjSotaJB zm>IAMy61Dd`DLRjVFCCB>D}*0Ivs*%RuB}zb8}7;tg7>SK#zWDrhpuPU1zZL-)+r? z?)e)*y5R)4#LU^~1NkpLVCYRt1y7&Y1@$7ep;O!EbYeAs&NJk(*S0Dg?Z@ik_dn+bivRFM$MJKn5 zQV0!!=%s<==?ak|@d;H;M}bpEv7;8af~(B~nL@U5k()EVuahObdD>%P%| z9vbEOYT&gCCY4$?l(k{I^XEUml?yV9s78XOkU(j(=5>rFvsR3Kh1}Ecosd<|y^e z7W{0-mJODB#}T5o{r0ietpy>_4XI|)1I_I8p7DvChABQql9~YZf^I=M`6Lt6ZuEwUR%m71=APF9vWLVSPs( znLX)SUCDqNx>2oliLVj-jp}7d>vO8jU&j~J}_9E#itgB>Vqbr0nG*F;kLav8OoiB9#7IbGS5HA?R^WFY zREUG-+>T!9XM_&DEiT=tbxC5%;ffq)Tq)Yp6X=DrQ6vbQE(!U6i##qhWLqWiT}_g?Oj$GJxt(@fr31&6ill}s79LFtry01X!TP%qe4Uu zgC@rvCM;B~K*88(F5y}xl_u%J80Rfbjp)WqbS(YMv`vpmei=P;)D^4@fxZ9ywX!C* z2L-qyY+@R5ndIKoYFDb;m~06m!ONIy75iFYki23O`Bkm@gMe(F=;aq_^kyS3o8igI zuO{%AVCapjSl)-TBsr^F7F+p@buRKzd zUeQV`TqAUT?nOD@71n2WmZV_3IHxR!A7UYJiPH~6k_zh;h#hG#PzZ;}d&|^DYt-rc zG)Uxr2Qep!^UG)$4^=9E+TxqZqBVvIr%03gO++V&uj+)5m5^k$Y?!lxuLHF(n=~1X z54bLEx@Z|hQU;r3Y^10C%Vmnc{w;u&N!AFN^G$~aG!|_yTktj4=VNj?k*frz3YusZ zL58AdlrM#Uy&t+IDXV}861q6UBM|=0tnYJSD%MDl3RuJ!`+lTt^AbVSM#XgQ^$gqTBu{;W_( zHxP_E#ufP4`u}PHf^@jJKGdf&Qw>Q*caG|OHaE>F9a?##QF9y&w6MCp5G50`d>ALw zyD^S4}hO>CTH*G;Aa(XSVoL*zqMyl9)n;EzJ2Bh%^fB#-;FF)_i z!t_X-srw1q`dxOIVK>w!0z?Wk_k%!OtcX!?VM zR_ogP>|u}H%L#w(vk>81Fu%u-uE=7FLsE;Wj<;lBAOdna=YpnVWPi+x3koKbq$-o9 zD|^t!`p%lFTr+J0q;v%QM3)+DF*!OoHcrMKc+4)j5LpmL$_=CQ(>QOIA$i$$eAC?a zvzz+0OtMR>Sx^nxkJ`{tJLNKYj6b-&{J(~Fj?GLPiZTl;yZxo)}c-!Ul`8>*F7ip<*^wsJ6C+sMS z@Lhp~rUF`ty{o91qVe_euX1tnT3O&YsFQIAvsA7tiyWLi1AE$S48ifMq#-|kG8~G% zP%c}oM4YBPU2?g=g_O06LuMZgtsU8ZBRM}oo7;;o0wcb&Y=t*3K_8 zj~r zaX1r!SzUxF4uZx{o-1OY2s$)pl#>eH2_IFAAUs#+8SS&cuj6p6qYi%tfWambAkiJ{ z^{3^H@3GddE|69fRRNX*9W0DzHe62?pEkibM3!FM4nHF50CsAXi~yMI{YoNxZR+p&*7fgxFo&w(X9mV{u#bpq)d|qPL=M8}&@gY$#^A;*#DgRn zs`HzN=Az<@8WUjNysz`asHRUWd%_8(iyMr3e8?z1afS)UXdVVoQ4@bMnMmZnq^bZJ zi@K`|{@SL3x)FS|u_b*Xg5JPnRSAp_Fjh~bQsQqRvbuT&J(ikVVg^o#WLyh#X!n`O zI7K2pRu`P2w~1>N-=Cr%5%C%o)~Ld7_XOY7x)B-Jf|Nva-$6beNB)fQaoV`*GFHe(51=HP zXKAE_lZ7ThFQ~huS^S%8^D}l>I9CpKb|hVIwGoD17-G%ahph9nu3!N0Cr~(R2<-Vz z12-PeL9NVApEn+k&yCj^t%$BaQZFVSvX=cSCC{^={nNyNR7w(htz^YB)40omB+Np8 zz7n(2L=D*ZwguV%nfY&!?CN1=?q6m4&Ou%vkjBOK3UqKsJ0H5dbb2Li1fO<-k$fCN zq>t={-BH&)P$6Vm#5SFVfgdp7wOXKp{qvLg;LJlG+A97j{uP#+8d3yV*22ChMNqe_ zWyQqbG&N82rfwi`YgoTvbr50NJ(z@H(nG(Lu@@s6DdP?2*>`)vI;5!|hS8c2)2qBWSOG<*Vem5E-SGoQQ1z|aJdzDQ zRk}fstU3hmvFUkxMO?2J7zVp!@9m{=fTSTTx{+9_Px4>Av?xZ}UoS=@q?ONvQ8z&z zfHZ%iPCD*2N2EUMq{P!H?M4e99dfp95i&-0Qn5`~U)0BR(Kz3bL5^F3h@r14Sz_s!G(4r5-Xlsa@KQh8$=)rZoCz|6}r!2AVk!4W+Da-6& z@iDS53r4L!5^QJaU%~ ztKnO&2)z~}(XE}Hs~@D_+Zo!j7>uOMzcr^BT8}Z&X8g}+o4AEasZWYb93`79PT3RV zk7^Y8l%LHs5({m@eIgRd->gzWF=ImrJ?1NyM&U6fbwuK@1u#2lj3CjPCeSxzR_TDB zG1flxI**QmWT-}ENMG5W(NQ%9a&%KwW{qv92rvGQWd~Vq`4MY8$*Os6E%F+_Q}^y+ zKU1awvuBq=Ng1fXRsBJUpi^b_Xku$_$z%zO)GWwr)8A*HbvzLzUAScXMTXnP^c?Y1 zY&pRue2RGRq^nEwO<$(j`nWz6Ec69fGbI*V6>3jt(7k*{(cLNL9_rkQJ1z)-WYV6CK# z>8;m+*FfKWm@p=BdPO8!JO0UIbH1gFS@rIB*7g)V;I8xQSf@n_B@S~&`VZivR z-lmh{LHtSt?L*_ohoXSujT54=0KO^O532`%a4?Srh_MHUoh0KCbA#+t84w!`a;ks50>+CPEi86WRO{oAvwkx;pYeGU%1`}9hpl8EohwCeMYkMa0o~OHAV*JoV z8MG-TJw@xyLvWNl%=0ax?_bu;dzl^G5nPlYm)H|z+0`aF_AD?#f2lB)8RBTGLuHfs z2gpIRxKoEzYEnz&p$)@8W*I5ba7u6ylSxi+V7>edgMaq0-(MNSIeA`YbeKnUW>4sv zv^YYEgLfrgL5tVN$c7k@myQO?&qqnT6x>gR zHb0%gytjWqq3K8u$hE=p4)$m$k~-NdUy`?(N;Zg0$sq<8F_F#N1a%y{qn#4J7?tci zi9k+{Z1zUUAr|)ii22FOV`&%s^J;2~X3q}P@(1CA79BYU@sZ?Tx!e>PbP_=g!8|oXwe(T)CeMwYU891u)j1b4yp1z9+>{%tFr`8g*N`!OIA@ z=Ko-L$SMnVFNQ?9BpPYdS5l}!F$jM&9q+ftf91;zE`M(j4Z-U(jpkaXibXHUK-h2fy7v1JA9T1 ze}(h&%!!0?xxcs~O7TvOpC#Sk#IT!D-HVRa2YvRCy_j&3sGP0@5>-sSD~&F#yG8V7 zVB>a#WS8QPtu!W}(+eq@ve_-PN-#cfGBJbT`r6jpAmO(W`N8Ei5phSTYo>+u@mD#r z{AEJz$Uz#uxk{BP%i&S-2p&|gPT73+o3>QLwbq?4ts(^dw3Jb0Xkx?NP+p4LC9wVIJ(HUJaF|QVK0=e9H7k7bMe=Ke+REmHSjY^~F&L zQNF-jts6=-m*jyP@t!fjW}3xY;MUhd4ER&nc3R}YA0Y`Rrwww(5iFR?CCl8G?}!tP zJepc|F}y5uztokWj8@=-4_sUYdBM668b!Ua&Uo+f19stBg;o}NN5dkxPmtv57c$4P zKup}#S^LeuAS$~>wFII(m41%d1XfwJ zvAb~Xz!~yDFi0AmfL;5kUl%1x?{EY-Q%tR`TEXUX)5mK?5F3NUwBQvodU1P4uVlZY z7XR27za>gc^?@3Ios3|a3fP;5%O=FJ{(^4tc&B?2o#rC4CF?TM;6$sGq;w61i%x&m z(lp5LRyhjoc6j8(mG6G^D27pD(bS3XZjnto$ z){nrSo7-F-{Y3CLY{3zGO20@zLmJJ_Y}&=KON?|vhRmzOmdI9F-R0ZWk0gJxnt7#b%SN)Qff%)A+=Cr>NemQFx!}$tU!UG9n?iWd-4=@ zP(%YrMxK*{a?wm<$~dJl8u5#3rOQj7IvGFCI;co2CTugh^n2D-Bi9s_$sP1IKcv8? z6T^a+-!V+k+b(+~ImJ`$l!d?WgZ_MW!Br{)*;`z3h*s&Cq>ox1N3Yxrje(Ltt~mGs z+CRiOcSA0|%wR5t)daX*Mpm(rSP03+8C%E7;1;#`nO{5{xlxJhT;313E4!6e zR+ScBd92=|j(ty}{-S%tq8CWxw#xg;6Xc-ti?B}28)C|r!DYGQeAGv|IZ3;3u{IL- z@5#+2fY*T}$e7NHz_y}`@w-+}1G?w2t4ocuEhXCIw#GD^Z+>0cdKH(I9a|~pmkLBy z_bl9$kz7AiXr)`8y!N>6nNsY`P5y=#2XeThU%PoC4sr)rFU<{rJOYdUW(cVUE^^ow zA?!Z~Dm6@<#rox)Jn=yP)gzcBm``q5brLlgyam{Olw7=lS~5kG`#D*=@zLrb!H&2|S0 zdd%XL|HxgV(FX(!e=9ru zbj*-{j0vK)xzfWJcB3_ea#c_TNfu{$)~0N}tn#c?J`pN9!h=7~q!&%D%NwWc z&8D#DrVD-Fp_4-%8uR1`)n-`Fk>^Zw@U**s=6T+xIi4H4`BmRxT6V_vQswac7z-CA zVHwU$kNi-yM~!-%PO)Z4_bhVtq1q1)4NB#`$-x}uNP8BIrLo&i}N zXOqmma8N%&lmx*-Fp`QJHy0ib2+AV3m0SpAL>(FlRIoajrj~B>JBi@4T6M>hJ>#O0 zFu61>@q=nLufOk~@SS?fJ4te)Bs4U7rNOAz1}EZ2`nU?phlo`OX*S zoEd8mJOfGe(};)fDSt`M${)zm{FXqhxs1?bkcDrgd1+dC~2_Y&k$F*z}>*6V)BlitmMhK~B*i%9QE{{v$Bgz)4BV@#m--Y5Xra zmoiJO@@79smQzS5Q^-0oNnj~8s-tR$Sp}8sJF{vJ8lP`*2&;Ct<0A^cfIUCnq3m94C=c}YAJ<*mGqUwx6I zOEcJKq&KPA%gElXziV3+rZf*#0qiNx_91%^BGSk;e-ITLMU-ewzZtFJ@3Ib z6WCUSOr^G=Awg7zXQ&6 zgUfY5jpYk8BTZ<^S@2)wP2LOb z;9<7pDgqjU(HpF}eOLlOJEIq}jBpnbN(x2TYsA^>(s8M)jJ-f6NM{|VKCI(kM1R?u zLDtIA#wJX#R@r%3B}>5XO*L!h{lUfd7=PO4E6?a5`uEiw>DP#GRl@nWqG^x1Kd1Wy zXq)XeH|L_iOGP-Tjxf%@TYhbGGFD7svK57MUK$FKfWrllhf&^*P7ESt{rqIa!FC5Gq|dR!9T288A`hMidlP`yCUu}&nR&Nq zL~(gozMxpxunVjz$K#GR72evwcfJe~!}m3Ssym#67<*%)6`^@TC(Vkz4?qjs=hp-d zcEM8{);)u~;sUO=|FV3(K2Iiqt>NTnuAMsN$eXrUZ>`j()T`*D9H+C^F@{M=JT*Of z3``I^{&Ry9?;C4ETD~LE(wfxyg{LwD;7l`&LIjH_UekjavQqyH@slUOBy9iv;YbN8 zeD2-I+a9fgT-8#X@ByEXQ&01lo-;@FV>k_j&d)GA{pk(~tNH?o)#A%=EKfvWC^tuX z%WPz7LM#h0_rjjSmgdx(x+Q}VhxT_!M!nR`RoV*` z*KEXKK7{USS{<)>!(Urdedq7;j+u)kfF~>oW^Hy6L*UO5ZWO@ zb#ulR*`6AfNML69tWaGcj0RJa?UU1@(tYr=?_1OxYHxK;2*7qOs!xvxS!5aM^gx zvfvM#oz>IE@NJvue81)Uk88dLq*uIDGQxz8V1*uAw5+OWv+>qY3hT-9<6U@xFOSDjgH; z%px%qj`!F2B6ajR?h+}(Sxfh8DCPweqBHa}hgJbEc!nm zmGPpKJ2-5tH-%*{|J95g<=8$@PuZ4LVJlMHiY;AI!m+a(vg?O-+<^kej;9;tRXZ7y zzd+>zuD5YBzovG;tnYB$UDOkPbF)o6z=49`AdK9k*T0jay(6es`axCak=p*21IEVW zy{C#3XumEG%xU_5nlFv+g{QW|8&jlQfow4a{ji`)o5(@rj55h0c%BHd z&p6g%VDrF2M`8ze-+Y$VC-Rl8cR!#pawl=u6^r<1X%j}+HIvNY7>Z2;o_C3*NGvmZ zVNa&Uw?N}a#W-OR#DQ1d3)r{}a8umKrC=k`gT5#zs8VbH17kp(znesA@%RbrwsPqp znwT1p=abI#7fAZC;b!y6jeu|UEOFczydV0i_| z=T|I%Zg)>z3NZ)u70biDo;ZgKrBq`_hLL&DCvS*8HYJd_fT%s37*YK!~~651sl8udo^+nSNDS z001BWNklZLC-m}Nisb7%JCe#2*?){Rbi~NOLW?rkJlD29b~Gyc1*I8E&6skZ44@P; zmU(^ulq2-V4Us>@=mmJQ2NGfbjy;~oKKV~L;69x-)BB1%PZ?#D!axG#?C0lD+M?rl zr3C;7;#@ml9`cI_hEm}gEHn0520=*GMvNHW1@LQ$!OPejG=#JIa|jZ!F3CV$JPzw7 zL+Y=qQ*L>rf{Qph^AC3|8u~2G-*p5G+C+%c&Os~yk3nfWXK(h<^!NCCtofIZrRXyy z02Sj2jjgN&G(7}Ju1`pGpi^=&F}vfr*FIlgBFZ+iGe$KZn*xR+?NtOdY02mc6cZ!E z3WmsF_uS_oNTFbulakdH-Xb$Nji&ebkjGe&$ExUkQX~!vRtx>T?7m|Jx8i7XeCTpy zAOW)Xk})(5g?bBl0-hP?+Nttz-$jUsdmzla^_-PATkSjs3gR{y3muFSEaYeZ#;|++ zZD(D=e7S)2bWK^;uW<28tVSe9bj{|Yo7-e&%qd zHVLhPacYRbyEU{vJ5JV{E3*7XGG%M{�rl^~R%FVS|pjGAA747H21#d-|Ze5@3)& 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 literal 0 HcmV?d00001 From c0dcd4f00fd95b93dae86e6c31e72c418db71395 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 15 May 2019 17:30:34 +0200 Subject: [PATCH 03/40] Delete script.js --- Engines/Wine/Verbs/atmlib/script.js | 50 ----------------------------- 1 file changed, 50 deletions(-) delete mode 100644 Engines/Wine/Verbs/atmlib/script.js diff --git a/Engines/Wine/Verbs/atmlib/script.js b/Engines/Wine/Verbs/atmlib/script.js deleted file mode 100644 index 8b8070d03c..0000000000 --- a/Engines/Wine/Verbs/atmlib/script.js +++ /dev/null @@ -1,50 +0,0 @@ -include("engines.wine.engine.object"); -include("utils.functions.net.resource"); -include("utils.functions.filesystem.files"); - -/** -* Verb to install atmlib -* @returns {Wine} Wine object -*/ -Wine.prototype.atmlib = function () { - var setupFile = new Resource() - .wizard(this.wizard()) - .url("https://ftp.gnome.org/mirror/archive/ftp.sunet.se/pub/security/vendor/microsoft/win2000/Service_Packs/usa/W2KSP4_EN.EXE") - .checksum("fadea6d94a014b039839fecc6e6a11c20afa4fa8") - .name("W2ksp4_EN.exe") - .get(); - - new CabExtract() - .archive(setupFile) - .wizard(this.wizard()) - .to(this.system32directory()) - .extract(); - - new CabExtract() - .archive(this.system32directory() + "/i386/atmlib.dl_") - .wizard(this.wizard()) - .to(this.system32directory()) - .extract(); - - remove(this.system32directory() + "/i386/"); - - return this; -}; - -/** - * Verb to install atmlib -*/ -var verbImplementation = { - install: function (container) { - var wine = new Wine(); - wine.prefix(container); - var wizard = SetupWizard(InstallationType.VERBS, "atmlib", java.util.Optional.empty()); - wine.wizard(wizard); - wine.atmlib(); - wizard.close(); - } -}; - -/* exported Verb */ -var Verb = Java.extend(org.phoenicis.engines.Verb, verbImplementation); - From 3394614489c795c9804e0911afe937ff83260a46 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 15 May 2019 17:30:57 +0200 Subject: [PATCH 04/40] Delete script.json --- Engines/Wine/Verbs/atmlib/script.json | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Engines/Wine/Verbs/atmlib/script.json diff --git a/Engines/Wine/Verbs/atmlib/script.json b/Engines/Wine/Verbs/atmlib/script.json deleted file mode 100644 index 70cc4b033e..0000000000 --- a/Engines/Wine/Verbs/atmlib/script.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "scriptName" : "atmlib", - "id" : "engines.wine.verbs.atmlib", - "compatibleOperatingSystems" : [ - "MACOSX", - "LINUX" - ], - "testingOperatingSystems" : [], - "free" : true, - "requiresPatch" : false -} From 039d8a3ab84367b90d22955794fdd463db95a418 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 21 May 2019 13:21:22 +0200 Subject: [PATCH 05/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index dc732e5dfc..4c6d060680 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -5,8 +5,8 @@ include("engines.wine.verbs.dotnet20sp2"); include("engines.wine.verbs.vcrun2010"); include("engines.wine.verbs.vcrun2013"); include("engines.wine.verbs.d9vk"); -include("utils.functions.net.download"); -include("utils.functions.filesystem.files"); +include("utils.functions.apps.resources"); +include("engines.wine.plugins.regedit"); var installerImplementation = { run: function () { @@ -16,23 +16,19 @@ var installerImplementation = { .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") .author("ZemoScripter") .category("Games") - .wineVersion("4.0") + .wineVersion("4.3") .wineDistribution("staging") .wineArchitecture("amd64") .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") - .preInstall(function(wine, wizard) { - new Downloader() - .wizard(wizard) - .url("http://www.dll-found.com/dll-8d/u/unarc.dll") - .checksum("5faa19aa1629e401915001a3392e3d916be38578") - .to(wine.system32directory() + "/unarc.dll") - .get(); + .preInstall(function (wine, wizard) { wine.dotnet20sp2(); wine.vcrun6sp6(); wine.mfc42(); wine.vcrun2010(); wine.vcrun2013(); wine.D9VK(); + var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); + wine.regedit().patch(registrySettings); }) .go(); } From a517263c9f62deb329672e77443dbb144a8c9382 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 21 May 2019 13:22:27 +0200 Subject: [PATCH 06/40] Update script.js --- Applications/Games/The Sims 4/Local/script.js | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index 05ae158e30..a1b7d8131d 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -2,8 +2,11 @@ include("engines.wine.quick_script.local_installer_script"); include("engines.wine.verbs.vcrun6sp6"); include("engines.wine.verbs.mfc42"); include("engines.wine.verbs.dotnet20sp2"); -include("utils.functions.net.download"); -include("utils.functions.filesystem.files"); +include("engines.wine.verbs.vcrun2010"); +include("engines.wine.verbs.vcrun2013"); +include("engines.wine.verbs.d9vk"); +include("utils.functions.apps.resources"); +include("engines.wine.plugins.regedit"); var installerImplementation = { run: function () { @@ -17,16 +20,15 @@ var installerImplementation = { .wineArchitecture("amd64") .wineVersion(4.7) .wineDistribution("staging") - .preInstall(function(wine, wizard) { - new Downloader() - .wizard(wizard) - .url("http://www.dll-found.com/dll-8d/u/unarc.dll") - .checksum("5faa19aa1629e401915001a3392e3d916be38578") - .to(wine.system32directory() + "/unarc.dll") - .get(); + .preInstall(function (wine, wizard) { wine.dotnet20sp2(); wine.vcrun6sp6(); wine.mfc42(); + wine.vcrun2010(); + wine.vcrun2013(); + wine.D9VK(); + var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); + wine.regedit().patch(registrySettings); }) .go(); } @@ -34,4 +36,3 @@ var installerImplementation = { /* exported Installer */ var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); - From ce8c9556403ecb6627a22902bec67a5c221619a3 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 21 May 2019 13:23:15 +0200 Subject: [PATCH 07/40] Add files via upload --- Applications/Games/The Sims 4/resources/registry.reg | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Applications/Games/The Sims 4/resources/registry.reg diff --git a/Applications/Games/The Sims 4/resources/registry.reg b/Applications/Games/The Sims 4/resources/registry.reg new file mode 100644 index 0000000000..02696dff86 --- /dev/null +++ b/Applications/Games/The Sims 4/resources/registry.reg @@ -0,0 +1,9 @@ +REGEDIT4 + +[HKEY_CURRENT_USER\Software\Wine\Direct3D] +"MaxShaderModelVS"=dword:00000002 + +[HKEY_CURRENT_USER\Software\Wine\Direct3D] +"MaxShaderModelPS"=dword:00000002 + + From ea9fb7af560e092b75e30cd34d06dfca1629148e Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Thu, 23 May 2019 09:28:52 +0200 Subject: [PATCH 08/40] Update registry.reg Uploaded wrong reg file, fixed. --- Applications/Games/The Sims 4/resources/registry.reg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Applications/Games/The Sims 4/resources/registry.reg b/Applications/Games/The Sims 4/resources/registry.reg index 02696dff86..9a7221334d 100644 --- a/Applications/Games/The Sims 4/resources/registry.reg +++ b/Applications/Games/The Sims 4/resources/registry.reg @@ -1,9 +1,7 @@ REGEDIT4 [HKEY_CURRENT_USER\Software\Wine\Direct3D] -"MaxShaderModelVS"=dword:00000002 +"VideoPciVendorID"=dword:1002 [HKEY_CURRENT_USER\Software\Wine\Direct3D] -"MaxShaderModelPS"=dword:00000002 - - +"VideoPciDeviceID"=dword:699f From 77fecb0216a22f3a32f60bcedb2695f722754fab Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Thu, 23 May 2019 17:01:55 +0200 Subject: [PATCH 09/40] Update script.js --- Applications/Games/The Sims 4/Local/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index a1b7d8131d..10b9fa5d10 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -20,7 +20,7 @@ var installerImplementation = { .wineArchitecture("amd64") .wineVersion(4.7) .wineDistribution("staging") - .preInstall(function (wine, wizard) { + .preInstall(function (wine) { wine.dotnet20sp2(); wine.vcrun6sp6(); wine.mfc42(); From 3d475d3574a4539b28c8b1d871b47e07fea4d75e Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Thu, 23 May 2019 17:02:39 +0200 Subject: [PATCH 10/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 4c6d060680..0f086ff622 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -20,7 +20,7 @@ var installerImplementation = { .wineDistribution("staging") .wineArchitecture("amd64") .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") - .preInstall(function (wine, wizard) { + .preInstall(function (wine) { wine.dotnet20sp2(); wine.vcrun6sp6(); wine.mfc42(); From e90518570ef004e8a506cd14a8e3e5fc89afc1c5 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 28 May 2019 10:17:08 +0200 Subject: [PATCH 11/40] Update script.js Added an dll overrride. --- Applications/Games/The Sims 4/Origin/script.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 0f086ff622..71a4d90f8d 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -29,6 +29,9 @@ var installerImplementation = { wine.D9VK(); var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); + this.overrideDLL() + .set("disabled", ["nvapi","nvapi64"]) + .do(); }) .go(); } From a436bb4b467b80928a790cac535c3fbde07959bb Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 28 May 2019 10:17:43 +0200 Subject: [PATCH 12/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 71a4d90f8d..22aad029ae 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -7,6 +7,7 @@ include("engines.wine.verbs.vcrun2013"); include("engines.wine.verbs.d9vk"); include("utils.functions.apps.resources"); include("engines.wine.plugins.regedit"); +include("engines.wine.plugins.override_dll"); var installerImplementation = { run: function () { From 2d5d942fcfc1dd67f04a69084a59ed98b8b492b4 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 19 Aug 2019 20:29:05 +0200 Subject: [PATCH 13/40] Update script.js Updated script structure --- Applications/Games/The Sims 4/Local/script.js | 47 +++++++++---------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index 10b9fa5d10..6b4195e309 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -1,4 +1,4 @@ -include("engines.wine.quick_script.local_installer_script"); +cinst LocalInstallerScript = include("engines.wine.quick_script.local_installer_script"); include("engines.wine.verbs.vcrun6sp6"); include("engines.wine.verbs.mfc42"); include("engines.wine.verbs.dotnet20sp2"); @@ -8,31 +8,26 @@ include("engines.wine.verbs.d9vk"); include("utils.functions.apps.resources"); include("engines.wine.plugins.regedit"); -var installerImplementation = { - run: function () { - new LocalInstallerScript() - .name("The Sims 4") - .editor("Electronic Arts") - .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") - .author("ZemoScripter") - .category("Games") - .executable("TS4_x64.exe") - .wineArchitecture("amd64") - .wineVersion(4.7) - .wineDistribution("staging") - .preInstall(function (wine) { - wine.dotnet20sp2(); - wine.vcrun6sp6(); - wine.mfc42(); - wine.vcrun2010(); - wine.vcrun2013(); - wine.D9VK(); - var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); - wine.regedit().patch(registrySettings); - }) - .go(); - } -}; +new LocalInstallerScript() + .name("The Sims 4") + .editor("Electronic Arts") + .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") + .author("ZemoScripter") + .category("Games") + .executable("TS4_x64.exe") + .wineArchitecture("amd64") + .wineVersion(LATEST_STAGING_VERSION) + .wineDistribution("staging") + .preInstall(function (wine) { + wine.dotnet20sp2(); + wine.vcrun6sp6(); + wine.mfc42(); + wine.vcrun2010(); + wine.vcrun2013(); + wine.D9VK(); + var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); + wine.regedit().patch(registrySettings); + }) /* exported Installer */ var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); From c13cf0d1a7570b2d6eb751724f477f207c0e278c Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 19 Aug 2019 20:31:46 +0200 Subject: [PATCH 14/40] Update script.js --- .../Games/The Sims 4/Origin/script.js | 56 ++++++++----------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 22aad029ae..0aafc3c719 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -1,4 +1,4 @@ -include("engines.wine.quick_script.origin_script"); +const OriginScript = include("engines.wine.quick_script.origin_script"); include("engines.wine.verbs.vcrun6sp6"); include("engines.wine.verbs.mfc42"); include("engines.wine.verbs.dotnet20sp2"); @@ -9,34 +9,26 @@ include("utils.functions.apps.resources"); include("engines.wine.plugins.regedit"); include("engines.wine.plugins.override_dll"); -var installerImplementation = { - run: function () { - new OriginScript() - .name("The Sims 4") - .editor("Electronic Arts") - .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") - .author("ZemoScripter") - .category("Games") - .wineVersion("4.3") - .wineDistribution("staging") - .wineArchitecture("amd64") - .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") - .preInstall(function (wine) { - wine.dotnet20sp2(); - wine.vcrun6sp6(); - wine.mfc42(); - wine.vcrun2010(); - wine.vcrun2013(); - wine.D9VK(); - var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); - wine.regedit().patch(registrySettings); - this.overrideDLL() - .set("disabled", ["nvapi","nvapi64"]) - .do(); - }) - .go(); - } -}; - -/* exported Installer */ -var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); +new OriginScript() + .name("The Sims 4") + .editor("Electronic Arts") + .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") + .author("ZemoScripter") + .category("Games") + .wineVersion("4.3") + .wineDistribution("staging") + .wineArchitecture("amd64") + .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") + .preInstall(function (wine) { + wine.dotnet20sp2(); + wine.vcrun6sp6(); + wine.mfc42(); + wine.vcrun2010(); + wine.vcrun2013(); + wine.D9VK(); + var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); + wine.regedit().patch(registrySettings); + this.overrideDLL() + .set("disabled", ["nvapi","nvapi64"]) + .do(); + }) From 1c89c1323056dceb87e64f4ebf8f2c5e621772f9 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 19 Aug 2019 20:33:09 +0200 Subject: [PATCH 15/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 0aafc3c719..35391cb19e 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -15,7 +15,7 @@ new OriginScript() .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") .author("ZemoScripter") .category("Games") - .wineVersion("4.3") + .wineVersion(LATEST_STAGING_VERSION) .wineDistribution("staging") .wineArchitecture("amd64") .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") From 0d1a7717c09b99b067f2e1e61cdbb4cf302463c5 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 19 Aug 2019 20:43:55 +0200 Subject: [PATCH 16/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 35391cb19e..bb09d4bf7d 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -1,4 +1,5 @@ const OriginScript = include("engines.wine.quick_script.origin_script"); +const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); include("engines.wine.verbs.vcrun6sp6"); include("engines.wine.verbs.mfc42"); include("engines.wine.verbs.dotnet20sp2"); From c367dfeeb24432090bdb026ce184c62d30a0c1a6 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 20 Aug 2019 23:01:54 +0200 Subject: [PATCH 17/40] Update script.js Adde missing const, typo fixes --- Applications/Games/The Sims 4/Local/script.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index 6b4195e309..b9f0984dfa 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -1,11 +1,12 @@ -cinst LocalInstallerScript = include("engines.wine.quick_script.local_installer_script"); +const LocalInstallerScript = include("engines.wine.quick_script.local_installer_script"); +const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); +const Resource = include("utils.functions.apps.resources"); include("engines.wine.verbs.vcrun6sp6"); include("engines.wine.verbs.mfc42"); include("engines.wine.verbs.dotnet20sp2"); include("engines.wine.verbs.vcrun2010"); include("engines.wine.verbs.vcrun2013"); include("engines.wine.verbs.d9vk"); -include("utils.functions.apps.resources"); include("engines.wine.plugins.regedit"); new LocalInstallerScript() From 8e8e9f8aceb191d251867da19ef43cfb9ca43f4d Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 20 Aug 2019 23:03:06 +0200 Subject: [PATCH 18/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index bb09d4bf7d..0309a844f7 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -1,12 +1,12 @@ const OriginScript = include("engines.wine.quick_script.origin_script"); const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); +const Resource = include("utils.functions.apps.resources"); include("engines.wine.verbs.vcrun6sp6"); include("engines.wine.verbs.mfc42"); include("engines.wine.verbs.dotnet20sp2"); include("engines.wine.verbs.vcrun2010"); include("engines.wine.verbs.vcrun2013"); include("engines.wine.verbs.d9vk"); -include("utils.functions.apps.resources"); include("engines.wine.plugins.regedit"); include("engines.wine.plugins.override_dll"); From c885abe82e5b56b0ac7ef81a3e2d7b438f0a7078 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 20 Aug 2019 23:14:23 +0200 Subject: [PATCH 19/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 0309a844f7..bcb41d2c08 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -29,7 +29,7 @@ new OriginScript() wine.D9VK(); var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); - this.overrideDLL() + wine.overrideDLL() .set("disabled", ["nvapi","nvapi64"]) .do(); }) From a2108060716940d980a167657fe0e13eefe621ae Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Fri, 23 Aug 2019 11:04:12 +0200 Subject: [PATCH 20/40] Update script.js Fixed const name --- Applications/Games/The Sims 4/Local/script.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index b9f0984dfa..d9b7e74763 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -1,6 +1,6 @@ const LocalInstallerScript = include("engines.wine.quick_script.local_installer_script"); const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); -const Resource = include("utils.functions.apps.resources"); +const AppResource = include("utils.functions.apps.resources"); include("engines.wine.verbs.vcrun6sp6"); include("engines.wine.verbs.mfc42"); include("engines.wine.verbs.dotnet20sp2"); @@ -26,9 +26,6 @@ new LocalInstallerScript() wine.vcrun2010(); wine.vcrun2013(); wine.D9VK(); - var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); + const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); }) - -/* exported Installer */ -var Installer = Java.extend(org.phoenicis.scripts.Installer, installerImplementation); From dda1f66d7b26bcecbf07b6ba60405759047651c2 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Fri, 23 Aug 2019 11:05:51 +0200 Subject: [PATCH 21/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index bcb41d2c08..a3dc49aab2 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -1,6 +1,6 @@ const OriginScript = include("engines.wine.quick_script.origin_script"); const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); -const Resource = include("utils.functions.apps.resources"); +const AppResource = include("utils.functions.apps.resources"); include("engines.wine.verbs.vcrun6sp6"); include("engines.wine.verbs.mfc42"); include("engines.wine.verbs.dotnet20sp2"); @@ -27,7 +27,7 @@ new OriginScript() wine.vcrun2010(); wine.vcrun2013(); wine.D9VK(); - var registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); + const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); wine.overrideDLL() .set("disabled", ["nvapi","nvapi64"]) From 62b1e716598816cb858e2a3f55c539f05d92df07 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sun, 25 Aug 2019 20:14:20 +0200 Subject: [PATCH 22/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index a3dc49aab2..6f46395217 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -33,3 +33,4 @@ new OriginScript() .set("disabled", ["nvapi","nvapi64"]) .do(); }) + .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE_PATH": "$GAMEDIR", "__GL_SHADER_DISK_CACHE": "1"}') From ddab905337e565a15735493e73c88917828c1f8f Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sun, 25 Aug 2019 20:53:41 +0200 Subject: [PATCH 23/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 6f46395217..a1d4c2cd1a 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -33,4 +33,4 @@ new OriginScript() .set("disabled", ["nvapi","nvapi64"]) .do(); }) - .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE_PATH": "$GAMEDIR", "__GL_SHADER_DISK_CACHE": "1"}') + .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE_PATH": "wine.prefixDirectory()", "__GL_SHADER_DISK_CACHE": "1"}') From c33e3ddbeb2104b52cc8bbb7e841535470cae011 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 26 Aug 2019 00:46:11 +0200 Subject: [PATCH 24/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index a1d4c2cd1a..fbfb419263 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -33,4 +33,4 @@ new OriginScript() .set("disabled", ["nvapi","nvapi64"]) .do(); }) - .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE_PATH": "wine.prefixDirectory()", "__GL_SHADER_DISK_CACHE": "1"}') + .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1"}') From d8bc50d5f0fd391d60b08afd9866f6e4fa1354cd Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Fri, 13 Sep 2019 19:52:29 +0200 Subject: [PATCH 25/40] Update script.js --- Applications/Games/The Sims 4/Local/script.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index d9b7e74763..63e5d1edb8 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -28,4 +28,8 @@ new LocalInstallerScript() wine.D9VK(); const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); + wine.overrideDLL() + .set("disabled", ["nvapi","nvapi64"]) + .do(); }) + .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1"}') From 71d9c47e3b7112e16041bc1d4c9d73f7ae06d38b Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sat, 14 Sep 2019 12:25:14 +0200 Subject: [PATCH 26/40] Update script.js --- .../Games/The Sims 4/Origin/script.js | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index fbfb419263..8ea3af31f7 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -1,14 +1,14 @@ const OriginScript = include("engines.wine.quick_script.origin_script"); const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); const AppResource = include("utils.functions.apps.resources"); -include("engines.wine.verbs.vcrun6sp6"); -include("engines.wine.verbs.mfc42"); -include("engines.wine.verbs.dotnet20sp2"); -include("engines.wine.verbs.vcrun2010"); -include("engines.wine.verbs.vcrun2013"); -include("engines.wine.verbs.d9vk"); -include("engines.wine.plugins.regedit"); -include("engines.wine.plugins.override_dll"); +const vcrun6sp6 = include("engines.wine.verbs.vcrun6sp6"); +const MFC42 = include("engines.wine.verbs.mfc42"); +const dotnet20sp2 = include("engines.wine.verbs.dotnet20sp2"); +const vcrun2010 = include("engines.wine.verbs.vcrun2010"); +const vcrun2013 = include("engines.wine.verbs.vcrun2013"); +const D9VK = include("engines.wine.verbs.d9vk"); +const regedit = include("engines.wine.plugins.regedit"); +const overrideDLL = include("engines.wine.plugins.override_dll"); new OriginScript() .name("The Sims 4") @@ -21,12 +21,12 @@ new OriginScript() .wineArchitecture("amd64") .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") .preInstall(function (wine) { - wine.dotnet20sp2(); - wine.vcrun6sp6(); - wine.mfc42(); - wine.vcrun2010(); - wine.vcrun2013(); - wine.D9VK(); + new dotnet20sp2(wine).go(); + new vcrun6sp6(wine).go(); + new MFC(wine).go(); + new vcrun2010(wine).go(); + new vcrun2013(wine).go(); + new D9VK(wine).go(); const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); wine.overrideDLL() From 371b32a2d6577b15b3ce6a6a551f8d47c468c3fb Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sat, 14 Sep 2019 12:26:16 +0200 Subject: [PATCH 27/40] Update script.js --- Applications/Games/The Sims 4/Local/script.js | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index 63e5d1edb8..32dc962901 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -1,13 +1,14 @@ const LocalInstallerScript = include("engines.wine.quick_script.local_installer_script"); const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); const AppResource = include("utils.functions.apps.resources"); -include("engines.wine.verbs.vcrun6sp6"); -include("engines.wine.verbs.mfc42"); -include("engines.wine.verbs.dotnet20sp2"); -include("engines.wine.verbs.vcrun2010"); -include("engines.wine.verbs.vcrun2013"); -include("engines.wine.verbs.d9vk"); -include("engines.wine.plugins.regedit"); +const vcrun6sp6 = include("engines.wine.verbs.vcrun6sp6"); +const MFC42 = include("engines.wine.verbs.mfc42"); +const dotnet20sp2 = include("engines.wine.verbs.dotnet20sp2"); +const vcrun2010 = include("engines.wine.verbs.vcrun2010"); +const vcrun2013 = include("engines.wine.verbs.vcrun2013"); +const D9VK = include("engines.wine.verbs.d9vk"); +const regedit = include("engines.wine.plugins.regedit"); +const overrideDLL = include("engines.wine.plugins.override_dll"); new LocalInstallerScript() .name("The Sims 4") @@ -20,12 +21,12 @@ new LocalInstallerScript() .wineVersion(LATEST_STAGING_VERSION) .wineDistribution("staging") .preInstall(function (wine) { - wine.dotnet20sp2(); - wine.vcrun6sp6(); - wine.mfc42(); - wine.vcrun2010(); - wine.vcrun2013(); - wine.D9VK(); + new dotnet20sp2(wine).go(); + new vcrun6sp6(wine).go(); + new MFC(wine).go(); + new vcrun2010(wine).go(); + new vcrun2013(wine).go(); + new D9VK(wine).go(); const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); wine.overrideDLL() From 81d1ffb7c50eec7cf0252e4d9bb97d14a7934434 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sun, 15 Sep 2019 13:34:01 +0200 Subject: [PATCH 28/40] Update script.js --- Applications/Games/The Sims 4/Local/script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index 32dc962901..b647aa195a 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -7,8 +7,8 @@ const dotnet20sp2 = include("engines.wine.verbs.dotnet20sp2"); const vcrun2010 = include("engines.wine.verbs.vcrun2010"); const vcrun2013 = include("engines.wine.verbs.vcrun2013"); const D9VK = include("engines.wine.verbs.d9vk"); -const regedit = include("engines.wine.plugins.regedit"); -const overrideDLL = include("engines.wine.plugins.override_dll"); +include("engines.wine.plugins.regedit"); +include("engines.wine.plugins.override_dll"); new LocalInstallerScript() .name("The Sims 4") @@ -23,7 +23,7 @@ new LocalInstallerScript() .preInstall(function (wine) { new dotnet20sp2(wine).go(); new vcrun6sp6(wine).go(); - new MFC(wine).go(); + new MFC42(wine).go(); new vcrun2010(wine).go(); new vcrun2013(wine).go(); new D9VK(wine).go(); From 3c32172ab028bbd7ec1be4775640bd97b56b8a1a Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sun, 15 Sep 2019 14:11:47 +0200 Subject: [PATCH 29/40] Update script.js --- Applications/Games/The Sims 4/Local/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Local/script.js b/Applications/Games/The Sims 4/Local/script.js index b647aa195a..8fc18e27f5 100644 --- a/Applications/Games/The Sims 4/Local/script.js +++ b/Applications/Games/The Sims 4/Local/script.js @@ -30,7 +30,7 @@ new LocalInstallerScript() const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); wine.overrideDLL() - .set("disabled", ["nvapi","nvapi64"]) + .set("disabled", ["nvapi", "nvapi64"]) .do(); }) .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1"}') From fd01635257631a6054241a8f4fcebfabdbc05526 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Sun, 15 Sep 2019 14:13:12 +0200 Subject: [PATCH 30/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 8ea3af31f7..88c3141506 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -7,8 +7,9 @@ const dotnet20sp2 = include("engines.wine.verbs.dotnet20sp2"); const vcrun2010 = include("engines.wine.verbs.vcrun2010"); const vcrun2013 = include("engines.wine.verbs.vcrun2013"); const D9VK = include("engines.wine.verbs.d9vk"); -const regedit = include("engines.wine.plugins.regedit"); -const overrideDLL = include("engines.wine.plugins.override_dll"); + +include("engines.wine.plugins.regedit"); +include("engines.wine.plugins.override_dll"); new OriginScript() .name("The Sims 4") @@ -23,14 +24,14 @@ new OriginScript() .preInstall(function (wine) { new dotnet20sp2(wine).go(); new vcrun6sp6(wine).go(); - new MFC(wine).go(); + new MFC42(wine).go(); new vcrun2010(wine).go(); new vcrun2013(wine).go(); new D9VK(wine).go(); const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); wine.overrideDLL() - .set("disabled", ["nvapi","nvapi64"]) + .set("disabled", ["nvapi", "nvapi64"]) .do(); }) .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1"}') From 8fb3faf5f860a2c5521d9f93cd539111ea295642 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 30 Oct 2019 19:06:07 +0100 Subject: [PATCH 31/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 88c3141506..32242e5bba 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -30,8 +30,11 @@ new OriginScript() new D9VK(wine).go(); const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); wine.regedit().patch(registrySettings); + var configFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; + touch(configFile); + writeToFile(configFile, dxgi.nvapiHack = False); wine.overrideDLL() - .set("disabled", ["nvapi", "nvapi64"]) + .set("disabled", ["nvapi", "nvapi64", "OriginThinSetupInternal.exe"]) .do(); }) - .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1"}') + .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1", "DXVK_CONFIG_FILE": "configFile", "PULSE_LATENCY_MSEC": "60"}') From 76491683f6a243ff282b8f244968355975598bc9 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 30 Oct 2019 19:11:41 +0100 Subject: [PATCH 32/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 32242e5bba..487e8d006c 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -32,7 +32,7 @@ new OriginScript() wine.regedit().patch(registrySettings); var configFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; touch(configFile); - writeToFile(configFile, dxgi.nvapiHack = False); + writeToFile(configFile, "dxgi.nvapiHack = False"); wine.overrideDLL() .set("disabled", ["nvapi", "nvapi64", "OriginThinSetupInternal.exe"]) .do(); From c8ee9c7b3df9748396a622ad6516594e02f66933 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 30 Oct 2019 19:20:38 +0100 Subject: [PATCH 33/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 487e8d006c..938e19ac1f 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -7,6 +7,7 @@ const dotnet20sp2 = include("engines.wine.verbs.dotnet20sp2"); const vcrun2010 = include("engines.wine.verbs.vcrun2010"); const vcrun2013 = include("engines.wine.verbs.vcrun2013"); const D9VK = include("engines.wine.verbs.d9vk"); +const { touch, writeToFile } = include("utils.functions.filesystem.files"); include("engines.wine.plugins.regedit"); include("engines.wine.plugins.override_dll"); From b6813731d3c7cce3092472d05b5711137ffac46c Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Tue, 26 Nov 2019 23:31:01 +0100 Subject: [PATCH 34/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 938e19ac1f..070c009b04 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -8,6 +8,7 @@ const vcrun2010 = include("engines.wine.verbs.vcrun2010"); const vcrun2013 = include("engines.wine.verbs.vcrun2013"); const D9VK = include("engines.wine.verbs.d9vk"); const { touch, writeToFile } = include("utils.functions.filesystem.files"); +const OverrideDLL = include("engines.wine.plugins.override_dll"); include("engines.wine.plugins.regedit"); include("engines.wine.plugins.override_dll"); @@ -29,13 +30,11 @@ new OriginScript() new vcrun2010(wine).go(); new vcrun2013(wine).go(); new D9VK(wine).go(); - const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); - wine.regedit().patch(registrySettings); + //const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); + //wine.regedit().patch(registrySettings); var configFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; touch(configFile); writeToFile(configFile, "dxgi.nvapiHack = False"); - wine.overrideDLL() - .set("disabled", ["nvapi", "nvapi64", "OriginThinSetupInternal.exe"]) - .do(); + new OverrideDLL(wine).withMode("disabled", ["nvapi", "nvapi64", "OriginThinSetupInternal.exe"]).go(); }) .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1", "DXVK_CONFIG_FILE": "configFile", "PULSE_LATENCY_MSEC": "60"}') From 556bc196b565f843db17d422a8c02ce7550d2f6a Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Wed, 27 Nov 2019 10:02:52 +0100 Subject: [PATCH 35/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 070c009b04..07a59c2625 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -1,6 +1,5 @@ const OriginScript = include("engines.wine.quick_script.origin_script"); const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); -const AppResource = include("utils.functions.apps.resources"); const vcrun6sp6 = include("engines.wine.verbs.vcrun6sp6"); const MFC42 = include("engines.wine.verbs.mfc42"); const dotnet20sp2 = include("engines.wine.verbs.dotnet20sp2"); From d9cf1bba3e4f89b4286ceb6e7120f93947ec55c9 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 9 Dec 2019 11:25:37 +0100 Subject: [PATCH 36/40] Update script.js Changed the script to reflect on the Lutris one. --- .../Games/The Sims 4/Origin/script.js | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 07a59c2625..b4bd0e505b 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -1,13 +1,8 @@ const OriginScript = include("engines.wine.quick_script.origin_script"); -const {LATEST_STAGING_VERSION} = include("engines.wine.engine.versions"); -const vcrun6sp6 = include("engines.wine.verbs.vcrun6sp6"); -const MFC42 = include("engines.wine.verbs.mfc42"); -const dotnet20sp2 = include("engines.wine.verbs.dotnet20sp2"); const vcrun2010 = include("engines.wine.verbs.vcrun2010"); const vcrun2013 = include("engines.wine.verbs.vcrun2013"); const D9VK = include("engines.wine.verbs.d9vk"); const { touch, writeToFile } = include("utils.functions.filesystem.files"); -const OverrideDLL = include("engines.wine.plugins.override_dll"); include("engines.wine.plugins.regedit"); include("engines.wine.plugins.override_dll"); @@ -18,22 +13,19 @@ new OriginScript() .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") .author("ZemoScripter") .category("Games") - .wineVersion(LATEST_STAGING_VERSION) - .wineDistribution("staging") + .wineVersion("4.20") + .wineDistribution("upstream") .wineArchitecture("amd64") .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") .preInstall(function (wine) { - new dotnet20sp2(wine).go(); - new vcrun6sp6(wine).go(); - new MFC42(wine).go(); new vcrun2010(wine).go(); new vcrun2013(wine).go(); new D9VK(wine).go(); - //const registrySettings = new AppResource().application([TYPE_ID, CATEGORY_ID, APPLICATION_ID]).get("registry.reg"); - //wine.regedit().patch(registrySettings); var configFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; touch(configFile); writeToFile(configFile, "dxgi.nvapiHack = False"); - new OverrideDLL(wine).withMode("disabled", ["nvapi", "nvapi64", "OriginThinSetupInternal.exe"]).go(); + wine.overrideDLL() + .set("disabled", ["nvapi", "nvapi64", "OriginThinSetupInternal.exe"]) + .do(); }) - .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1", "DXVK_CONFIG_FILE": "configFile", "PULSE_LATENCY_MSEC": "60"}') + .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1", "DXVK_CONFIG_FILE": "configFile"}') From 73362e15ab23b7c5dc2c64d86e56c34754d8cd97 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 9 Dec 2019 11:28:59 +0100 Subject: [PATCH 37/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index b4bd0e505b..59fbab48bb 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -3,9 +3,7 @@ const vcrun2010 = include("engines.wine.verbs.vcrun2010"); const vcrun2013 = include("engines.wine.verbs.vcrun2013"); const D9VK = include("engines.wine.verbs.d9vk"); const { touch, writeToFile } = include("utils.functions.filesystem.files"); - -include("engines.wine.plugins.regedit"); -include("engines.wine.plugins.override_dll"); +const OverrideDLL = include("engines.wine.plugins.override_dll"); new OriginScript() .name("The Sims 4") @@ -25,7 +23,7 @@ new OriginScript() touch(configFile); writeToFile(configFile, "dxgi.nvapiHack = False"); wine.overrideDLL() - .set("disabled", ["nvapi", "nvapi64", "OriginThinSetupInternal.exe"]) + .set("disabled", ["nvapi", "nvapi64"]) .do(); }) .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1", "DXVK_CONFIG_FILE": "configFile"}') From 128363285bed941ee9befdc641d627517f2b1fa0 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Mon, 9 Dec 2019 11:33:32 +0100 Subject: [PATCH 38/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 59fbab48bb..973f711f62 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -22,8 +22,8 @@ new OriginScript() var configFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; touch(configFile); writeToFile(configFile, "dxgi.nvapiHack = False"); - wine.overrideDLL() - .set("disabled", ["nvapi", "nvapi64"]) - .do(); + new OverrideDLL(wine) + .withMode("disabled", ["nvapi, nvapi64"]) + .go(); }) .environment('{ "STAGING_SHARED_MEMORY": "0", "__GL_SHADER_DISK_CACHE": "1", "DXVK_CONFIG_FILE": "configFile"}') From e43bbbc164d342b83d539f628106c8c7d128b476 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Fri, 20 Dec 2019 12:24:56 +0100 Subject: [PATCH 39/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 973f711f62..2e42eaf683 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -1,6 +1,7 @@ const OriginScript = include("engines.wine.quick_script.origin_script"); const vcrun2010 = include("engines.wine.verbs.vcrun2010"); const vcrun2013 = include("engines.wine.verbs.vcrun2013"); +const vcrun2015 = include("engines.wine.verbs.vcrun2015"); const D9VK = include("engines.wine.verbs.d9vk"); const { touch, writeToFile } = include("utils.functions.filesystem.files"); const OverrideDLL = include("engines.wine.plugins.override_dll"); @@ -11,13 +12,14 @@ new OriginScript() .applicationHomepage("https://www.ea.com/games/the-sims/the-sims-4/pc") .author("ZemoScripter") .category("Games") - .wineVersion("4.20") + .wineVersion("4.21") .wineDistribution("upstream") .wineArchitecture("amd64") .appId("1011164,1015875,1015876,1015793,1015794,1015795,1015806,1015807,1015808,1018025,1018023,1015236,1015235,1015224") .preInstall(function (wine) { new vcrun2010(wine).go(); new vcrun2013(wine).go(); + new vcrun2015(wine).go(); new D9VK(wine).go(); var configFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; touch(configFile); From eb3a40197d9424d383b6b989fc6922cc3ee5a474 Mon Sep 17 00:00:00 2001 From: Zemogiter Date: Fri, 3 Jan 2020 12:58:23 +0100 Subject: [PATCH 40/40] Update script.js --- Applications/Games/The Sims 4/Origin/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Applications/Games/The Sims 4/Origin/script.js b/Applications/Games/The Sims 4/Origin/script.js index 2e42eaf683..5074f5c631 100644 --- a/Applications/Games/The Sims 4/Origin/script.js +++ b/Applications/Games/The Sims 4/Origin/script.js @@ -21,7 +21,7 @@ new OriginScript() new vcrun2013(wine).go(); new vcrun2015(wine).go(); new D9VK(wine).go(); - var configFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; + const configFile = wine.prefixDirectory() + "/drive_c/dxvk.conf"; touch(configFile); writeToFile(configFile, "dxgi.nvapiHack = False"); new OverrideDLL(wine)