tweaks and fixes.

Data/scripts/source/zzzmoa_dhelpless_interface.psc

@@ -3,12 +3,16 @@ Scriptname zzzmoa_dhelpless_interface extends Quest
 import zzzmoautilscript
 
 Faction helplessFaction 
+Spell dhCloakSpell
+Actor player
 
 Bool bIsBusy = False
 
 event OnEndState()
   Utility.Wait(5.0)
   helplessFaction = Game.GetFormFromFile(0x005379, "DeviouslyHelpless.esp") as Faction
+  dhCloakSpell = Game.GetFormFromFile(0x000D68, "DeviouslyHelpless.esp") as Spell
+  player = game.GetPlayer()
 endevent
 
 event OnInit()
@@ -56,6 +60,10 @@ Bool Function IsSceneRunning()
 	return False
 endfunction
 
+Bool function IsEnabled()
+  return False
+endfunction
+
 state Installed
 
   event On_MOA_Int_PlayerLoadsGame(string eventName, string strArg, float numArg, Form sender)
@@ -66,9 +74,19 @@ state Installed
     if helplessFaction == None
       helplessFaction = Game.GetFormFromFile(0x005379, "DeviouslyHelpless.esp") as Faction
     endIf
+	if dhCloakSpell == None
+	  dhCloakSpell = Game.GetFormFromFile(0x000D68, "DeviouslyHelpless.esp") as Spell
+	endif
+	if player == None
+      player = game.GetPlayer()
+	endif
   endfunction
 
   Bool function IsSceneRunning()
-  	return Game.getplayer().isInfaction(helplessFaction)
+  	return player.isInfaction(helplessFaction)
+  endfunction
+
+  Bool function IsEnabled()
+    return player.hasSpell(dhCloakSpell)
   endfunction
 endstate

Data/scripts/source/zzzmoarespawnscript.psc

@@ -1422,15 +1422,16 @@ Bool function bIsArrived(ObjectReference akMarker)
       if PlayerRef.GetActorValue("paralysis")
         PlayerRef.ForceActorValue("paralysis", 0)
       endif
-      Utility.Wait(6.5)
+      Utility.Wait(6.0)
     endif
-    Float i = 10.0
+    Float i = 4.0
     while (!bIsTeleportSafe(akMarker) && (i > 0.0))
       Utility.Wait(0.2)
       i -= 0.2
     endwhile
     if ReviveScript.NPCScript.isActorInSexAnimation(PlayerRef)
       Debug.Trace("MarkOfArkay: The player is in a Sexlab/OStim/FlowerGirls animation and cannot teleport.")
+      ReviveScript.BlackScreen.Remove()
       return True
     endif
   endif
@@ -1520,7 +1521,14 @@ Bool function bIsTeleportSafe(ObjectReference akMarker)
     bFirstTryFailed = False
     return False
   endif
-  return !(PlayerRef.GetAnimationVariableBool("bIsSynced") || PlayerRef.GetActorValue("paralysis") || ReviveScript.NPCScript.isActorInSexAnimation(PlayerRef))
+  if PlayerRef.GetAnimationVariableBool("bIsSynced")
+  elseif PlayerRef.GetActorValue("paralysis")
+  elseif ReviveScript.NPCScript.isActorInSexAnimation(PlayerRef)
+    ReviveScript.BlackScreen.Remove()
+  else
+    return true
+  endif
+  return false
 endfunction
 
 Bool function bSendToCustomMarker(Int iSlot)

Data/scripts/source/zzzmoarevivemcm.psc

@@ -781,6 +781,7 @@ event OnOptionDefault(Int option)
   elseif (option == oidRespawnNaked)
     bRespawnNaked = False
     _SetToggleOptionValue(oidRespawnNaked, bRespawnNaked)
+    forcePageReset()
   elseif (option == oidRespawnNakedOnlyIfRapedOrRobbed)
     bRespawnNakedOnlyIfRapedOrRobbed = False
     _SetToggleOptionValue(oidRespawnNakedOnlyIfRapedOrRobbed, bRespawnNakedOnlyIfRapedOrRobbed)
@@ -2085,6 +2086,7 @@ event OnOptionSelect(Int option)
   elseif (option == oidRespawnNaked)
     bRespawnNaked = !bRespawnNaked
     _SetToggleOptionValue(oidRespawnNaked, bRespawnNaked)
+    forcePageReset()
   elseif (option == oidRespawnNakedOnlyIfRapedOrRobbed)
     bRespawnNakedOnlyIfRapedOrRobbed = !bRespawnNakedOnlyIfRapedOrRobbed
     _SetToggleOptionValue(oidRespawnNakedOnlyIfRapedOrRobbed, bRespawnNakedOnlyIfRapedOrRobbed)
@@ -3325,6 +3327,11 @@ event OnPageReset(String page)
       flags = OPTION_FLAG_DISABLED
     endif    
     oidRespawnNakedOnlyIfRapedOrRobbed = AddToggleOption("$mrt_MarkofArkay_RespawnNakedOnlyIfRapedOrRobbed", bRespawnNakedOnlyIfRapedOrRobbed, flags)
+    if ((moaState.getValue() == 1) && (iNotTradingAftermath == 1))
+      flags = OPTION_FLAG_NONE
+    else
+      flags = OPTION_FLAG_DISABLED
+    endif
     oidJail = AddToggleOption("$mrt_MarkofArkay_Jail", bSendToJail, flags)
     oidShowRaceMenu = AddToggleOption("$mrt_MarkofArkay_ShowRaceMenu", bShowRaceMenu, flags)
     oidKillIfCantRespawn = AddToggleOption("$mrt_MarkofArkay_KillIfCantRespawn", bKillIfCantRespawn, flags)