From 330f9f1a96ec0910e01a9c97efd9cd4fe0d90c54 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Fri, 26 Nov 2021 00:16:01 +0100
Subject: [PATCH] Fixed FrostSlowFix changing actor value and comparing base
 actor value afterwards

---
 scripts/frostslowfix.pex        | Bin 1566 -> 1494 bytes
 source/scripts/frostslowfix.psc |  31 +++++++++++++------------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/scripts/frostslowfix.pex b/scripts/frostslowfix.pex
index c3db84bac6bc25fd864c5a55f436416d5b78aedd..9e76a4aa0cb2ab7e3daab9b8818f4c26503bffac 100644
GIT binary patch
literal 1494
zcmZuw&2k$>5bl*%lBHO3oH$NINHQcOvV)W2=Rl!?qT<8~6lI_gu@4+l<K32a;?<05
zcGil0=M8uO?mPokJV2=8#*GKz#5cQ=e~7nN(oFZ)Uw3~q`giY-e-<hf5FYt!=O?<{
zw<dFg)J*&8_2WqvQTR-aCDmUHwtsl^{ZrbcrJ;vpfDF}Z<SjmDH*nH1HJ%%1%4O?2
zy*(Uq<RjKmd%o=}t+Iqx`^H8*m@vmXdFozFVxNC0GCEdH87)()B`S_t(~69oI^?k&
zsfY_o`fZC7-gg3F(dQ&(yD4IsWg=EAcG;#<k1{#V^++5VKzzT)GT&#bg;r7G#4y(f
zzK&w+HignLk3EAp>FCiD=d9Y#Q6#rfA`WtUe9Y)=#Nw}CfVZAK=1hF84_P~7kM>xN
zKt1BTn8t~zvhic;^m;qKcdzL)Gu1yzJ7V|pP+F=V@X^%Rn66%cpzvFxnHJ?inL*Vj
z5z2VSQ<*tNdavhrJo%WyEo0L8_7kf1QzIQUdOgpui$a~RWLA_Y&ty-z<eORP7EZ4q
z-j!+26!ztqsWmv~Y!tGLaZnUyoDQkAW8yPO%m34W>bX;?az_;IN#*FXey(wdI0~0Y
zC$gz>Q3B~)qB3FjU*VbvXRu|FO*m3R#j(hWE48S3THdJI00*K+)HHfq$E6Pnl#3;!
zw|J!ViQ5bF;arlBs5#t{S$W@R1rz(-nE|@z8?@|lt9^egqTE`XZ`sc5e{%h2s^a1Y
zRPp~CzgU<rLZT)u!kUF$q9s@x=21v$&}w1V=o+oTZoqt~M&P(bx9JW@>j4Ph#8dec
zDNVn^J|NFG+qAGOAa!_stO{$FF67ZNU8WU$7U&9HMNMC?O^xdT;av{sitjl9rC;N%
z(%Q^f2jE75SuHRX>cI0(;aT&ZN`-C)wA#j}82qhh2N5`H0lgbgk%B_YB^yRP=@L$K
z2nbvYNVs*b#_jO;H*fv~*PVdGoG1MJ-rvm&pkDxrS=;p9T%fyj?+o?(r@c@sp!)&c
z1<QjoUJ6eeJC!e_E~HzBgc~ynef5V$qurT2H$k`&P#1wxw|SrgVb{wT#9jCB8bIfz
h#DE)6s*9iSOCa6?Kx<EZv6>Z3`9V3d{|>-?|39<FFlPV&

literal 1566
zcmZuw+j1L45bc#$l5JVCO&kZ?gbYq_;#(?^yhH^>+1LtH$~aXD_9Lu!TiU_WjB0k)
z!u}5afJeT8s(e7G;*B>xgeT6-N-lvtqsw&n=`*LhcmFwk_xDtZ0>b+7U2;haEu%Br
z?&)Dm{`_>1#Z=u>Rx7D#{@}3v`t9+X-Gk>Zj$b}|L%TFLi3Y{=E4FPLS*Dp++Unw1
zKURmG4#zHHEH%bvODdVAwA9ij=JtR&Im&zX`$6LJE2&HpR#c0%N~D!qMLk-KVk<AW
zA9ZESo|1ms=akQ^09Ld(?XlSrNt9(Gkt|Nw^di;GqJFNr;z9%Bs=JEvGd4;n8K+is
za&_+bB^$dVq)NE&7{s-r-92lKJj-!OZsJs&=jQ5)p{dK_&tHHyjy>T_e5)=P%`%s#
zEW4oYa_+0KVkk}WlvbL}Bd6W9_dpNT+sJg;{%{c)s-E-ZP@9A*g_FvAF_`GiEeRBU
zrxjY<Y`XswWY>>$;_)X@FK3$npAf3%R`#U5r0_J7mR`1Ug-)U$HjS*vhSJ6<^xITs
zLZAJFSqZCQvd9J;%Z}tkWPYyGiigEmD{XW|b!k?sLzNW1Fymf_s?BC$&S|yJU8xFd
zIyxWKhSS$kW*KESo0j{7&&P-76z*%?8=Ehv-0JDb(#khc<~vb5NvG1LuSX4A#51=a
zWjs-T*oyj0^)}lH=Zqg{ACK6W{n_~N8O?Sag-6ii|8~c)&5d%+VG-xXV8TT&MlVh4
zS1RMt52)l`B6pY?A3~xU&EQ+3Ilt@Fz+S+1IHWb`uHVbFOe=n`(kiWC-^X^K3W0B(
z9?~ORP{k`2z=>7rfO*!PV3+(2-f&m=70^8H^w=uGF0Bl<g~H_^0WHFux);y~0o7qS
z;iVGY34ee8{*RS_mIAsvatGlT5C59I1^OkRP`H2s{0itEeK<i4n$;19yJHP;uzWP(
zg{*5)B~;y@kMRxZ0e%I2;){1e8;t<I`GAC1`(PO-r+5mq_}pJ|Mga0h-uAH|pjwe3
z$}~=>0`sZItoxJ_ZNT%`d&WI@63{yC^8mUL-9QA+%0v~#?T~$IEt?qN7HZkXzpJG-
z(tNFCbEM=60^0#?-Uw`9Mq5P;b!<6!<u+a05VZ+h_!SU004U2*-y*z(sqG+Tv;qum
F?O%)PH$wmb

diff --git a/source/scripts/frostslowfix.psc b/source/scripts/frostslowfix.psc
index 5d14aeb8..3ea85bc4 100644
--- a/source/scripts/frostslowfix.psc
+++ b/source/scripts/frostslowfix.psc
@@ -3,35 +3,30 @@ Scriptname FrostSlowFix extends activemagiceffect
 
 Keyword Property MagicSlowDownTarget Auto
 
-Actor Target
-
 Event OnEffectStart(Actor akTarget, Actor akCaster)
-	Target = akTarget
 
-	Float fBaseSpeed = Target.GetBaseActorValue("Speedmult")
-	If fBaseSpeed > Target.GetBaseActorValue("Fame") ; ensures that the speedmult gets only halved once
-		Target.SetActorValue("Fame", fBaseSpeed)
-		Target.SetActorValue("Speedmult", fBaseSpeed * 0.5)
+	Float fBaseSpeed = akTarget.GetBaseActorValue("Speedmult")
+
+	If fBaseSpeed > akTarget.GetActorValue("Fame") ; ensures that the speedmult gets only halved once
+		akTarget.SetActorValue("Fame", fBaseSpeed)
+		akTarget.SetActorValue("Speedmult", fBaseSpeed * 0.5)
 
-		ForceSpeedMultUpdate()
+		ForceSpeedMultUpdate(akTarget)
 	EndIf
 EndEvent
 
 Event OnEffectFinish(Actor akTarget, Actor akCaster)
-	If Target == None ; version update
-		Target = akTarget
-	EndIf
 
-	If Target.HasMagicEffectWithKeyword(MagicSlowDownTarget) == False
-		Target.SetActorValue("Speedmult", Target.GetBaseActorValue("Fame"))
-		Target.SetActorValue("Fame", 0)
+	If akTarget.HasMagicEffectWithKeyword(MagicSlowDownTarget) == False
+		akTarget.SetActorValue("Speedmult", akTarget.GetActorValue("Fame"))
+		akTarget.SetActorValue("Fame", 0)
 
-		ForceSpeedMultUpdate()
+		ForceSpeedMultUpdate(akTarget)
 	EndIf
 EndEvent
 
-Function ForceSpeedMultUpdate()
-	Target.ModActorValue("InventoryWeight", -0.1)
+Function ForceSpeedMultUpdate(Actor akTarget)
+	akTarget.ModActorValue("InventoryWeight", -0.1)
 	Utility.Wait(0.01)
-	Target.ModActorValue("InventoryWeight", 0.1)
+	akTarget.ModActorValue("InventoryWeight", 0.1)
 EndFunction