2.5.6

annakins · Aug 2, 2024 · de60bf1 · de60bf1
1 parent 7a4f686
commit de60bf1
Show file tree

Hide file tree

Showing 411 changed files with 1,095 additions and 183 deletions.
diff --git a/Katana.esp b/Katana.esp
diff --git a/Scripts/AK69CQPlayerScript.pex b/Scripts/AK69CQPlayerScript.pex
diff --git a/Scripts/AK69EasterEggPlayerScript.pex b/Scripts/AK69EasterEggPlayerScript.pex
diff --git a/Scripts/AK69LockpickMGEFScript.pex b/Scripts/AK69LockpickMGEFScript.pex
diff --git a/Scripts/AK69RavensLamentPlayerScript.pex b/Scripts/AK69RavensLamentPlayerScript.pex
diff --git a/Scripts/AK69_QF_AK69CarrotQuest_05E02209.pex b/Scripts/AK69_QF_AK69CarrotQuest_05E02209.pex
diff --git a/Scripts/AK69_QF_AK69SerenataQuest_058BB421.pex b/Scripts/AK69_QF_AK69SerenataQuest_058BB421.pex
diff --git a/Scripts/AK69_SF_AK69NOLockpickScene_0544A0B4.pex b/Scripts/AK69_SF_AK69NOLockpickScene_0544A0B4.pex
diff --git a/Scripts/AK69_TIF__0544A0AC.pex b/Scripts/AK69_TIF__0544A0AC.pex
diff --git a/Scripts/AK69_TIF__0544A0BB.pex b/Scripts/AK69_TIF__0544A0BB.pex
diff --git a/Scripts/AK69_TIF__0544A0C0.pex b/Scripts/AK69_TIF__0544A0C0.pex
diff --git a/Scripts/AK69_TIF__054542E0.pex b/Scripts/AK69_TIF__054542E0.pex
diff --git a/Scripts/AK69_TIF__054542E1.pex b/Scripts/AK69_TIF__054542E1.pex
diff --git a/Scripts/AK69_TIF__054635E9.pex b/Scripts/AK69_TIF__054635E9.pex
diff --git a/Scripts/AK69_TIF__054635EA.pex b/Scripts/AK69_TIF__054635EA.pex
diff --git a/Scripts/AK69_TIF__054635EB.pex b/Scripts/AK69_TIF__054635EB.pex
diff --git a/Scripts/AK69_TIF__054686EC.pex b/Scripts/AK69_TIF__054686EC.pex
diff --git a/Scripts/AK69_TIF__054686ED.pex b/Scripts/AK69_TIF__054686ED.pex
diff --git a/Scripts/AK69_TIF__054686EE.pex b/Scripts/AK69_TIF__054686EE.pex
diff --git a/Scripts/AK69_TIF__054686EF.pex b/Scripts/AK69_TIF__054686EF.pex
diff --git a/Scripts/AK69_TIF__054686F0.pex b/Scripts/AK69_TIF__054686F0.pex
diff --git a/Scripts/AK69_TIF__054686F5.pex b/Scripts/AK69_TIF__054686F5.pex
diff --git a/Scripts/AK69_TIF__054686F6.pex b/Scripts/AK69_TIF__054686F6.pex
diff --git a/Scripts/AK69_TIF__054686F7.pex b/Scripts/AK69_TIF__054686F7.pex
diff --git a/Scripts/AK69_TIF__054686F8.pex b/Scripts/AK69_TIF__054686F8.pex
diff --git a/Scripts/AK69_TIF__054686F9.pex b/Scripts/AK69_TIF__054686F9.pex
diff --git a/Scripts/AK69_TIF__054686FA.pex b/Scripts/AK69_TIF__054686FA.pex
diff --git a/Scripts/AK69_TIF__054686FB.pex b/Scripts/AK69_TIF__054686FB.pex
diff --git a/Scripts/AK69_TIF__054686FC.pex b/Scripts/AK69_TIF__054686FC.pex
diff --git a/Scripts/AK69_TIF__054686FD.pex b/Scripts/AK69_TIF__054686FD.pex
diff --git a/Scripts/AK69_TIF__054686FE.pex b/Scripts/AK69_TIF__054686FE.pex
diff --git a/Scripts/AK69_TIF__054686FF.pex b/Scripts/AK69_TIF__054686FF.pex
diff --git a/Scripts/AK69_TIF__05468700.pex b/Scripts/AK69_TIF__05468700.pex
diff --git a/Scripts/AK69_TIF__05468701.pex b/Scripts/AK69_TIF__05468701.pex
diff --git a/Scripts/AK69_TIF__05468702.pex b/Scripts/AK69_TIF__05468702.pex
diff --git a/Scripts/AK69_TIF__05468703.pex b/Scripts/AK69_TIF__05468703.pex
diff --git a/Scripts/AK69_TIF__05468704.pex b/Scripts/AK69_TIF__05468704.pex
diff --git a/Scripts/AK69_TIF__05468705.pex b/Scripts/AK69_TIF__05468705.pex
diff --git a/Scripts/AK69_TIF__05468706.pex b/Scripts/AK69_TIF__05468706.pex
diff --git a/Scripts/AK69_TIF__0546870D.pex b/Scripts/AK69_TIF__0546870D.pex
diff --git a/Scripts/AK69_TIF__0546870E.pex b/Scripts/AK69_TIF__0546870E.pex
diff --git a/Scripts/AK69_TIF__0546870F.pex b/Scripts/AK69_TIF__0546870F.pex
diff --git a/Scripts/AK69_TIF__05468710.pex b/Scripts/AK69_TIF__05468710.pex
diff --git a/Scripts/Source/AK69CQPlayerScript.psc b/Scripts/Source/AK69CQPlayerScript.psc
@@ -3,11 +3,19 @@ Scriptname AK69CQPlayerScript extends ReferenceAlias
 Location Property WhiterunBanneredMareLocation Auto  
 int Property BanneredMareTime  Auto  
 GlobalVariable Property AK69MegaraRecruitedVar Auto
