From 757abbdcc465ae60bd84c3f4e089c869ed402e80 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Wed, 31 Jan 2024 06:23:50 +0100 Subject: [PATCH] Disabled scripted combat music control, returned to threat-based Skyrim formula --- BattleMusic.esp | Bin 0 -> 8779 bytes scripts/_00e_playerfunctions.pex | Bin 4450 -> 4381 bytes source/scripts/_00e_playerfunctions.psc | 1 - 3 files changed, 1 deletion(-) create mode 100644 BattleMusic.esp diff --git a/BattleMusic.esp b/BattleMusic.esp new file mode 100644 index 0000000000000000000000000000000000000000..5e8fbb5f4b939fdc885aa10e1dc2ea33c24b0889 GIT binary patch literal 8779 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 literal 0 HcmV?d00001 diff --git a/scripts/_00e_playerfunctions.pex b/scripts/_00e_playerfunctions.pex index 8f58ce511c118d6e327d13b335398fed45e84425..2b163eb69423a1b47ab79e9281e59650843b414b 100644 GIT binary patch literal 4381 zcmZ`*+jnO&HbG*A1V#dB5eXQtM?1aJ!0ya4JByGV z$3QF~*Lj7!MDFtCLGtA)mwABPkiWWTdS`^J`q-)dyXvp%>h5a(_uwD@N_CMS{K>!n z{2w||nVc+D?$)h6=`Xe2YT$To>vFSIrK2U=_S$}{UC+{>jP%R9j+>>w&^Y{LrK$XC zksnBVZ^~dJumVX(ZhC>I)sYILRo`g_o6>I~1a+^uE3OmJ@S3ZGf9+ZJO{*bkh;5%b z_4=ac2EJFPQ3m!JO)J>hi!f#6wOu;`hGDenFm;3+1G4BfwyfYzyX92l@RDWAvbRvT zs!t=BgOp`mHa#C+I`9YwwrX-Ekd1ZO@Sf}B7JO^hB*$^@IIiPvM_v;ff!AEOT-$3b zOUo|%h=OT4u`XNfhCF0ukjt|SkBzz)lwQ!_eOEqfJI%7^S9fHK2G?a`+`Z%2wsfhl z>bbVVJ7(1>bG;gPJ{_N*4-;9(T3QaUy~=aT4>wG@w)Cw!9J#bD`lNP4)~t3tFsYWE zhV<9!_NG;DOUf+OJu9G7HEiVGFW8KH5Ri_mQ*}t0d*|m-%w~Ru(lyU-P&A%3+FYa+ zCMmtm2cienSz_bSLkLGyq>cDd2sv|85mRp3XfsBerT&E1s3J;kWyn-4L|($ zE;@<2(oJbcx4fIr_@l?s7ET$qsRE@JJT$_L!%e~%6e)w-UEMK&sm9ba9hsl!Fq^pf z{kT8e!WMB!0!p`Jy+(Z{ZZM3Z--IhEnoC%mqrSH8K}~L5p}~~d$f+ESfmM-U3CvU8 zYf9pd8G&nCPh>Tqfv}l{vBoxJz-=C%0Mxp@oUUD8S@!Dop}mMsV3ymD=jtbf+fcw= zmFA)sD;w-sLAJH)1l%w&a#~qW#m@#FhBDh~%BoXyq@8W4*QwW)yZUkJ-UxhNH3lIGD7g=L8PXaF(@8B#J#TG*(YsE3XznIJ6; z_Yh_1lo5t{89HMmjF6#oMi@HER_Bc{)W^_8BMkL3bj1im0}K_6Ff_=}j1h*082Z8p zL&FSRGs4gap(ZPIOBG<02dlKE24g&U2w^i+Z-Tz13Vo-Ke?3rgAwL7CB#?zFgv-BynbFlmjQ<;wh{YucU1!eg-2>ux#6!a;8(;!sZIcVnv zofGugN&Lf6`AwYj0ysa1-$igRzLW1*iK^HV9w2RPwi;tj7;Jk!=xg6)b0?tWr z=D?Z9REP6Qf^$;P70n4P2d#jQpgcJ9SZ=YyiN&2%t~fhW9XL(X2sMLHvj{bZsZOZr zL?~ROX&nmMEVOxi1kEAT98TI7an7sY{1TjBf%6)sI-FM%oL>sMsyU&31?_kE2)YK& zYdFx?Whf)Y6%p>dLkNbj&RHEA13iZ*$W!GkIC%`mQ}5ru|1bKBeQ^0M zmhAy>1-+kwBUGkr}vAGe4?Xk12*B0@CgjBc<$Jm6Q+Ntlw9;h7~fkK)Uf-xVjcN4oy5I z<~ZpgXCnd|o>=7Ihx zhT?6DC6K0{@IJi6`F@2>c#Tcy(^3B{=qFVyBm<&T7=AGE0uvu&0te$Iq42K+r~DE{ zeZ{Vw+wxj5r6~Q^f3mHh*YIRhT`;_AKhV#5LHsLFs2}kkiCCT~+DDFWkmFnA*aMb* zj`&8=>?7ivWW=|Li2H)x>WKSc#IdOF^B(Xu6!Z?iUD)S$?AiqsS-hjscox67T_}*Q LPHYcfpg8{rnX*Fk literal 4450 zcmZ`*+jUcFICQI8Dy%e%IdqJPp5{A8h~{K}yp zKsy$tzu{ZHq!Wv-?`pQcz|x{;*ZeK%)v*P&tvbt&?Ni^Xqc{J?wMvUtRZ=h8KDH~B zS=aGBw?YFf*sInoe`hb0DI>SxltMutjJ9ls4kf1`nRTlVEq|p^w~JBnf>n~6?o7oh zJ`Tma$)>Exn(M(!Z`{utTV=WI%j&wUx=(a)GoH0;g5!NxY{z!CL$Bct->t1%PRXq< zNvpK!VHc=rWL?%9Re6l2hs(1BkBy4!&p)M}+m8I9Vb?ZYuec-Y)Uz&Q>$V-cRFV#L z7G0-g^NCp%N=_Gj*Q3)@Q$Zl>$fa&WwpVy!dBK56rzAbA0!J=wojxef$+Fd`_$Jg% zyDGiaN@>fgG$bV#Dz4?z*)k4t?{{qa-`S7`)UArwrDJLeb*$xblqkDimBMx2a90gC zPKj;43+*V(0vmV7u}&-eV~#NZ%}j()naPmLju|dZ1IPICm7Xsgy=ehrIum-QvxdtV zE>FEj9s4z0^pb{HCeie`K`;@gC#h>A>J4oho+E`0E2Jt)gERgusfw_m^6*hi1KVFO42z)Y~8`4l%ZgkBwaAXqLXa(nIRT+vgnc_7Im>` z%n*yZS(G!xq8=7a7-CT`i>@1DQ6G!GGQ^^OLS1gs*D93(UaZoZS`6~yE{M%g!C@-U z1F{r7B&H&$L=sd6Z7X_AOpbCoMey^euE-~!8uUcbE-^g|=tp8|!3K0%U@tuF|3YyU zhu>CukIt}^=q$>N2j_<8{pdo_2QbpkuxFeh zf>L}X1pf^62>J+ua{yG_d2pW!IxpzL8T{cqK8s>r1m@@P`vRDkplV`XjA4E*=%U61 z_XW5=;3eo1FfZZ0T#jO10p=Jm)4^m8H-Nbb%-g`+f~twR5yRXRw4pJ<-3Iq9UV^rOxrO2I=P2eKV15V8 zyTH5$RTJ}04D&ldcQhuryWqaZOVB-F-b3r$Z(^cR&L~&Rl7bckA2turj~2G!!BE1s zow~iGpa;snh05K6&SLqFVjGJ0p+NIl)GO$rAlO*L;MlbpbV(t#QsU>|*j7*po@_d# z6qpqS+Tn0`Xxa1#zmFkm#bBujs$#`<1Sbc2NZp7OGw2c3Sg#*}d>lck^^FwZ(L z&+cQI6*155W1fv-mW|R=toQKd?S_EgP#b+Hs1C0_K|VxSASItQ{V73Dpn(*|yI4T8 z%bHF^^-M)o=cRynK+se8Dnyt)WhMc$!I)VClD{<5NhsKQl9ECf2L;>X%(3m>sNNb2 zt-~&eQ^hPecr1rn-@bkOUwj};`dm{^uSK8Vk3ltCaIlHFXT;}#aT*bCD=`Lf5uWM^ zE4Yu!J%{*3P{o&cAE0_%N#0@@LA*$Ew5E>xx{l9Pbo(g7b1p+alK!hodOxUE1NY~p zAhqm-*-MslQU9jQ4ni|v?+QAAg(`bHEOb2$5F~$Z*0WXF@2j8=z>kI{JW#O)MKvG~oy}&;ck&-6q5Iyq>`TvA*$GN{o4Nl;&4!ILvsq1}+C|_~l%}#i&@(4TO zP|$0HffG2?5r9L@I|cp3cKl)e2l(K`hz7%sW-GqNg5Kb_1xdbPhZaZ?>l+$~#`?R* MkG6jI@X^x$2UW;Zt^fc4 diff --git a/source/scripts/_00e_playerfunctions.psc b/source/scripts/_00e_playerfunctions.psc index 004010a5..ebbe9e3e 100644 --- a/source/scripts/_00e_playerfunctions.psc +++ b/source/scripts/_00e_playerfunctions.psc @@ -21,7 +21,6 @@ Event OnPlayerLoadGame() if ControlRepository == None ControlRepository = Game.GetForm(0x493C2) as _00E_EnderalControls endif - GetCombatMusicControl().InitCombatMusic() EndEvent _00E_SkillControl function GetSkillControl() Global