From 7530eb221daf12ab77cfa461bf677a824b03770a Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Mon, 26 Feb 2024 17:39:08 +0100 Subject: [PATCH] Refresh the cooldown spell if it got dispelled for whatever reason --- scripts/_00e_game_talentcontrolsc.pex | Bin 3067 -> 3231 bytes scripts/_00e_game_talentcooldownsc.pex | Bin 4647 -> 4650 bytes source/scripts/_00e_game_talentcontrolsc.psc | 5 ++++- source/scripts/_00e_game_talentcooldownsc.psc | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/_00e_game_talentcontrolsc.pex b/scripts/_00e_game_talentcontrolsc.pex index 7785398af5d70d46b8e806d3c96716bd23161531..cc529fefbe9fe3fdfe01d1765a6bd54b6190788a 100644 GIT binary patch literal 3231 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 literal 4647 zcma)8+ix3L8UKxAH}}h?*`&>u?zGVDJx!eS=H8P{Qg3tHI!#)Z-E?A~IMYmK+?jE^ z1tfMQUbsmMPav%jE1q}&Bm_d@i3c8+e}TUN!5a^h-*=8@>@-^mf3oL0=eu9W|5^X* zKiV>|z>oUdM^ABdV|;veW8T?S8>^0|{CFk^yh`xgFU^eAqB6Q>E0v%gMs?3dpGxqt z=dN!f!YHNHMpdL^EnRL%QxX^`Ry_5fR&iprqCz*QpkrRerI=@Q&IfT|(B5T#c56$O zg%ZZ-SoVz!2A2Kh%_k(xKCQd8nyO%6At>+YlVOQ4_`vsGz3ZEE{Yq&&sK-UWqCUn@ zdR`8f0$-WiH%rblrMd2_a_~%rFIL@Mg~9u(>PE2&m(<5`!;$V~Uo*})QH-GyV-V$g z#13q`m5TDwT@L(;8@qw;czEMZId-3^MW^bPO^B$K%As3}?ReXXZSuxp;6*$sn?AeG z+)CZ?cyDT82V1tuYjn;I9dd;t=-bO0w<=*{sm@8?q)rw z7ExnPQ*f|Qcu*|uxSkiy1?76Q@yrR4i-Nje!Ju}d7>P>PufEIPL(fb-4B3pDgq(Tw z?oolZq94O5p`%cU)oyL#a*AC^v8%|LVz-+DMhPW9j;yo-y4iEpMnTc}n9(bU1#&+BR)xBjs)B=2{EfvfATD zpK1(%83$zNf^Zj|q1sZ+5}oJ|^qe#=lBA3$0Z&YzH_>9!nXu$jmdO;GLQmK_6bbLe zl;aYHILrH89pJ5QDUPeL)5n|EmKeIPA{D>dC`qPMZzfZ3CMPhG3?&0Eu}PA(f_78< ziwSZmK`tlAl?1tpzH&Wm^&~5e4*Ihds%SfD=~7L39D))@%CF+&T;1mo2fmruP{sAo zHv>y;(xY~y7aBb=>#Pw;ej>?LK8-1##*}Aca?6frN8$Bt#A%Q0u8Fn1#B@@+DnMPHm;dKW)-niWr__N%aI+mWm zpXL_y_Xd;}KYu9=EgiaiI&}G~33Za)=j^QNCP$9DFbL&BwkX$2qjcj5GLazp1er{b zDP-jx!MIT>I7BUup4B95| zL%GW)NDk=52o4iQ2}f{LgAE(U@eR#;02s#UuYfZ+tKkAJV4N^Pn8cJ8Y6niBK)6P@ zPPm0>%xJiayC}B6dsx6CVTrKZfEBFZeGRKv#kyA60lK|`$AnFN(FtU*g{nSu0fX3q zN7!uv9|8g4sfM~{?gkFw1-?!A&THVi5cnS96MRbez836}T>OCWL&A>;KPLR71wO-P z_$lFM4UlB_0tfMP{6fR$_#D3^{Av$;fiLiDg0Qnx7Jj4AexL`xCHxM*C;S0_B>ai+ zXZ(e+4*+jSarx=I!tf6Y#&ZXT@TSJ;?T8>O^C6a4e@5|^L5|>S204ni4PqN^;25i~ zKN)|qNN7V;Lx<(SD}Ql1hhma}B_^$$h4v;_2A6OdS8x^G9M9t%PZQU5;x`!SO;+X>?`{*9 zO5Nden&%TtcfrCXYQ9d4S-3`wS-7UN`kHV_Kc=%ppJsHBH*|LP#m0=>NE7z1<}7H= zhCNzuwU=ccfWW$a zd99l2*m%rZk#XMD5f=^5-GoQ__q~>OBa?QZttq>YqsW!e(zorn$DkG%;3B_E?9F9% z-by3TVTzkb?&(Ol^A;@J(^aJ}#24txg3vPNY`=2d#%@`(Fr0%SEGGOpNrApyV$0Fa z`xcH`SQcGuk)v(F^0A2m}aX?#FBZ#P- z#R@5k-(j}?WA>|VC3^Z;;_ap4ZmrmnBV#--Nw(lHs?A2YAor$_J4h>&<(SDS4-_}u zqJ%EvqiBM^K`J`^ONLE=b!NUh)x<`e!hjk!j2A>etE=6=IhL( zQnSf-HIcWBeV4bb>yF1-b7q+BDgJ*+olo9rS>}6Kw6xLUQww3zN7)-+e))IZbpNIP V;T)CkmzGy4sm]" + RefreshCooldownSpell() + endif endif else Debug.Trace("NO SKSE: individual shout cooldowns are disabled") @@ -63,7 +66,7 @@ State RealPlayer ; This OnUpdate is triggered by RegisterForUpdates in other scripts attached to the player, e.g. in _00E_EPUpdateFunctions. ; So we must be cautious here. - If (CooldownMagicEffect == None && _00E_Game_TalentControl_CooldownResetDesired.GetValue() != 0) + If (CooldownMagicEffect == None && _00E_Game_TalentControl_CooldownResetDesired.GetValueInt() != 0) _00E_Game_TalentControl_CooldownResetDesired.SetValue(0) AddSpell(_00E_Game_AbTalentCooldown, False) EndIf diff --git a/source/scripts/_00e_game_talentcooldownsc.psc b/source/scripts/_00e_game_talentcooldownsc.psc index 20068f20..8613c214 100644 --- a/source/scripts/_00e_game_talentcooldownsc.psc +++ b/source/scripts/_00e_game_talentcooldownsc.psc @@ -27,7 +27,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) LastTimeElapsed = 0.0 - Player = Game.GetPlayer() as _00E_Game_TalentControlSC + Player = Game.GetForm(0x14) as _00E_Game_TalentControlSC CurrentShout = Player.GetEquippedShout()