diff --git a/scripts/_00e_a2_eldritchbloodsc.pex b/scripts/_00e_a2_eldritchbloodsc.pex index a4947f45..1cc486bc 100644 Binary files a/scripts/_00e_a2_eldritchbloodsc.pex and b/scripts/_00e_a2_eldritchbloodsc.pex differ 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