From d59ee1f499f2e3b307ffa544cdc78edf60efbba5 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Sat, 27 Jan 2024 03:24:11 +0100
Subject: [PATCH] Updated SprigganFXSCRIPT

---
 scripts/sprigganfxscript.pex        | Bin 3697 -> 3974 bytes
 source/scripts/sprigganfxscript.psc | 143 ++++++++++++++--------------
 2 files changed, 74 insertions(+), 69 deletions(-)

diff --git a/scripts/sprigganfxscript.pex b/scripts/sprigganfxscript.pex
index aed1adf4199db427edc802769288b5b47364eb2c..fc7a34e4d692f08b97b0058a0e454093b5a672bb 100644
GIT binary patch
literal 3974
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
LTANJY@WT2(R$G1&

literal 3697
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
Yu}|6?+YBW^XAq%NSLpor1at<!0;P&hGynhq

diff --git a/source/scripts/sprigganfxscript.psc b/source/scripts/sprigganfxscript.psc
index 978a0b32..c86bed7c 100644
--- a/source/scripts/sprigganfxscript.psc
+++ b/source/scripts/sprigganfxscript.psc
@@ -7,36 +7,35 @@ VisualEffect Property SprigganFXAttachEffect Auto
 Spell Property crSprigganHeal01 Auto
 Spell Property crSprigganCallCreatures Auto
 Idle Property FFselfIdle  Auto  
-bool bBledout
-bool bIsDead
+bool bAnimEffects = true
 ;===============================================
 
 auto state Alive
 
-	EVENT OnEffectStart(Actor Target, Actor Caster)
-		if Target == None
-			Return
-		EndIf
-		
-		If Target.IsDead() || Target == Game.GetForm(0x14)
+	event OnEffectStart(Actor Target, Actor Caster)
+		If ! Target || Target == Game.GetForm(0x14)
 			GotoState("DoNothing")
 			Dispel()
 			return
 		EndIf
 		
-		;test to see if spriggan is not in ambush mode
-		if (Target.IsInCombat() || Target.GetSleepState() == 0) && Target.Is3DLoaded()
-			SprigganFXAttachEffect.Play(Target, -1)
+		if bAnimEffects
+			bAnimEffects = false
+			Target.PlaySubGraphAnimation("KillFX")
 		endif
-	ENDEVENT
-
-	; May fire when dispelled with a script or console
-	Event OnEffectFinish(Actor akTarget, Actor akCaster)
+		
+		If Target.IsDead()
+			GotoState("DoNothing")
+			Dispel()
+		EndIf
+	endevent
+	
+	event OnEffectFinish(Actor akTarget, Actor akCaster)
 		GotoState("DoNothing")
 		SprigganFXAttachEffect.Stop(akTarget)
-	endEvent
+	endevent
 	
-	EVENT onCombatStateChanged(Actor akTarget, int aeCombatState)
+	event OnCombatStateChanged(Actor akTarget, int aeCombatState)
 		Actor actorRef = GetTargetActor()
 	
 		if ! actorRef || ! actorRef.Is3DLoaded()
@@ -53,92 +52,98 @@ auto state Alive
 		endif
 		
 		if aeCombatState == 1
+			if ! bAnimEffects
+				bAnimEffects = true
+				actorRef.PlaySubGraphAnimation("Revive")
+			endif
 			SprigganFXAttachEffect.Play(actorRef, -1)
 			actorRef.playIdle(FFselfIdle)
-			Utility.Wait(Utility.RandomFloat(1.0, 4.0))
-			crSprigganCallCreatures.cast(actorRef, actorRef)
-		endif
-	endEVENT
-
-	Event OnGetUp(ObjectReference akFurniture)
-		Actor actorRef = GetTargetActor()
-	
-		if ! actorRef
-			return
+			Utility.Wait(Utility.RandomFloat(1.0, 3.0))
+			if GetState() == "Alive"
+				crSprigganCallCreatures.cast(actorRef, actorRef)
+			endif
 		endif
