Check triggering ref type in TrapBear

Enderal SE v2.1.0 Changelog.txt

@@ -74,7 +74,8 @@ Gameplay changes:
 
 Werewolf updates:
 - Expanded the collision box, making werewolves and melee builds more viable against other werewolves, Bonerippers, and Vatyrs.
-- Fixed freezing in the beginning of one of werewolf killmoves thanks to improved werewolf behaviors from Precision Creatures by NickaNack.
+- Temporarily disabled the broken mauling killcam until it gets a proper fix (the delay is fixed, getting stuck in 1st person mode is not).
+- Werewolf killmoves play on the last hostile actors.
 - Fixed inability to turn off werewolf killmoves.
 - Fixed inability to break spider webs.
 - Werewolf does not need a shovel to dig up a mound.

source/Enderal DLL/src/Patches/HUDMenuPatch.h

@@ -22,7 +22,7 @@ private:
 				auto playerAV = RE::PlayerCharacter::GetSingleton()->AsActorValueOwner();
 				auto currentHealth = playerAV->GetActorValue(RE::ActorValue::kHealth);
 
-				if (currentHealth < playerAV->GetBaseActorValue(RE::ActorValue::kHealth) && currentHealth > 0) {
+				if (currentHealth < playerAV->GetPermanentActorValue(RE::ActorValue::kHealth) && currentHealth > 0) {
 					auto uiMovie = RE::UI::GetSingleton()->GetMovieView(RE::HUDMenu::MENU_NAME);
 
 					if (uiMovie) {

source/scripts/_00E_BlueprintCollectionItem.psc

@@ -51,11 +51,19 @@ function StoreSingleCopy()
 		_00E_FS_BlueprintItemsStored.Show(iItemsToStore)
 	endif
 /;
+	int iCount = EnderalFunctions.MoveItemsToCountByKeyword(PlayerREF, _00E_FS_BlueprintContainerActorREF, Blueprint, 1)
 	ITMBookClose.Play(PlayerREF)
-	_00E_FS_BlueprintItemsStored.Show(EnderalFunctions.MoveItemsToCountByKeyword(PlayerREF, _00E_FS_BlueprintContainerActorREF, Blueprint, 1))
+	
-	Armor item = Game.GetForm(0x1FE82) as Armor ; non-playable Draugr Skin
+	Utility.WaitMenuMode(0.5)
-	PlayerREF.RemoveItem(item, 1, true) ; doing this twice seems to reliably refresh inventory
+	Form item = Game.GetForm(0x1FE82) ; non-playable Draugr Skin
 	PlayerREF.RemoveItem(item, 1, true)
+	
+	if iCount > 150
+		Utility.WaitMenuMode(0.5)
+		PlayerREF.RemoveItem(item, 1, true) ; doing this twice seems to reliably refresh inventory
+	endif
+	
+	_00E_FS_BlueprintItemsStored.Show(iCount)
 endfunction
 
 Function TakeBlueprints()

source/scripts/_00e_smoking_wallmarkerscript.psc

@@ -70,6 +70,14 @@ Event OnSleepStart(float afSleepStartTime, float afDesiredSleepEndTime)
 	_UnlockAnimationUpdates()
 EndEvent
 
+Event OnCellDetach()
+	UnregisterForSleep()
+endEvent
+
+Event OnCellAttach()
+	RegisterForSleep()
+endEvent
+
 Event OnEffectFinish(Actor akTarget, Actor akCaster)
 	; Debug.Trace(self + ": OnEffectFinish, " + Target)
 

source/scripts/trapbear.psc

@@ -92,7 +92,7 @@ event OnActivate(objectReference TriggerRef)
 endEvent
 
 Bool function checkPerks(objectReference triggerRef)
-	if checkForLightFootPerk
+	if checkForLightFootPerk && triggerRef as actor
 ; 		;debug.Trace(self + " is checking if " + triggerRef + " has LightFoot Perk")
 		if  (triggerRef as actor).hasPerk(LightFoot)
 ; 			;debug.Trace(self + " has found that " + triggerRef + " has LightFoot Perk")