From c6b34691a8c0794499e703c9d96d69cbf39062fd Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Tue, 5 Aug 2025 01:13:32 +0200 Subject: [PATCH] Do not remove Entropic Blood target from PlayerAlliesFaction if it was the member before --- scripts/_00e_a2_eldritchbloodsc.pex | Bin 8346 -> 8405 bytes source/scripts/_00e_a2_eldritchbloodsc.psc | 16 ++++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/_00e_a2_eldritchbloodsc.pex b/scripts/_00e_a2_eldritchbloodsc.pex index 1cc486bcf52a4bd16f573e2a9834e48cb4f07dd2..4eec96b359aab0739db238ba4319b08ebfebc88a 100644 GIT binary patch literal 8405 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 literal 8346 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 PXkmC+#Vz=+v$p>MWDGMv diff --git a/source/scripts/_00e_a2_eldritchbloodsc.psc b/source/scripts/_00e_a2_eldritchbloodsc.psc index 85709b49f..be15efdf2 100644 --- a/source/scripts/_00e_a2_eldritchbloodsc.psc +++ b/source/scripts/_00e_a2_eldritchbloodsc.psc @@ -31,7 +31,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) Victim = akTarget A2_EldritchBlood_Victim.ForceRefTo(Victim) - _00E_A2_EldritchBloodParticelAttachVFX.Play(Victim) + bIsInPlayerFaction = Victim.IsInFaction(PlayerAlliesFaction) ; Strip Victim off all its factions VictimFactions = Victim.GetFactions(-128, 127) @@ -48,7 +48,6 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) EndWhile Victim.AddToFaction(PlayerAlliesFaction) - Victim.AddToFaction(EPFaction) Victim.SetRelationshipRank(PlayerRef, 3) @@ -57,6 +56,8 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) AdjustDamageMult(Victim) + _00E_A2_EldritchBloodParticelAttachVFX.Play(Victim) + Victim.StopCombat() If A2_EldritchBlood_VictimTarget.GetActorReference() @@ -79,9 +80,10 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster) _00E_A2_EldritchBloodParticelAttachVFX.Stop(Victim) ; Restore old factions of Victim - Victim.RemoveFromFaction(PlayerAlliesFaction) - Victim.RemoveFromFaction(EPFaction) - + if ! bIsInPlayerFaction + Victim.RemoveFromFaction(PlayerAlliesFaction) + endif + Int i = 0 While i < VictimFactions.Length If VictimFactions[i] @@ -238,4 +240,6 @@ Explosion Property _00E_MAGEldritchShockExplosion Auto Explosion Property _00E_MAGEldritchShockExplosion02 Auto Explosion Property _00E_MAGEldritchShockExplosion03 Auto Explosion Property _00E_A2_SynergyEldritchBloodSkyfallExp Auto -Explosion Property _00E_FS_MAGGoreExplosion Auto \ No newline at end of file +Explosion Property _00E_FS_MAGGoreExplosion Auto + +bool bIsInPlayerFaction