From 54dfde9cbf75665f014093a83ec34e82e5825593 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Sat, 28 Oct 2023 00:36:54 +0200
Subject: [PATCH] Moved ResetArmorWeightPerks() to a separate quest

---
 WeightPerkQuest.esp                        | Bin 0 -> 503 bytes
 scripts/ArmorWeightPerkFixAlias.pex        | Bin 0 -> 1154 bytes
 scripts/_00e_playersetupscript.pex         | Bin 3668 -> 3104 bytes
 source/scripts/ArmorWeightPerkFixAlias.psc |  25 +++++++++++++++++++++
 source/scripts/_00e_playersetupscript.psc  |  23 -------------------
 5 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 WeightPerkQuest.esp
 create mode 100644 scripts/ArmorWeightPerkFixAlias.pex
 create mode 100644 source/scripts/ArmorWeightPerkFixAlias.psc

diff --git a/WeightPerkQuest.esp b/WeightPerkQuest.esp
new file mode 100644
index 0000000000000000000000000000000000000000..70a2e86c9c618cb12fb02f373b46d643a2e64110
GIT binary patch
literal 503
zcmZ`$O-sWt7=EX74%}@6uRVD5V+TD;Y*HQTMqSe?cnE=o8rG&G4d{M}DD#K;Q#{S2
zMPV>s2;_Y}-j9Tm_;L-~aca{$f@eMWc>lWIvzZzI_)|3L0ww`ULJAWU(<6u%D=mw2
zQ5Ap@McuzT4V^6K+=zc@4~Uuz&2#U}3rd}p#t7xbrqohYJ3ON)P2142EpBH?<lD=A
z5>wal>7wcD^1c(;C<d_aaJLJ=Bisk1i&8%bnLV3G=tUr3A)O%n1_$6)bf>P~cpcb+
z;~g%POI}&_1lVv$n4j~iVq+neLbGUi#eC+MYA%f|l~h^F&a>HMpPg-e$}`QCsSP(Q
zbVI$=qc!^PbqBD0?;hBE<0f-4C69JrWbx)5P#Dv8&7g3E4<X9=N@xgbfx}T4%-Uf8
N4pQomf29Ni`~ZFrZIl22

literal 0
HcmV?d00001

diff --git a/scripts/ArmorWeightPerkFixAlias.pex b/scripts/ArmorWeightPerkFixAlias.pex
new file mode 100644
index 0000000000000000000000000000000000000000..1ede99b23907ff60b3bba7b0013bd259b4529a9c
GIT binary patch
literal 1154
zcmZ`%T~8B16g{)F^b1;$F9pN}Q4=3X)%alJ3y^|FBBUhnxLI~D?Mge-%ucEP0{?@F
z|HWV85An%6vn(G*W;WR~_ug~%+`IGV^w;kR4+6aC{lZVIZ0mv2r<8Pi=7{vgUh;Lj
zpM>ewFpW@c$FUmebkz4zryOsM6Y1kQmhPdlba|i5u?Y>KvagKF;LM>s>WAM*AE+?i
z4+n&5(4myvcQM&Z;+Q0Ak&<y@5+%bv>K!^KO)?^93NKr&pxJB(yZtatgHJ?5(!o*l
zZLk~c=Cnk1gUe8(z`2Wm7$;#@htfF8PH<qG9=p~ZWAm2wy_L9Kb*}>yJ}XHmwOWP-
z!zLQ)><dLk=k4T~S15*&Q93`rMqx*(J}TLyI_*7FS}m(}!YxhlSg$97LQ4H}%zR7_
zFG;s$G#Z@otYS<a8_h$&i@lMI>>z#93yrVIjI>PoKz=mRJXPbT?jNzs><_)W%SgwG
ziF#xyN$O`E_(nN}bVyNho=|+HQI<5$M5;=*Wt`zDC3mQs$m}GBd7E!g`Vgk}zM<No
zfx0AzOWSd5L4G}dpum?&z_ZuYf{7e(yo{pTRa8;K6mMHm1V0aW&taaohe@C$vI{T1
zGs$Y(vxf>3-KyolW07iBTVl=Wn?uEM3hbwz<t?#@24*mO^|1whFLJuPB*4!@frhhN
z7no%{EwI3dGmjjabIC;k2MQc7I?|$zd#<GNzhG_N7FhqwSg|g$C6)zNc|LVKz6xNC
zD}=K&!9q`N)WKd>1=cv~-->cS*Ufpb?X2?vJZ$hBZDU2Qf9i~FI12*nY~NvPf77L$
OeZeV?Ji8mojQ<6PhV796

literal 0
HcmV?d00001

diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex
index ed3e081038abb6259668842a9cb31768ff695aa5..0222012d54ecb76deb7f029f19a6746277a7af79 100644
GIT binary patch
delta 1560
zcmZ8hO;Z$C6g{{5H9er>XvRSi@e?&lR1ifPkpXl7zatS1nhcZJQkFBe1*01mUAlE;
zy+7bzaGOoE+*l>aD%oa{wLid0RSM60-80NMJ>7l3-aY5tdtd+6^Ll&szgutraUBTw
z3(w}?yvmNqFRw2CuKVR*{oV<5!P%`}I%l-+4#b&D4=R-_(bEv_?4ugg)#y=(Oc2z<
z>f?bCc*ROouAw~$jAOpMT=xy0fSQb=N<$xnx*si98~RE3)o^8{ywpfHIDk!aVQu2q
zTC_Z0t~{Y*Mz5;VoocCE4dG9RwIVZU@p7J82`l$?&O56AY@5;js#lj(x4zK!T>tGo
z*2CTlo%avxPi{efba!s3Z*>+Ode(ne%;GMu60b#G_YkJn5+2|os)*oVBd|%5BB}q;
ziOr^5)D^PWVr3m=wiUaqNb7cVCDA_e*ufAB>NC0<-_(_@*okd*B}YNf!L>blEt8LT
zB@UCY4ZYZnJ=lf4*oXZ%fIb|=A<EfKL9c6Kx&(&>dBGl|Iu5?2hsGn;xYx$eYXz6~
zqt<@N+H>Y9I|K&>{b`0+9DGO9F~M=cejDMU<3lGA`)H^G3v->YCJU^%N{y|q{*m%B
zZeK8vW;HZ3t!jI#+L5Ypx~ai+H>dO@2UQsl3)NI0g&`K@6i(YB4fCxU)Q3{)e&288
zd`d9HMh;UVl`~ed#DVsfj4?*owSYA?bsuH=4402!vmg*;DYBY@$?Y|uMpGy^xMN}k
zql7Y{Nr4G?*6Jys*9^D;V;rk<yvK=IK%6vu0zH`IJw*cNaREg-r}^$8z!+P|*Ev>*
ztj4W0#`;kjC%JLM#_dJ|&cK2(l*poWP-f_<d)LP(wj`4|DsatLO`H{M6-=0n=3q=x
zrcUHZYpTO%Tsl&tq;X7k(XO5{p+Yaw&kLsLpQc3rB|%KFXmjP<wY9a+a9OR(2F@J2
zE4a$1>5Q4>YwI&&$XutN*6*9F$TZhl;Ree&haYT)n|!C^GB3DcFdY}MdOqRc7OBnA
z$gDRhG3#wBr5$ug<3~%$KBSxA@SC9=EU;sSXdB1mj^M6f!S36^Pwd(P|DHLv)@U~K
zvmnQ<J+ndfVH@bIyBZ$zWoS7CC63P`?{XcJ^h?Q<EGAP@7Eme?ux!#8Kz<J!$1|Cg
EFGz%*=l}o!

literal 3668
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
XZig7<x`M@3kz%$y+7&;>EOYcfWM<a(

diff --git a/source/scripts/ArmorWeightPerkFixAlias.psc b/source/scripts/ArmorWeightPerkFixAlias.psc
new file mode 100644
index 00000000..d7a0920a
--- /dev/null
+++ b/source/scripts/ArmorWeightPerkFixAlias.psc
@@ -0,0 +1,25 @@
+Scriptname ArmorWeightPerkFixAlias extends ReferenceAlias Hidden 
+
+Event OnPlayerLoadGame()
+
+	Actor PlayerREF = GetReference() as Actor
+
+	; Perks modifying armor weights need some push on each game load to work.
+	; The push is needed only if the player is over-encumbered on game load. 
+	; If the player is not over-encumbered, the push is not needed because checking the inventory, picking up items, sheathing/drawing a weapon will reset the perks anyway.
+	If PlayerREF.IsOverEncumbered()
+		_ResetPerk(PlayerREF, _00E_Class_Keeper_P05_C_Conditioning)
+		_ResetPerk(PlayerREF, _00E_Class_Vagrant_P05_B_Lightweight)
+	EndIf
+
+EndEvent
+
+Function _ResetPerk(Actor PlayerREF, Perk p)
+	If PlayerREF.HasPerk(p)
+		PlayerREF.RemovePerk(p)
+		PlayerREF.AddPerk(p)
+	EndIf
+EndFunction
+
+Perk Property _00E_Class_Keeper_P05_C_Conditioning  Auto  
+Perk Property _00E_Class_Vagrant_P05_B_Lightweight  Auto  
diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc
index dc8fbdab..d6189d61 100644
--- a/source/scripts/_00e_playersetupscript.psc
+++ b/source/scripts/_00e_playersetupscript.psc
@@ -79,24 +79,6 @@ Function RefreshMountNamesOnLoad()
 
 EndFunction
 
-Function _ResetPerk(Perk p)
-	If PlayerREF.HasPerk(p)
-		PlayerREF.RemovePerk(p)
-		PlayerREF.AddPerk(p)
-	EndIf
-EndFunction
-
-Function ResetArmorWeightPerks()
-
-	; Perks modifying armor weights need some push on each game load to work.
-	; The push is needed only if the player is over-encumbered on game load. 
-	; If the player is not over-encumbered, the push is not needed because checking the inventory, picking up items, sheathing/drawing a weapon will reset the perks anyway.
-	If PlayerREF.IsOverEncumbered()
-		_ResetPerk(_00E_Class_Keeper_P05_C_Conditioning)
-		_ResetPerk(_00E_Class_Vagrant_P05_B_Lightweight)
-	EndIf
-
-EndFunction
 
 ;=====================================================================================
 ;              							 MAINTENANCE                   					 
@@ -120,8 +102,6 @@ Function Maintenance()
 
 	EnableDisableKillmove()
 	
-	ResetArmorWeightPerks()
-
 	SetAutoSaveInterval()
 	
 	FailsafeMQ05PrologueAliases()
@@ -143,6 +123,3 @@ Actor Property PlayerREF Auto
 FormList Property QuestsToStart Auto
 
 GlobalVariable Property KillMove Auto
-
-Perk Property _00E_Class_Keeper_P05_C_Conditioning Auto
-Perk Property _00E_Class_Vagrant_P05_B_Lightweight Auto