diff --git a/Remove script from Human Heart.esp b/Remove script from Human Heart.esp new file mode 100644 index 00000000..ea26d109 Binary files /dev/null and b/Remove script from Human Heart.esp differ diff --git a/scripts/_00E_FS_NQR03_PlayerAlias.pex b/scripts/_00E_FS_NQR03_PlayerAlias.pex new file mode 100644 index 00000000..88ece63a Binary files /dev/null and b/scripts/_00E_FS_NQR03_PlayerAlias.pex differ diff --git a/scripts/_00e_fs_nqr03_heartsc.pex b/scripts/_00e_fs_nqr03_heartsc.pex index af503dbc..501d03b4 100644 Binary files a/scripts/_00e_fs_nqr03_heartsc.pex and b/scripts/_00e_fs_nqr03_heartsc.pex differ diff --git a/scripts/qf_fs_nqr03_0014cea2.pex b/scripts/qf_fs_nqr03_0014cea2.pex index 07ea3788..96c1bcf9 100644 Binary files a/scripts/qf_fs_nqr03_0014cea2.pex and b/scripts/qf_fs_nqr03_0014cea2.pex differ diff --git a/source/scripts/_00E_FS_NQR03_PlayerAlias.psc b/source/scripts/_00E_FS_NQR03_PlayerAlias.psc new file mode 100644 index 00000000..3fcea575 --- /dev/null +++ b/source/scripts/_00E_FS_NQR03_PlayerAlias.psc @@ -0,0 +1,30 @@ +Scriptname _00E_FS_NQR03_PlayerAlias extends ReferenceAlias Hidden + +; _00E_FS_NQR03_NessahsHeart is tracked in _00E_FS_NQR03_HeartSC + +event OnInit() + AddInventoryEventFilter(HumanHeart) +endevent + +Event OnItemAdded(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akSourceContainer) + + _00E_FS_NQR03_Functions rQuest = GetOwningQuest() as _00E_FS_NQR03_Functions + int iStage = rQuest.GetCurrentStageID() + + if iStage < 90 + return + endif + + AddInventoryEventFilter(_00E_EmptyFormlist) + RemoveInventoryEventFilter(HumanHeart) + + If iStage <= 95 + rQuest.ClearPlayerAlias() + rQuest.SetObjectiveDisplayed(45, True) + endif + +EndEvent + +Ingredient Property HumanHeart Auto + +FormList Property _00E_EmptyFormlist Auto diff --git a/source/scripts/_00e_fs_nqr03_heartsc.psc b/source/scripts/_00e_fs_nqr03_heartsc.psc index 18c17011..3277e85f 100644 --- a/source/scripts/_00e_fs_nqr03_heartsc.psc +++ b/source/scripts/_00e_fs_nqr03_heartsc.psc @@ -5,14 +5,15 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo If FS_NQR03.GetCurrentStageID() >= 90 && FS_NQR03.GetCurrentStageID() <= 95 If akNewContainer == PlayerREF && !bDone bDone = True - If bIsNessahsHeart - FS_NQR03.SetObjectiveDisplayed(40, True, True) - Else - FS_NQR03.ClearPlayerAlias() - FS_NQR03.SetObjectiveDisplayed(45, True) - EndIf - ElseIf akOldContainer == PlayerREF && bIsNessahsHeart - Self.Disable() + FS_NQR03.SetObjectiveDisplayed(40, True, True) + ElseIf akOldContainer == PlayerREF + if akNewContainer + akNewContainer.RemoveItem(_00E_FS_NQR03_NessahsHeart, 1, true) + else + Disable() + Delete() + endif + PlayerREF.AddItem(_00E_FS_NQR03_NessahsHeart, 1, true) _00E_FS_CantDropItemMessage.Show() EndIf @@ -21,7 +22,6 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo EndEvent bool bDone -bool Property bIsNessahsHeart Auto Actor Property PlayerREF Auto @@ -29,4 +29,4 @@ Ingredient Property _00E_FS_NQR03_NessahsHeart Auto _00E_FS_NQR03_Functions Property FS_NQR03 Auto -Message Property _00E_FS_CantDropItemMessage Auto \ No newline at end of file +Message Property _00E_FS_CantDropItemMessage Auto diff --git a/source/scripts/qf_fs_nqr03_0014cea2.psc b/source/scripts/qf_fs_nqr03_0014cea2.psc index 7c226897..784d4749 100644 --- a/source/scripts/qf_fs_nqr03_0014cea2.psc +++ b/source/scripts/qf_fs_nqr03_0014cea2.psc @@ -2,29 +2,29 @@ ;NEXT FRAGMENT INDEX 13 Scriptname QF_FS_NQR03_0014CEA2 Extends Quest Hidden -;BEGIN ALIAS PROPERTY FS_NQR03_SC01_Scion +;BEGIN ALIAS PROPERTY Tharael ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_FS_NQR03_SC01_Scion Auto +ReferenceAlias Property Alias_Tharael Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY FS_NQR03_Flavour_03_Akolythe_Male +;BEGIN ALIAS PROPERTY FS_NQR03_SC02_Flavour_NoviceFemale ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_FS_NQR03_Flavour_03_Akolythe_Male Auto +ReferenceAlias Property Alias_FS_NQR03_SC02_Flavour_NoviceFemale Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY Sister_Envy +;BEGIN ALIAS PROPERTY FS_NQR03_DetachedFatherVoice ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_Sister_Envy Auto +ReferenceAlias Property Alias_FS_NQR03_DetachedFatherVoice Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY FS_NQR03_SC02_Flavour_NoviceFemale +;BEGIN ALIAS PROPERTY Brother_Greed ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_FS_NQR03_SC02_Flavour_NoviceFemale Auto +ReferenceAlias Property Alias_Brother_Greed Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY Brother_Greed +;BEGIN ALIAS PROPERTY FS_NQR03_Flavour_03_Akolythe_Male ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_Brother_Greed Auto +ReferenceAlias Property Alias_FS_NQR03_Flavour_03_Akolythe_Male Auto ;END ALIAS PROPERTY ;BEGIN ALIAS PROPERTY Sister_Pride @@ -37,19 +37,24 @@ ReferenceAlias Property Alias_Sister_Pride Auto ReferenceAlias Property Alias_FS_NQR03_Flavour_03_Akolythe_Female Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY FS_NQR03_MissingPages +;BEGIN ALIAS PROPERTY FS_NQR03_SC01_Scion ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_FS_NQR03_MissingPages Auto +ReferenceAlias Property Alias_FS_NQR03_SC01_Scion Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY First_Seer +;BEGIN ALIAS PROPERTY FS_NQR03_SC02_Flavour_VoiceMale ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_First_Seer Auto +ReferenceAlias Property Alias_FS_NQR03_SC02_Flavour_VoiceMale Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY FS_NQR03_SC02_Flavour_VoiceMale +;BEGIN ALIAS PROPERTY FS_NQR03_Poster ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_FS_NQR03_SC02_Flavour_VoiceMale Auto +ReferenceAlias Property Alias_FS_NQR03_Poster Auto +;END ALIAS PROPERTY + +;BEGIN ALIAS PROPERTY First_Seer +;ALIAS PROPERTY TYPE ReferenceAlias +ReferenceAlias Property Alias_First_Seer Auto ;END ALIAS PROPERTY ;BEGIN ALIAS PROPERTY Bard @@ -57,24 +62,24 @@ ReferenceAlias Property Alias_FS_NQR03_SC02_Flavour_VoiceMale Auto ReferenceAlias Property Alias_Bard Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY Brother_Sorrow +;BEGIN ALIAS PROPERTY Sister_Envy ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_Brother_Sorrow Auto +ReferenceAlias Property Alias_Sister_Envy Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY FS_NQR03_Poster +;BEGIN ALIAS PROPERTY Brother_Sorrow ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_FS_NQR03_Poster Auto +ReferenceAlias Property Alias_Brother_Sorrow Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY FS_NQR03_DetachedFatherVoice +;BEGIN ALIAS PROPERTY Player ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_FS_NQR03_DetachedFatherVoice Auto +ReferenceAlias Property Alias_Player Auto ;END ALIAS PROPERTY -;BEGIN ALIAS PROPERTY Tharael +;BEGIN ALIAS PROPERTY FS_NQR03_MissingPages ;ALIAS PROPERTY TYPE ReferenceAlias -ReferenceAlias Property Alias_Tharael Auto +ReferenceAlias Property Alias_FS_NQR03_MissingPages Auto ;END ALIAS PROPERTY ;BEGIN FRAGMENT Fragment_6 @@ -89,38 +94,38 @@ kmyQuest.TeleportPlayer() EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_0 -Function Fragment_0() +;BEGIN FRAGMENT Fragment_1 +Function Fragment_1() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.SetUp() +kmyQuest.UnlockDoorEnableTharael() ;END CODE EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_8 -Function Fragment_8() +;BEGIN FRAGMENT Fragment_10 +Function Fragment_10() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.UpdateObjectives_02() +kmyQuest.UpdateObjectives_03() ;END CODE EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_4 -Function Fragment_4() +;BEGIN FRAGMENT Fragment_8 +Function Fragment_8() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.StartSC04() +kmyQuest.UpdateObjectives_02() ;END CODE EndFunction ;END FRAGMENT @@ -138,38 +143,38 @@ kmyQuest.DisableBard() EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_2 -Function Fragment_2() +;BEGIN FRAGMENT Fragment_9 +Function Fragment_9() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.StartSC02() +kmyQuest.UpdateObjectives_03() ;END CODE EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_10 -Function Fragment_10() +;BEGIN FRAGMENT Fragment_5 +Function Fragment_5() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.UpdateObjectives_03() +kmyQuest.UpdateObjectives_01() ;END CODE EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_9 -Function Fragment_9() +;BEGIN FRAGMENT Fragment_11 +Function Fragment_11() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.UpdateObjectives_03() +kmyQuest.FinishUp() ;END CODE EndFunction ;END FRAGMENT @@ -186,38 +191,38 @@ kmyQuest.GivePlayerNote() EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_5 -Function Fragment_5() +;BEGIN FRAGMENT Fragment_4 +Function Fragment_4() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.UpdateObjectives_01() +kmyQuest.StartSC04() ;END CODE EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_1 -Function Fragment_1() +;BEGIN FRAGMENT Fragment_2 +Function Fragment_2() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.UnlockDoorEnableTharael() +kmyQuest.StartSC02() ;END CODE EndFunction ;END FRAGMENT -;BEGIN FRAGMENT Fragment_11 -Function Fragment_11() +;BEGIN FRAGMENT Fragment_0 +Function Fragment_0() ;BEGIN AUTOCAST TYPE _00E_FS_NQR03_Functions Quest __temp = self as Quest _00E_FS_NQR03_Functions kmyQuest = __temp as _00E_FS_NQR03_Functions ;END AUTOCAST ;BEGIN CODE -kmyQuest.FinishUp() +kmyQuest.SetUp() ;END CODE EndFunction ;END FRAGMENT