2.6.2 - Need backup before deleting meshes

annakins · Aug 14, 2024 · 1c31f93 · 1c31f93
1 parent 9406b88
commit 1c31f93
Show file tree

Hide file tree

Showing 68 changed files with 283 additions and 149 deletions.
diff --git a/Katana.esp b/Katana.esp
diff --git a/Scripts/AK69CQPlayerScript.pex b/Scripts/AK69CQPlayerScript.pex
diff --git a/Scripts/AK69ChadSceneTrigger1Script.pex b/Scripts/AK69ChadSceneTrigger1Script.pex
diff --git a/Scripts/AK69ChadSceneTrigger2Script.pex b/Scripts/AK69ChadSceneTrigger2Script.pex
diff --git a/Scripts/AK69ChadSceneTrigger3Script.pex b/Scripts/AK69ChadSceneTrigger3Script.pex
diff --git a/Scripts/AK69CookMGEFScript.pex b/Scripts/AK69CookMGEFScript.pex
diff --git a/Scripts/AK69EasterEggPlayerScript.pex b/Scripts/AK69EasterEggPlayerScript.pex
diff --git a/Scripts/AK69EasterEggsScript.pex b/Scripts/AK69EasterEggsScript.pex
diff --git a/Scripts/AK69FallowstoneAmbushScript.pex b/Scripts/AK69FallowstoneAmbushScript.pex
diff --git a/Scripts/AK69FallowstoneSceneTriggerScript.pex b/Scripts/AK69FallowstoneSceneTriggerScript.pex
diff --git a/Scripts/AK69HideoutTriggerScript.pex b/Scripts/AK69HideoutTriggerScript.pex
diff --git a/Scripts/AK69NutBoysSceneScript.pex b/Scripts/AK69NutBoysSceneScript.pex
diff --git a/Scripts/AK69PlayerSitScript.pex b/Scripts/AK69PlayerSitScript.pex
diff --git a/Scripts/AK69RiverSceneTriggerCamp.pex b/Scripts/AK69RiverSceneTriggerCamp.pex
diff --git a/Scripts/AK69SaSPlayerScript.pex b/Scripts/AK69SaSPlayerScript.pex
diff --git a/Scripts/AK69SaSSceneScript.pex b/Scripts/AK69SaSSceneScript.pex
diff --git a/Scripts/AK69ShaleTrigger1Script.pex b/Scripts/AK69ShaleTrigger1Script.pex
diff --git a/Scripts/AK69ShaleTrigger2Script.pex b/Scripts/AK69ShaleTrigger2Script.pex
diff --git a/Scripts/AK69StopSneakScript.pex b/Scripts/AK69StopSneakScript.pex
diff --git a/Scripts/AK69_QF_AK69CarrotQuest_05E02209.pex b/Scripts/AK69_QF_AK69CarrotQuest_05E02209.pex
diff --git a/Scripts/AK69_QF_AK69EasterEggsQuest_05B74A58.pex b/Scripts/AK69_QF_AK69EasterEggsQuest_05B74A58.pex
diff --git a/Scripts/AK69_SF_AK69EasterEgg1AfterSc_05490F2A.pex b/Scripts/AK69_SF_AK69EasterEgg1AfterSc_05490F2A.pex
diff --git a/Scripts/AK69_SF_AK69EasterEgg1Scene_05C0277B.pex b/Scripts/AK69_SF_AK69EasterEgg1Scene_05C0277B.pex
diff --git a/Scripts/AK69_SF_AK69KatanaCookOccScen_0563F7D7.pex b/Scripts/AK69_SF_AK69KatanaCookOccScen_0563F7D7.pex
diff --git a/Scripts/AK69_SF_AK69MegaraCookOccScen_0563F7D8.pex b/Scripts/AK69_SF_AK69MegaraCookOccScen_0563F7D8.pex
diff --git a/Scripts/AK69_SF_AK69ShaleCookOccScene_0563F7D9.pex b/Scripts/AK69_SF_AK69ShaleCookOccScene_0563F7D9.pex
diff --git a/Scripts/AK69_TIF__05052F95.pex b/Scripts/AK69_TIF__05052F95.pex
diff --git a/Scripts/AK69_TIF__05052F96.pex b/Scripts/AK69_TIF__05052F96.pex
diff --git a/Scripts/AK69_TIF__055633DC.pex b/Scripts/AK69_TIF__055633DC.pex
diff --git a/Scripts/AK69_TIF__056355C5.pex b/Scripts/AK69_TIF__056355C5.pex
diff --git a/Scripts/AK69_TIF__05E4E281.pex b/Scripts/AK69_TIF__05E4E281.pex
diff --git a/Scripts/AK69_TIF__05E4E283.pex b/Scripts/AK69_TIF__05E4E283.pex
diff --git a/Scripts/Source/AK69CQPlayerScript.psc b/Scripts/Source/AK69CQPlayerScript.psc
@@ -1,19 +1,30 @@
 Scriptname AK69CQPlayerScript extends ReferenceAlias  
 
 Location Property WhiterunBanneredMareLocation Auto  