-		
-		SprigganFXAttachEffect.Play(actorRef, -1)
-		actorRef.PlaySubGraphAnimation("Revive")
-	endEvent
+	endevent
 
-	EVENT onDying(actor myKiller)
+	event onDying(actor myKiller)
 		GotoState("Dying")
-	ENDEVENT
+	endevent
 
-	EVENT onDeath(actor myKiller)
+	event onDeath(actor myKiller)
 		GotoState("Dying")
 	endevent
 
-	Event OnEnterBleedout()
-		if bBledout
-			return
-		endif
-		bBledout = true
-		RegisterForSingleUpdate(2.0)
-	ENDEVENT
-	
-	; Heals itself
-	event OnUpdate()
+	event OnEnterBleedout()
 		Actor actorRef = GetTargetActor()
-	
-		if ! actorRef
+		SprigganFXAttachEffect.Stop(actorRef)
+		
+		if actorRef.GetActorValue("Variable07")
+			RegisterForAnimationEvent(actorRef, "BleedoutStop")
 			return
 		endif
 		
-		if actorRef.Is3DLoaded()
+		actorRef.SetActorValue("Variable07", 1)
+		Utility.Wait(Utility.RandomFloat(2.0, 3.5))
+		
+		if GetState() == "Alive"
+			RegisterForAnimationEvent(actorRef, "BleedoutStop")
 			crSprigganHeal01.Cast(actorRef)
-			actorRef.setActorValue("variable07",1)
-			Utility.Wait(Utility.RandomFloat(1.5, 2.5))
-			actorRef.evaluatePackage()
+			actorRef.EvaluatePackage()
 		endif
 	endevent
+	
+	event OnAnimationEvent(ObjectReference akSource, string asEventName)
+		UnregisterForAnimationEvent(akSource, asEventName)
+		SprigganFXAttachEffect.Play(akSource)
+	endevent
 
 endstate
 
 state Dying
+
 	event OnBeginState()
-		RegisterForSingleUpdate(Utility.RandomFloat(2.5, 4.5))
+		RegisterForSingleUpdate(Utility.RandomFloat(2.0, 3.5))
+		UnregisterForAnimationEvent(GetTargetActor(), "BleedoutStop")
 	endevent
 
-	Event OnEffectFinish(Actor akTarget, Actor akCaster)
-		GotoState("DoNothing")
-		akTarget.PlaySubGraphAnimation("KillFX")
-	endEvent
-	
 	event OnCellAttach()
 		RegisterForSingleUpdate(1.0)
 	endevent
 	
+	event OnCellDetach()
+		UnregisterForUpdate()
+		GotoState("Dead")
+		SprigganFXAttachEffect.Stop(GetTargetActor())
+		Dispel()
+	endevent
+	
 	event OnUpdate()
-		if bIsDead
-			Dispel()
-			return
-		endif
-		
-		bIsDead = true	
-		Actor actorRef = GetTargetActor()
+		SprigganFXAttachEffect.Stop(GetTargetActor())
+		GotoState("Dead")
+		RegisterForSingleUpdate(Utility.RandomFloat(3.0, 7.5))
+	endevent
 	
-		if actorRef
-			SprigganFXAttachEffect.Stop(actorRef)
+endstate
+
+state Dead
+
+	event OnUpdate()
+		Dispel()
+	endevent
+	
+	event OnEffectFinish(Actor akTarget, Actor akCaster)
+		GotoState("DoNothing")
+		if bAnimEffects
+			bAnimEffects = false
+			akTarget.PlaySubGraphAnimation("KillFX")
 		endif
-		
-		RegisterForSingleUpdate(Utility.RandomFloat(3.0, 7.5))
 	endevent
+	
 endstate
 
 state DoNothing
 endstate
 
 ; Compiler wants it here
-Event OnEnterBleedout()
-ENDEVENT
+event OnEnterBleedout()
+endevent