Unsummon apparition before transporting into the Pyrean's memory

source/scripts/_00E_CameraControl.psc

@@ -7,10 +7,10 @@ Function LockVanityCamera() Global
 	
 	if SKSE.GetVersion()
 		float fCameraMaxDistance = Utility.GetIniFloat("fVanityModeMaxDist:Camera")
-		PlayerREF.SetActorValue("Variable08", fCameraMaxDistance)
+		PlayerREF.SetActorValue("Variable04", fCameraMaxDistance)
 		fMinDist = Utility.GetIniFloat("fVanityModeMinDist:Camera")
 	else
-		PlayerREF.SetActorValue("Variable08", 600.0)
+		PlayerREF.SetActorValue("Variable04", 600.0)
 	endif
 	
 	Utility.SetINIFloat("fVanityModeMaxDist:Camera", fMinDist)
@@ -20,13 +20,13 @@ EndFunction
 Function UnlockVanityCamera() Global
 
 	Actor PlayerREF = Game.GetForm(0x14) as Actor
-	float fCameraMaxDistance = PlayerREF.GetActorValue("Variable08")
+	float fCameraMaxDistance = PlayerREF.GetActorValue("Variable04")
 	
 	if fCameraMaxDistance <= 0
 		fCameraMaxDistance = 600.0
 	endif
 	
 	Utility.SetINIFloat("fVanityModeMaxDist:Camera", fCameraMaxDistance)
-	PlayerREF.SetActorValue("Variable08", 0)
+	PlayerREF.SetActorValue("Variable04", 0)
 
 EndFunction

source/scripts/_00e_ambrosiaeffect.psc

@@ -2,8 +2,8 @@ Scriptname _00E_AmbrosiaEffect extends activemagiceffect
 
 Event OnEffectStart(Actor akTarget, Actor akCaster)
 
-	float fMagnitude = - akTarget.GetActorValue("Mood")
-	akTarget.SetActorValue("Mood", 0)
+	float fMagnitude = - akTarget.GetActorValue("Variable08")
+	akTarget.RestoreActorValue("Variable08", fMagnitude)
 	
 	if akTarget != Game.GetForm(0x14)
 		return

source/scripts/_00e_mq07a_functions.psc

@@ -302,6 +302,9 @@ EndFunction
 
 Function StartMemory()
 
+	_FS_TheriantrophistControlQuest.TransformBackIfTransformed()
+	_FS_Phasmalist_ControlQuest.UnsummonApparitionIfExists()
+	
 	_00E_EquipControl.SheatheWeapon(PlayerREF)
 
 	OBJEyeofMagnusVanishM.Play(PlayerREF)

source/scripts/_00e_mq07a_sc4_doorsc.psc

@@ -20,8 +20,12 @@ Event OnActivate(ObjectReference akActionRef)
 			self.Activate(Game.GetPlayer(), True)
 		EndIf
 	ElseIf MQ07a.GetCurrentStageID() == 170
-		Self.BlockActivation(True)
-		_00E_MQ07a_sDoorDoesntBudge.Show()
+		; Pre-2.1, apparitions tried enter this door, triggering the message.
+		; Added this condition for mod-added companions
+		If akActionRef == Game.GetPlayer()
+			Self.BlockActivation(True)
+			_00E_MQ07a_sDoorDoesntBudge.Show()
+		endif
 	EndIf
 
 EndEvent