modified: mrt_MarkofArkay.bsa

modified: scripts/source/zzzmoaitemcursescript.psc modified: scripts/source/zzzmoareviverscript.psc modified: scripts/zzzmoaitemcursescript.pex modified: scripts/zzzmoareviverscript.pex
mort65 · Nov 4, 2019 · 3cd67f8 · 3cd67f8
1 parent 2d3ed3e
commit 3cd67f8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/Data/mrt_MarkofArkay.bsa b/Data/mrt_MarkofArkay.bsa
diff --git a/Data/scripts/source/zzzmoaitemcursescript.psc b/Data/scripts/source/zzzmoaitemcursescript.psc
@@ -57,6 +57,7 @@ Function RestoreLostItems(Actor ActorRef)
 	stopandConfirm(ReviveScript.moaPlayerVoicelessQuest)
 	stopandConfirm(ReviveScript.moaPlayerGhostQuest,3,10)
 	PlayerRef.SetVoiceRecoveryTime(0.0)
+	ReviveScript.bPlayerIsVoiceless = False
 	If ReviveScript.moaSoulMark01.IsRunning()
 		ReviveScript.NPCScript.RemoveDeadClone()
 		stopandConfirm(ReviveScript.moaSoulMark01,1)
@@ -107,6 +108,7 @@ Function DestroyLostItems(Actor ActorRef)
 	stopandConfirm(ReviveScript.moaPlayerVoicelessQuest)
 	stopandConfirm(ReviveScript.moaPlayerGhostQuest,3,10)
 	PlayerRef.SetVoiceRecoveryTime(0.0)
+	ReviveScript.bPlayerIsVoiceless = False
 	If ReviveScript.moaSoulMark01.IsRunning()
 		ReviveScript.NPCScript.RemoveDeadClone()
 		stopandConfirm(ReviveScript.moaSoulMark01,1)

diff --git a/Data/scripts/source/zzzmoareviverscript.psc b/Data/scripts/source/zzzmoareviverscript.psc
@@ -138,6 +138,7 @@ GlobalVariable Property moaLockReset Auto
 Message Property DeathMessage Auto
 Bool Property bReadyForRespawn = False Auto Hidden
 Bool Property bInfectingPlayer = False Auto Hidden
+Bool Property bPlayerIsVoiceless = False Auto Hidden
 Bool bIsBusy = False
 Float fHealrate = 0.0
 Int iIsBeast = 0
@@ -167,7 +168,7 @@ State Bleedout1
 			Return
 		EndIf
 		SetGameVars()
-		If moaPlayerVoicelessQuest.IsRunning()
+		If bPlayerIsVoiceless
 			PlayerRef.SetVoiceRecoveryTime(9999999.0)
 		EndIf
 	EndEvent
@@ -195,7 +196,7 @@ State Bleedout2
 			Return
 		EndIf
 		SetGameVars()
-		If moaPlayerVoicelessQuest.IsRunning()
+		If bPlayerIsVoiceless
 			PlayerRef.SetVoiceRecoveryTime(9999999.0)
 		EndIf
 	EndEvent
@@ -279,7 +280,7 @@ Event OnPlayerLoadGame()
 		moaLockReset.SetValue(0)
 	EndIf
 	SetGameVars()
-	If moaPlayerVoicelessQuest.IsRunning()
+	If bPlayerIsVoiceless
 		PlayerRef.SetVoiceRecoveryTime(9999999.0)
 	EndIf
 	RegisterForSingleUpdate(3.0)
@@ -1696,6 +1697,7 @@ Function RevivePlayer(Bool bRevive)
 						moaPlayerVoicelessQuest.Start()
 					EndIf
 					PlayerRef.SetVoiceRecoveryTime(9999999.0)
+					bPlayerIsVoiceless = True
 				EndIf
 				If PlayerRef.GetActorValue("paralysis")
 					PlayerRef.SetActorValue("paralysis",0)

diff --git a/Data/scripts/zzzmoaitemcursescript.pex b/Data/scripts/zzzmoaitemcursescript.pex
diff --git a/Data/scripts/zzzmoareviverscript.pex b/Data/scripts/zzzmoareviverscript.pex