From 9ba7c7c1fa016744f8e1b377fa35e36c42114472 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Tue, 23 Aug 2022 00:30:18 +0200 Subject: [PATCH] Quest potion messages use "Replace default" for their entrypoint --- Quest potions update.esp | Bin 0 -> 1402 bytes .../PRKF__00E_CraftQuestPotionPe_0300146D.pex | Bin 942 -> 982 bytes .../PRKF__00E_FS_NQ07_CraftPotio_0300146E.pex | Bin 942 -> 982 bytes scripts/_00e_fs_nq05_functions.pex | Bin 9518 -> 9598 bytes .../PRKF__00E_CraftQuestPotionPe_0300146D.psc | 10 +++--- .../PRKF__00E_FS_NQ07_CraftPotio_0300146E.psc | 10 +++--- source/scripts/_00e_fs_nq05_functions.psc | 34 +++++++++--------- 7 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 Quest potions update.esp diff --git a/Quest potions update.esp b/Quest potions update.esp new file mode 100644 index 0000000000000000000000000000000000000000..5a476df3559e0821de1761cfc2d4371e46834c0d GIT binary patch literal 1402 zcmd6mzi-n(6vv+(SG0f_D=}1fVWVLBgGgB-lRLLoo5+owip{+?M`bm!tFv2)t^Wpy zm7Rru0U`baSdls+rZR^2?6?h;2~k7@B7|6eH?Iq?JfL19^rPAv+iAZ^ZHA( zhP$sOK&xZ7=Yes@?rjIqw*BA^_(!i)G<+=6Auv0z=P!MV>)vr+WbzN!Ch)i~l^B@I zrjw|{B+F!M`dOkPnO4NOonY4h4O47%d)`L_z~kL5%DA{(Dn`f%3Cn@)3B`3=*cHd*Jq5TJ^-{C)wjV>;&3SAEUYu`w=kOCdyXtX!*Y2IOV7`0 zaBo4!6VkK-W}C2wDu5q$17|8R-;SpdjzU$Qa$IbD*Z-nA!TaMC1NOeHe<&k!FV|mr z0FA~zi&C*akex&g#lSwuqEkVS9i9p`E~^YHtzJ}E-6tzIbz^TJ4kY#8PWm!8DO%Jf zi$80=$EFuci$A|0O0EW}xaR~K82DK=fUqYH3d~BZeon)xJ~LJYHk0}i zD?Wi$y})YW^EIrdL|0%nMLmI)bwjMqpA%M8;?-NyzwmEZc@-?&5Ub4!tN#M4U(J|6 Aw*UYD literal 0 HcmV?d00001 diff --git a/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.pex b/scripts/PRKF__00E_CraftQuestPotionPe_0300146D.pex index a664757eb5d4d19adac515cd7931ea4efe1d83de..cb5c7747882f5fed64774c3be4813bccf297c480 100644 GIT binary patch delta 535 zcmYk1&q^Cn6vn?ZGiFA|n56k{O|>>gv5SK4W>F|AX|WWFkkaLl8PkC{De1$r=Z@4kiU&y`+j-mbj+C!LSRY1law)wPIx0N*x`TPo zqZju4F*0vAxs_(4)D6|%WIPUI#nM6eZXecZI6O{X8LbBFiHe4iI)`=UM+(lHzKXv2 zYI@hrEsWxWI7mK9`F%F*{co6@T43nmwb0L0Sbz&Bjd|#B8F?%*49p2~n%1P3d^cWR z7|br}_unJSLf9glLSRh+MU?P_g=JJwMGbX292iYv%XkX6E?5ybf^s@WSy0XNR*hPl z){>whXc2uTC<&VB0vB{ETA9rAZ-@ESRHb<|1#5!m|8VQ|Z1#gBsS@wHppf-9XwI<> fM|zR1f;M+!B`uTi27k}`AkQrY?YiXA`Okg?laWX1 delta 471 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 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