diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index 40efdb39..d0be69ad 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/Skyrim.esm b/Skyrim.esm index 2e7012bb..b162cf33 100644 Binary files a/Skyrim.esm and b/Skyrim.esm differ diff --git a/scripts/_00E_IntegrityCheckAlias.pex b/scripts/_00E_IntegrityCheckAlias.pex index e2f92cda..2d9a4d2d 100644 Binary files a/scripts/_00E_IntegrityCheckAlias.pex and b/scripts/_00E_IntegrityCheckAlias.pex differ diff --git a/scripts/_00e_ark_travelcrossroadssc.pex b/scripts/_00e_ark_travelcrossroadssc.pex index 68be6a68..dc853fd8 100644 Binary files a/scripts/_00e_ark_travelcrossroadssc.pex and b/scripts/_00e_ark_travelcrossroadssc.pex differ diff --git a/scripts/_00e_chestanddoorlockscript.pex b/scripts/_00e_chestanddoorlockscript.pex index 57af2c38..f8b13979 100644 Binary files a/scripts/_00e_chestanddoorlockscript.pex and b/scripts/_00e_chestanddoorlockscript.pex differ diff --git a/scripts/_00e_fs_nqr01_startboxsc.pex b/scripts/_00e_fs_nqr01_startboxsc.pex index 5a738f57..ddd38509 100644 Binary files a/scripts/_00e_fs_nqr01_startboxsc.pex and b/scripts/_00e_fs_nqr01_startboxsc.pex differ diff --git a/scripts/_00e_fs_sleightofhand_hiddenslotsc.pex b/scripts/_00e_fs_sleightofhand_hiddenslotsc.pex index 7f79c22d..4b3bfa1c 100644 Binary files a/scripts/_00e_fs_sleightofhand_hiddenslotsc.pex and b/scripts/_00e_fs_sleightofhand_hiddenslotsc.pex differ diff --git a/scripts/_00e_lootcontainer.pex b/scripts/_00e_lootcontainer.pex index 4ad05063..9b67c8a6 100644 Binary files a/scripts/_00e_lootcontainer.pex and b/scripts/_00e_lootcontainer.pex differ diff --git a/scripts/_00e_mq13a_functions.pex b/scripts/_00e_mq13a_functions.pex index 97daeafe..751cd28c 100644 Binary files a/scripts/_00e_mq13a_functions.pex and b/scripts/_00e_mq13a_functions.pex differ diff --git a/scripts/_00e_mq14_functions.pex b/scripts/_00e_mq14_functions.pex index e4afb6f9..73a30acb 100644 Binary files a/scripts/_00e_mq14_functions.pex and b/scripts/_00e_mq14_functions.pex differ diff --git a/scripts/_00e_mq17_functions.pex b/scripts/_00e_mq17_functions.pex index e2836323..238770d1 100644 Binary files a/scripts/_00e_mq17_functions.pex and b/scripts/_00e_mq17_functions.pex differ diff --git a/scripts/_00e_mqp02_functions.pex b/scripts/_00e_mqp02_functions.pex index dc9b50d1..f1ee7ee5 100644 Binary files a/scripts/_00e_mqp02_functions.pex and b/scripts/_00e_mqp02_functions.pex differ diff --git a/scripts/_00e_myradsystem02.pex b/scripts/_00e_myradsystem02.pex index b1e9861e..ecc56297 100644 Binary files a/scripts/_00e_myradsystem02.pex and b/scripts/_00e_myradsystem02.pex differ diff --git a/source/scripts/_00E_IntegrityCheckAlias.psc b/source/scripts/_00E_IntegrityCheckAlias.psc index 3dc44376..186558f1 100644 --- a/source/scripts/_00E_IntegrityCheckAlias.psc +++ b/source/scripts/_00E_IntegrityCheckAlias.psc @@ -10,9 +10,12 @@ EndEvent Event OnUpdate() + if _00E_FS_IsForgottenStoriesActivated == None + _00E_FS_IsForgottenStoriesActivated = Game.GetForm(0x4320E) as GlobalVariable + endif + ; If Enderal - Forgotten Stories.esm is not loaded, kick the player back to main menu if _00E_FS_IsForgottenStoriesActivated.GetValue() as Int != 1 - Utility.wait(0.1) Game.QuitToMainMenu() Debug.MessageBox("Enderal - Forgotten Stories.esm is not loaded! The game will not run properly.") EndIf diff --git a/source/scripts/_00e_ark_travelcrossroadssc.psc b/source/scripts/_00e_ark_travelcrossroadssc.psc index fc1413b4..be605d89 100644 --- a/source/scripts/_00e_ark_travelcrossroadssc.psc +++ b/source/scripts/_00e_ark_travelcrossroadssc.psc @@ -143,7 +143,6 @@ Message Property _00E_FastTravel_Ark_SelectionMenu_02 Auto Message Property _00E_FastTravel_Ark_SelectionMenu_Restricted1 Auto GlobalVariable Property _00E_TeleportGlobal Auto -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto ObjectReference Property _00E_FastTravel_Ark_Marker_CapitalCity_Entrance Auto ObjectReference Property _00E_FastTravel_Ark_Marker_CapitalCity_StrangerQuarter Auto diff --git a/source/scripts/_00e_chestanddoorlockscript.psc b/source/scripts/_00e_chestanddoorlockscript.psc index 68ea9cdb..29d81187 100644 --- a/source/scripts/_00e_chestanddoorlockscript.psc +++ b/source/scripts/_00e_chestanddoorlockscript.psc @@ -12,19 +12,13 @@ float fPlayerLockpicking bool bDone -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto - Message Property _00E_FS_LockpickingGoldBuffMSG Auto MiscObject Property Gold001 Auto Event OnOpen(ObjectReference akActionRef) - If _00E_FS_IsForgottenStoriesActivated == None ; just in case, all properties in all doors and containers should be filled by now - _00E_FS_IsForgottenStoriesActivated = Game.GetForm(0x0004320E) as GlobalVariable - EndIf - - if !bDone && (Self.GetBaseObject().GetType() == 28) && _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 ; check if it's a container otherwise the script tries to call this stuff on doors + if !bDone && (Self.GetBaseObject().GetType() == 28) ; check if it's a container otherwise the script tries to call this stuff on doors bDone = True iCurrentGoldCount = Self.GetItemCount(Gold001) @@ -59,17 +53,7 @@ EndFunction ;===================================================================================== Event OnLoad() - - If _00E_FS_IsForgottenStoriesActivated == None ; just in case, all properties in all doors and containers should be filled by now - _00E_FS_IsForgottenStoriesActivated = Game.GetForm(0x0004320E) as GlobalVariable - Gold001 = Game.GetFormFromFile(0x0000000F, "Skyrim.esm") as MiscObject - _00E_FS_LockpickingGoldBuffMSG = Game.GetFormFromFile(0x0001ED74, "Enderal - Forgotten Stories.esm") as Message - _00E_sDoorLocked = Game.GetForm(0x00141570) as Message - _00E_Game_UnlockNeedsSkill = Game.GetForm(0x00042AE0) as Message - EndIf - BlockActivation(True) - EndEvent Int Property LOCK_LEVEL_NOVICE = 1 AutoReadOnly diff --git a/source/scripts/_00e_fs_nqr01_startboxsc.psc b/source/scripts/_00e_fs_nqr01_startboxsc.psc index 234456de..956a88e0 100644 --- a/source/scripts/_00e_fs_nqr01_startboxsc.psc +++ b/source/scripts/_00e_fs_nqr01_startboxsc.psc @@ -2,7 +2,7 @@ Scriptname _00E_FS_NQR01_StartBoxSC extends ObjectReference Event OnTriggerEnter(ObjectReference akActionRef) - if !bDone && _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 + if !bDone if FS_NQR01.GetStage() < 1 @@ -16,10 +16,4 @@ Event OnTriggerEnter(ObjectReference akActionRef) EndEvent bool bDone - - -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto - -Actor Property PlayerREF Auto - -Quest Property FS_NQR01 Auto \ No newline at end of file +Quest Property FS_NQR01 Auto diff --git a/source/scripts/_00e_fs_sleightofhand_hiddenslotsc.psc b/source/scripts/_00e_fs_sleightofhand_hiddenslotsc.psc index 0c84c6f7..239ee6d5 100644 --- a/source/scripts/_00e_fs_sleightofhand_hiddenslotsc.psc +++ b/source/scripts/_00e_fs_sleightofhand_hiddenslotsc.psc @@ -8,7 +8,7 @@ Scriptname _00E_FS_SleightOfHand_HiddenSlotSC extends ObjectReference Event OnActivate(ObjectReference akActionRef) - If _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 && !Self.IsLocked() && akActionRef == PlayerREF + If !Self.IsLocked() && akActionRef == PlayerREF If !bSetUp SetUpHiddenSlot() @@ -254,7 +254,6 @@ Cell ContainerParentCell Actor Property PlayerREF Auto -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto GlobalVariable Property PlayerLevel Auto GlobalVariable Property _00E_HiddenSlotAchievementUnlocked Auto diff --git a/source/scripts/_00e_lootcontainer.psc b/source/scripts/_00e_lootcontainer.psc index 76bc8ac8..6acc9358 100644 --- a/source/scripts/_00e_lootcontainer.psc +++ b/source/scripts/_00e_lootcontainer.psc @@ -33,18 +33,13 @@ EndEvent Function CheckForGoldIncrementation() - if _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 + bDone = True + + iCurrentGoldCount = Self.GetItemCount(Gold001) + fPlayerLockpicking = PlayerREF.GetActorValue("Lockpicking") - bDone = True - - iCurrentGoldCount = Self.GetItemCount(Gold001) - fPlayerLockpicking = PlayerREF.GetActorValue("Lockpicking") - - if fPlayerLockpicking >= 15 - IncrementGold() - EndIf - - + if fPlayerLockpicking >= 15 + IncrementGold() EndIf EndFunction @@ -69,7 +64,6 @@ int iGoldMultiplicator = 5 float fPlayerLockpicking int iCurrentGoldCount -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto Actor Property PlayerREF Auto Sound Property ITMGoldUp Auto diff --git a/source/scripts/_00e_mq13a_functions.psc b/source/scripts/_00e_mq13a_functions.psc index 0a337353..ec7ec6d0 100644 --- a/source/scripts/_00e_mq13a_functions.psc +++ b/source/scripts/_00e_mq13a_functions.psc @@ -28,9 +28,7 @@ Function SetUp() ; This starts the Forgotten Stories - quest for Yuslan. - if _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 - FS_NQ01.SetStage(5) - EndIf + FS_NQ01.SetStage(5) _00E_MC_YuslanREF.MoveTo(MQ13a_SC01_YuslanMarker) _00E_MC_LexREF.MoveTo(MQ13a_SC01_LexMarkerREF) @@ -44,12 +42,8 @@ Function AddScrollSetUpSC02() _00E_SC_KurmaiREF.Enable() EndIf - If _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 - - if FS_NQ01.GetStage() < 10 - FS_NQ01.SetStage(10) - EndIf - + if FS_NQ01.GetStage() < 10 + FS_NQ01.SetStage(10) EndIf _00E_SC_KurmaiREF.MoveTo(MQ13a_SC03_KurmaiStartMarker) @@ -617,7 +611,6 @@ GlobalVariable Property JesparFlirtCounter Auto GlobalVariable Property _00E_TeleportGlobal Auto GlobalVariable Property _00E_MQ13a_JesparDump Auto GlobalVariable Property _00E_MQ13a_CaliaDump Auto -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto Message Property MQ13a_WaitPrompt Auto Message Property MQ13a_SC07_WaitPrompt02 Auto diff --git a/source/scripts/_00e_mq14_functions.psc b/source/scripts/_00e_mq14_functions.psc index b33bdf9d..d2c854d7 100644 --- a/source/scripts/_00e_mq14_functions.psc +++ b/source/scripts/_00e_mq14_functions.psc @@ -175,7 +175,7 @@ Function LockUpEverything() SetObjectiveFailed(5) EndIf - If !FS_NQ01.IsCompleted() && _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 + If !FS_NQ01.IsCompleted() FS_NQ01.SetStage(200) EndIf @@ -720,7 +720,6 @@ EffectShader Property _00E_BloodyFXShader Auto GlobalVariable Property _00E_TeleportGlobal Auto GlobalVariable Property Timescale Auto GlobalVariable Property _00E_MQ14_Readyfor10 Auto -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto Outfit Property _00E_MC_Calia_SimpleClothingBarefeet Auto Outfit Property MinerClothesOutfit01NoBoots Auto diff --git a/source/scripts/_00e_mq17_functions.psc b/source/scripts/_00e_mq17_functions.psc index 04f508a9..12958c04 100644 --- a/source/scripts/_00e_mq17_functions.psc +++ b/source/scripts/_00e_mq17_functions.psc @@ -933,7 +933,7 @@ Function SetUpEpilogue() if bHasChosenEndingKatharsis - if _00E_FS_DreamflowerConsumed.GetValueInt() == 1 && _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 + if _00E_FS_DreamflowerConsumed.GetValueInt() == 1 FS_MQ18c.SetStage(5) @@ -1065,7 +1065,6 @@ GlobalVariable Property MQ17_JesparFinalCompanion Auto GlobalVariable Property CompanionIsTalking Auto GlobalVariable Property MQ17_BlackGuardianIsTalking Auto GlobalVariable Property _00E_FS_DreamflowerConsumed Auto -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto GlobalVariable Property _00E_VideoSkip Auto ImageSpaceModifier Property _00E_MQ16_VisionIMOD Auto diff --git a/source/scripts/_00e_mqp02_functions.psc b/source/scripts/_00e_mqp02_functions.psc index 805e01b4..9065ebb9 100644 --- a/source/scripts/_00e_mqp02_functions.psc +++ b/source/scripts/_00e_mqp02_functions.psc @@ -110,9 +110,7 @@ Function StartSC2() Game.EnablePlayerControls() MQP02_SC3_Navcut.Disable() - If _00E_FS_IsForgottenStoriesActivated.GetValueInt() == 1 - AddRacialAbilites() - EndIf + AddRacialAbilites() FreightRoomDoor.GetReference().Lock(False) Riq.GetActorReference().Enable() @@ -504,8 +502,6 @@ MusicType Property _00E_Music_Special_WiegeDesLebens Auto Topic Property MQP02_D3_SebaldCombatCommentTopic Auto -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto - Actor Property PlayerREF Auto Idle Property TG05_GetUp Auto diff --git a/source/scripts/_00e_myradsystem02.psc b/source/scripts/_00e_myradsystem02.psc index 7548d6a1..797baf44 100644 --- a/source/scripts/_00e_myradsystem02.psc +++ b/source/scripts/_00e_myradsystem02.psc @@ -144,8 +144,6 @@ EndFunction bool bDone int MyradFligthCounter = 0 -GlobalVariable Property _00E_FS_IsForgottenStoriesActivated Auto - Quest Property MQ04 Auto Keyword Property _00E_FS_MyradTakeOffMarker Auto diff --git a/strings/skyrim_english.strings b/strings/skyrim_english.strings index f8fd7d51..93ae9d38 100644 Binary files a/strings/skyrim_english.strings and b/strings/skyrim_english.strings differ