From 1faacce0dca82059fcf9be7e905e97f2ab1368c8 Mon Sep 17 00:00:00 2001 From: fluo10 Date: Thu, 13 Mar 2025 18:28:10 +0900 Subject: [PATCH] Make spells for return --- ConjurableMaid.esp | 4 ++-- Scripts/FCMReturnMaidScript.pex | 3 +++ Scripts/FCMSummonMaidScript.pex | 4 ++-- Source/Scripts/FCMReturnMaidScript.psc | 13 +++++++++++++ Source/Scripts/FCMSummonMaidScript.psc | 12 +++++------- 5 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 Scripts/FCMReturnMaidScript.pex create mode 100644 Source/Scripts/FCMReturnMaidScript.psc diff --git a/ConjurableMaid.esp b/ConjurableMaid.esp index 4da325d..5fa18d1 100644 --- a/ConjurableMaid.esp +++ b/ConjurableMaid.esp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b23dfcf8d96dd34a3bfc974def5885075c73a8955b41cf7ffc75cb512bacd624 -size 67993 +oid sha256:a89f6623d14dbfd9a771508c4b5553f375dac7ff3882130d2722f2f6a2b19e51 +size 69165 diff --git a/Scripts/FCMReturnMaidScript.pex b/Scripts/FCMReturnMaidScript.pex new file mode 100644 index 0000000..9417a8c --- /dev/null +++ b/Scripts/FCMReturnMaidScript.pex @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8b139559fc4afd7095888f657018787b0f15cb92b6562def8a179ea4a4ba27d +size 1036 diff --git a/Scripts/FCMSummonMaidScript.pex b/Scripts/FCMSummonMaidScript.pex index fd16cdb..2e590a3 100644 --- a/Scripts/FCMSummonMaidScript.pex +++ b/Scripts/FCMSummonMaidScript.pex @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06fac8bb611d757020c6c880e77c61fa39f0110bad8af092ea5990e27b8e52c3 -size 865 +oid sha256:2643060012cb2ab2f064dd064973290cb0d4b37f14e92d98e24f8cadf51c8dd3 +size 904 diff --git a/Source/Scripts/FCMReturnMaidScript.psc b/Source/Scripts/FCMReturnMaidScript.psc new file mode 100644 index 0000000..51d455d --- /dev/null +++ b/Source/Scripts/FCMReturnMaidScript.psc @@ -0,0 +1,13 @@ +Scriptname FCMReturnMaidScript extends activemagiceffect + +ObjectReference Property pMaidRef Auto +keyword Property pReturnMaidMagicKeyword Auto + +Event OnEffectFinish(actor akTarget, actor akCaster) + if (Game.GetPlayer().hasMagicEffectWithKeyword(pReturnMaidMagicKeyword)) + Debug.Trace("Player still have return magic effect") + else + Debug.Trace("Start Returning") + (pMaidRef as FCMSpectralMaidScript).TryReturn() + endif +endEvent diff --git a/Source/Scripts/FCMSummonMaidScript.psc b/Source/Scripts/FCMSummonMaidScript.psc index 190617c..703917e 100644 --- a/Source/Scripts/FCMSummonMaidScript.psc +++ b/Source/Scripts/FCMSummonMaidScript.psc @@ -1,12 +1,10 @@ Scriptname FCMSummonMaidScript extends activemagiceffect -ObjectReference Property MaidRef Auto -Bool Property IsSpectral Auto +ObjectReference Property pMaidRef Auto +Bool Property pIsSpectral Auto +Spell Property pReturnMaidSpell auto Event OnEffectStart(actor akTarget, actor akCaster) - (MaidRef as FCMSpectralMaidScript).TryConjure(isSpectral) -EndEvent - -Event OnEffectFinish(actor akTarget, actor akCaster) - (MaidRef as FCMSpectralMaidScript).TryReturn() + (pMaidRef as FCMSpectralMaidScript).TryConjure(pIsSpectral) + pReturnMaidSpell.Cast(akCaster, akCaster) EndEvent \ No newline at end of file