+GlobalVariable Property AK69CappyCarrotTimeVar Auto
+GlobalVariable Property GameDaysPassed Auto
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 if (GetOwningQuest().GetStage() == 40) && (akNewLoc == WhiterunBanneredMareLocation) && BanneredMareTime == 0 && AK69MegaraRecruitedVar.GetValue() == 1
     GetOwningQuest().SetObjectiveCompleted(40)
     GetOwningQuest().SetObjectiveDisplayed(41)
     BanneredMareTime = 1
 endif
+if (GetOwningQuest().GetStage() == 50 && akNewLoc != akOldLoc)
+    If GameDaysPassed.GetValue() >= AK69CappyCarrotTimeVar.GetValue() && (AK69MegaraRecruitedVar.GetValue() == 1)
+        GetOwningQuest().SetObjectiveCompleted(50)
+    GetOwningQuest().SetObjectiveDisplayed(51)
+    Endif
+   endif
 EndEvent
diff --git a/Scripts/Source/AK69EasterEggPlayerScript.psc b/Scripts/Source/AK69EasterEggPlayerScript.psc
@@ -31,6 +31,7 @@ ObjectReference Property AK69NutBoysSceneTrigger  Auto
 int Property SolitudeTime  Auto  
 int Property RiftenTime  Auto  
 int Property RiverwoodTime  Auto  
+int Property InnTime  Auto  
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 
@@ -49,6 +50,11 @@ if (GetOwningQuest().GetStage() == 30) && (akNewLoc != Riften) && RiverwoodTime
     RiverwoodTime == 1
 endif
 
+if (GetOwningQuest().GetStage() == 60) && (akNewLoc != akOldLoc) && InnTime == 0
+    Chadryn.MoveTo(AK69ChadrynSleepingGiantInnMarker)
+    InnTime == 1
+endif
+
 if (AK69NutTalkNowVar.GetValue() == 1 && akNewLoc != BanneredMare)
 If GameDaysPassed.GetValue() >= AK69NutBoysGoodbyeTimeVar.GetValue()
     Azatar.Disable()