+Location Property ChillfurrowFarmInteriorLocation Auto  
 int Property BanneredMareTime  Auto  
 GlobalVariable Property AK69MegaraRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
 GlobalVariable Property AK69CappyCarrotTimeVar Auto
 GlobalVariable Property GameDaysPassed Auto
+ObjectReference Property AK69CappyCarrot Auto
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
-if (GetOwningQuest().GetStage() == 40) && (akNewLoc == WhiterunBanneredMareLocation) && BanneredMareTime == 0 && AK69MegaraRecruitedVar.GetValue() == 1
+if GetOwningQuest().GetStage() == 20 && (akNewLoc == ChillfurrowFarmInteriorLocation) 
+    if (AK69MegaraRecruitedVar.GetValue() == 0 || AK69MegaraRelax.GetValue() == 1)
+    AK69CappyCarrot.BlockActivation(True)
+elseif (AK69MegaraRecruitedVar.GetValue() == 1 && AK69MegaraRelax.GetValue() == 0)
+    AK69CappyCarrot.BlockActivation(False)
+endif
+endif
+
+if (GetOwningQuest().GetStage() == 40) && (akNewLoc == WhiterunBanneredMareLocation) && BanneredMareTime == 0 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69MegaraRelax.GetValue() == 0
     GetOwningQuest().SetObjectiveCompleted(40)
     GetOwningQuest().SetObjectiveDisplayed(41)
     BanneredMareTime = 1
 endif
 if (GetOwningQuest().GetStage() == 50 && akNewLoc != akOldLoc)
-    If GameDaysPassed.GetValue() >= AK69CappyCarrotTimeVar.GetValue() && (AK69MegaraRecruitedVar.GetValue() == 1)
+    If GameDaysPassed.GetValue() >= AK69CappyCarrotTimeVar.GetValue() && (AK69MegaraRecruitedVar.GetValue() == 1) && AK69MegaraRelax.GetValue() == 0
         GetOwningQuest().SetObjectiveCompleted(50)
     GetOwningQuest().SetObjectiveDisplayed(51)
     Endif

diff --git a/Scripts/Source/AK69ChadSceneTrigger1Script.psc b/Scripts/Source/AK69ChadSceneTrigger1Script.psc
@@ -4,6 +4,7 @@ Scene Property ChadScene Auto
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69MegaraRecruitedVar Auto
 GlobalVariable Property AK69KatanaRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
 Quest Property AK69EasterEggsQuest Auto
 Actor Property Chadryn Auto
 Actor Property Katana Auto
@@ -12,7 +13,7 @@ Actor Property Katana Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Katana && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69EasterEggsQuest.GetStage() == 10)
+    if (akActionRef == Katana && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69MegaraRelax.GetValue() == 0 && AK69EasterEggsQuest.GetStage() == 10)
         if (SceneTriggered == 0) && (Chadryn.GetParentCell() == Game.GetPlayer().GetParentCell())
             if Game.GetPlayer().IsInCombat() == 0
                 ChadScene.Start()

diff --git a/Scripts/Source/AK69ChadSceneTrigger2Script.psc b/Scripts/Source/AK69ChadSceneTrigger2Script.psc
@@ -4,6 +4,7 @@ Scene Property ChadScene Auto
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69KatanaRecruited Auto
 GlobalVariable Property AK69MegaraRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
 Quest Property AK69EasterEggsQuest Auto
 Actor Property Chadryn Auto
 Actor Property Katana Auto
