diff --git a/Quest potions update.esp b/Quest potions update.esp new file mode 100644 index 00000000..5a476df3 Binary files /dev/null and b/Quest potions update.esp differ diff --git a/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.pex b/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.pex index a664757e..cb5c7747 100644 Binary files a/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.pex and b/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.pex differ diff --git a/scripts/PRKF__00E_FS_NQ07_CraftPotio_0300146E.pex b/scripts/PRKF__00E_FS_NQ07_CraftPotio_0300146E.pex index 4b169697..f65a1912 100644 Binary files a/scripts/PRKF__00E_FS_NQ07_CraftPotio_0300146E.pex and b/scripts/PRKF__00E_FS_NQ07_CraftPotio_0300146E.pex differ diff --git a/scripts/_00e_fs_nq05_functions.pex b/scripts/_00e_fs_nq05_functions.pex index 112e2239..24ad6498 100644 Binary files a/scripts/_00e_fs_nq05_functions.pex and b/scripts/_00e_fs_nq05_functions.pex differ diff --git a/source/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.psc b/source/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.psc index f684f2c5..9004a4fc 100644 --- a/source/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.psc +++ b/source/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.psc @@ -1,15 +1,17 @@ ;BEGIN FRAGMENT CODE - Do not edit anything between this and the end comment -;NEXT FRAGMENT INDEX 12 +;NEXT FRAGMENT INDEX 14 Scriptname PRKF__00E_CraftQuestPotionPe_0300146D Extends Perk Hidden ;BEGIN FRAGMENT Fragment_7 Function Fragment_7(ObjectReference akTargetRef, Actor akActor) ;BEGIN CODE if FS_NQ05.GetCurrentStageID() >= 40 - Game.GetPlayer().RemovePerk(Self) - return + akActor.RemovePerk(Self) +else + (FS_NQ05 as _00E_FS_NQ05_Functions).AskCreatePotion() endif -(FS_NQ05 as _00E_FS_NQ05_Functions).AskCreatePotion() +Utility.wait(0.3) +akTargetRef.Activate(akActor, false) ;END CODE EndFunction ;END FRAGMENT diff --git a/source/scripts/PRKF__00E_FS_NQ07_CraftPotio_0300146E.psc b/source/scripts/PRKF__00E_FS_NQ07_CraftPotio_0300146E.psc index dc7e2e4c..2b1a9897 100644 --- a/source/scripts/PRKF__00E_FS_NQ07_CraftPotio_0300146E.psc +++ b/source/scripts/PRKF__00E_FS_NQ07_CraftPotio_0300146E.psc @@ -1,15 +1,17 @@ ;BEGIN FRAGMENT CODE - Do not edit anything between this and the end comment -;NEXT FRAGMENT INDEX 10 +;NEXT FRAGMENT INDEX 11 Scriptname PRKF__00E_FS_NQ07_CraftPotio_0300146E Extends Perk Hidden ;BEGIN FRAGMENT Fragment_0 Function Fragment_0(ObjectReference akTargetRef, Actor akActor) ;BEGIN CODE if FS_NQ07.GetCurrentStageID() >= 120 - Game.GetPlayer().RemovePerk(Self) - return + akActor.RemovePerk(Self) +else + (FS_NQ07 as _00E_FS_NQ07_Functions).AskCreatePotion() endif -(FS_NQ07 as _00E_FS_NQ07_Functions).AskCreatePotion() +Utility.wait(0.3) +akTargetRef.Activate(akActor, false) ;END CODE EndFunction ;END FRAGMENT diff --git a/source/scripts/_00e_fs_nq05_functions.psc b/source/scripts/_00e_fs_nq05_functions.psc index 175b942f..53738295 100644 --- a/source/scripts/_00e_fs_nq05_functions.psc +++ b/source/scripts/_00e_fs_nq05_functions.psc @@ -193,32 +193,30 @@ Function AskCreatePotion() Int qStage = GetCurrentStageID() If qStage >= 30 && qStage < 40 If FS_NQ05_AlchemyMessagebox.Show() == 0 - SetCurrentStageID(40) - - if PlayerREF.GetItemCount(Vynroot) > 0 - PlayerREF.RemoveItem(Vynroot, 1) - else - _00E_SecureChest_HostChestREF.RemoveItem(Vynroot, 1) + + if PlayerREF.GetItemCount(Vynroot) == 0 + _00E_SecureChest_HostChestREF.RemoveItem(Vynroot, 1, true, PlayerREF) endif - if PlayerREF.GetItemCount(SkeeverTail) > 0 - PlayerREF.RemoveItem(SkeeverTail, 1) - else - _00E_SecureChest_HostChestREF.RemoveItem(SkeeverTail, 1) + if PlayerREF.GetItemCount(SkeeverTail) == 0 + _00E_SecureChest_HostChestREF.RemoveItem(SkeeverTail, 1, true, PlayerREF) endif - if PlayerREF.GetItemCount(MothWingMonarch) > 0 - PlayerREF.RemoveItem(MothWingMonarch, 1) - else - _00E_SecureChest_HostChestREF.RemoveItem(MothWingMonarch, 1) + if PlayerREF.GetItemCount(MothWingMonarch) == 0 + _00E_SecureChest_HostChestREF.RemoveItem(MothWingMonarch, 1, true, PlayerREF) endif - if PlayerREF.GetItemCount(Garlic) > 0 - PlayerREF.RemoveItem(Garlic, 1) - else - _00E_SecureChest_HostChestREF.RemoveItem(Garlic, 1) + if PlayerREF.GetItemCount(Garlic) == 0 + _00E_SecureChest_HostChestREF.RemoveItem(Garlic, 1, true, PlayerREF) endif + Utility.wait(0.5) + + SetCurrentStageID(40) + PlayerREF.RemoveItem(Vynroot, 1) + PlayerREF.RemoveItem(SkeeverTail, 1) + PlayerREF.RemoveItem(MothWingMonarch, 1) + PlayerREF.RemoveItem(Garlic, 1) PlayerREF.RemoveItem(_00E_FS_NQ05_Rezept, 1) EndIf EndIf