diff --git a/Scripts/Source/AK69LockpickMGEFScript.psc b/Scripts/Source/AK69LockpickMGEFScript.psc
@@ -0,0 +1,33 @@
+Scriptname AK69LockpickMGEFScript extends activemagiceffect  
+
+Quest property AK69KatanaLockpickQuest auto
+ReferenceAlias property UnlockMe auto
+Scene Property AK69LockpickScene auto
+Scene Property AK69NOLockpickScene auto
+Actor property Katana auto
+
+ObjectReference targetobj1
+
+Event OnEffectStart(Actor aktarget, Actor akcaster)    
+    AK69KatanaLockpickQuest.start()
+    CheckAround()    
+    Katana.EvaluatePackage()
+    ;Debug.Notification ("Lockpick effect started")
+EndEvent
+
+Function CheckAround()
+    UnlockMe.getReference()
+    targetobj1 = UnlockMe.getReference()
+    If Katana.GetDistance(UnlockMe.getReference()) <= 700
+    AK69LockpickScene.Start()
+     Else
+    AK69NOLockpickScene.Start()
+    endif
+    ;Debug.Notification ("Lockpick check + scene")
+EndFunction
+
+Event OnEffectFinish(Actor target, Actor caster)
+    AK69KatanaLockpickQuest.stop()
+    ;Debug.Notification ("Lockpick effect end")
+EndEvent 
+
diff --git a/Scripts/Source/AK69RavensLamentPlayerScript.psc b/Scripts/Source/AK69RavensLamentPlayerScript.psc
@@ -20,6 +20,7 @@ Keyword property LocTypeCity auto
 Keyword property LocTypeTown auto
 Keyword property LocTypeClearable auto
 Keyword property LocTypeDungeon auto
+Keyword property LocTypeBanditCamp auto
 Location Property RiftenBeeandBarbLocation auto
 Location Property IvarsteadVilemyrInnLocation auto
 
@@ -42,7 +43,7 @@ Event OnLocationChange(Location akOldLoc, Location akNewLoc)
         AK69TheRavensLamentVoiceScene2.Start()
         endif
     endif
-    if ((akNewLoc.HasKeyword(LocTypeClearable) || akNewLoc.HasKeyword(LocTypeDungeon))  && GetOwningQuest().GetStage() == 20 && !Game.GetPlayer().IsOnMount())
+    if ((akNewLoc.HasKeyword(LocTypeClearable) || akNewLoc.HasKeyword(LocTypeDungeon) || akNewLoc.HasKeyword(LocTypeBanditCamp))  && GetOwningQuest().GetStage() == 20 && !Game.GetPlayer().IsOnMount())
         if (AK69KatanaRecruited.GetValue() ==1) && (AK69KatanaRelax.GetValue() ==0) && (AK69MegaraRecruited.GetValue() ==1) && (AK69MegaraRelax.GetValue() ==0)
         AK69RiverVoiceMarker.GetReference().MoveTo(Game.GetPlayer())
         Utility.Wait(0.1)

diff --git a/Scripts/Source/AK69_QF_AK69CarrotQuest_05E02209.psc b/Scripts/Source/AK69_QF_AK69CarrotQuest_05E02209.psc
@@ -2,19 +2,14 @@
 ;NEXT FRAGMENT INDEX 15
 Scriptname AK69_QF_AK69CarrotQuest_05E02209 Extends Quest Hidden
 
-;BEGIN ALIAS PROPERTY Wilmuth
-;ALIAS PROPERTY TYPE ReferenceAlias
-ReferenceAlias Property Alias_Wilmuth Auto
-;END ALIAS PROPERTY
-
-;BEGIN ALIAS PROPERTY Chillfurrow
+;BEGIN ALIAS PROPERTY Player
 ;ALIAS PROPERTY TYPE ReferenceAlias
-ReferenceAlias Property Alias_Chillfurrow Auto
+ReferenceAlias Property Alias_Player Auto
 ;END ALIAS PROPERTY
 
-;BEGIN ALIAS PROPERTY Megara
+;BEGIN ALIAS PROPERTY Wilmuth
 ;ALIAS PROPERTY TYPE ReferenceAlias
-ReferenceAlias Property Alias_Megara Auto
+ReferenceAlias Property Alias_Wilmuth Auto
 ;END ALIAS PROPERTY
 
 ;BEGIN ALIAS PROPERTY Carrot
@@ -27,16 +22,30 @@ ReferenceAlias Property Alias_Carrot Auto
 ReferenceAlias Property Alias_Bannered_Mare Auto
 ;END ALIAS PROPERTY
 
-;BEGIN ALIAS PROPERTY Player
+;BEGIN ALIAS PROPERTY Megara
 ;ALIAS PROPERTY TYPE ReferenceAlias