@@ -12,7 +13,7 @@ Actor Property Katana Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Katana && AK69KatanaRecruited.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69EasterEggsQuest.GetStage() == 20)
+    if (akActionRef == Katana && AK69KatanaRecruited.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69MegaraRelax.GetValue() == 0 && AK69EasterEggsQuest.GetStage() == 20)
         if (SceneTriggered == 0) && (Chadryn.GetParentCell() == Game.GetPlayer().GetParentCell())
             if Game.GetPlayer().IsInCombat() == 0
                 ChadScene.Start()

diff --git a/Scripts/Source/AK69ChadSceneTrigger3Script.psc b/Scripts/Source/AK69ChadSceneTrigger3Script.psc
@@ -4,6 +4,7 @@ Scene Property ChadScene Auto
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69MegaraRecruited Auto
 GlobalVariable Property AK69KatanaRecruited Auto
+GlobalVariable Property AK69MegaraRelax Auto
 Quest Property AK69EasterEggsQuest Auto
 Actor Property Chadryn Auto
 Actor Property Katana Auto
@@ -12,7 +13,7 @@ Actor Property Katana Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Katana && AK69KatanaRecruited.GetValue() == 1 && AK69MegaraRecruited.GetValue() == 1 && AK69EasterEggsQuest.GetStage() == 30)
+    if (akActionRef == Katana && AK69KatanaRecruited.GetValue() == 1 && AK69MegaraRecruited.GetValue() == 1 && AK69MegaraRelax.GetValue() == 0 && AK69EasterEggsQuest.GetStage() == 30)
         if (SceneTriggered == 0) && (Chadryn.GetParentCell() == Game.GetPlayer().GetParentCell())
             if Game.GetPlayer().IsInCombat() == 0
                 ChadScene.Start()

diff --git a/Scripts/Source/AK69CookMGEFScript.psc b/Scripts/Source/AK69CookMGEFScript.psc
@@ -4,6 +4,7 @@ Quest property AK69CookQuest auto
 ReferenceAlias property CookingPot auto
 Scene Property AK69CookScene auto
 Scene Property AK69NOCookScene auto
+Scene Property AK69CookOccScene Auto
 Actor property Follower auto
 
 ObjectReference targetobj1
@@ -20,6 +21,8 @@ Function CheckAround()
     targetobj1 = CookingPot.getReference()
     If (Follower.GetDistance(targetobj1) <= 700 && !targetobj1.IsFurnitureInUse())
         AK69CookScene.Start()
+    Elseif (Follower.GetDistance(targetobj1) <= 700 && targetobj1.IsFurnitureInUse())
+        AK69CookOccScene.Start()
      Else
         AK69NOCookScene.Start()
     endif

diff --git a/Scripts/Source/AK69EasterEggPlayerScript.psc b/Scripts/Source/AK69EasterEggPlayerScript.psc
@@ -25,6 +25,8 @@ Actor Property Katana Auto
 Actor Property Megara Auto
 GlobalVariable Property AK69KatanaRecruitedVar Auto
 GlobalVariable Property AK69MegaraRecruitedVar Auto
+GlobalVariable Property AK69KatanaRelax Auto
+GlobalVariable Property AK69MegaraRelax Auto
 ObjectReference Property AK69ChadrynWhiterunMarker  Auto 
 ObjectReference Property AK69NutBoysSceneTrigger  Auto 
 
@@ -67,7 +69,7 @@ If GameDaysPassed.GetValue() >= AK69NutBoysGoodbyeTimeVar.GetValue()
 Endif
 endif
 
-if (AK69KatanaRecruitedVar.GetValue() == 1) && (AK69MegaraRecruitedVar.GetValue() == 1) && (GetOwningQuest().GetStage() == 0)
+if (AK69KatanaRecruitedVar.GetValue() == 1) && AK69KatanaRelax.GetValue() == 0 && AK69MegaraRelax.GetValue() == 0 && (AK69MegaraRecruitedVar.GetValue() == 1) && (GetOwningQuest().GetStage() == 0)
     Chadryn.moveto(AK69ChadrynWhiterunMarker)
 if (GetOwningQuest().GetStage() == 0 && (akNewLoc == Whiterun) && Chadryn.GetParentCell() == Game.GetPlayer().GetParentCell())
     AK69ChadrynIntroScene.Start()

diff --git a/Scripts/Source/AK69EasterEggsScript.psc b/Scripts/Source/AK69EasterEggsScript.psc
@@ -16,6 +16,9 @@ Quest Property AK69CarrotQuest Auto
 ObjectReference Property AK69NutBoysSceneTrigger Auto
 
 bool property EEFlirtatious = false auto conditional
