From 11b6e15e661d7139854c153381e43d6d619311ad Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Thu, 1 Feb 2024 00:08:15 +0100 Subject: [PATCH] Moved the GetNewGameCount() check to the init quest --- scripts/_00e_mqp01_functions.pex | Bin 9445 -> 9408 bytes scripts/_00e_mqp01_startsc.pex | Bin 2388 -> 2272 bytes scripts/qf_mq101_0003372b.pex | Bin 973 -> 1279 bytes source/scripts/_00e_mqp01_functions.psc | 1 - source/scripts/_00e_mqp01_startsc.psc | 50 ++++++++++-------------- source/scripts/qf_mq101_0003372b.psc | 5 +++ 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/scripts/_00e_mqp01_functions.pex b/scripts/_00e_mqp01_functions.pex index 1185aaf595369f6262c23bf15a2d978f7c37550b..208a85dffd66805e61bcaa21c2bb3748c582974e 100644 GIT binary patch literal 9408 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 A{{R30 literal 9445 zcmeHN>3bW;dH*d5kfKOYqVCg%WXn=~NF*rgK&%5i1&fqufutn2HM<0sZ6Q#)~_TuS02O>Qkjk z)hq?{%0;Uzk=EG~LS@XF6`*Tg+EP(L508#s7M3eiJcYl}u9yo}jZ`dx?0MVr(IGI3 zQkPcR47(Z>AGVemO(V|Igk-oQms3Gk9Lmm$gBM3edymMi^%v&eW|b(~yyXjBu${R1 zF@ZE_I?l*Ds*xD`Vk$aTR1{5^{*vWOa^kcM?_u9ED_DdkH<#MvNh!mI%a9WHm^3k^Q>o z73Es!>1|}KEIsErL2tjXxun>g%Z-^8i>axM+P&a-bEZRaY;(@BgiNtJRgw%5-#0}V zOA0irN&^wQv&E`avP~x}JcD)HDNk1=-rY$`^tI#Fm`=s2dDTrgwW-yQN&*|~nF~W> zEH%FA%$QEy!q!|aUoYF<5L0!*^RH1wiMdWDUMYm4Q*l;CZpxrv9$Q6jx+vi^UIUx_ z#Go>kh^YM7FpGg-mjzasmDUrXtkhFEu{l~#dBb*17`C@h)CFx?9gnhbT{4{|mXL%| zwrEUM-k3mAt~67f#df9G#nH=hd(R57W9!LnCW-Xhj9s?8;*zbr)YLpGvZH#};AokA zHA!)$AheT&ug~SC?21(@nT`rNhJs`rR>b_AU#|wMsv%3DwhtSIialYQgkf0w8cJ|r zxiu?_?X<%J8$@Y!*7PfmRjY~p$RSd|4omwB8=1b`AH7^$WELwocUdw^YZ8KH&g>OV zP&upex;HyMDM`P1&MTwRHcB&HyAoB3^;339)$D3hi(!|Ngqu2QKyDpq7MARzekD>{ z#pT}B(Ypc-I~wepY;oB2zceTm^Fik7qFq|dIM%Y|WNM3E-6?0-^fPAI$}%!bGjmp^ zDw=Qkbmn01p@GZ;r!oV*`!n8r#-+rjlX1Ly*`?p!f=!9as>>ZV=^%;QO%@v(5|(OW z!%FvHdwj5=826!v2V^QowGurI1VsgC#&`g`G|?s@+w8;cUgE-9kM(LNDkw+`z)HihlwfP~+XZ%O+PZip8#KBbYYRG}C`V>> z)HT*j>{LP5tPSE0x%Z}(qnVA5BBKa46fPxx*r8U~ZeqHKom#(aSbO5Whb@YpazS+e zX~w%B+ZrM#F2d-DisGAwVwT2|Oyp&%X)!=ovR*Y4p-(4qgZip&ho){?8e`s#9*(a| z*c?k2UxRQ*42=p-qR(Sr(uK{h!`PazFz=kYu4A93tz}x>GLbs(@jbF8mkX>)HQO7_ z`l4ADsX@gt+!%{YmY{ZTgJ_b@X%bCX--mVp5YMk#K ztY?0dmh$ZX%cgiBAhp0GLl@Bs?$Dy?FNpVps9YE7fyh6k^VO)>xnJFbCM>rO3Fuo1IFbOg z=F4TIga&9Eapi4ttyEOH3~l1sHRa)iex0&8m_ep?RbItwT-mjZCtnPiz>}S$CN7tJ zl9V%)p0Betu632f#5=7R_~Ko+)^kVPvVzenYSQJogLJ8@R$*N99f?dbfbG;e@ABy* z9LQ*pcV8JH8|EVTuz1C~NSCd-`T{l!)@oCA2(T+mdv4%|7wOPjfjOo+g-v2I!RpPPZUdLMQ*$p_@n>(1VTGgw5E3tr9a0p4yE)a?vKv-X*8)KpWn|aWBVx9Aaw?(2hRz zhvNv2NN@+p@U3_dC*^XjKpm3PPLNz791lT_37p3i$27+b$7PNy9KXi#>vBAbM`2

R85Aj(2ce!#nX?_-&5g!SCW-c#Pxs@cWX` zIv|brar_bfm_rEM4cg=hdyoB%IyLg%7`y8*}2lyfW3O~YM;}(7_ z32hK|{aH9(!)y3CozeqrG$Knn@U;%`h9Ioh+>Q%xPw5gmwiB@nQmt@nRqBSb{xxTfDd%OY!1~lpM_vpFNRnX!i;HWUGifBBdimmS}N^Rc4!}HqL?*Q9I7s6YU&j5sFke#d;K>4X`vt)b_GUMLQ>1uA(!etXz?7 z=UBudv*HwOX5c9U{RTcLTUED#C&XlH zkAV*n$mLef1gMp$A2#q215b*jkvh%q&0^ZZou>_)i*`=F`s!`g^#o^baVZc#YT%v_ zu_a9;g09CPgKaRi`e4@%12+tOEIinnHaMVw9}j^kQd2@n$w>DT2JR0xx$zhTuTL7d z6vM7uzd_j3D`i(O8YR>;{}e)Ip9*2&@@BZ~5WIy*@{d{xvj}z+p*JEEity=JtX0|@ z)af$@J{z4mbCZNRlNM=X)7yb(`S%=Kgs=5^>sW;0Gb6SGe&*&W%^d^65l5AUNED zFiEohaf_G37kGn=KE_Te&pUpD5W;inj(HbvnHgl17yl*{y_L5v5|I8Os~;JdB%{AI zaLm9hAzq3=DJI=4tUE=xLOib!>FcJ5dBTao5_EUSE2@I88aSz8GV}=87XwKCR%E6} z4E#7W(=CeLP@RP2tJUf6@0aS3Iq6=B=_8EvzBV?YDZLkXfv>HA_#1$ZC^uuZRu znA;55pRm6FR74C<{G9<^XGMy0nF|SoOI;kr^6wLcgiDsGag9tdZ%c0yp6rDLQ~NCj z{z1#dI;GBP;|WhUc>m0QUB5xt&kVd~;3tx53;vOZer{mQz)uAP>$#=pES3^2EM)%_ zvP!q$pJfGOJyWe_C8ty4uihqIR{2EHKCB>#y1!dNv?&ZWlBB*op6Fh;S8QqX@|589 zF9sgeS_wtcg#Bxy6Szz|flJLDBQ}4`3&@AUPnj`7nJM-Q9-9`H6*T4Qwr@%lL|MTrzEDh@Q?%?p`xV}B; zODmB5_SPh{QS3U79|d9L)==V!ymc+S8hThD6d#OVPY4w%6d{280hi=Maug1H=^L?h z8kdOWP{3n=|2Xzkewv+FBa9{?KyCm9U0x z>}I=R>&@8bw(&Xa_#Q`Q&-dLVT0`%w#-7`*6^4i0i;gHs;px3{vw7@VZ+LLp-8XJ5 zTlxViI;Hmz$R3^$UG<_KnAeUrHf&TsS_G7|`6ek8Zo(OS15pm)r_E+>#gF-zPi}YC5-u;u2Gb{uO`aBkS;CG{Qokdrr#}V@p-L zdqtH+wdc5e-w$lw;pbN5#vjLw;(Kb@T#XH?ao(ndZQqlD?}nJ~e~|Kg%W()MEVngO zNl3EU&dXAB2d~c7_9BVE4 zOZQnio)c9DH&O(BQ;C#?e1Dq$L*4 zQWObO%>2GG%M?jdq-T*L77Q!pP+v2Npq%TgoLJ@(VV+{?Yca7@$g93oaD5esK^!SZ zq&}mQI&6-3uiPqgSiMz>xO1zNahJ%&m^?lwIzE6wI#Y$ zKhs5qb%uFkUQf(VX33Ui%M4E#>I@I{C}cr~ZH76*=wUG6bpn$Q1=i*)ooX=5Fg((y zDELM!X9+>_hC#%y8(@ZjI~ur=xc}e7%K1kQCtOy@gB_+%OQ36_D)Q`Im39~7ip9G(>I%cR4BsX7%)B5TU?FU2gQimO2&Pd_odh)<@-n8MG-eJeJ?sC%(mpbuRI zQ&08DGhJ%~bOo24RlsQj>qZ88Si-x;-(#+pSmvT|*V4udH X!jmaYz=PWnRCT&X`(*v)Kh}Q%A47nF literal 2388 zcma)6>r&fB6h7+<#sK#kxe!g>A{qyUef8}$;2tWQu_cvNUX*7B#hcAyB&6B=z zBh~NJC$UGBp6|;fij&ZxD$nTpMIanHq!oDalkuAgykhMI52D$9t`I|UD(_1rEm?gb zUPZxZ#G{^2JffM?!1uYJIZp~dP=OR~NQ*B9zjIF=^C6G8@HiC*T`4#fcBKqyuHCi( z&)tZMZxSA>Ox8NlveaPPFgMz5Q`5^N@Xkz0N0A&)lu?$(JdWKFr^R;rD0JWP=(x9M zG)31_GNO&tyA!%`e8@%e0^kGjK25Xb8K#yRz7BjY`)9$#NUNhz4%`r+0(TH{i>%pj zZ38A+rFCm1vjc0+Yi7{)kvqAjd9DP^0XqF>8mIZBf7Jf2v0ZJQKznQ zBCe81#9+ANB@ue99Lx_BE4ABpUWMnn@lUS$#TS9{PPujrVn>=`IZB#1@q~N9FyMX~ zX;$zH8>-xH>tL@jp^6ke;inm59u8?TPMS`88OXtdC2vm9>m9q5V}=MT=+b4!}msu*yrc`V&5I} zj!clIFak+cY?gW@58XiM1)-wP2g!&khjz7gB)fTB;E{!yt-PoeKR^ zc|mI(Y`ZRQCk*Yi3eI^<3z_((xj&^u1!17xQQ^W3aGg-75bJAV_qHR2iewnma-XY?-A-)Bh#z!mdB^wR7P#TgK;!0d_6a+t zJU%^)a{7~|3C$X!K-8e(l`}&nnl-0P`c%xBqj_4uSu$stR%n%Kv_|XZT%&7roi=c8 z&`r8UADiQlJvqdu8HT+0<^M)}L*ZFLp0bt_$T>^QXT(BARB6$wmT1`$D~Mr!tC@|) zVt(tHqzp`RHd6`UKSB_bwnSB6ooW^UddgIQf6A<*loV bv5nfH`o&OoPYuGHwMW<9+gB|1%g=uSlkv87 diff --git a/scripts/qf_mq101_0003372b.pex b/scripts/qf_mq101_0003372b.pex index 812917558dfd7f5a93a2d039d9d3caa9e141a446..f73e97b3bb8e963e2e7094dd353819daa2bd1155 100644 GIT binary patch delta 717 zcmZuuJ#Q016rAUau`uRhz&OOg$?_QzOi~aeWYL6RMHGevkSL=~{Op{t_rl#CfyyQAa0bZ^qp zlhfLBKjJ<|Yz|lt10AE$Zg09~@1@m|?ds?aM=!X)_fAKs_taQS(MI~29*(PQdK~FtKQRY32u+OHZMM(&cw3KnD@;W1?j6Iw-@`shSlLi%qu2}r!%7q_W%yVP#7D)4VKVF~6I!(| z$lZv0O84y}j?`PRw}BZr1AEA7BtdEA4IWTOMei1C*QuO zox<`;1&yp0;HsI`B9^2II0KX@e|Gwmek^Q`XW-}9{R+Y?s-QW-1;Rx^o+I6-EW?*j zbE14vgK!zezo(0+V-8m^FY&%aUzO-8D)WRz!V;nGjNp?-Nj4IS$tbB%LYE$?I zzJOQ@zJd>8qxbGMi*sR^`^~v$&it0YO5xA=<6C(k@G^_n!zA3Jo#a?2pPiGynyIno z{>tdtt$sjlI2_4gaz4{f#!eo!MLi>zb8Y8m+TIy^VWwEh>)e12T!nU>rG58K1NY`# ztHn#?BGvEuh|_9A%7YJ-D2qdhc-f+u5Tbx;CK5=fVHMOQ)Cp_cDS@(8 zP|OPz8fYRyi=V8*ZxPyr4xu4h1jJWt(q%x1g(*TmDzeExDXZ2AWgbW;x$U`ep?3tu ez8hjDsWv$|8!=L>*h;gdwpivr@IBM*9Q^~i3pOeM diff --git a/source/scripts/_00e_mqp01_functions.psc b/source/scripts/_00e_mqp01_functions.psc index 7d351cc3..eb917a7d 100644 --- a/source/scripts/_00e_mqp01_functions.psc +++ b/source/scripts/_00e_mqp01_functions.psc @@ -8,7 +8,6 @@ Import Utility Function SetUpScene() - Game.SetInChargen(true, true, false) Game.FadeOutGame(false, true, 0.5, 0.5) FadeToBlackHoldIMOD.Apply() PlayerREF.SetScale(0.85) diff --git a/source/scripts/_00e_mqp01_startsc.psc b/source/scripts/_00e_mqp01_startsc.psc index 04789afc..13f73bfa 100644 --- a/source/scripts/_00e_mqp01_startsc.psc +++ b/source/scripts/_00e_mqp01_startsc.psc @@ -3,35 +3,27 @@ Scriptname _00E_MQP01_StartSC extends ObjectReference Event OnTriggerEnter (ObjectReference akActionREF) if akActionRef == PlayerREF && !bDone - bDone = true ; deletion may take some time - Delete() - If !MQ10a.IsRunning() - If !MQ12c.IsRunning() - if EnderalFunctions.GetNewGameCount() > 1 - Game.QuitToMainMenu() - Debug.MessageBox("Due to an engine bug, new game should not be started after quitting to the main menu. Please, restart Enderal first.") - return - endif - - if _00E_QuickStartPrompt.Show() > 0 - MQP01.CompleteAllObjectives() - MQP01.CompleteQuest() - MQP02.CompleteAllObjectives() - MQP02.CompleteQuest() - Utility.wait(0.5) - If _00E_VideoSkip.GetValueInt() == 0 - Game.PlayBink("MQP03NearDeathExperience.bik", true) - EndIf - PlayerREF.MoveTo(_00E_ClassMenuOrigin) - Debug.SendAnimationEvent(PlayerRef, "IdleForceDefaultState") - Game.ShowRaceMenu() - Game.DisablePlayerControls(false, true, true, false, true, false, false, true) - MQP03.SetCurrentStageID(15) - (MQP02 as _00E_MQP02_Functions).AddRacialAbilites() - else - MQP01.SetCurrentStageID(10) - endif - EndIf + bDone = true + Disable() + If ! MQP01.IsCompleted() && MQ10a.GetCurrentStageID() != 5 && !MQ10a.IsRunning() && !MQ12c.IsRunning() + if _00E_QuickStartPrompt.Show() > 0 + MQP01.CompleteAllObjectives() + MQP01.CompleteQuest() + MQP02.CompleteAllObjectives() + MQP02.CompleteQuest() + Utility.wait(0.5) + If _00E_VideoSkip.GetValueInt() == 0 + Game.PlayBink("MQP03NearDeathExperience.bik", true) + EndIf + PlayerREF.MoveTo(_00E_ClassMenuOrigin) + Debug.SendAnimationEvent(PlayerRef, "IdleForceDefaultState") + Game.ShowRaceMenu() + Game.DisablePlayerControls(false, true, true, false, true, false, false, true) + MQP03.SetCurrentStageID(15) + (MQP02 as _00E_MQP02_Functions).AddRacialAbilites() + else + MQP01.SetCurrentStageID(10) + endif EndIf EndIf diff --git a/source/scripts/qf_mq101_0003372b.psc b/source/scripts/qf_mq101_0003372b.psc index e255c23c..b9683393 100644 --- a/source/scripts/qf_mq101_0003372b.psc +++ b/source/scripts/qf_mq101_0003372b.psc @@ -25,6 +25,11 @@ Function Fragment_332() ;BEGIN CODE game.GetPlayer().RemoveAllItems(none, false, false) game.GetPlayer().MoveTo(Alias_StartMarkerRef.GetReference(), 0.000000, 0.000000, 0.000000, true) + +if EnderalFunctions.GetNewGameCount() > 1 + Game.QuitToMainMenu() + Debug.MessageBox("Due to an engine bug, new game should not be started after quitting to the main menu. Please, restart Enderal first.") +endif ;END CODE EndFunction ;END FRAGMENT