From 6f96053d7695f8c5a8e6c68e7f9a0649b47dbce0 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Tue, 30 Jul 2024 04:48:26 +0200 Subject: [PATCH] Entropic Blood fixes: - Controlled actor no longer remains hostile to player. - Fixed floating in the air after save reload or player's death, occurred during victim selection or ghostwalking. - Unmarking attacking actor unmarks its target as well. --- scripts/_00e_a2_eldritchbloodplayermarksc.pex | Bin 3682 -> 3583 bytes scripts/_00e_a2_eldritchbloodplayersc.pex | Bin 12078 -> 12565 bytes scripts/_00e_a2_eldritchbloodsc.pex | Bin 8219 -> 8480 bytes scripts/_00e_playerfunctions.pex | Bin 3392 -> 3559 bytes scripts/_00e_slowselfmesc.pex | Bin 931 -> 931 bytes .../_00e_a2_eldritchbloodplayermarksc.psc | 13 +- .../scripts/_00e_a2_eldritchbloodplayersc.psc | 139 +++++++++++------- source/scripts/_00e_a2_eldritchbloodsc.psc | 41 +++--- source/scripts/_00e_playerfunctions.psc | 5 + source/scripts/_00e_slowselfmesc.psc | 2 + 10 files changed, 122 insertions(+), 78 deletions(-) diff --git a/scripts/_00e_a2_eldritchbloodplayermarksc.pex b/scripts/_00e_a2_eldritchbloodplayermarksc.pex index 52298071b2363d033540789316c6479a37da02c6..d09c09a72efdf15375723097c7a2409f162694c5 100644 GIT binary patch literal 3583 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 IoP9d{5nWAWVE_OC literal 12078 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 diff --git a/scripts/_00e_a2_eldritchbloodsc.pex b/scripts/_00e_a2_eldritchbloodsc.pex index fb7f8fc83cc1d9bfd1ca59b48828b07f5328bd8c..4377b236fb152eaac2a03be1ae716ec208a2187e 100644 GIT binary patch literal 8480 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 Ql2?)XvTFvW|16vSAN4=|3;+NC diff --git a/scripts/_00e_playerfunctions.pex b/scripts/_00e_playerfunctions.pex index 6bca25aec60f8ed298d3f3a81de3dd1aee72cbfb..34909214e2e510917f39d645695015f45eb8d452 100644 GIT binary patch literal 3559 zcma)--B#O15XWc14utQo1VYl(Nz;;~3Go+S4lRLz!A*b!yO5-5iDIomLDo9542Ql( zU!oU%fL`|Wx_yN{MX!3*|7xYR1oWJGjE>*82NvEmvhItsbKrsY`9LFm;F%c`ZjSIeGg>==$I>KoiJD=rqrY?|2N%~qXX zFmmb8GEMGKZ&f&^B{Of>lw7WQ!lm&-Ay{Vzp*AhpPWO)uH%L5pOzs*s9A%1{bhEa~ zYeviV^wJfp&fRU>+%@bLr)1FvL89B|(X>M+T`eI(=ewY`Wc!101 zLtJ)7YkG<79F1JyJF4~`e>cMTvLPmy)0$o+H$www-l-8E7Jo~_;L;%>o6(x)XLHma zca!C}wtu!N0$4^nW^`Z~9av_D2G2SMM;xuXE_KB76etT}SQ#B^CWEt#`V9I}MQS1l zD6bdK>(u9U>hp8d6Y)`7J6ob*p7i-=bwD{CP%cA*XB}123N;IJdz%F zOKb@T_gbMK+g;S+XqkKR&O+m%)K!h$s4bT^gl%3}kTii&S%bn+_o1vsPhJ&ap3|X{ z36(4*Rs`_T{Zr@TYMOEpg{uX@Ov=vmE_c>jS{y_6@=<*8WoZ;;P#xoE3gxIjT1mU)AMa%XQ?UJXLME zE_V=#zeW&zKHSAjsLX}REOoU!%eK5z>cs|2TP2mx+qIIjY`I0lw&mq}Xt?XHag1r3 zxb6xY#<4h}UYtPa5PsW=G>q>NqYnA4lS*f(BxLWhZ%Y#OQa@w>GU&??DUp*d5%tj( zU#^mpNs@9MA}4eaB`Kvvn!2Uwj+S7pB;C~_O+9kf11-|jD@|!F($ptSc`ee^FHQ4W zq-j8!7PUyzpfo+vB27cmw5mm#kf09QqHTXGBeGMb3ZA1xV+`Z?C4a^4eGSh}-O)CZipO)Ql^aF3gvlVa&UsOaW?A9)>)GPuk`L-K0;EN}^i;+{RGy8l%q` z-C=aopD!O{1B_BI+`u}%b_?3)jBYWyJ&8ZE@kNw51?FA&-2?MJhT6=j81pWpDaC|# z589V#7~Kc+K91%=l=%?MX)qswnZ{6?`7p+uX7o@op*@0@LBl8wW*P^XjWTm!=E0l+ za~4BwW-i9eGs-C@v>9k~Xc*0cIg7VyKFVAGvjFB}Fc&e@W-i2-1x5>s3GFeouh1}B z1alGZ^Vd=45|~fGTn2LmLv7|#jQNDol43$zhV~QD zFQUwsVD5lf2D5^pHuGhSxx?tCVnQoJ`xXtO3YZm?=5Ca^2j(jjQNVu zo?=3K4edKLjNX9xhDPYEVgdx^dvrTg?fihA)_A0*`Bg5YnqUlFC=$;#RhXHKLK%Kv*K}JBhUvEmlA$Wh)t z0U_D=9z=GTB!L|^u)~kot&3gCy!Rm%A>(fN!3YG@h{x^5;ueft6}M1vBOy&j9;1)` dybfv&`LK_PrCC0(-N&J6 zi@VglT=RuT*Xo$M6Ah}^4esqY)}HCKId!i)!u088eU;bEw&Q=pZK6~PYu&|gTQ;~S z)z4ALV56ulRgk0DamIWEF&4D77+HlJWljf<1h{g1M}(}rE+{`25%QX!U!aSLs4)df zZiWz5$VY&Jp{;_piZpa;6O9J2s3oTPoc388M@MZ4wDrRQR7RVifFEMR8fzwsLL#3e95rXrt6ccDsk*0 zoLW483y=ox+%-(Q{&Z%DyKL^i*_DX8l9c&wAW% zdu|IaJX>pf9(Vn0E4TqMk?Q_SzY;E|#bjLT*!F9OTn5^$toU%mYkt-j0jJgEHM?$e zDv~V4B(K_ZM!=Utvz{MIm6le@5 zRNlR1?)w;_x?Qf2&53Z;y)LgHUtW1M2Fe*&n5r1%oQ;gR@ULjO zNhA3CVALi5nxv76jI?~a5NO>*12l*>gq8`~FsUY;dWd@IQqV4wYEtec>ZWVDNvTgt zw{#0LbkiN(q|`6HrgW3ifRrBSCZ&r~n$b;4gHkH!CZ!=M&FdzmjFgsilhUx1p6Dhe zOiLGS(pE45qw?hy?cjHe(YWl#r`y4p0}Hm^XYT<1bg}Y9PYx8q6T1m#)B& zd4}n_lBAxd8*~#BM3jZ+ZFF^CVe}oNJB)6~wPEsSe2CF42-g7&tSqeW8D$yWzKSm< z=Z84+E|^n@y9efdbaj|_6U-?_cNG)XJy<{D!RS7i_puiq#F-Dld<5n+m^0|=FdrtE zj~G2vOjy&fa(FPB0doc`mX9+HFbiN7!JI``hiN331xAKq!YabTel9Ya1#=eLXFkqc z0CN${5|~Tq>M$1)%tb~EiV3R(>nA)IErGd&jr(()`54S6U_J$N8C@Ob;{@{wqsNK~ z>nW@iJQyv5xs3DiEY4g7a}CUOFgMWEVXh{aYm8PE6V^Jc=XfyM0CNL-do#}50`mo! zFTvbKSBJTkV7_3qrI@f@!g_@Vqiry^u_bppOl-ibK`2hv>yDhJH%PUMRAr>9psSPW zO(NAUqcsLG&y$AC> zj_hyrJ0RhQLHq-!wMu^~g^>vlMjs%hCK%NiS$LBPXb`^Whst9r?ux1^Q~IQ-jzR%QIxeFF=lOs#j1C#W=K#{74DAf~C?KUM{r5l8 zm(dX-rR#XmL8I}K)L^<)Ha8qh7s@~tXT%07z!e@FQHlgc)5K^#VKlwSCuD8SAfZ5Q k&17w#6153NpHyuktZgI?|7LCJ)xSuN2zOnq4}o!q2><{9 diff --git a/scripts/_00e_slowselfmesc.pex b/scripts/_00e_slowselfmesc.pex index 062cf8dd13a91daa2aaec449be6023b4f618b961..63d80796b6a3c34809ac0d285dffffdbb1f14b42 100644 GIT binary patch delta 400 zcmZ3?zL;I$SNMT@%uEc73_y^!;_JkT0?Q|U)L=B6EX5c)xt+1zk}bHTC^Ijefh#}H zH7_N&B(Wrwfu%S#CyjyK$_m2e$gz#f zNdpxCg=G-J3=AyT-6ack7Yp27vPkZdMRk`PBZE9t1Y{?=Gi}eDIV%eEs|14r*qLC0 I5$G~$0L@e}=>Px# delta 400 zcmZvWu}T9$5QhKRy?7+vnM*VpW7KOb(j|xp0TBeBAc(c#8iKkJJ?ndhW6P8&Y^<$) zfXge0SXlZ1R?gmCB%lMk%=|O|%r|wXZt#8n`X&Vk9BT6MnFLSn(jdAY>7gl!P8n{$ zKZq_OmArJQo4lWyFKU_tihGr@KGm0556*+Sxq>&=Cu%s-xyHsw-QM-)s~^pw*r%$w z7JIQk85Mgn4{8yX;lRr|00AE>sPYpCP(z(t&L&}%uto@^wQUd@oD=G{B!bTa>tyvz z0hdj(e^v^CmUEP*Gf2c9wu;MWGYXIJ0m;s7!p_|9GZdlC>h6My(*KxYfhm76!v)N+ OSej!t{(v1nr?VeZmohZ~ diff --git a/source/scripts/_00e_a2_eldritchbloodplayermarksc.psc b/source/scripts/_00e_a2_eldritchbloodplayermarksc.psc index a010ad99..fcb50ad8 100644 --- a/source/scripts/_00e_a2_eldritchbloodplayermarksc.psc +++ b/source/scripts/_00e_a2_eldritchbloodplayermarksc.psc @@ -16,11 +16,14 @@ Event OnCrosshairRefChange(ObjectReference ref) lastTarget.blockActivation(false) EndIf lastTarget = ref - ref.blockActivation(true) - + + if ref + ref.blockActivation(true) + endif + If _00E_A2_EldritchBloodGlobal.GetValueInt() == 1 - If Ref.GetSelfAsActor() && Ref != Game.GetPlayer() - EldritchBloodEffectScript.SelectEnemy(Ref as Actor) + If ref as Actor && ref != Game.GetForm(0x14) + EldritchBloodEffectScript.SelectEnemy(ref as Actor) EndIf Else UnregisterForCrosshairRef() @@ -86,7 +89,6 @@ Function EnterMarkingMode(Float iReach, _00E_A2_EldritchBloodPlayerSC _00E_A2_El akSelfRef = Self.GetActorReference() RegisterForAnimationEvent(akSelfRef, "weaponSwing") - Game.DisablePlayerControls(false, false, false, false, false, false, false, false) fActivatePickLengthBefore = GetINIFloat("fActivatePickLength:Interface") SetINIFloat("fActivatePickLength:Interface", iReach) EldritchBloodEffectScript = _00E_A2_EldritchBloodMEScript @@ -103,7 +105,6 @@ Function ExitMarkingMode() iAttackCounter = 0 UnregisterForAnimationEvent(akSelfRef, "weaponSwing") - Game.EnablePlayerControls() UnregisterForCrosshairRef() SetINIFloat("fActivatePickLength:Interface", 150) diff --git a/source/scripts/_00e_a2_eldritchbloodplayersc.psc b/source/scripts/_00e_a2_eldritchbloodplayersc.psc index e418b251..100948fa 100644 --- a/source/scripts/_00e_a2_eldritchbloodplayersc.psc +++ b/source/scripts/_00e_a2_eldritchbloodplayersc.psc @@ -88,15 +88,25 @@ State AddEffect Event OnBeginState() A2_EldritchBlood_Victim.GetActorReference().RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimSP) - A2_EldritchBlood_VictimTarget.GetActorReference().RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP) + + if A2_EldritchBlood_VictimTarget.GetActorReference() + A2_EldritchBlood_VictimTarget.GetActorReference().RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP) + endif + PlayerREF.RemoveSpell(_00E_A2_EldritchBloodAbSelectionSP) A2_EldritchBlood_PlayerForScript.ExitMarkingMode() _00E_A2_EldritchBloodSelectionHoldIMOD.Remove() - Sound.StopInstance(MarkingLP) QSTDA16SoulGemOffM.Play(PlayerREF) A2_EldritchBlood_Player.Clear() - A2_EldritchBlood_Rune.GetReference().Delete() - A2_EldritchBlood_VictimRune.GetReference().Delete() + + if A2_EldritchBlood_Rune.GetReference() + A2_EldritchBlood_Rune.GetReference().Delete() + endif + + if A2_EldritchBlood_VictimRune.GetReference() + A2_EldritchBlood_VictimRune.GetReference().Delete() + endif + A2_EldritchBlood_Rune.Clear() A2_EldritchBlood_VictimRune.Clear() @@ -108,10 +118,10 @@ Event OnBeginState() MarkingVictimRuneREF.Delete() EndIf - AddFrenzySpell() _00E_A2_EldritchBloodGlobal.SetValueInt(0) + Sound.StopInstance(MarkingLP) EndEvent @@ -125,38 +135,54 @@ Function AddFrenzySpell() float iExpDamage = _00E_A2_EldritchBloodSP.GetNthEffectMagnitude(iIndex - 1) _00E_A2_EldritchBloodEnchantment.SetNthEffectMagnitude(0, iExpDamage) - _00E_A2_EldritchBloodMarkedVictimFXS.Stop(A2_EldritchBlood_VictimTarget.GetActorReference()) + + if A2_EldritchBlood_VictimTarget.GetActorReference() + _00E_A2_EldritchBloodMarkedVictimFXS.Stop(A2_EldritchBlood_VictimTarget.GetActorReference()) + endif + float iFrenzyDMGMult = _00E_A2_EldritchBloodSP.GetNthEffectMagnitude(iIndex + 2) Int iFrenzyDuration = _00E_A2_EldritchBloodSP.GetNthEffectDuration(iIndex + 2) as Int _00E_A2_EldritchBloodVictimSP.SetNthEffectMagnitude(0, iFrenzyDMGMult) _00E_A2_EldritchBloodVictimSP.SetNthEffectDuration(0, iFrenzyDuration) - - _00E_A2_EldritchBloodVictimSP.Cast(A2_EldritchBlood_Victim.GetReference(), A2_EldritchBlood_Victim.GetReference()) - If iFrezyAttackTargetMarked - A2_EldritchBlood_Victim.GetActorReference().StartCombat(A2_EldritchBlood_VictimTarget.GetActorReference()) - Else - A2_EldritchBlood_Victim.GetActorReference().StartCombat(PlayerREF.GetCombatTarget()) - EndIf + if A2_EldritchBlood_Victim.GetReference() + _00E_A2_EldritchBloodVictimSP.Cast(A2_EldritchBlood_Victim.GetReference(), A2_EldritchBlood_Victim.GetReference()) + endif EndFunction Function NotMarkedClearUp() - A2_EldritchBlood_Victim.GetActorReference().RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimSP) - A2_EldritchBlood_VictimTarget.GetActorReference().RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP) + if A2_EldritchBlood_Victim.GetActorReference() + A2_EldritchBlood_Victim.GetActorReference().RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimSP) + endif + + if A2_EldritchBlood_VictimTarget.GetActorReference() + A2_EldritchBlood_VictimTarget.GetActorReference().RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP) + _00E_A2_EldritchBloodMarkedVictimFXS.Stop(A2_EldritchBlood_VictimTarget.GetActorReference()) + endif + (PlayerREF as _00E_Game_TalentControlSC).SetTalentRecoveryTime(_00E_A2_EldritchBlood, 0) MAGFail.Play(PlayerREF) PlayerREF.RemoveSpell(_00E_A2_EldritchBloodAbSelectionSP) - A2_EldritchBlood_PlayerForScript.ExitMarkingMode() + + if A2_EldritchBlood_PlayerForScript + A2_EldritchBlood_PlayerForScript.ExitMarkingMode() + endif + _00E_A2_EldritchBloodSelectionHoldIMOD.Remove() - Sound.StopInstance(MarkingLP) QSTDA16SoulGemOffM.Play(PlayerREF) A2_EldritchBlood_Player.Clear() - A2_EldritchBlood_Rune.GetReference().Delete() - A2_EldritchBlood_VictimRune.GetReference().Delete() - _00E_A2_EldritchBloodMarkedVictimFXS.Stop(A2_EldritchBlood_VictimTarget.GetActorReference()) + + if A2_EldritchBlood_Rune.GetReference() + A2_EldritchBlood_Rune.GetReference().Delete() + endif + + if A2_EldritchBlood_VictimRune.GetReference() + A2_EldritchBlood_VictimRune.GetReference().Delete() + endif + A2_EldritchBlood_Rune.Clear() A2_EldritchBlood_VictimRune.Clear() A2_EldritchBlood_VictimTarget.Clear() @@ -170,31 +196,38 @@ Function NotMarkedClearUp() MarkingVictimRuneREF.Delete() EndIf - Wait(2) + if ! PlayerREF.IsDead() + Wait(2.0) + endif + _00E_A2_EldritchBloodGlobal.SetValueInt(0) + if MarkingLP + Sound.StopInstance(MarkingLP) + endif + EndFunction Function SelectEnemy(Actor iVictim) - If IsTargetValid(iVictim) - If !IsTargetMarked(iVictim) - If !iFrenzyTargetMarked - MarkFrenzyVictim(iVictim) - iFrenzyTargetMarked = True - Elseif !iFrezyAttackTargetMarked - MarkFrenzyTargetVictim(iVictim) - iFrezyAttackTargetMarked = True - Else - _00E_Levelsystem_sEnemyAlreadyMarked.Show() - MAGFail.Play(PlayerREF) - EndIf - Else - UnmarkEnemy(iVictim) - EndIf + If ! IsTargetValid(iVictim) + return + EndIf + + If !IsTargetMarked(iVictim) + If !iFrenzyTargetMarked + MarkFrenzyVictim(iVictim) + iFrenzyTargetMarked = True + Elseif !iFrezyAttackTargetMarked + MarkFrenzyTargetVictim(iVictim) + iFrezyAttackTargetMarked = True Else - Return + _00E_Levelsystem_sEnemyAlreadyMarked.Show() + MAGFail.Play(PlayerREF) EndIf + Else + UnmarkEnemy(iVictim) + EndIf EndFunction @@ -224,35 +257,39 @@ EndFunction Function UnmarkEnemy(Actor iVictim) - bool Cleared - If iVictim.HasSpell(_00E_A2_EldritchBloodAbMarkedVictimSP) A2_EldritchBlood_Rune.Clear() A2_EldritchBlood_Victim.Clear() - MarkingRuneREF.Disable() iFrenzyTargetMarked = False _00E_Levelsystem_sEldritchBloodVictimMarkingRemoved.Show() iVictim.RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimSP) _00E_A2_EldritchBloodMarkedFXS.Stop(iVictim) _00E_A2_GhostwalkDeselectM.Play(PlayerREF) - Cleared = True + MarkingRuneREF.Delete() + MarkingRuneREF = None + + ; Unmark attack target too + if A2_EldritchBlood_VictimTarget.GetActorReference() + UnmarkEnemy(A2_EldritchBlood_VictimTarget.GetActorReference()) + endif + Elseif iVictim.HasSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP) A2_EldritchBlood_VictimRune.Clear() A2_EldritchBlood_VictimTarget.Clear() - MarkingVictimRuneREF.Disable() iFrezyAttackTargetMarked = False _00E_Levelsystem_sEldritchBloodAttackVictimMarkingRemoved.Show() iVictim.RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP) _00E_A2_EldritchBloodMarkedVictimFXS.Stop(iVictim) _00E_A2_GhostwalkDeselectM.Play(PlayerREF) - Cleared = True + MarkingVictimRuneREF.Delete() + MarkingVictimRuneREF = None EndIf - + EndFunction bool Function IsTargetValid(Actor CheckVictim) - If CheckVictim.IsInFaction(PlayerAlliesFaction) + If CheckVictim.IsInFaction(PlayerAlliesFaction) || CheckVictim.IsCommandedActor() || CheckVictim.IsPlayerTeammate() Return False ElseIf CheckVictim.HasKeyword(MagicNoEldritchBlood) _00E_Levelsystem_sAbilityEnemyLevelTooHigh.Show() @@ -272,21 +309,13 @@ bool Function EnemyLevelTooHigh(Actor LevelVictim) Float iAllowedDif = _00E_A2_EldritchBloodSP.GetNthEffectMagnitude(6) - If (LevelVictim.GetLevel() > (PlayerLevel.GetValueInt() + iAllowedDif as Int)) - Return True - Else - Return False - EndIf + return (LevelVictim.GetLevel() > (PlayerLevel.GetValueInt() + iAllowedDif as Int)) EndFunction bool Function IsTargetMarked(Actor iVictim) - If iVictim.HasSpell(_00E_A2_EldritchBloodAbMarkedVictimSP) || iVictim.HasSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP) - Return True - Else - Return False - EndIf + return iVictim.HasSpell(_00E_A2_EldritchBloodAbMarkedVictimSP) || iVictim.HasSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP) EndFunction diff --git a/source/scripts/_00e_a2_eldritchbloodsc.psc b/source/scripts/_00e_a2_eldritchbloodsc.psc index a274b547..65f594b0 100644 --- a/source/scripts/_00e_a2_eldritchbloodsc.psc +++ b/source/scripts/_00e_a2_eldritchbloodsc.psc @@ -20,7 +20,7 @@ EndEvent Event OnEffectStart(Actor akTarget, Actor akCaster) - Actor PlayerRef = Game.GetPlayer() + Actor PlayerRef = Game.GetForm(0x14) as Actor TalentLevel = GetPlayerTalentLevel(_00E_Class_LifeAndDeath_P09b_Talent_EldritchBlood, _00E_Class_LifeAndDeath_P09b_Talent_EldritchBlood2, _00E_Class_LifeAndDeath_P09b_Talent_EldritchBlood3) Game.ShowFirstPersonGeometry() @@ -29,10 +29,6 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) _00E_A2_EldritchBloodParticelAttachVFX.Play(Victim) - If Victim.GetCombatTarget() == PlayerRef - Victim.StopCombat() - EndIf - ; Strip Victim off all its factions VictimFactions = Victim.GetFactions(-128, 127) VictimFactionRanks = CreateIntArray(VictimFactions.Length) @@ -55,9 +51,16 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) Victim.SetActorValue("Confidence", 4) Victim.SetActorValue("Aggression", 2) - Victim.EvaluatePackage() - AdjustAndAddFrenzyPerk() - + AdjustAndAddFrenzyPerk(Victim) + + Victim.StopCombat() + + If A2_EldritchBlood_VictimTarget.GetActorReference() + A2_EldritchBlood_Victim.GetActorReference().StartCombat(A2_EldritchBlood_VictimTarget.GetActorReference()) + ElseIf PlayerREF.GetCombatTarget() + A2_EldritchBlood_Victim.GetActorReference().StartCombat(PlayerREF.GetCombatTarget()) + EndIf + EndEvent @@ -85,6 +88,7 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster) EndWhile Victim.EvaluatePackage() + EndEvent Event OnDying(Actor akKiller) @@ -98,7 +102,7 @@ EndEvent ; FUNCTIONS ;===================================================================================== -Function AdjustAndAddFrenzyPerk() +Function AdjustAndAddFrenzyPerk(Actor Victim) float iDamageMultiplicator = _00E_A2_EldritchBloodSP.GetNthEffectMagnitude(TalentLevel + 2) @@ -112,6 +116,8 @@ Function AdjustAndAddFrenzyPerk() iPerk.SetNthEntryValue(1, 1, iDamageMultiplicator) iPerk.SetNthEntryValue(2, 1, iDamageMultiplicator) + + Victim.AddPerk(iPerk) EndFunction @@ -172,14 +178,15 @@ Function Explode() _00E_A2_ShatterSoulExpIMOD.Apply() Victim.AttachAshPile(_00E_EldritchPile) - EndIf - - ObjectReference VictimREF = Victim as ObjectReference - (VictimREF as _00E_EPOnDeath).HasBlameSpell = true - Victim.SetAlpha(0.0, true) - Victim.Kill(Victim) - Victim.SetCriticalStage(Victim.CritStage_DisintegrateEnd) - EXPMarker.Delete() + EndIf + + ObjectReference VictimREF = Victim as ObjectReference + (VictimREF as _00E_EPOnDeath).HasBlameSpell = true + Victim.SetAlpha(0.0, true) + Victim.RemovePerk(iPerk) + Victim.Kill(Victim) + Victim.SetCriticalStage(Victim.CritStage_DisintegrateEnd) + EXPMarker.Delete() EndFunction diff --git a/source/scripts/_00e_playerfunctions.psc b/source/scripts/_00e_playerfunctions.psc index bcd4f32d..6eb0826c 100644 --- a/source/scripts/_00e_playerfunctions.psc +++ b/source/scripts/_00e_playerfunctions.psc @@ -21,6 +21,11 @@ Event OnPlayerLoadGame() if ControlRepository == None ControlRepository = Game.GetForm(0x493C2) as _00E_EnderalControls endif + + ; Restore INI value changed by slow time effects + if Utility.GetINIFloat("fInAirFallingCharGravityMult:Havok") < 1.35 + Utility.SetINIFloat("fInAirFallingCharGravityMult:Havok", 1.35) + endif EndEvent _00E_SkillControl function GetSkillControl() Global diff --git a/source/scripts/_00e_slowselfmesc.psc b/source/scripts/_00e_slowselfmesc.psc index 6e1d7392..c1cefb12 100644 --- a/source/scripts/_00e_slowselfmesc.psc +++ b/source/scripts/_00e_slowselfmesc.psc @@ -12,6 +12,8 @@ EndEvent Event OnEffectFinish(Actor akTarget, Actor akCaster) _00E_PlayerFunctions.GetVisionControl().UpdateSpeed(akTarget) + + ; Also restored on game load in _00E_PlayerFunctions Utility.SetINIFloat("fInAirFallingCharGravityMult:Havok", 1.35) EndEvent