+bool property DoneWithChad = false auto conditional
+bool property DoneWithNutBoys = false auto conditional
+
 
 Function Setup()	
     Azatar.Enable()

diff --git a/Scripts/Source/AK69FallowstoneAmbushScript.psc b/Scripts/Source/AK69FallowstoneAmbushScript.psc
@@ -4,11 +4,13 @@ Scene Property AK69AmbushScene Auto
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69MegaraRecruitedVar Auto
 GlobalVariable Property AK69KatanaRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
+GlobalVariable Property AK69KatanaRelax Auto
 Quest Property AK69TheRavensLamentQuest Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69TheRavensLamentQuest.GetStage() == 110)
+    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69KatanaRelax.GetValue() == 0 && AK69MegaraRelax.GetValue() == 0 && AK69TheRavensLamentQuest.GetStage() == 110)
         if SceneTriggered == 0
             AK69TheRavensLamentQuest.SetObjectiveCompleted(110)
             AK69TheRavensLamentQuest.SetStage(120)

diff --git a/Scripts/Source/AK69FallowstoneSceneTriggerScript.psc b/Scripts/Source/AK69FallowstoneSceneTriggerScript.psc
@@ -6,11 +6,13 @@ ReferenceAlias Property ShaleVoice Auto
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69MegaraRecruited Auto
 GlobalVariable Property AK69KatanaRecruited Auto
+GlobalVariable Property AK69MegaraRelax Auto
+GlobalVariable Property AK69KatanaRelax Auto
 Quest Property AK69TheRavensLamentQuest Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruited.GetValue() == 1 && AK69MegaraRecruited.GetValue() == 1 && AK69TheRavensLamentQuest.GetStage() == 100)
+    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruited.GetValue() == 1 && AK69MegaraRecruited.GetValue() == 1 && AK69KatanaRelax.GetValue() == 0 && AK69MegaraRelax.GetValue() == 0 && AK69TheRavensLamentQuest.GetStage() == 100)
         if SceneTriggered == 0
             if Game.GetPlayer().IsInCombat() == 0
                 AK69RiverVoiceMarker.GetReference().MoveTo(Game.GetPlayer())

diff --git a/Scripts/Source/AK69HideoutTriggerScript.psc b/Scripts/Source/AK69HideoutTriggerScript.psc
@@ -2,13 +2,14 @@ Scriptname AK69HideoutTriggerScript extends ObjectReference
 
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69KatanaRecruited Auto
+GlobalVariable Property AK69KatanaRelax Auto
 Actor Property Katana auto
 Quest Property AK69KatanaPersonalQuest Auto
 Activator Property InVis Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruited.GetValue() == 1 && AK69KatanaPersonalQuest.GetStage() == 180)
+    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruited.GetValue() == 1 && AK69KatanaRelax.GetValue() == 0 && AK69KatanaPersonalQuest.GetStage() == 180)
         if SceneTriggered == 0
             Katana.EvaluatePackage()
             SceneTriggered = 1 

diff --git a/Scripts/Source/AK69NutBoysSceneScript.psc b/Scripts/Source/AK69NutBoysSceneScript.psc
@@ -5,10 +5,12 @@ int Property SceneTriggered  Auto
 Quest Property AK69EasterEggsQuest Auto
 GlobalVariable Property AK69KatanaRecruitedVar Auto
 GlobalVariable Property AK69MegaraRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
+GlobalVariable Property AK69KatanaRelax Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if akActionRef == Game.GetPlayer() && (AK69MegaraRecruitedVar.GetValue() == 1) && (AK69KatanaRecruitedVar.GetValue() == 1)
+    if akActionRef == Game.GetPlayer() && (AK69MegaraRecruitedVar.GetValue() == 1) && (AK69KatanaRecruitedVar.GetValue() == 1)  && AK69KatanaRelax.GetValue() == 0 && AK69MegaraRelax.GetValue() == 0 
         if SceneTriggered == 0
             if Game.GetPlayer().IsInCombat() == 0
                 AK69EasterEgg1Scene.Start()

diff --git a/Scripts/Source/AK69PlayerSitScript.psc b/Scripts/Source/AK69PlayerSitScript.psc
@@ -10,26 +10,26 @@ GlobalVariable Property AK69KatanaRelaxVar Auto
 
 
 Event OnSit(ObjectReference akFurniture)
