From 6c5ab0e96633850433841a6760b2d86170130e96 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Mon, 27 Nov 2023 17:27:59 +0100
Subject: [PATCH] Moved KillMove sync to a separate quest

---
 SyncKillMove.esp                          | Bin 0 -> 425 bytes
 scripts/_00E_SyncKillMoveAlias.pex        | Bin 0 -> 1037 bytes
 scripts/_00e_playersetupscript.pex        | Bin 2865 -> 2450 bytes
 source/scripts/_00E_SyncKillMoveAlias.psc |  34 ++++++++++++++++++++++
 source/scripts/_00e_playersetupscript.psc |  21 -------------
 5 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 SyncKillMove.esp
 create mode 100644 scripts/_00E_SyncKillMoveAlias.pex
 create mode 100644 source/scripts/_00E_SyncKillMoveAlias.psc

diff --git a/SyncKillMove.esp b/SyncKillMove.esp
new file mode 100644
index 0000000000000000000000000000000000000000..641d04925790a512dd11819109fd55a4e0b7f91e
GIT binary patch
literal 425
zcmZ`#%SyvQ6g|;M0~Qo1g1dZxk1pKHr8CjkB-GBNxGTX963nBdQ3!sC;_vtoeu(Qj
zlTcC63o~=iIrlk|i}N@9wqp&iIGgtI`totHrBN{eMiGS$822a+BtjB$7viC*()?7d
zaxjwQeAnsZc)3Vw^^fd=7YkJ-nS0`TWp!WHwJKaumsP4(f8_X)oY}B+i_2*|`PA=C
zETrl9d}i(rzjrS30k#cqcHzut2N0@$T#BZ+8>d+omQM<^kk~bLU^X<TEsi$TkQNRx
z9}fBaXA)&;veJ@+O&Lp%v|b<W?Sttb>O<qTDP}C<w|YX-d^b4-LfWlDfzNuFWJ#kc
Wcx`~;DTv8NPkS>t8gD{51HJ$xu~E<f

literal 0
HcmV?d00001

diff --git a/scripts/_00E_SyncKillMoveAlias.pex b/scripts/_00E_SyncKillMoveAlias.pex
new file mode 100644
index 0000000000000000000000000000000000000000..5a781db6e3b3d1fb926fe20d4f55775687877e1a
GIT binary patch
literal 1037
zcmZuv-A)rh6#k|yv=k^He}W)eZ@eR@SMH60Ser%#V+~%C?e3wB4l`tD7Q&qmVB%Bw
z9{M6ah*zH3=^8=iG~4fd=kGhS`}^aMU-cRU_)zxq8#Yh&_IfA7Yn{H9O1(9gw6A1h
zcQ0&;b}!3Jk=sH==um}sucVIf2y1s&a^qH?+|VVCFw-~A1UP-92U<ET9_e=~xu*P$
zNwR)&PMAKESw<SOsnMBq(&$8?^PWyAC!Gd8=)`d)@Z>Vd(HSc<N)$txj1-|&MbS7k
zn(+Kpp;O;0a%YK)?3Hxs8CmwEjm+p1r7m)YU5e}lrSeo#7THpCOViav^U&o|k1-R+
zzUeW~Z5!RwSqL{QsZ%uLIJk30AJACp;4$s!{9+IFfp$L0dr#0fFh-$aKU+eZ@9CIw
z%PP?<oK(_Xm*n7ZP^K-7j`u$dUrOs&j6Ftc$Tf*72#;@Wn3F4V?H8mdEpom(-n!gp
zGW%&I;#u|fzoNl!OQ7bz1`p~LV7@)ES<Irtw!pSjW=;9v{n9qDfi1RewjJ&>4Kzjg
zy2N+10^+B@4A+!LaKCm4G@13W1`nRYd=>Yz1Qwa9uL~>*++(klHZQO&&|!AvAC~Lq
zLPOu7j#aE-o#pus?F|9`Z3?WG9To(*I^Z?No~&<T#s3RVd?2tjp+ybbe^a>VAullz
zBK*CDqT21qi!U6i@d`UWCmg}^moaryX2deP|H+IhnO%W^Swr`3nI%1u8B%VG@#D+g
H?v(iljn=nS

literal 0
HcmV?d00001

diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex
index 3e3a33236de0366a6d3e12cdaee2c94592338cd9..12e0148dcdb1ffc3ba6636985b24e063d72a08a0 100644
GIT binary patch
literal 2450
zcmZWr+jiST6y5SYS0_#Drhyi<^a`o#+#5q%(k4zqo1~4~^5`Y3Ng^ssu4bGN-uNJX
zfG6My)+)ciAMnoNrR*6=#sSZ=b>>|5IcLuqE&u)1Pk&@Hu)vRSf4P8}R;{+tdhR=?
zB5Dfts@rTwURPDSvW?*l*A07-?D;mvMJiWMyuii_R2V5*T@xvV>M=q`61cP}R8u)h
zU}!T`VJuFzwAQ%17LoMA0EN9^JMa`H_JX*8XQAV6Ivs&2ma^7ksB<i~10|wk$H&Ee
zaS#c4v=jCMwM#d-7w8C#>^L5s0w-t-6plRC6#+)tVc>d-c^F#W`}!NvRs;}{&|W|2
z#Gd1O-wA0uzHh4|VF#iuq;#TF`$bPkC1>r92If~9d)(`+P2^a4>_lGJllFh>zkSC(
za6Df+2SQfumq(toV{&XtUZ)#I$_bQx5Jq-43cDh*dtKL2UT`>TyP+L~$_|f3bP{<=
z*q*9ls$P#vda2orREwEWVtmK<q(Zq~j|tr0Xc$x8X{#{8P+yC&Gx5lhRpfTVK%iK!
zE79rRPlZ*KV$EC)xyNDXW2j!&p0AlRCxw52)kZI9Yidc0qilKNsrC_xRJzm9P;INw
za3;H=?Hzc+wWXPeQXo#^fhaUp#Evl>1{;AJ>sU)HjE2Euap(o{E-h#dIo)%=z<FFY
zL+Ef+Bu7P_O19EENUD>VPKT%&Thh8Ea))}(%ACmt5gSq1X?VWCaP!S+<aMe-c2Iex
z4@IO9{W-jqqQu=toc$=7kajQPe322;Yr<?TWp*wV=2Kw-`Gy}lD%~%l;B5!4_%>B6
zrNT1uZ}m{7`xO-4m?OoQzAO5;Upsz}SB{Jecc<qol(vN9NBSNX_1)vFBTr#XAx~Z-
zIwS|Z(3ci5Wf%?K)|Ll&9NT?STTa`S22Rt4N^&KW+o-RrxsfUGQXhD^FWv7;t0?jk
zOXpDZRVx_U=Cw9g9Hn(ncJyV(#J=DwW=r_pog^Ut#21{$$>vdbvL**DqfHUGJE6OA
z%#*-5&X$NAzop+Rx;Eh^FTbDvM2Rme3mN?~)Iv5Da(b6HI{sEL-d|;uagJ+>tHO1W
zYntnlSu>b1K?R@yJ6Tt8)hLTV4tLF}8U?fGuxQqjQ4E23o^Um|Ho2bSS+aKV9Q&+v
z7#Oiw96#CLFp4oPai3vi*~pl{WGrM@=Va_#q;`r9Ca_3fjZtFy^Rde4Va;d;EY^M@
zR%@IbyBuYgqo&IlnhN6<Di$XAxM<;nvW00QRj8cS2wAF!Xt7`baXyC4GWJ6asdHS$
z75-{C?fub!_m~Bnc51H<Xi+>{)HQsJ>$qVMZt|JCWZ{;D+ZL|rY?&-_->+qGhecke
zj-WRw5%d!y#f6c!EBMq@WPYp}=H|f<v_FDbwtko2Dv$UcY9`|xiJRwlfmJMG3Cpyt
z@L6HH*_fKUF*Q{SlxBx5P^yxls$pm*A%*_;w4%kz?lUl<ER(@1EvZ%WeAZg0mCDa7
z&}U8~fGy5bK4&t`8&#UFl%;`Yt+Wz9Mt^Ri7mSuxA}v~2pnZiB?GKE!Y@p6(-@kwV
z7iVUGn;agp|3~=3aI(f{ate<vJT$0T6mR@U+(%Rpca0KppBO1Qf}ugg0@f3TH^^v%
z=$qKWHsx`mteZ**@INlrsr=H=w_$wPxDoVhJvI96qzlaeM`g>xvxI9agPnMISau^R
zd-zwKaFdEOuSKX`qcVl(7?peQ?%nT6S=wA2m{)E~XSaL*Zut-FIsb(5H3R$uM6c!O

literal 2865
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

diff --git a/source/scripts/_00E_SyncKillMoveAlias.psc b/source/scripts/_00E_SyncKillMoveAlias.psc
new file mode 100644
index 00000000..90ff7f87
--- /dev/null
+++ b/source/scripts/_00E_SyncKillMoveAlias.psc
@@ -0,0 +1,34 @@
+Scriptname _00E_SyncKillMoveAlias extends ReferenceAlias  
+
+GlobalVariable Property KillMove  Auto  
+
+Event OnInit()
+
+	; it seems like that this ini setting does not do stuff by itself (or it is bugged)
+	; therefore we need to read it from the file and change the global with which the killmoves are conditioned
+
+	if SKSE.GetVersion() == 0
+		return
+	endif
+
+	If Utility.GetINIBool("bVATSDisable:VATS")
+		KillMove.SetValue(0.0)
+	Else
+		KillMove.SetValue(1.0)
+	EndIf
+
+EndEvent
+
+Event OnPlayerLoadGame()
+
+	if SKSE.GetVersion() == 0
+		return
+	endif
+
+	If Utility.GetINIBool("bVATSDisable:VATS")
+		KillMove.SetValue(0.0)
+	Else
+		KillMove.SetValue(1.0)
+	EndIf
+
+EndEvent
diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc
index 4b3eeebe..04502e4c 100644
--- a/source/scripts/_00e_playersetupscript.psc
+++ b/source/scripts/_00e_playersetupscript.psc
@@ -18,8 +18,6 @@ Event OnInit()
 	PlayerREF.SetActorValue("speedMult", 95)
 	PlayerREF.SetActorValue("Healrate", 0)
 	
-	EnableDisableKillmove()
-	
 	; starts all quests that are in the formlist
 	Int iIndex = QuestsToStart.GetSize()
 	While iIndex > 0
@@ -41,19 +39,6 @@ EndEvent
 ;              							 ALL UPDATES                   					 
 ;=====================================================================================
 
-Function EnableDisableKillmove()
-	
-	; it seems like that this ini setting does not do stuff by itself (or it is bugged)
-	; therefore we need to read it from the file and change the global with which the killmoves are conditioned
-
-	If Utility.GetINIBool("bVATSDisable:VATS") == false
-		KillMove.SetValueInt(1)
-	Else
-		KillMove.SetValueInt(0)
-	EndIf
-
-EndFunction
-
 Function SetAutoSaveInterval()
 	
 	; updates the autosave interval
@@ -90,8 +75,6 @@ Function Maintenance()
 	Message.ResetHelpMessage("Clear")
 	(Game.GetForm(0xAC80E) as Message).ShowAsHelpMessage("Clear", 0.1, 1, 1)
 
-	EnableDisableKillmove()
-	
 	SetAutoSaveInterval()
 	
 	RefreshMountNamesOnLoad()
@@ -104,10 +87,6 @@ EndFunction
 ;              							 PROPERTIES                   					 
 ;=====================================================================================
 
-_00E_MQ05Prologue_Functions Property MQ05PrologueFunctions Auto
-
 Actor Property PlayerREF Auto
 
 FormList Property QuestsToStart Auto
-
-GlobalVariable Property KillMove Auto