diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index 48941ed1..83498f79 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/Enderal - Forgotten Stories.ini b/Enderal - Forgotten Stories.ini index ecf72f2e..1aa82a11 100644 --- a/Enderal - Forgotten Stories.ini +++ b/Enderal - Forgotten Stories.ini @@ -5,8 +5,8 @@ sLanguage=ENGLISH [Archive] bInvalidateOlderFiles=1 -sResourceArchiveList=Skyrim - Misc.bsa, Skyrim - Shaders.bsa, Skyrim - Interface.bsa, Skyrim - Animations.bsa, Skyrim - Meshes0.bsa, Skyrim - Meshes1.bsa, Skyrim - Sounds.bsa, Skyrim - Textures0.bsa, Skyrim - Textures1.bsa, Skyrim - Textures2.bsa, Skyrim - Textures3.bsa, Skyrim - Textures4.bsa, Skyrim - Textures5.bsa, Skyrim - Textures6.bsa -sResourceArchiveList2=Skyrim - Textures7.bsa, Skyrim - Textures8.bsa, Skyrim - Patch.bsa, Unofficial Skyrim Special Edition Patch.bsa, Unofficial Skyrim Special Edition Patch - Textures.bsa, E - Meshes.bsa, E - Scripts.bsa, E - Sounds.bsa, E - Textures1.bsa, E - Textures2.bsa, E - Textures3.bsa, E - SE.bsa, L - Textures.bsa, L - Voices.bsa +sResourceArchiveList=Skyrim - Misc.bsa, Skyrim - Shaders.bsa, Skyrim - Interface.bsa, Skyrim - Animations.bsa, Skyrim - Meshes0.bsa, Skyrim - Meshes1.bsa, Skyrim - Sounds.bsa, Skyrim - Textures0.bsa, Skyrim - Textures1.bsa, Skyrim - Textures2.bsa, Skyrim - Textures3.bsa, Skyrim - Textures4.bsa, Skyrim - Textures5.bsa, Skyrim - Textures6.bsa, Skyrim - Textures7.bsa +sResourceArchiveList2=Skyrim - Textures8.bsa, Skyrim - Patch.bsa, Unofficial Skyrim Special Edition Patch.bsa, Unofficial Skyrim Special Edition Patch - Textures.bsa, E - Meshes.bsa, E - Scripts.bsa, E - Sounds.bsa, E - Textures1.bsa, E - Textures2.bsa, E - Textures3.bsa, E - SE.bsa, E - Update.bsa, L - Textures.bsa, L - Voices.bsa [VATS] bVATSDisable=1 diff --git a/meshes/enderal/armor/heavy leather armor/1stpersonleathermedf_1.nif b/meshes/enderal/armor/heavy leather armor/1stpersonleathermedf_1.nif index 6afba95c..5b9075e5 100644 --- a/meshes/enderal/armor/heavy leather armor/1stpersonleathermedf_1.nif +++ b/meshes/enderal/armor/heavy leather armor/1stpersonleathermedf_1.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8d23734b6eb97a9382fa47cd37fc1f7c8cd95eca77d455bb1577a2cc2e41d8e -size 36570 +oid sha256:306cca97208ae875bd3a8e5c1f675773a7280357bf0e42fbcae81987efbe6a04 +size 36573 diff --git a/meshes/enderal/dungeons/crystals/crystalbase01blue.nif b/meshes/enderal/dungeons/crystals/crystalbase01blue.nif index e5201a1b..98d5daa4 100644 --- a/meshes/enderal/dungeons/crystals/crystalbase01blue.nif +++ b/meshes/enderal/dungeons/crystals/crystalbase01blue.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa1c252e34f62069a639d3857f02e8b858efcaf9c6546cd1a866b7baa1f7bcb7 -size 20256 +oid sha256:9d9062718e393256254733ec9baa8148fe1d8d4765d8cb813edcd7a466cc4307 +size 21228 diff --git a/meshes/enderal/dungeons/crystals/crystalbase01green.nif b/meshes/enderal/dungeons/crystals/crystalbase01green.nif index e5511898..caeb1a94 100644 --- a/meshes/enderal/dungeons/crystals/crystalbase01green.nif +++ b/meshes/enderal/dungeons/crystals/crystalbase01green.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:179c3ddc189aaee27dff60a139bf5c82de82744a6d0f7b797c4b0773661c72ac -size 20268 +oid sha256:d76de050e2ede4f75dd9e0bab943549588511045732aab484c4b89ee07bd166a +size 21241 diff --git a/meshes/enderal/dungeons/crystals/crystalbase01greentest.nif b/meshes/enderal/dungeons/crystals/crystalbase01greentest.nif index 42fd0890..caeb1a94 100644 --- a/meshes/enderal/dungeons/crystals/crystalbase01greentest.nif +++ b/meshes/enderal/dungeons/crystals/crystalbase01greentest.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2b192ac62f417af4dc5007e35b05f27c3d4eefc63b1a8e65a97f7f700b3f4c2 -size 20268 +oid sha256:d76de050e2ede4f75dd9e0bab943549588511045732aab484c4b89ee07bd166a +size 21241 diff --git a/meshes/enderal/dungeons/crystals/crystalbase01pink.nif b/meshes/enderal/dungeons/crystals/crystalbase01pink.nif index 544f2361..71eec29d 100644 --- a/meshes/enderal/dungeons/crystals/crystalbase01pink.nif +++ b/meshes/enderal/dungeons/crystals/crystalbase01pink.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62c0206654ced57344f669dbff860d368d8f26d8c9ea27a66419d50812af91fd -size 20266 +oid sha256:85f77c61be9b784980b898bd0aecbd103bb193760e1e93a8531a7bd2bb6708a8 +size 21238 diff --git a/meshes/enderal/dungeons/crystals/crystalbase01red.nif b/meshes/enderal/dungeons/crystals/crystalbase01red.nif index 93b3b3c9..4b19569a 100644 --- a/meshes/enderal/dungeons/crystals/crystalbase01red.nif +++ b/meshes/enderal/dungeons/crystals/crystalbase01red.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5f7d89b5fe568c5ff7cfe23a15977e35bc3556127fe0203fd3475fccddd1093 -size 20268 +oid sha256:7620d408ef7b43135463542879a37ec3b7e43667f2a87935386d98599485006b +size 21239 diff --git a/scripts/_00e_movetoeditorlocationonload.pex b/scripts/_00e_movetoeditorlocationonload.pex new file mode 100644 index 00000000..7d4acb0b Binary files /dev/null and b/scripts/_00e_movetoeditorlocationonload.pex differ diff --git a/scripts/_00e_mq16_functions.pex b/scripts/_00e_mq16_functions.pex index 1c6c6528..5144008a 100644 Binary files a/scripts/_00e_mq16_functions.pex and b/scripts/_00e_mq16_functions.pex differ diff --git a/scripts/_00e_mqp02_functions.pex b/scripts/_00e_mqp02_functions.pex index a6e2e718..a759064d 100644 Binary files a/scripts/_00e_mqp02_functions.pex and b/scripts/_00e_mqp02_functions.pex differ diff --git a/scripts/source/_00e_movetoeditorlocationonload.psc b/scripts/source/_00e_movetoeditorlocationonload.psc new file mode 100644 index 00000000..1d91127a --- /dev/null +++ b/scripts/source/_00e_movetoeditorlocationonload.psc @@ -0,0 +1,7 @@ +Scriptname _00E_MoveToEditorLocationOnLoad extends ObjectReference + +event OnLoad() + + Self.MoveToMyEditorLocation() + +endevent diff --git a/scripts/source/_00e_mq16_functions.psc b/scripts/source/_00e_mq16_functions.psc index afad91a5..1b07aced 100644 --- a/scripts/source/_00e_mq16_functions.psc +++ b/scripts/source/_00e_mq16_functions.psc @@ -855,6 +855,7 @@ EndFunction Function TealorGetUp() + akTealor.ResetInventory() akTealor.SetLookAt(MQ16_SC14_YuslanDeadREF) akTealor.PlayIdle(IdleExhaustedExit) _00E_ShatterSoulDarkFlamesShader.Stop(MQ16_SC14_YuslanDeadREF) @@ -896,14 +897,15 @@ Function ResetAnimations() EndFunction Function TealorKillYuslan() - - Wait(1) - - _00E_MC_TealorREF.PlayIdleWithTarget(pa_2HMKillMoveDecapSlash, MQ16_SC14_YuslanDeadREF) - - Wait(1) + + if _00E_MC_TealorREF.PlayIdleWithTarget(pa_KillMove1HMDecap, MQ16_SC14_YuslanDeadREF) + Utility.Wait(3) + else + ; animation failed + endif + Game.TriggerScreenBlood(7) - Wait(3) + Utility.Wait(3) YuslanDeath() SetStage(170) @@ -1004,6 +1006,7 @@ Topic Property MQ16_D03_VisionFragmentTopic Auto Idle Property TG05_Knockout Auto Idle Property TG05_GetUp Auto Idle Property pa_2HMKillMoveDecapSlash Auto +Idle Property pa_KillMove1HMDecap Auto Idle Property _00E_IdleCastMagicTwoHanded Auto Idle Property IdleMagic_01 Auto Idle Property IdleExhaustedExit Auto diff --git a/scripts/source/_00e_mqp02_functions.psc b/scripts/source/_00e_mqp02_functions.psc index 6b26eaf2..3cfea887 100644 --- a/scripts/source/_00e_mqp02_functions.psc +++ b/scripts/source/_00e_mqp02_functions.psc @@ -373,8 +373,6 @@ EndFunction Function RocioKillSirius() Sirius.GetActorReference().GetActorBase().SetEssential(False) - Debug.SendAnimationEvent(Sirius.GetActorReference(), "IdleStop") - Utility.Wait(1.5) Rocio.GetActorReference().PlayIdleWithTarget(pa_1HMKillMoveShortB, Sirius.GetActorReference()) Sirius.GetActorReference().Kill(Rocio.GetActorReference()) Utility.Wait(1) diff --git a/scripts/source/tif__0007b861.psc b/scripts/source/tif__0007b861.psc index 402bc66f..0b3660b0 100644 --- a/scripts/source/tif__0007b861.psc +++ b/scripts/source/tif__0007b861.psc @@ -16,6 +16,7 @@ EndFunction Function Fragment_0(ObjectReference akSpeakerRef) Actor akSpeaker = akSpeakerRef as Actor ;BEGIN CODE +Utility.Wait(1.4) GetOwningQuest().SetStage(95) ;END CODE EndFunction diff --git a/scripts/tif__0007b861.pex b/scripts/tif__0007b861.pex index 882c022c..64ba3898 100644 Binary files a/scripts/tif__0007b861.pex and b/scripts/tif__0007b861.pex differ diff --git a/strings/enderal - forgotten stories_chinese.dlstrings b/strings/enderal - forgotten stories_chinese.dlstrings index 7e083d0f..976c1774 100644 Binary files a/strings/enderal - forgotten stories_chinese.dlstrings and b/strings/enderal - forgotten stories_chinese.dlstrings differ diff --git a/strings/enderal - forgotten stories_chinese.ilstrings b/strings/enderal - forgotten stories_chinese.ilstrings index 44ae6ef9..80da92d9 100644 Binary files a/strings/enderal - forgotten stories_chinese.ilstrings and b/strings/enderal - forgotten stories_chinese.ilstrings differ diff --git a/strings/enderal - forgotten stories_chinese.strings b/strings/enderal - forgotten stories_chinese.strings index 1d2b8f70..1198a886 100644 Binary files a/strings/enderal - forgotten stories_chinese.strings and b/strings/enderal - forgotten stories_chinese.strings differ diff --git a/strings/enderal - forgotten stories_english.dlstrings b/strings/enderal - forgotten stories_english.dlstrings index 997ccc48..f90ef632 100644 Binary files a/strings/enderal - forgotten stories_english.dlstrings and b/strings/enderal - forgotten stories_english.dlstrings differ diff --git a/strings/enderal - forgotten stories_english.ilstrings b/strings/enderal - forgotten stories_english.ilstrings index 568ac421..26c619cd 100644 Binary files a/strings/enderal - forgotten stories_english.ilstrings and b/strings/enderal - forgotten stories_english.ilstrings differ diff --git a/strings/enderal - forgotten stories_english.strings b/strings/enderal - forgotten stories_english.strings index 45734709..2c8cc1dc 100644 Binary files a/strings/enderal - forgotten stories_english.strings and b/strings/enderal - forgotten stories_english.strings differ diff --git a/strings/enderal - forgotten stories_french.dlstrings b/strings/enderal - forgotten stories_french.dlstrings index 37f8ee01..30ea9f4a 100644 Binary files a/strings/enderal - forgotten stories_french.dlstrings and b/strings/enderal - forgotten stories_french.dlstrings differ diff --git a/strings/enderal - forgotten stories_french.ilstrings b/strings/enderal - forgotten stories_french.ilstrings index 5b0c96fe..0002be64 100644 Binary files a/strings/enderal - forgotten stories_french.ilstrings and b/strings/enderal - forgotten stories_french.ilstrings differ diff --git a/strings/enderal - forgotten stories_french.strings b/strings/enderal - forgotten stories_french.strings index d344f7a1..961cddbf 100644 Binary files a/strings/enderal - forgotten stories_french.strings and b/strings/enderal - forgotten stories_french.strings differ diff --git a/strings/enderal - forgotten stories_german.dlstrings b/strings/enderal - forgotten stories_german.dlstrings index 1254e013..ed04eb4e 100644 Binary files a/strings/enderal - forgotten stories_german.dlstrings and b/strings/enderal - forgotten stories_german.dlstrings differ diff --git a/strings/enderal - forgotten stories_german.ilstrings b/strings/enderal - forgotten stories_german.ilstrings index 31c3c0c0..41d11256 100644 Binary files a/strings/enderal - forgotten stories_german.ilstrings and b/strings/enderal - forgotten stories_german.ilstrings differ diff --git a/strings/enderal - forgotten stories_german.strings b/strings/enderal - forgotten stories_german.strings index 72ff0915..a526f1dc 100644 Binary files a/strings/enderal - forgotten stories_german.strings and b/strings/enderal - forgotten stories_german.strings differ diff --git a/strings/enderal - forgotten stories_italian.dlstrings b/strings/enderal - forgotten stories_italian.dlstrings index 62c17b77..b71000a6 100644 Binary files a/strings/enderal - forgotten stories_italian.dlstrings and b/strings/enderal - forgotten stories_italian.dlstrings differ diff --git a/strings/enderal - forgotten stories_italian.ilstrings b/strings/enderal - forgotten stories_italian.ilstrings index 185cf9ca..6da32bac 100644 Binary files a/strings/enderal - forgotten stories_italian.ilstrings and b/strings/enderal - forgotten stories_italian.ilstrings differ diff --git a/strings/enderal - forgotten stories_italian.strings b/strings/enderal - forgotten stories_italian.strings index d22ad951..91f08f4c 100644 Binary files a/strings/enderal - forgotten stories_italian.strings and b/strings/enderal - forgotten stories_italian.strings differ diff --git a/strings/enderal - forgotten stories_japanese.dlstrings b/strings/enderal - forgotten stories_japanese.dlstrings index 8d32bf8f..8ce20e39 100644 Binary files a/strings/enderal - forgotten stories_japanese.dlstrings and b/strings/enderal - forgotten stories_japanese.dlstrings differ diff --git a/strings/enderal - forgotten stories_japanese.ilstrings b/strings/enderal - forgotten stories_japanese.ilstrings index 4d1cba09..1516c746 100644 Binary files a/strings/enderal - forgotten stories_japanese.ilstrings and b/strings/enderal - forgotten stories_japanese.ilstrings differ diff --git a/strings/enderal - forgotten stories_japanese.strings b/strings/enderal - forgotten stories_japanese.strings index d52fde4e..c5f10c98 100644 Binary files a/strings/enderal - forgotten stories_japanese.strings and b/strings/enderal - forgotten stories_japanese.strings differ diff --git a/strings/enderal - forgotten stories_korean.dlstrings b/strings/enderal - forgotten stories_korean.dlstrings index 25b3749b..4f416b43 100644 Binary files a/strings/enderal - forgotten stories_korean.dlstrings and b/strings/enderal - forgotten stories_korean.dlstrings differ diff --git a/strings/enderal - forgotten stories_korean.ilstrings b/strings/enderal - forgotten stories_korean.ilstrings index a039365e..a82ef1a8 100644 Binary files a/strings/enderal - forgotten stories_korean.ilstrings and b/strings/enderal - forgotten stories_korean.ilstrings differ diff --git a/strings/enderal - forgotten stories_korean.strings b/strings/enderal - forgotten stories_korean.strings index 9fa9d807..3eb2857e 100644 Binary files a/strings/enderal - forgotten stories_korean.strings and b/strings/enderal - forgotten stories_korean.strings differ diff --git a/strings/enderal - forgotten stories_russian.dlstrings b/strings/enderal - forgotten stories_russian.dlstrings index 9e14abc3..179e12d2 100644 Binary files a/strings/enderal - forgotten stories_russian.dlstrings and b/strings/enderal - forgotten stories_russian.dlstrings differ diff --git a/strings/enderal - forgotten stories_russian.ilstrings b/strings/enderal - forgotten stories_russian.ilstrings index a8806dde..111b36ca 100644 Binary files a/strings/enderal - forgotten stories_russian.ilstrings and b/strings/enderal - forgotten stories_russian.ilstrings differ diff --git a/strings/enderal - forgotten stories_russian.strings b/strings/enderal - forgotten stories_russian.strings index d49f974e..86d78251 100644 Binary files a/strings/enderal - forgotten stories_russian.strings and b/strings/enderal - forgotten stories_russian.strings differ diff --git a/strings/enderal - forgotten stories_spanish.dlstrings b/strings/enderal - forgotten stories_spanish.dlstrings index 7865be68..4f746cec 100644 Binary files a/strings/enderal - forgotten stories_spanish.dlstrings and b/strings/enderal - forgotten stories_spanish.dlstrings differ diff --git a/strings/enderal - forgotten stories_spanish.ilstrings b/strings/enderal - forgotten stories_spanish.ilstrings index be9f785b..8e717dfb 100644 Binary files a/strings/enderal - forgotten stories_spanish.ilstrings and b/strings/enderal - forgotten stories_spanish.ilstrings differ diff --git a/strings/enderal - forgotten stories_spanish.strings b/strings/enderal - forgotten stories_spanish.strings index 5988636f..204419a9 100644 Binary files a/strings/enderal - forgotten stories_spanish.strings and b/strings/enderal - forgotten stories_spanish.strings differ