-if (GetOwningQuest().GetStage() == 20 && Game.GetPlayer().GetCurrentLocation() == DrunkenHuntsman)
+if (GetOwningQuest().GetStage() == 20 && Game.GetPlayer().GetCurrentLocation() == DrunkenHuntsman && (AK69KatanaRecruited.GetValue() == 1) && (AK69KatanaRelaxVar.GetValue() == 0))
 GetOwningQuest().SetStage(30)
 Endif
 
-if (GetOwningQuest().GetStage() == 50 && Game.GetPlayer().GetCurrentLocation() == SilverBloodInn)
+if (GetOwningQuest().GetStage() == 50 && Game.GetPlayer().GetCurrentLocation() == SilverBloodInn && (AK69KatanaRecruited.GetValue() == 1) && (AK69KatanaRelaxVar.GetValue() == 0))
 GetOwningQuest().SetStage(60)
 Endif
 
-if (GetOwningQuest().GetStage() == 90 && Game.GetPlayer().GetCurrentLocation() == BeeandBarb)
+if (GetOwningQuest().GetStage() == 90 && Game.GetPlayer().GetCurrentLocation() == BeeandBarb && (AK69KatanaRecruited.GetValue() == 1) && (AK69KatanaRelaxVar.GetValue() == 0))
 GetOwningQuest().SetStage(100)
 Endif
 EndEvent
 
 ;This used to have Katana.IsInLocation(FrozenHearth)
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
-	if (GetOwningQuest().GetStage() == 130 && FrozenHearth == akNewLoc && (AK69KatanaRecruited.GetValue() ==1) && (AK69KatanaRelaxVar.GetValue() ==0))
+	if (GetOwningQuest().GetStage() == 130 && FrozenHearth == akNewLoc && (AK69KatanaRecruited.GetValue() == 1) && (AK69KatanaRelaxVar.GetValue() == 0))
 	GetOwningQuest().SetStage(140) 
 Endif
 
-	if (GetOwningQuest().GetStage() == 180 && Hideout == akNewLoc)	 
+	if (GetOwningQuest().GetStage() == 180 && Hideout == akNewLoc && (AK69KatanaRecruited.GetValue() == 1) && (AK69KatanaRelaxVar.GetValue() == 0))	 
 	GetOwningQuest().SetStage(190) 
 	Endif
 endEvent
diff --git a/Scripts/Source/AK69RiverSceneTriggerCamp.psc b/Scripts/Source/AK69RiverSceneTriggerCamp.psc
@@ -4,11 +4,12 @@ Actor Property Katana auto
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69MegaraRecruitedVar Auto
 GlobalVariable Property AK69KatanaRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
 Quest Property AK69TheRavensLamentQuest Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Katana && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69TheRavensLamentQuest.GetStage() == 210)
+    if (akActionRef == Katana && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69MegaraRelax.GetValue() == 0 && AK69TheRavensLamentQuest.GetStage() == 210)
         if SceneTriggered == 0
 
             AK69TheRavensLamentQuest.SetStage(220)

diff --git a/Scripts/Source/AK69SaSPlayerScript.psc b/Scripts/Source/AK69SaSPlayerScript.psc
@@ -13,8 +13,8 @@ GlobalVariable Property AK69MegaraRelax Auto
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
     if (GetOwningQuest().GetStage() == 30 && AK69RiverHideoutLocation == akNewLoc && (AK69KatanaRecruited.GetValue() ==1) && (AK69KatanaRelax.GetValue() ==0)) 
         GetOwningQuest().SetObjectiveCompleted(30)
-        if ((AK69MegaraRecruited.GetValue() ==1) && (AK69MegaraRelax.GetValue() ==0))
+    if ((AK69MegaraRecruited.GetValue() ==1) && (AK69MegaraRelax.GetValue() ==0))
         AK69SaSKRMegara.Start()
-        endif
+    endif
     Endif
 EndEvent
diff --git a/Scripts/Source/AK69SaSSceneScript.psc b/Scripts/Source/AK69SaSSceneScript.psc
@@ -3,25 +3,24 @@ Scriptname AK69SaSSceneScript extends ObjectReference
 Scene Property AK69KatlaNoMegara Auto  
 Scene Property AK69KatlaWithMegara Auto  
 int Property SceneTriggered1  Auto  
