From 5ffd5d7e971669b0f0d9b5447e3361808a0d619e Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Thu, 8 Feb 2024 16:51:58 +0100 Subject: [PATCH] SKSE-free pipe smoking --- scripts/HealthBarManager.pex | Bin 1136 -> 1272 bytes scripts/_00E_CameraControl.pex | Bin 1336 -> 1464 bytes scripts/_00e_epupdatefunctions.pex | Bin 12051 -> 12041 bytes scripts/_00e_peaceweedplayeraliasscript.pex | Bin 11846 -> 12179 bytes source/scripts/HealthBarManager.psc | 4 +- source/scripts/_00E_CameraControl.psc | 22 +++-- source/scripts/_00e_epupdatefunctions.psc | 6 +- .../_00e_peaceweedplayeraliasscript.psc | 88 +++++++++++------- 8 files changed, 77 insertions(+), 43 deletions(-) diff --git a/scripts/HealthBarManager.pex b/scripts/HealthBarManager.pex index 05c280e8fa1588745878cb8d2c6a69761dfa5364..ba4416f8c5a0820395aee468b292bbd188b54cf8 100644 GIT binary patch delta 638 zcmZ9I%SyvQ7=_QD)YP`d-o5nhrCQx-K|x%pAT9(!(4`a`XtB0pyA=8iAq!u@y)WRx zozI}p;8K)=Cz+&PGB7j$Ip?4GGVhZgk;Lcu)0?hAz|VUAI<^yaS+@^PGDfT2Y+7B! zE_>Z(d(iH68y)+hS`P2*46N&$4TSc3y$+04qucCQ@a0YWbv|83sDIVB5IwX8XVz_> zz4mC|Ig(h?k8K6{?Z;D@ln`&;buP3*#6(C9=T6J9npVTP*J@KhL=>ouoEL3nXuu7` zkwB7b3Tb2zMV7TWEr<(ZGhB53nLaPzepX<*C6sLjc7*nvfU{?dhMXx#vScFZc1*A% z#RF9^FUaV~1DcmgDYYQTx>=#gGrYT+yj{o!~R zh5ZqX!O-`EFurTM#-JbiqX1^FHxAA(w&S;kxr5w66pfNP9ag%N%-lOP9J$U$c_V6x>?lQlZ0k|(h>M_i&n=|1@uoogLMl;H5^VjgAKsGtgK zkx-C>tp;I%z}KR@l0dCUaQMoSBPG2=aJgC))(K^)inPd8BKu0(&0;kTlxM8uS#y}d z%NUv&Lu)pJmo^J5DF$zvq4^I(^OvDDlR?9!jb%pWLs-Eod-)7njbIYivL6DkT<1Ki a#+1r0ZDT`qD{r!}IV}ht+5QvA<3T?Ib~OM1 diff --git a/scripts/_00E_CameraControl.pex b/scripts/_00E_CameraControl.pex index 500cf3d3c4b6a38af8284423aafb4d10cf8a3a5a..98c5f60cad5310b2c9bd888a3897cbe605a3a2ac 100644 GIT binary patch literal 1464 zcmb7DT~ix36g|6M{24pJ1ye{#wtSSfB-CxwFF!RQCc{i&GNGl9nax@Tg+*d^<+%L2 zKJ<6=NA$5zJ(9cx%2W1wS65f}o^y{R|NHx&e^){T;3NL}=U4Pz_xr=wyUDr8lU=P$ zuCtwsB1LmJ8tF-1OtKgqQTjVmsbcieyOkxBYFSOC#z4wbw&yEu%&825S z_cxXOKXyl}XW~REU(?iTs7Btep32ckD6~?oM$$;Fk_^$IRsyxbz=-pUKBBSC&&%o8 zm`hTl^K$+TD*MWy@iI#;MgD5Ihx+(Hs^_vWnA^*AV#>^K(HIOY@^O-*JNE4!B!Ae{ zM5O}J3HJ##%G|SrQE^rXG&wyMdBM(5n;4lpqN)_Lg&iAGB1EObIXK1sjYh;gy?}RdO zE>a=iiBUW~6)HBTvWO|yh}b$)Y0^`!8I9_Z$)!5M*4{*=_8gd-*m5(;Rl$jf(@CCN zNLO#!{Sp3jvtkBnOGu&LycMY-fkP-RL@LLUj2@$|#MFaCg~-Nu@&P?3)8sN9=lZ<7 z?FXpxmIesz?YB;)bRwXGIcHVWX$@KvEoW`qbJ=r18$D-BSi-Wi6|7(t4`>$9;yb5i zhmb&M1peO^{>;&KGMl@xiik9>Kl`bZ?+!^ixJ%A?j$M3&1-^?+>v8NX2UrU5ae$U> zKCqvKPJlK8eCO$L=tjFefT{eg1i0&T_GV6v!TSL|39#TGLaefcs|y5v;4l{LLKxy9 zWvHT4fRU_nO!m)+lzJA~z^(6Q4PeR-YFW#%W*=O&n{E*C~u4_9iy2w_#^{QQ6|+rCI7-G zmF+ZReB8be%J{JeguD=;KkN$So38BpG>s9y1w(0qF2#&S;mE{Nond`vpaOfOl*?_o z8N{kjhVX+y99zny-Ztd^#;dCpDXA?X34Que1cn3>hW@z-WJi*sC1$(AT2WPQC>qE+yXNRX`cjBr=oG&!L8S3fD=fy2NmeVS%A+TV?iD zpJAww<2nOvLe(Uc!y@52nG{c4m}7QZ7ZJ?aEH91aKBT$zq?S}@-(Z-xW-fnqE|M6$@!|4l&>$-`;3^H64OVoLK0_nze%W=@7|E_A0sFEOuQIGSH9})* zwoTe&M7Nyh>NE}dMn9o!vRU{tV17ovoF&dIP&86-xo36d@{+)t(LsjpF- PyoE6@U78Xe{G!B9n>qR) diff --git a/scripts/_00e_epupdatefunctions.pex b/scripts/_00e_epupdatefunctions.pex index e0a4a8d306e1ab08b4cd1eeb67c275edc4dde9fe..e7e230fb3a37725cc5e78c4cf9dae17bb24ff96e 100644 GIT binary patch literal 12041 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 literal 12051 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 JEctWJ{{b$lT5A9R diff --git a/scripts/_00e_peaceweedplayeraliasscript.pex b/scripts/_00e_peaceweedplayeraliasscript.pex index a23cf15b5c33a2c29580e233b4db7bc2cdd4b8df..54cf1e1ffc2b3cf5db426ef86fa5f31cc96341c7 100644 GIT binary patch literal 12179 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 diff --git a/source/scripts/HealthBarManager.psc b/source/scripts/HealthBarManager.psc index 305b5fd6..64ee05d5 100644 --- a/source/scripts/HealthBarManager.psc +++ b/source/scripts/HealthBarManager.psc @@ -1,7 +1,7 @@ Scriptname HealthBarManager Hidden function Show(Actor akActor) global - if akActor + if akActor && SKSE.GetVersion() int handle = ModEvent.Create("Enderal_ShowActorHealth") if handle ModEvent.PushForm(handle, akActor) @@ -11,7 +11,7 @@ function Show(Actor akActor) global endfunction function Hide(Actor akActor) global - if akActor + if akActor && SKSE.GetVersion() int handle = ModEvent.Create("Enderal_HideActorHealth") if handle ModEvent.PushForm(handle, akActor) diff --git a/source/scripts/_00E_CameraControl.psc b/source/scripts/_00E_CameraControl.psc index c52e85a7..205bc6fa 100644 --- a/source/scripts/_00E_CameraControl.psc +++ b/source/scripts/_00E_CameraControl.psc @@ -2,21 +2,31 @@ Scriptname _00E_CameraControl Hidden Function LockVanityCamera() Global - float fCameraMaxDistance = Utility.GetIniFloat("fVanityModeMaxDist:Camera") - (Game.GetForm(0x14) as Actor).SetActorValue("Variable08", fCameraMaxDistance) - Utility.SetINIFloat("fVanityModeMaxDist:Camera", Utility.GetIniFloat("fVanityModeMinDist:Camera")) + Actor PlayerREF = Game.GetForm(0x14) as Actor + float fMinDist = 150.0 + + if SKSE.GetVersion() + float fCameraMaxDistance = Utility.GetIniFloat("fVanityModeMaxDist:Camera") + PlayerREF.SetActorValue("Variable08", fCameraMaxDistance) + fMinDist = Utility.GetIniFloat("fVanityModeMinDist:Camera") + else + PlayerREF.SetActorValue("Variable08", 600.0) + endif + + Utility.SetINIFloat("fVanityModeMaxDist:Camera", fMinDist) EndFunction Function UnlockVanityCamera() Global - float fCameraMaxDistance = (Game.GetForm(0x14) as Actor).GetActorValue("Variable08") + Actor PlayerREF = Game.GetForm(0x14) as Actor + float fCameraMaxDistance = PlayerREF.GetActorValue("Variable08") if fCameraMaxDistance <= 0 - fCameraMaxDistance = 600 + fCameraMaxDistance = 600.0 endif Utility.SetINIFloat("fVanityModeMaxDist:Camera", fCameraMaxDistance) - (Game.GetForm(0x14) as Actor).SetActorValue("Variable08", 0) + PlayerREF.SetActorValue("Variable08", 0) EndFunction diff --git a/source/scripts/_00e_epupdatefunctions.psc b/source/scripts/_00e_epupdatefunctions.psc index 0bf4832f..e7925653 100644 --- a/source/scripts/_00e_epupdatefunctions.psc +++ b/source/scripts/_00e_epupdatefunctions.psc @@ -190,8 +190,10 @@ State RealPlayer ; Level up If iLevelUpsNeeded > 0 ; Level up if not in combat, not in dialogue, activate controls enabled (not in a scene?) and, obviously, not dead - While !IsInCombat() && (SKSE.GetVersion() == 0 || UI.IsMenuOpen("Dialogue Menu") == False) && Game.IsActivateControlsEnabled() && !Player.IsDead() && (isdead == False) && (iLevelUpsNeeded > 0) - levelUp() + While !IsInCombat() && Game.IsActivateControlsEnabled() && !Player.IsDead() && (isdead == False) && (iLevelUpsNeeded > 0) + if SKSE.GetVersion() == 0 || UI.IsMenuOpen("Dialogue Menu") == False + levelUp() + endif EndWhile EndIf diff --git a/source/scripts/_00e_peaceweedplayeraliasscript.psc b/source/scripts/_00e_peaceweedplayeraliasscript.psc index a8c8a8ef..e0e5f493 100644 --- a/source/scripts/_00e_peaceweedplayeraliasscript.psc +++ b/source/scripts/_00e_peaceweedplayeraliasscript.psc @@ -23,6 +23,7 @@ Sound Property _00E_FS_DecreaseArcaneFeverM Auto Message Property _00E_AlchAmbrosia_sArcaneFeverDecreased Auto Actor Property PlayerRef Auto +bool bSKSE = true ;===================================================================================== @@ -76,6 +77,11 @@ State Smoking Event OnUpdate() _UpdateSmoking() + + if ! bSKSE + Utility.Wait(2.5) + StopSmoking() + endif EndEvent EndState @@ -100,7 +106,7 @@ Int Property SMOKING_STAGE_SMOKING = 3 AutoReadOnly Float Property SMOKING_ARCANE_FEVER_REDUCE = 1.0 AutoReadOnly -Int StoredCameraState = -1 +bool bFirstPerson = true Armor StoredEquippedShield Armor StoredEquippedHelmet Form[] EquippedTorches @@ -121,12 +127,14 @@ Function StartSmoking() EndFunction Function _TryStartSmoking() + bSKSE = (SKSE.GetVersion() > 0) + If TheriantrophistControlQuest.IsTransformed() _00E_PeaceweedSmoking_CantSmokeInWolfForm.Show() Return EndIf - If (_00E_Meditate_Allowed.GetValueInt() == 0) || (PlayerRef.GetWorldSpace() == MQ07aDreamRealm) || PlayerRef.IsOnMount() || PlayerRef.IsSwimming() || (PlayerRef.GetSitState() != 0) || PlayerRef.IsInCombat() || PlayerREF.IsInLocation(_00E_ClassMenuLocation) + If (_00E_Meditate_Allowed.GetValueInt() == 0) || (PlayerRef.GetWorldSpace() == MQ07aDreamRealm) || PlayerRef.IsOnMount() || (bSKSE && PlayerRef.IsSwimming()) || (PlayerRef.GetSitState() != 0) || PlayerRef.IsInCombat() || PlayerREF.IsInLocation(_00E_ClassMenuLocation) _00E_PeaceweedSmoking_CantSmokeNow.Show() Return EndIf @@ -149,12 +157,9 @@ Function _TryStartSmoking() Game.SetInChargen(true, true, false) ; Forbid saving the game while smoking Game.DisablePlayerControls(abMovement=true, abFighting=true, abCamSwitch=true, abLooking=false, abSneaking=true, abMenu=true, abActivate = true, abJournalTabs=true) - StoredCameraState = Game.GetCameraState() + bFirstPerson = PlayerREF.GetAnimationVariableBool("IsFirstPerson") Game.ForceThirdPerson() - RefreshCancelKeys() - RegisterCancelKeys() - EquippedTorches = New Form[2] Bool bTorchesUnequipping = _00E_TorchControl.UnequipTorches(EquippedTorches) @@ -179,7 +184,7 @@ Function _TryStartSmoking() SmokingStage = SMOKING_STAGE_WARMUP ; Unequip armor in the HEAD slot. Will work for most closed-face helmets, I hope. - StoredEquippedHelmet = PlayerRef.GetWornForm(0x00000001) as Armor + StoredEquippedHelmet = PlayerRef.GetEquippedArmorInSlot(30) as Armor If StoredEquippedHelmet PlayerREF.UnequipItem(StoredEquippedHelmet, False, True) EndIf @@ -191,24 +196,31 @@ Function _TryStartSmoking() EndIf Debug.SendAnimationEvent(PlayerRef, "IdleSitCrossLeggedEnter") - Utility.Wait(1.1) _AdjustCameraPositionToSitting() - If (bQuitTutorialShown == False) && (_00E_DisableOtherTutorials.GetValueInt() == 0) - bQuitTutorialShown = True - Message.ResetHelpMessage("Empty") - If Game.UsingGamepad() - If _00E_PeaceweedSmoking_ExitTutorial_Console == None - _00E_PeaceweedSmoking_ExitTutorial_Console = Game.GetFormFromFile(0x000482F8, "Skyrim.esm") as Message + + if bSKSE + RefreshCancelKeys() + RegisterCancelKeys() + + If (bQuitTutorialShown == False) && (_00E_DisableOtherTutorials.GetValueInt() == 0) + bQuitTutorialShown = True + Message.ResetHelpMessage("Empty") + If Game.UsingGamepad() + If _00E_PeaceweedSmoking_ExitTutorial_Console == None + _00E_PeaceweedSmoking_ExitTutorial_Console = Game.GetFormFromFile(0x000482F8, "Skyrim.esm") as Message + EndIf + _00E_PeaceweedSmoking_ExitTutorial_Console.ShowAsHelpMessage("Empty", 7, 30, 1) + Else + _00E_PeaceweedSmoking_ExitTutorial.ShowAsHelpMessage("Empty", 7, 30, 1) EndIf - _00E_PeaceweedSmoking_ExitTutorial_Console.ShowAsHelpMessage("Empty", 7, 30, 1) - Else - _00E_PeaceweedSmoking_ExitTutorial.ShowAsHelpMessage("Empty", 7, 30, 1) EndIf - EndIf - + RegisterForSingleUpdate(2.9) + else + RegisterForSingleUpdate(5.0) + endif + Utility.Wait(0.4) - RegisterForSingleUpdate(2.5) Debug.SendAnimationEvent(PlayerRef, "pipesmokingcrossleggedstartblaze") Debug.SendAnimationEvent(PlayerRef, "pipesmokingcrossleggedblazed") EndFunction @@ -249,14 +261,18 @@ Function ApplySmokingSideEffects(Ingredient peaceweedIngredient, Float fReduceFe EndIf ; Teach ambrosia effect - Int Index = peaceweedIngredient.getNumEffects() - While Index > 0 - Index -= 1 - If peaceweedIngredient.getNthEffectMagicEffect(Index) == _00E_AlchReduceArcaneFever - peaceweedIngredient.LearnEffect(Index) - Index = 0 ; Break - EndIf - EndWhile + if bSKSE + Int Index = peaceweedIngredient.getNumEffects() + While Index > 0 + Index -= 1 + If peaceweedIngredient.getNthEffectMagicEffect(Index) == _00E_AlchReduceArcaneFever + peaceweedIngredient.LearnEffect(Index) + Index = 0 ; Break + EndIf + EndWhile + else + peaceweedIngredient.LearnEffect(1) + endif EndFunction Function StopSmoking() @@ -296,10 +312,9 @@ Function StopSmoking() _00E_TorchControl.ReequipTorches(EquippedTorches) - If StoredCameraState == 0 + If bFirstPerson Game.ForceFirstPerson() EndIf - StoredCameraState = -1 _00E_Meditate_Allowed.SetValueInt(1) EndIf @@ -337,14 +352,21 @@ Float fStoredOverShoulderPosZ Function _SetCameraPosition(Float x, Float z) Utility.SetINIFloat("fOverShoulderPosX:Camera", x) Utility.SetINIFloat("fOverShoulderPosZ:Camera", z) - Game.UpdateThirdPerson() + if bSKSE + Game.UpdateThirdPerson() + endif EndFunction Function _AdjustCameraPositionToSitting() If bStoredCameraPositions == False bStoredCameraPositions = True - fStoredOverShoulderPosX = Utility.GetINIFloat("fOverShoulderPosX:Camera") - fStoredOverShoulderPosZ = Utility.GetINIFloat("fOverShoulderPosZ:Camera") + if bSKSE + fStoredOverShoulderPosX = Utility.GetINIFloat("fOverShoulderPosX:Camera") + fStoredOverShoulderPosZ = Utility.GetINIFloat("fOverShoulderPosZ:Camera") + else + fStoredOverShoulderPosX = 30.0 + fStoredOverShoulderPosZ = -10.0 + endif _00E_CameraControl.LockVanityCamera() EndIf