diff --git a/Enderal SE v2.1.4 Changelog.txt b/Enderal SE v2.1.4 Changelog.txt index 23dc4629f..06feb3de5 100644 --- a/Enderal SE v2.1.4 Changelog.txt +++ b/Enderal SE v2.1.4 Changelog.txt @@ -14,6 +14,7 @@ Beware, spoilers ahead! - Dreamflower can be found without finishing The Secrets first. - Dimension Rift might get stuck in an infinite effect+sound loop if player left the cell while it's active. - Fixed Battle of Treomar opponents permanently disappearing after a game if no dice were cast. +- Fixed apparitions losing their equipment after being moved to player in a dying state. - Fixed missing damage from spectral arrows provided by the Arcane Arrow affinity. - Fixed dismantling recipes checking for Arcane Smith instead if Arcane Disassembling. - Fixed scripts causing black screen during starting quests with SkyParkour and possibly some other mods. diff --git a/scripts/_00e_phasmalist_apparationtoplayer.pex b/scripts/_00e_phasmalist_apparationtoplayer.pex index 2a6a4d05d..516ade5ff 100644 Binary files a/scripts/_00e_phasmalist_apparationtoplayer.pex and b/scripts/_00e_phasmalist_apparationtoplayer.pex differ diff --git a/scripts/_fs_phasmalist_controlquest.pex b/scripts/_fs_phasmalist_controlquest.pex index 882fb6204..7836c398c 100644 Binary files a/scripts/_fs_phasmalist_controlquest.pex and b/scripts/_fs_phasmalist_controlquest.pex differ diff --git a/source/scripts/_00e_phasmalist_apparationtoplayer.psc b/source/scripts/_00e_phasmalist_apparationtoplayer.psc index 7b006cbfa..756db471f 100644 --- a/source/scripts/_00e_phasmalist_apparationtoplayer.psc +++ b/source/scripts/_00e_phasmalist_apparationtoplayer.psc @@ -13,7 +13,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) _00E_Phasmalist_Tutorial_Teleport.ShowAsHelpMessage("_00E_Phasmalist_Tutorial_Teleport", 5, 1, 1) EndIf - If controlQuest.IsApparitionSpawned() == False || _00E_Phasmalist_TankMode.GetValue() != 0 + If controlQuest.IsApparitionSpawned() == False || _00E_Phasmalist_TankMode.GetValue() != 0 || ! controlQuest.GetApparitionFailsafeRef() _00E_Phasmalist_NoApparitionCurrentlySummoned.Show() Else controlQuest.TeleportApparitionToPlayer(True) diff --git a/source/scripts/_fs_phasmalist_controlquest.psc b/source/scripts/_fs_phasmalist_controlquest.psc index 45a8fbfbb..b9f8f93f0 100644 --- a/source/scripts/_fs_phasmalist_controlquest.psc +++ b/source/scripts/_fs_phasmalist_controlquest.psc @@ -356,7 +356,7 @@ Event OnKeyDown(int iKeyCode) If iKeyCode == iTeleportApparitionKeyCode UnregisterTeleportKey() If Utility.IsInMenuMode() == False && UI.IsTextInputEnabled() == False && Game.IsFightingControlsEnabled() && UI.IsMenuOpen("Dialogue Menu") == False && PlayerREF.GetCurrentLocation() != _00E_Dreamworld_Location - If IsApparitionSpawned() == False || _00E_Phasmalist_TankMode.GetValue() != 0 + If IsApparitionSpawned() == False || _00E_Phasmalist_TankMode.GetValue() != 0 || ! GetApparitionFailsafeRef() _00E_Phasmalist_NoApparitionCurrentlySummoned.Show() Else TeleportApparitionToPlayer(True)