-int Property SceneTriggered2  Auto  
 GlobalVariable Property AK69MegaraRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
+GlobalVariable Property AK69KatanaRelax Auto
 GlobalVariable Property AK69KatanaRecruitedVar Auto
+GlobalVariable Property AK69KatlaNoMegaraFGVar Auto
 Quest Property AK69SugarandSpiceQuest Auto
+Actor Property Katana Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruitedVar.GetValue() == 1 && AK69SugarandSpiceQuest.GetStage() == 50)
-        if (SceneTriggered1 == 0 && AK69MegaraRecruitedVar.GetValue() == 0)
-            if Game.GetPlayer().IsInCombat() == 0
-                AK69KatlaNoMegara.Start()
-                SceneTriggered1 = 1
-            endif
-        endif
-        if (SceneTriggered2 == 0 && AK69MegaraRecruitedVar.GetValue() == 1)
-            if Game.GetPlayer().IsInCombat() == 0
-                AK69KatlaWithMegara.Start()
-                SceneTriggered2 = 1
-            endif
-        endif
+    IF (akActionRef == Katana && AK69SugarandSpiceQuest.GetStage() == 50 && Game.GetPlayer().IsInCombat() == 0) && SceneTriggered1 == 0
+        if AK69MegaraRecruitedVar.GetValue() == 1 && AK69MegaraRelax.GetValue() == 0 && SceneTriggered1 == 0 
+            AK69KatlaWithMegara.Start()
+            SceneTriggered1 = 1
+        elseif (AK69MegaraRecruitedVar.GetValue() == 0 || AK69MegaraRelax.GetValue() == 1) && AK69KatlaNoMegaraFGVar.GetValue() == 0
+            AK69KatlaNoMegara.Start()
+            SceneTriggered1 = 1
     endif
-endEvent
+endif
+endEvent
+
diff --git a/Scripts/Source/AK69ShaleTrigger1Script.psc b/Scripts/Source/AK69ShaleTrigger1Script.psc
@@ -4,11 +4,13 @@ Scene Property AK69FindShaleScene1 Auto
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69MegaraRecruitedVar Auto
 GlobalVariable Property AK69KatanaRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
+GlobalVariable Property AK69KatanaRelax Auto
 Quest Property AK69TheRavensLamentQuest Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69TheRavensLamentQuest.GetStage() == 140)
+    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69KatanaRelax.GetValue() == 0 && AK69MegaraRelax.GetValue() == 0 && AK69TheRavensLamentQuest.GetStage() == 140)
         if SceneTriggered == 0
 
                 AK69FindShaleScene1.Start()

diff --git a/Scripts/Source/AK69ShaleTrigger2Script.psc b/Scripts/Source/AK69ShaleTrigger2Script.psc
@@ -5,11 +5,13 @@ Scene Property AK69FindShaleScene2 Auto
 int Property SceneTriggered  Auto  
 GlobalVariable Property AK69MegaraRecruitedVar Auto
 GlobalVariable Property AK69KatanaRecruitedVar Auto
+GlobalVariable Property AK69MegaraRelax Auto
+GlobalVariable Property AK69KatanaRelax Auto
 Quest Property AK69TheRavensLamentQuest Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69TheRavensLamentQuest.GetStage() == 150)
+    if (akActionRef == Game.GetPlayer() && AK69KatanaRecruitedVar.GetValue() == 1 && AK69MegaraRecruitedVar.GetValue() == 1 && AK69KatanaRelax.GetValue() == 0 && AK69MegaraRelax.GetValue() == 0 && AK69TheRavensLamentQuest.GetStage() == 150)
         if SceneTriggered == 0
 
                 AK69TheRavensLamentQuest.SetObjectiveCompleted(140)

diff --git a/Scripts/Source/AK69StopSneakScript.psc b/Scripts/Source/AK69StopSneakScript.psc
@@ -2,5 +2,8 @@ Scriptname AK69StopSneakScript extends activemagiceffect
 
 Event OnEffectStart(Actor aktarget, Actor akcaster)    
     akcaster.StartSneaking()
-    Debug.Notification ("Stop sneaking, babe")
+    akcaster.Disable()
+    akcaster.Enable()
+    akcaster.EvaluatePackage()
+    Debug.Notification ("Stop sneaking! They are now disabled+enabled, too")
 endEvent