From b81e14aed959802fc27724da68660eb45d2b5037 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Thu, 1 Aug 2024 13:04:59 +0200 Subject: [PATCH] Use EquipItemEx to re-equip items after turning back from the werewolf form --- Enderal SE v2.1.2 Changelog.txt | 1 + .../_00e_theriantrophist_transformstorage.pex | Bin 7817 -> 7898 bytes .../_00e_theriantrophist_transformstorage.psc | 24 +++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Enderal SE v2.1.2 Changelog.txt b/Enderal SE v2.1.2 Changelog.txt index 1f27b6c8..2f0559a5 100644 --- a/Enderal SE v2.1.2 Changelog.txt +++ b/Enderal SE v2.1.2 Changelog.txt @@ -15,6 +15,7 @@ Beware, spoilers ahead! -- Marking NPCs no longer happens solely by pointing, press "Activate" to mark an actor. - Added the light attach crash fix by powerofthree. - Fixed hightlighting of permanent effects in the hero menu (regression since 2.1). +- Fixed apparition talismans not recognized as equipped after turning back from the werewolf form. 2.1.1 (2024-04-24) diff --git a/scripts/_00e_theriantrophist_transformstorage.pex b/scripts/_00e_theriantrophist_transformstorage.pex index 93c43498657fb49aa7fe52e69147729b69ff5020..097115f0d1a5cbe59e302ccac21fc199f8d6e13b 100644 GIT binary patch literal 7898 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 literal 7817 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 Q43^X7GW6(uS5@!-0h|T!5C8xG diff --git a/source/scripts/_00e_theriantrophist_transformstorage.psc b/source/scripts/_00e_theriantrophist_transformstorage.psc index 1ec231e4..cfe42524 100644 --- a/source/scripts/_00e_theriantrophist_transformstorage.psc +++ b/source/scripts/_00e_theriantrophist_transformstorage.psc @@ -216,24 +216,25 @@ EndFunction Function equipeItems() Actor PlayerRef = Game.GetPlayer() + bool bSKSE = SKSE.GetVersion() as bool if whatKindRight == 2 PlayerRef.EquipSpell(EquippedItemRight as Spell, 1) elseif EquippedItemRight && PlayerRef.GetItemCount(EquippedItemRight) > 0 - if SKSE.GetVersion() + if bSKSE PlayerRef.EquipItemEx(EquippedItemRight, 1) else - PlayerRef.equipitem(EquippedItemRight, false, true) + PlayerRef.EquipItem(EquippedItemRight, false, true) endif endif if whatKindLeft == 2 PlayerRef.EquipSpell(EquippedItemLeft as Spell, 0) elseif EquippedItemLeft && PlayerRef.GetItemCount(EquippedItemLeft) > 0 - if SKSE.GetVersion() + if bSKSE PlayerRef.EquipItemEx(EquippedItemLeft, 2) else - PlayerRef.equipitem(EquippedItemLeft, false, true) + PlayerRef.EquipItem(EquippedItemLeft, false, true) endif endif @@ -241,10 +242,15 @@ Function equipeItems() while index > 0 index -= 1 If wornArmor[index] && PlayerRef.GetItemCount(wornArmor[index]) > 0 - ;removing and readding items fixes the issue that set bonuses wouldn't apply properly after re-transforming - PlayerRef.RemoveItem(wornArmor[index], 1, true, _00E_TransformStorageREF) - _00E_TransformStorageREF.RemoveItem(wornArmor[index], 1, true, PlayerRef) - PlayerRef.EquipItem(wornArmor[index],false,true) + if bSKSE + ; EquipItemEx triggers OnEquipped properly + PlayerRef.EquipItemEx(wornArmor[index], 0, false, false) + else + ;removing and readding items fixes the issue that set bonuses wouldn't apply properly after re-transforming + PlayerRef.RemoveItem(wornArmor[index], 1, true, _00E_TransformStorageREF) + _00E_TransformStorageREF.RemoveItem(wornArmor[index], 1, true, PlayerRef) + PlayerRef.EquipItem(wornArmor[index], false, true) + endif EndIf Endwhile -endFunction \ No newline at end of file +endFunction