diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index dbfdb55a..5f7e3013 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 66fc30db..13772b14 100644 --- a/Enderal - Forgotten Stories.esm.xml +++ b/Enderal - Forgotten Stories.esm.xml @@ -2,7 +2,7 @@ - + Niseam Enderal: Forgotten Stories (Special Edition) 2.0.12 @@ -43007,30 +43007,9 @@ _00E_Theriantrophist_SummonLaboratory - @@ -137514,66 +137468,6 @@ - - - @@ -137605,17 +137499,6 @@ 80 -90 - @@ -137643,17 +137526,6 @@ _00E_Placeable_CraftingTanningRackNEW - @@ -137684,17 +137556,6 @@ _00E_Placeable_CraftingAnvilNEW - @@ -137725,17 +137586,6 @@ _00E_Placeable_CraftingSharpeningWheelNEW - - @@ -137815,19 +137652,6 @@ CraftingBlacksmithSharpeningWheel - - - @@ -137859,19 +137683,6 @@ CraftingTanningRackMarker - - - @@ -137904,25 +137715,6 @@ CraftingSmelterMarker1 - - - @@ -137962,68 +137754,6 @@ CraftingAlchemyWorkbench - - - - - @@ -138061,19 +137791,6 @@ CraftingEnchantingWorkbench - - - @@ -138117,17 +137834,6 @@ - @@ -138188,17 +137894,6 @@ - @@ -138256,68 +137951,6 @@ CraftingAlchemyWorkbenchTabletop - - - - - @@ -138355,19 +137988,6 @@ CraftingEnchantingWorkbenchTabletop - - - @@ -138403,19 +138023,6 @@ CraftingBlacksmithArmorWorkbench - - - @@ -138446,19 +138053,6 @@ CraftingCookingPotSm - - - @@ -138492,19 +138086,6 @@ CraftingCookingPotLG - - - @@ -138535,19 +138116,6 @@ CraftingCookingPotSmNoHandle - - - @@ -138578,19 +138146,6 @@ CraftingCookingPotInvisible - - - @@ -138618,19 +138173,6 @@ CraftingAlchemyWorkbenchTabletopNoAct - - - @@ -138721,17 +138263,6 @@ _00E_Placeable_CraftingEnchantingWorkbenchNEW - @@ -139225,17 +138756,6 @@ - @@ -140639,9 +140159,6 @@ - - - @@ -804790,6 +804377,9 @@ + + + @@ -805037,8 +804627,20 @@ 6 Player - 0 + 2 00000014 + + 0x00 + 0x00,0x00,0x00 + 35 + 58 + 0x00,0x00 + 0x0201c82f + 0x00000000 + 0 + 00000000 + 0xffffffff + 00000000 7 @@ -805113,6 +804715,9 @@ + + + @@ -805496,6 +805110,9 @@ + + + @@ -805986,8 +805603,20 @@ 14 Player - 0 + 2 00000014 + + 0x00 + 0x00,0x00,0x00 + 370 + 58 + 0x00,0x00 + 0x0201ca09 + 0x00000000 + 0 + 00000000 + 0xffffffff + 00000000 15 @@ -854082,20 +853711,6 @@ 0202e68e 0201e8fc - - PlayerPerks - 000cb40d - 000cb40e - 000cb40f - 000cb410 - 000cb411 - 000cb412 - 000cb413 - 000cb414 - 00052190 - 0202f218 - 0202f219 - TrapGasMagicDrawn 00035d7f @@ -856815,6 +856430,639 @@ 3333933f + + _00E_FS_NQ05_CraftPotionPerk + + + + + + + 0 + 0000010001 + + + + 0e0902 + 0 + + 0x60 + 0x00,0x00,0x00 + 30 + 58 + 0x00,0x00 + 0x0201c82f + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 0 + 69 + 0x00,0x00 + 0x0202ee47 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 0 + 629 + 0x00,0x00 + 0x00043270 + 0x00000000 + 0 + 00000000 + 0xffffffff + + ::bDisableNormalActivation_var + + 0x00 + 0x00,0x00,0x00 + 0 + 629 + 0x00,0x00 + 0x00043270 + 0x00000000 + 0 + 00000000 + 0xffffffff + + ::bIsInPlacementMode_var + 1 + + 0x00 + 0x00,0x00,0x00 + 1 + 432 + 0x00,0x00 + 0x00000016 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x0004f6e6 + 0x00000000 + 0 + 00000000 + 0xffffffff + + 04 + 01000000 + + + + _00E_FS_NQ07_CraftPotionPerk + + + + + + + 0 + 0000010001 + + + + 0e0902 + 0 + + 0x60 + 0x00,0x00,0x00 + 115 + 58 + 0x00,0x00 + 0x0201ca09 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 0 + 69 + 0x00,0x00 + 0x0202ee47 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 0 + 629 + 0x00,0x00 + 0x00043270 + 0x00000000 + 0 + 00000000 + 0xffffffff + + ::bDisableNormalActivation_var + + 0x00 + 0x00,0x00,0x00 + 0 + 629 + 0x00,0x00 + 0x00043270 + 0x00000000 + 0 + 00000000 + 0xffffffff + + ::bIsInPlacementMode_var + 1 + + 0x00 + 0x00,0x00,0x00 + 1 + 432 + 0x00,0x00 + 0x00000016 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x0004f6e6 + 0x00000000 + 0 + 00000000 + 0xffffffff + + 04 + 01000000 + + + + _00E_SE_WerewolfBlockFurniturePerk + + + + + + + 0 + 0000010001 + + + + 0e0902 + 0 + + 0x00 + 0x00,0x00,0x00 + 1 + 69 + 0x00,0x00 + 0x0202ee47 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 0 + 629 + 0x00,0x00 + 0x00043270 + 0x00000000 + 0 + 00000000 + 0xffffffff + + ::bDisableNormalActivation_var + + 0x00 + 0x00,0x00,0x00 + 0 + 629 + 0x00,0x00 + 0x00043270 + 0x00000000 + 0 + 00000000 + 0xffffffff + + ::bIsInPlacementMode_var + 1 + + 0x00 + 0x00,0x00,0x00 + 1 + 432 + 0x00,0x00 + 0x00000016 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x000adb78 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x00088105 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x000a5cb3 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x000a5cce + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x0007866a + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x0004f6e6 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x0004f6dd + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x0004f680 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x01 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x0004f6fd + 0x00000000 + 0 + 00000000 + 0xffffffff + + 04 + 03000000 + + + + _00E_SE_2_0_12_UpgradePerk + + + + + + + 0 + 0000010001 + + + + 0e0902 + 0 + + 0x00 + 0x00,0x00,0x00 + 0 + 69 + 0x00,0x00 + 0x0202ee47 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 0 + 629 + 0x00,0x00 + 0x00043270 + 0x00000000 + 0 + 00000000 + 0xffffffff + + ::bDisableNormalActivation_var + + 0x00 + 0x00,0x00,0x00 + 0 + 629 + 0x00,0x00 + 0x00043270 + 0x00000000 + 0 + 00000000 + 0xffffffff + + ::bIsInPlacementMode_var + 1 + + 0x00 + 0x00,0x00,0x00 + 1 + 432 + 0x00,0x00 + 0x00000016 + 0x00000000 + 0 + 00000000 + 0xffffffff + + + 0x00 + 0x00,0x00,0x00 + 1 + 560 + 0x00,0x00 + 0x000a5cce + 0x00000000 + 0 + 00000000 + 0xffffffff + + 04 + 03000000 + + _00E_FS_A3_Mage_PsionicDart_Perk_01 0 @@ -864159,7 +864407,7 @@ 00000019 - + Enderal\clothes\Noble\DJerkin_1.nif @@ -864185,12 +864433,15 @@ - Enderal\clothes\Noble\DressNoble_Blue_1Person1.nif + Enderal\clothes\Noble\DressNoble1.nif + + + 00013740 00013741 00013742 diff --git a/OnItemAdded Optimization.esp b/OnItemAdded Optimization.esp deleted file mode 100644 index f89e3f13..00000000 Binary files a/OnItemAdded Optimization.esp and /dev/null differ diff --git a/Skyrim.esm b/Skyrim.esm index 57920ad8..181bcfe9 100644 Binary files a/Skyrim.esm and b/Skyrim.esm differ diff --git a/scripts/_00e_fs_nq05_playeralias.pex b/scripts/_00e_fs_nq05_playeralias.pex index c6da6237..e1916623 100644 Binary files a/scripts/_00e_fs_nq05_playeralias.pex and b/scripts/_00e_fs_nq05_playeralias.pex differ diff --git a/scripts/_00e_fs_nq07_dinnercontrolsc.pex b/scripts/_00e_fs_nq07_dinnercontrolsc.pex index b9f183dc..2fbb3acc 100644 Binary files a/scripts/_00e_fs_nq07_dinnercontrolsc.pex and b/scripts/_00e_fs_nq07_dinnercontrolsc.pex differ diff --git a/scripts/_00e_playersetupscript.pex b/scripts/_00e_playersetupscript.pex index 4981877e..3475b441 100644 Binary files a/scripts/_00e_playersetupscript.pex and b/scripts/_00e_playersetupscript.pex differ diff --git a/source/scripts/_00e_fs_nq05_playeralias.psc b/source/scripts/_00e_fs_nq05_playeralias.psc index 8853b7ea..a785a1ac 100644 --- a/source/scripts/_00e_fs_nq05_playeralias.psc +++ b/source/scripts/_00e_fs_nq05_playeralias.psc @@ -3,7 +3,7 @@ Scriptname _00E_FS_NQ05_PlayerAlias extends ReferenceAlias Event OnInit() AddInventoryEventFilter(_00E_EmptyFormlist) - If FS_NQ05.GetStage() == 35 ; version update + If FS_NQ05.GetCurrentStageID() == 35 ; version update AddInventoryEventFilter(SkeeverTail) AddInventoryEventFilter(Garlic) AddInventoryEventFilter(MothWingMonarch) @@ -23,7 +23,7 @@ EndEvent Event OnItemAdded(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akSourceContainer) - If FS_NQ05.GetStage() != 35 + If FS_NQ05.GetCurrentStageID() != 35 AddInventoryEventFilter(_00E_EmptyFormlist) ; in case clearing fails RemoveInventoryEventFilter(Garlic) RemoveInventoryEventFilter(MothWingMonarch) diff --git a/source/scripts/_00e_fs_nq07_dinnercontrolsc.psc b/source/scripts/_00e_fs_nq07_dinnercontrolsc.psc index ead3af0a..aa0f1da9 100644 --- a/source/scripts/_00e_fs_nq07_dinnercontrolsc.psc +++ b/source/scripts/_00e_fs_nq07_dinnercontrolsc.psc @@ -3,7 +3,7 @@ Scriptname _00E_FS_NQ07_DinnerControlSC extends ReferenceAlias Event OnInit() AddInventoryEventFilter(_00E_EmptyFormlist) - If FS_NQ07.GetStage() == 370 ; version update + If FS_NQ07.GetCurrentStageID() == 370 ; version update AddInventoryEventFilter(_00E_DalSarkerHoneywine) AddInventoryEventFilter(FoodChickenCooked) AddInventoryEventFilter(FoodCabbagePotatoSoup) @@ -20,7 +20,7 @@ EndEvent Event OnItemAdded(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akSourceContainer) - If FS_NQ07.GetStage() != 370 + If FS_NQ07.GetCurrentStageID() != 370 AddInventoryEventFilter(_00E_EmptyFormlist) ; in case clearing fails RemoveInventoryEventFilter(_00E_DalSarkerHoneywine) RemoveInventoryEventFilter(FoodChickenCooked) @@ -41,7 +41,7 @@ EndEvent Event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akDestContainer) - If FS_NQ07.GetStage() != 370 + If FS_NQ07.GetCurrentStageID() != 370 AddInventoryEventFilter(_00E_EmptyFormlist) ; in case clearing fails RemoveInventoryEventFilter(_00E_DalSarkerHoneywine) RemoveInventoryEventFilter(FoodChickenCooked) diff --git a/source/scripts/_00e_playersetupscript.psc b/source/scripts/_00e_playersetupscript.psc index 890f95a6..f715bc8e 100644 --- a/source/scripts/_00e_playersetupscript.psc +++ b/source/scripts/_00e_playersetupscript.psc @@ -41,10 +41,6 @@ Event OnInit() kQuest.Start() endwhile - ; Added in 2.0.12 - - AddPlayerPerks() - EndEvent Event OnPlayerLoadGame() @@ -157,25 +153,9 @@ EndFunction ;===================================================================================== Function Update_212() - ; -EndFunction - -Function AddPlayerPerks() - - if PlayerPerks == None - PlayerPerks = Game.GetForm(0x493B8) as FormList - endif - - Perk kPerk - int iIndex = PlayerPerks.GetSize() - While iIndex > 0 - iIndex -= 1 - kPerk = PlayerPerks.GetAt(iIndex) as Perk - if ! PlayerREF.HasPerk(kPerk) - PlayerREF.AddPerk(kPerk) - endif - endwhile - + PlayerREF.AddPerk(Game.GetFormFromFile(0x14CF8, "Enderal - Forgotten Stories.esm") as Perk) ; _00E_SE_WerewolfBlockFurniturePerk + PlayerREF.AddPerk(Game.GetFormFromFile(0x14CFA, "Enderal - Forgotten Stories.esm") as Perk) ; _00E_SE_DismantlePerk + PlayerREF.AddPerk(Game.GetFormFromFile(0x14CF9, "Enderal - Forgotten Stories.esm") as Perk) ; _00E_SE_2_0_12_UpgradePerk EndFunction @@ -216,7 +196,7 @@ EndFunction Function RefreshMountNamesOnLoad() - _00E_NQ06_Functions NQ06Functions = Game.GetFormFromFile(0x000725BA,"Skyrim.esm") as _00E_NQ06_Functions + _00E_NQ06_Functions NQ06Functions = Game.GetForm(0x725BA) as _00E_NQ06_Functions NQ06Functions.RefreshNamesOnSaveLoad() EndFunction @@ -346,7 +326,7 @@ EndFunction Function Maintenance() - if fPatchVersion < 1.62 + if fPatchVersion <= 1.62 Debug.MessageBox("A savegame was loaded which was made before the release of Enderal SE. In this save, several new features won't be available and there is a chance that you'll encounter grave bugs. Please, start a new game.") Game.QuitToMainMenu() return @@ -382,8 +362,6 @@ Function Maintenance() ResetArmorWeightPerks() - AddPlayerPerks() - SetAutoSaveInterval() FailsafeMQ05PrologueAliases() @@ -408,7 +386,6 @@ _00E_MQ05Prologue_Functions Property MQ05PrologueFunctions Auto Actor Property PlayerREF Auto FormList Property QuestsToStart Auto -FormList Property PlayerPerks Auto GlobalVariable Property KillMove Auto diff --git a/strings/enderal - forgotten stories_english.dlstrings b/strings/enderal - forgotten stories_english.dlstrings index f743b000..527decb4 100644 Binary files a/strings/enderal - forgotten stories_english.dlstrings and b/strings/enderal - forgotten stories_english.dlstrings differ