diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index c963cbb8..ba45ba66 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/Enderal - Forgotten Stories.esm.xml b/Enderal - Forgotten Stories.esm.xml index fe7d8507..d172103a 100644 --- a/Enderal - Forgotten Stories.esm.xml +++ b/Enderal - Forgotten Stories.esm.xml @@ -2,10 +2,10 @@ - + Niseam - Enderal: Forgotten Stories (Special Edition) 2.0.12 + Enderal: Forgotten Stories (Special Edition) 2.0.12.3 Skyrim.esm 0 Update.esm @@ -137601,34 +137601,6 @@ - - CraftingBlacksmithAnvil - - - - 7607 - Furniture\Clutter\BlacksmithAnvil.nif - - - - - - - - - 5 - 0006e9c7,00088105,000a56d8,0004f680,000eb60b - 0 - 0 - 00013794 - 1207959553 - - - - - - - _00E_Placeable_CraftingAlchemyWorkbenchNEW @@ -137781,587 +137753,6 @@ - - CraftingCookingFireSpit - - - - 7601 - Furniture\FireSpitCooking.nif - - - - - - - - - - - - - - - - - 5 - 000a56d8,0006e9c7,00068ada,000a5cb3,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingBlacksmithSharpeningWheel - - - - 7600 - Furniture\Clutter\BlacksmithSharpeningWheelAnimating.nif - - - - - - - - - - - - 5 - 0006e9c7,00088108,000a56d8,0004f6fd,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingTanningRackMarker - - - - 7599 - Furniture\TanningRackMarker.nif - - - - - - - - - - - - - 4 - 000727a0,000a56d8,0006e9c7,0007866a - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingSmelterMarker1 - - - - 7598 - Furniture\SmelterMarker.nif - - - - - - - - - - - - - - - - - - - - 5 - 000a56d8,0006e9c7,0009c6c3,000a5cce,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingAlchemyWorkbench - - - - 7597 - Furniture\AlchemyWorkbench.nif - - - - - - - - - - - - - - - - - - 5 - 0002a40b,0004f6e6,0006e9c7,000a56d8,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingEnchantingWorkbench - - - - 7596 - Furniture\EnchantingWorkbench.nif - - - 49 - - - - - - - - - - - - - - - 5 - 0006e2a3,000a56d8,0006e9c7,0004f6dd,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingBlackSmithForgeWR - - - - - - - 7595 - Furniture\BlacksmithForgeMarkerWR.nif - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - 000a56d8,0006e9c7,000cae0a,0004f680,00088105,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingBlackSmithForge - - - - - - - 7594 - Furniture\BlacksmithForgeMarker.nif - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - 000a56d8,0006e9c7,000cae0a,0004f680,00088105,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingAlchemyWorkbenchTabletop - - - - 7593 - Furniture\AlchemyWorkstation.nif - - - - - - - - - - - - - - - - - - 5 - 0002a40b,0004f6e6,0006e9c7,000a56d8,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingEnchantingWorkbenchTabletop - - - - 7592 - Furniture\EnchantingWorkStation.nif - - - 49 - - - - - - - - - - - - - 5 - 000a56d8,0006e9c7,0006e2a3,0004f6dd,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingBlacksmithArmorWorkbench - - - - 7591 - furniture\_Rblacksmithworkbench01.nif - - - - - - - - - - - 6 - 000a56d8,0006e9c7,000d932e,000fd0e1,000adb78,0004f6fd - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingCookingPotSm - - - - 7590 - Furniture\SmallCookingPot.nif - - - - - - - - - - - - - - 5 - 000a56d8,0006e9c7,001010b2,000a5cb3,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingCookingPotLG - - - - 7589 - Furniture\LargeCookingPot.nif - - - - - - - - - - - 5 - 000a56d8,0006e9c7,001010b2,000a5cb3,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingCookingPotSmNoHandle - - - - 7588 - Furniture\SmallCookingPotNoHandle.nif - - - - - - - - - - - 5 - 000a56d8,0006e9c7,001010b2,000a5cb3,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - - - CraftingCookingPotInvisible - - - - Furniture\SmallCookingPotNoHandleInv.nif - - - - - - - - - 5 - 000a56d8,0006e9c7,001010b2,000a5cb3,000fd0e1 - 0 - 2 - 00013794 - 1073741825 - - - - - - - - - CraftingAlchemyWorkbenchTabletopNoAct - - - - Furniture\AlchemyWorkstation.nif - - - - - - 5 - 000a56d8,0002a40b,0006e9c7,0004f6e6,000fd0e1 - 0 - 0 - 00013794 - 1073741825 - - - - - - - _00E_Placeable_CommonChair01NEW diff --git a/Enderal SE v2.0.12.2 Changelog.txt b/Enderal SE v2.0.12.3 Changelog.txt similarity index 98% rename from Enderal SE v2.0.12.2 Changelog.txt rename to Enderal SE v2.0.12.3 Changelog.txt index c531301c..84e8e944 100644 --- a/Enderal SE v2.0.12.2 Changelog.txt +++ b/Enderal SE v2.0.12.3 Changelog.txt @@ -6,6 +6,13 @@ See https://en.wiki.sureai.net/Enderal:Patch for the list of official patches up Beware, spoilers ahead! +2.0.12.3 (2022-09-15) +- Excluded a few distant cells from testing, fixes compatibility with SkyVRaan. +- Reverted dialoguemenu.swf to the pre-2.0.12 version and replaced quest journal in locked dialogs with a quit prompt. Discarded solution caused increased framerate in menu mode and was making scrolling unusable. +gavrant: +- Fixed the neck hole in Vagrant Dress + + 2.0.12.2 (2022-09-12) - The Father's arrival scene might fail to properly start (reported by KappaPride). diff --git a/Update.esm b/Update.esm index 22dd4cf3..ab1de930 100644 Binary files a/Update.esm and b/Update.esm differ diff --git a/interface/dialoguemenu.swf b/interface/dialoguemenu.swf index e85d0f95..c0f951b5 100644 --- a/interface/dialoguemenu.swf +++ b/interface/dialoguemenu.swf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:301b8c7e99fc049a1b38c57ecd907583a977863be9ab5dcfee2d4cca2d9da3a2 -size 24628 +oid sha256:e8a0091104d54e023bd4902f8c3510caaff2ec1fd409d04237af12d128530e4d +size 24622 diff --git a/scripts/_00e_questfunctions.pex b/scripts/_00e_questfunctions.pex index fd236e0a..704309a4 100644 Binary files a/scripts/_00e_questfunctions.pex and b/scripts/_00e_questfunctions.pex differ diff --git a/source/scripts/_00e_questfunctions.psc b/source/scripts/_00e_questfunctions.psc index f6226446..ddc5ee06 100644 --- a/source/scripts/_00e_questfunctions.psc +++ b/source/scripts/_00e_questfunctions.psc @@ -146,15 +146,44 @@ Function DisableDialogueQuitting() Global UI.InvokeBool("Dialogue Menu", "_root.DialogueMenu_mc.SetVariable", False) + (Game.GetForm(0x10AA2) as Quest).RegisterForKey(1) ; Escape + (Game.GetForm(0x10AA2) as Quest).RegisterForKey(15) ; Tab + int iControllerKey = Input.GetMappedKey("Tween Menu", 0x02) + if iControllerKey > -1 + (Game.GetForm(0x10AA2) as Quest).RegisterForKey(iControllerKey) ; Controller + endif + EndFunction Function EnableDialogueQuitting() Global {Disables the TAB Key during dialogue. Resets automatically upon dialogue exit via Goodbye.} UI.InvokeBool("Dialogue Menu", "_root.DialogueMenu_mc.SetVariable", True) - + UnregisterDialogQuitKey() + EndFunction +function UnregisterDialogQuitKey() Global + (Game.GetForm(0x10AA2) as Quest).UnregisterForKey(1) + (Game.GetForm(0x10AA2) as Quest).UnregisterForKey(15) + int iControllerKey = Input.GetMappedKey("Tween Menu", 0x02) + if iControllerKey > -1 + (Game.GetForm(0x10AA2) as Quest).UnregisterForKey(iControllerKey) + endif +endfunction + +Event OnKeyDown(Int KeyCode) + if UI.IsMenuOpen("Dialogue Menu") + if ! UI.IsMenuOpen("MessageBoxMenu") + if (Game.GetFormFromFile(0x163D, "Update.esm") as Message).Show() == 1 + Game.QuitToMainMenu() + endif + endif + else + UnregisterDialogQuitKey() + endif +EndEvent + Function RefreshFace() Global String facegen = "bUseFaceGenPreprocessedHeads:General" @@ -1366,6 +1395,7 @@ Message Property _00E_Levelsystem_sEldritchBloodAttackTargetMarked Auto Message Property _00E_Levelsystem_sEldritchBloodAttackVictimMarkingRemoved Auto Message Property _00E_Levelsystem_sEldritchBloodVictimMarkingRemoved Auto Message Property _00E_Levelsystem_sGhostwalkEnemyTooCloseToWall Auto +Message Property _00E_DialogueQuitGame Auto ObjectReference Property PlayerVisionStartMarker Auto Hidden ObjectReference Property PlayerVisionFailsaveMarker Auto Hidden @@ -1425,4 +1455,4 @@ MusicType MTToRemove ;for sets Sound Property MAGIllusionCharm Auto Message Property _00E_ArmorSetScript_sSetBonusRemoved Auto -bool bSetAchievementUnlocked = false +bool bSetAchievementUnlocked = false \ No newline at end of file