From 87ca1ee28453e76752468e4ca37df897c32bc15f Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Thu, 1 Aug 2024 01:19:11 +0200 Subject: [PATCH] Fixed damage bonus never applied with Entropic Blood --- scripts/_00e_a2_eldritchbloodsc.pex | Bin 8533 -> 8346 bytes source/scripts/_00e_a2_eldritchbloodsc.psc | 39 ++++++++------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/scripts/_00e_a2_eldritchbloodsc.pex b/scripts/_00e_a2_eldritchbloodsc.pex index a4947f45cc722667fbcc6d0505627aff33c4fb6b..1cc486bcf52a4bd16f573e2a9834e48cb4f07dd2 100644 GIT binary patch literal 8346 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 PXkmC+#Vz=+v$p>MWDGMv literal 8533 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 ROBK7RPWGQ^4C(pW{|8v8OBMhC diff --git a/source/scripts/_00e_a2_eldritchbloodsc.psc b/source/scripts/_00e_a2_eldritchbloodsc.psc index 5028977e..85709b49 100644 --- a/source/scripts/_00e_a2_eldritchbloodsc.psc +++ b/source/scripts/_00e_a2_eldritchbloodsc.psc @@ -55,7 +55,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) Victim.SetActorValue("Confidence", 4) Victim.SetActorValue("Aggression", 2) - AdjustAndAddFrenzyPerk(Victim) + AdjustDamageMult(Victim) Victim.StopCombat() @@ -70,8 +70,10 @@ EndEvent Event OnEffectFinish(Actor akTarget, Actor akCaster) + Victim.SetActorValue("attackdamagemult", fInitialAttackDamageMult) + Victim.SetActorValue("destructionpowermod", fInitialDestructionPowerMod) + _00E_A2_EldritchBloodMarkedFXS.Stop(Victim) - Victim.RemovePerk(iPerk) A2_EldritchBlood_Victim.Clear() A2_EldritchBlood_VictimTarget.Clear() _00E_A2_EldritchBloodParticelAttachVFX.Stop(Victim) @@ -106,35 +108,20 @@ EndEvent ; FUNCTIONS ;===================================================================================== -Function AdjustAndAddFrenzyPerk(Actor Victim) +Function AdjustDamageMult(Actor Victim) - float iDamageMultiplicator = _00E_A2_EldritchBloodSP.GetNthEffectMagnitude(TalentLevel + 2) + float iDamageMultiplicator = GetMagnitude() - If TalentLevel == 1 - iPerk = _00E_A2_EldritchBloodPerk01 - Elseif TalentLevel == 2 - iPerk = _00E_A2_EldritchBloodPerk02 - Elseif TalentLevel == 3 - iPerk == _00E_A2_EldritchBloodPerk03 - EndIf - - iPerk.SetNthEntryValue(1, 1, iDamageMultiplicator) - iPerk.SetNthEntryValue(2, 1, iDamageMultiplicator) - - Victim.AddPerk(iPerk) + fInitialAttackDamageMult = Victim.GetActorValue("attackdamagemult") + fInitialDestructionPowerMod = Victim.GetActorValue("destructionpowermod") + + Victim.SetActorValue("attackdamagemult", fInitialAttackDamageMult * iDamageMultiplicator) + Victim.SetActorValue("destructionpowermod", fInitialDestructionPowerMod + (100 * iDamageMultiplicator)) EndFunction Function Explode() - If TalentLevel == 1 - iPerk = _00E_A2_EldritchBloodPerk01 - Elseif TalentLevel == 2 - iPerk = _00E_A2_EldritchBloodPerk02 - Elseif TalentLevel == 3 - iPerk == _00E_A2_EldritchBloodPerk03 - EndIf - Victim.SetCriticalStage(Victim.CritStage_DisintegrateStart) If bSynergySkyfallExplosion @@ -187,7 +174,6 @@ Function Explode() 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() @@ -198,6 +184,9 @@ EndFunction ; PROPERTIES ;===================================================================================== +float fInitialAttackDamageMult +float fInitialDestructionPowerMod + Faction[] VictimFactions Int[] VictimFactionRanks FormList Property VoiceFactions Auto