source/scripts/_00e_a2_eldritchbloodplayermarksc.psc

@@ -10,21 +10,7 @@ Import Utility
 
 Auto State Marking
 
-	Event OnControlUp(string control, float HoldTime)
+Event OnCrosshairRefChange(ObjectReference ref)
-		
-		Actor rTarget = Game.GetCurrentCrosshairRef() as Actor
-		
-		if ! rTarget || rTarget == Game.GetForm(0x14)
-			return
-		endif
-		
-		If _00E_A2_EldritchBloodGlobal.GetValueInt() == 1
-			EldritchBloodEffectScript.SelectEnemy(rTarget)
-		EndIf
-		
-	EndEvent
-
-	Event OnCrosshairRefChange(ObjectReference ref)
 
 	if lastTarget != None
 		lastTarget.blockActivation(false)
@@ -35,9 +21,17 @@ Auto State Marking
 		ref.blockActivation(true)
 	endif
 	
-	EndEvent
+	If _00E_A2_EldritchBloodGlobal.GetValueInt() == 1
+		If ref as Actor && ref != Game.GetForm(0x14)
+			EldritchBloodEffectScript.SelectEnemy(ref as Actor)
+		EndIf
+	Else
+		UnregisterForCrosshairRef()
+	EndIf
 	
-	Event OnAnimationEvent(ObjectReference akSource, string asEventName)
+EndEvent
+
+Event OnAnimationEvent(ObjectReference akSource, string asEventName)
 
 	if(akSource == akSelfRef && asEventName == "weaponSwing") 
 		if iAttackCounter == 0
@@ -50,19 +44,23 @@ Auto State Marking
 		EndIf
 	EndIf
 
-	EndEvent
+EndEvent
 
-	Event OnObjectEquipped(Form equippedObject, ObjectReference reference)
+Event OnObjectEquipped(Form equippedObject, ObjectReference reference)
 	
-		if ! equippedObject as Shout
+	Shout equippedShout = equippedObject as Shout
+	
+	if(!equippedShout)
 		; Debug.Notification(sMarkingModeInterrupted)
         _00E_MarkingTalents_sMarkingModeInterrupted.Show()
 		EldritchBloodEffectScript.abort()
 	EndIf
 
-	EndEvent
+EndEvent
 
-	Event OnSpellCast(Form akSpell)
+Event OnSpellCast(Form akSpell)
+
+	Shout equippedShout = akSpell as Shout
 	
 	if akSpell != _00E_A2_EldritchBloodSP
 		; Debug.Notification(sMarkingModeInterrupted)
@@ -70,15 +68,15 @@ Auto State Marking
 		EldritchBloodEffectScript.abort()
 	EndIf
 
-	EndEvent
+EndEvent
 
-	Event OnPlayerBowShot(Weapon akWeapon, Ammo akAmmo, float afPower, bool abSunGazing)
+Event OnPlayerBowShot(Weapon akWeapon, Ammo akAmmo, float afPower, bool abSunGazing)
 
 	; Debug.Notification(sMarkingModeInterrupted)
     _00E_MarkingTalents_sMarkingModeInterrupted.Show()
 	EldritchBloodEffectScript.abort()
 
-	EndEvent
+EndEvent
 
 EndState
 
@@ -95,28 +93,21 @@ Function EnterMarkingMode(Float iReach, _00E_A2_EldritchBloodPlayerSC _00E_A2_El
 	SetINIFloat("fActivatePickLength:Interface", iReach)
 	EldritchBloodEffectScript = _00E_A2_EldritchBloodMEScript
 	RegisterForCrosshairRef()
-	RegisterForControl("Activate")
 
 EndFunction
 
 Function ExitMarkingMode()
 
-	iAttackCounter = 0
-	UnregisterForAllControls()
-	UnregisterForCrosshairRef()
-	UnregisterForAnimationEvent(akSelfRef, "weaponSwing")
-
-	; Restore activation reach
-	if fActivatePickLengthBefore <= 0
-		fActivatePickLengthBefore = 150.0
-	endif
-	SetINIFloat("fActivatePickLength:Interface", fActivatePickLengthBefore)
-	
 	if lastTarget != None
 		lastTarget.blockActivation(false)
 	EndIf
 	lastTarget = None
 
+	iAttackCounter = 0
+	UnregisterForAnimationEvent(akSelfRef, "weaponSwing")
+	UnregisterForCrosshairRef()
+	SetINIFloat("fActivatePickLength:Interface", 150)
+
 EndFunction
 
 ;=====================================================================================

source/scripts/_00e_a2_eldritchbloodplayersc.psc

@@ -51,7 +51,7 @@ EndFunction
 
 State MarkTargets
 
-	Event OnBeginState()
+Event OnBeginState()
 
 	If _00E_SelectionTutorialShown.GetValueInt() == 0 && _00E_DisableSkillTutorials.GetValueInt() == 0
 		_00E_Tutorial_SelectionMode.Show()
@@ -79,13 +79,13 @@ State MarkTargets
 	Wait(0.5)
 	_00E_A2_EldritchBloodSelectionHoldIMOD.ApplyCrossFade(1.5)
 
-	EndEvent
+EndEvent
 
 EndState
 
 State AddEffect
 
-	Event OnBeginState()
+Event OnBeginState()
 
 	A2_EldritchBlood_Victim.GetActorReference().RemoveSpell(_00E_A2_EldritchBloodAbMarkedVictimSP)
 	
@@ -123,7 +123,7 @@ State AddEffect
 	_00E_A2_EldritchBloodGlobal.SetValueInt(0)
 	Sound.StopInstance(MarkingLP)
 	
-	EndEvent
+EndEvent
 
 EndState
 
@@ -267,6 +267,12 @@ Function UnmarkEnemy(Actor iVictim)
 		_00E_A2_GhostwalkDeselectM.Play(PlayerREF)
 		MarkingRuneREF.Delete()
 		MarkingRuneREF = None
+		
+		; Unmark attack target too
+		if A2_EldritchBlood_VictimTarget.GetActorReference()
+			UnmarkEnemy(A2_EldritchBlood_VictimTarget.GetActorReference())
+		endif
+		
 	Elseif iVictim.HasSpell(_00E_A2_EldritchBloodAbMarkedVictimTargetSP)
 		A2_EldritchBlood_VictimRune.Clear()
 		A2_EldritchBlood_VictimTarget.Clear()

source/scripts/_00e_playerfunctions.psc

@@ -22,13 +22,10 @@ Event OnPlayerLoadGame()
 		ControlRepository = Game.GetForm(0x493C2) as _00E_EnderalControls
 	endif
 	
-	; Restore INI values changed by Entropic Blood
+	; Restore INI value changed by slow time effects
-	if Utility.GetINIFloat("fInAirFallingCharGravityMult:Havok") < 1.0
+	if Utility.GetINIFloat("fInAirFallingCharGravityMult:Havok") < 1.35
 		Utility.SetINIFloat("fInAirFallingCharGravityMult:Havok", 1.35)
 	endif
-	if Utility.GetINIFloat("fActivatePickLength:Interface") >= 1799.0
-		Utility.SetINIFloat("fActivatePickLength:Interface", 150.0)
-	endif
 EndEvent
 
 _00E_SkillControl function GetSkillControl() Global