-ReferenceAlias Property Alias_Player Auto
+ReferenceAlias Property Alias_Megara Auto
 ;END ALIAS PROPERTY
 
 ;BEGIN ALIAS PROPERTY Katana
 ;ALIAS PROPERTY TYPE ReferenceAlias
 ReferenceAlias Property Alias_Katana Auto
 ;END ALIAS PROPERTY
 
+;BEGIN ALIAS PROPERTY Chillfurrow
+;ALIAS PROPERTY TYPE ReferenceAlias
+ReferenceAlias Property Alias_Chillfurrow Auto
+;END ALIAS PROPERTY
+
+;BEGIN FRAGMENT Fragment_6
+Function Fragment_6()
+;BEGIN CODE
+Alias_Megara.GetActorReference().EvaluatePackage()
+SetObjectiveDisplayed(40)
+;END CODE
+EndFunction
+;END FRAGMENT
+
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
@@ -47,6 +56,22 @@ SetObjectiveCompleted(10)
 EndFunction
 ;END FRAGMENT
 
+;BEGIN FRAGMENT Fragment_8
+Function Fragment_8()
+;BEGIN AUTOCAST TYPE AK69CarrotQuestScript
+Quest __temp = self as Quest
+AK69CarrotQuestScript kmyQuest = __temp as AK69CarrotQuestScript
+;END AUTOCAST
+;BEGIN CODE
+Alias_Megara.GetActorReference().EvaluatePackage()
+Game.GetPlayer().RemoveItem(CarrotREF)
+setObjectiveCompleted(41)
+setObjectiveDisplayed(50)
+kmyQuest.CappyCarrotTimer()
+;END CODE
+EndFunction
+;END FRAGMENT
+
 ;BEGIN FRAGMENT Fragment_12
 Function Fragment_12()
 ;BEGIN AUTOCAST TYPE AK69CarrotQuestScript
@@ -63,6 +88,16 @@ kmyQuest.DeleteTheStuff()
 EndFunction
 ;END FRAGMENT
 
+;BEGIN FRAGMENT Fragment_4
+Function Fragment_4()
+;BEGIN CODE
+Alias_Megara.GetActorReference().EvaluatePackage()
+AK69CarrotQuestMegaraPickup.Start()
+SetObjectiveCompleted(20)
+;END CODE
+EndFunction
+;END FRAGMENT
+
 ;BEGIN FRAGMENT Fragment_10
 Function Fragment_10()
 ;BEGIN AUTOCAST TYPE AK69CarrotQuestScript
@@ -75,7 +110,7 @@ kmyQuest.DeleteTheStuff()
 
 Self.CompleteAllObjectives()
 AK69CQCompleted.SetValue(1)
-setObjectiveCompleted(50)
+setObjectiveCompleted(51)
 Self.Stop()
 ;END CODE
 EndFunction
@@ -92,41 +127,6 @@ AK69SugarandSpiceQuest.Start()
 EndFunction
 ;END FRAGMENT
 
-;BEGIN FRAGMENT Fragment_6
-Function Fragment_6()
-;BEGIN CODE
-Alias_Megara.GetActorReference().EvaluatePackage()
-SetObjectiveDisplayed(40)
-;END CODE
-EndFunction
-;END FRAGMENT
-
-;BEGIN FRAGMENT Fragment_4
-Function Fragment_4()
-;BEGIN CODE
-Alias_Megara.GetActorReference().EvaluatePackage()
-AK69CarrotQuestMegaraPickup.Start()
-SetObjectiveCompleted(20)
-;END CODE
-EndFunction
-;END FRAGMENT
-
-;BEGIN FRAGMENT Fragment_8
-Function Fragment_8()
-;BEGIN AUTOCAST TYPE AK69CarrotQuestScript
-Quest __temp = self as Quest
-AK69CarrotQuestScript kmyQuest = __temp as AK69CarrotQuestScript
-;END AUTOCAST
-;BEGIN CODE
-Alias_Megara.GetActorReference().EvaluatePackage()
-Game.GetPlayer().RemoveItem(CarrotREF)
-setObjectiveCompleted(40)
-setObjectiveDisplayed(50)
-kmyQuest.CappyCarrotTimer()
-;END CODE
-EndFunction
-;END FRAGMENT
-
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment
 
 ObjectReference Property CarrotREF  Auto