Fix script about conjure/return

Source/Scripts/FCMMaidDialogueScript.psc

@@ -0,0 +1,8 @@
+Scriptname FCMMaidDialogueScript extends Quest  
+Spell Property ConjureMaidSpell Auto
+Spell Property ConjurePermanentMaidSpell Auto
+Spell Property ConjureSpectralMaidSpell Auto
+Bool Function TryReturn()
+    Actor player = Game.GetPlayer()
+    return player.DispelSpell(ConjureMaidSpell) || player.DispelSpell(ConjurePermanentMaidSpell) ||  player.DispelSpell(ConjureSpectralMaidSpell)
+EndFunction

Source/Scripts/FCMSummonMaidScript.psc

@@ -2,9 +2,18 @@ Scriptname FCMSummonMaidScript extends activemagiceffect
 
 ObjectReference Property pMaidRef  Auto  
 Bool Property pIsSpectral Auto
-Spell Property pReturnMaidSpell auto
+Keyword Property pSummonMaidMagicKeyword Auto
 
 Event OnEffectStart(actor akTarget, actor akCaster)
          		(pMaidRef as FCMSpectralMaidScript).TryConjure(pIsSpectral)
-		pReturnMaidSpell.Cast(akCaster, akCaster)
 EndEvent
+
+
+Event OnEffectFinish(actor akTarget, actor akCaster)
+    if (Game.GetPlayer().hasMagicEffectWithKeyword(pSummonMaidMagicKeyword))
+        Debug.Trace("Player still have return magic effect")
+    else
+        Debug.Trace("Start Returning")
+         (pMaidRef as FCMSpectralMaidScript).TryReturn()
+    endif 
+endEvent

Source/Scripts/FCMSummonMaidStaffScript.psc

@@ -0,0 +1,7 @@
+Scriptname FCMSummonMaidStaffScript extends activemagiceffect  
+
+Spell Property pConjureMaidSpell AUTO
+
+EVENT OnEffectStart(actor akTarget, actor akCaster)
+		pConjureMaidSpell.Cast(akCaster, akTarget)
+EndEvent

Source/Scripts/TIF__05011623.psc

@@ -6,7 +6,7 @@ Scriptname TIF__05011623 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-(akSpeaker as FCMSpectralMaidScript).TryReturn()
+(GetOwningQuest() as FCMMaidDialogueScript).TryReturn()
 ;END CODE
 EndFunction
 ;END FRAGMENT