enderal/enderalse
1
Fork 0
Code Releases Activity

Fixed damage bonus never applied with Entropic Blood

Browse Source
This commit is contained in:
Eddoursul 2024-08-01 01:19:11 +02:00
parent a2cbdf65ee
commit 87ca1ee284
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
scripts/_00e_a2_eldritchbloodsc.pex
View File

Binary file not shown.

39
source/scripts/_00e_a2_eldritchbloodsc.psc
View File

@ -55,7 +55,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
Victim.SetActorValue("Confidence", 4) Victim.SetActorValue("Confidence", 4)
Victim.SetActorValue("Aggression", 2) Victim.SetActorValue("Aggression", 2)
AdjustAndAddFrenzyPerk(Victim) AdjustDamageMult(Victim)
Victim.StopCombat() Victim.StopCombat()
@ -70,8 +70,10 @@ EndEvent
Event OnEffectFinish(Actor akTarget, Actor akCaster) Event OnEffectFinish(Actor akTarget, Actor akCaster)
Victim.SetActorValue("attackdamagemult", fInitialAttackDamageMult)
Victim.SetActorValue("destructionpowermod", fInitialDestructionPowerMod)
_00E_A2_EldritchBloodMarkedFXS.Stop(Victim) _00E_A2_EldritchBloodMarkedFXS.Stop(Victim)
Victim.RemovePerk(iPerk)
A2_EldritchBlood_Victim.Clear() A2_EldritchBlood_Victim.Clear()
A2_EldritchBlood_VictimTarget.Clear() A2_EldritchBlood_VictimTarget.Clear()
_00E_A2_EldritchBloodParticelAttachVFX.Stop(Victim) _00E_A2_EldritchBloodParticelAttachVFX.Stop(Victim)
@ -106,35 +108,20 @@ EndEvent
; FUNCTIONS ; FUNCTIONS
;===================================================================================== ;=====================================================================================
Function AdjustAndAddFrenzyPerk(Actor Victim) Function AdjustDamageMult(Actor Victim)
float iDamageMultiplicator = _00E_A2_EldritchBloodSP.GetNthEffectMagnitude(TalentLevel + 2) float iDamageMultiplicator = GetMagnitude()
If TalentLevel == 1 fInitialAttackDamageMult = Victim.GetActorValue("attackdamagemult")
iPerk = _00E_A2_EldritchBloodPerk01 fInitialDestructionPowerMod = Victim.GetActorValue("destructionpowermod")
Elseif TalentLevel == 2
iPerk = _00E_A2_EldritchBloodPerk02 Victim.SetActorValue("attackdamagemult", fInitialAttackDamageMult * iDamageMultiplicator)
Elseif TalentLevel == 3 Victim.SetActorValue("destructionpowermod", fInitialDestructionPowerMod + (100 * iDamageMultiplicator))
iPerk == _00E_A2_EldritchBloodPerk03
EndIf
iPerk.SetNthEntryValue(1, 1, iDamageMultiplicator)
iPerk.SetNthEntryValue(2, 1, iDamageMultiplicator)
Victim.AddPerk(iPerk)
EndFunction EndFunction
Function Explode() 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) Victim.SetCriticalStage(Victim.CritStage_DisintegrateStart)
If bSynergySkyfallExplosion If bSynergySkyfallExplosion
@ -187,7 +174,6 @@ Function Explode()
ObjectReference VictimREF = Victim as ObjectReference ObjectReference VictimREF = Victim as ObjectReference
(VictimREF as _00E_EPOnDeath).HasBlameSpell = true (VictimREF as _00E_EPOnDeath).HasBlameSpell = true
Victim.SetAlpha(0.0, true) Victim.SetAlpha(0.0, true)
Victim.RemovePerk(iPerk)
Victim.Kill(Victim) Victim.Kill(Victim)
Victim.SetCriticalStage(Victim.CritStage_DisintegrateEnd) Victim.SetCriticalStage(Victim.CritStage_DisintegrateEnd)
EXPMarker.Delete() EXPMarker.Delete()
@ -198,6 +184,9 @@ EndFunction
; PROPERTIES ; PROPERTIES
;===================================================================================== ;=====================================================================================
float fInitialAttackDamageMult
float fInitialDestructionPowerMod
Faction[] VictimFactions Faction[] VictimFactions
Int[] VictimFactionRanks Int[] VictimFactionRanks
FormList Property VoiceFactions Auto FormList Property VoiceFactions Auto