diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index f286c91b..695c52e0 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/scripts/_00E_DonkeyNameAlias.pex b/scripts/_00E_DonkeyNameAlias.pex index b68012be..9ca8583c 100644 Binary files a/scripts/_00E_DonkeyNameAlias.pex and b/scripts/_00E_DonkeyNameAlias.pex differ diff --git a/scripts/_00E_HorseNameAlias.pex b/scripts/_00E_HorseNameAlias.pex index 709283c6..17b10d90 100644 Binary files a/scripts/_00E_HorseNameAlias.pex and b/scripts/_00E_HorseNameAlias.pex differ diff --git a/scripts/_00E_NQ06_ShadowAlias.pex b/scripts/_00E_NQ06_ShadowAlias.pex index 4d203e9d..d469f9b6 100644 Binary files a/scripts/_00E_NQ06_ShadowAlias.pex and b/scripts/_00E_NQ06_ShadowAlias.pex differ diff --git a/scripts/_00e_game_playerhouse_boardsc.pex b/scripts/_00e_game_playerhouse_boardsc.pex index adab6193..b8e13b26 100644 Binary files a/scripts/_00e_game_playerhouse_boardsc.pex and b/scripts/_00e_game_playerhouse_boardsc.pex differ diff --git a/scripts/_00e_game_playerhouse_documentsc.pex b/scripts/_00e_game_playerhouse_documentsc.pex index d4040ab4..069711b9 100644 Binary files a/scripts/_00e_game_playerhouse_documentsc.pex and b/scripts/_00e_game_playerhouse_documentsc.pex differ diff --git a/scripts/_00e_nq06_functions.pex b/scripts/_00e_nq06_functions.pex index c72e3431..8f66fc96 100644 Binary files a/scripts/_00e_nq06_functions.pex and b/scripts/_00e_nq06_functions.pex differ diff --git a/scripts/_00e_playerhousing_cellnamesc.pex b/scripts/_00e_playerhousing_cellnamesc.pex index 53ba8029..2dbdde45 100644 Binary files a/scripts/_00e_playerhousing_cellnamesc.pex and b/scripts/_00e_playerhousing_cellnamesc.pex differ diff --git a/source/scripts/_00E_DonkeyNameAlias.psc b/source/scripts/_00E_DonkeyNameAlias.psc index 2b6c1cd7..58685f9e 100644 --- a/source/scripts/_00E_DonkeyNameAlias.psc +++ b/source/scripts/_00E_DonkeyNameAlias.psc @@ -2,7 +2,7 @@ Scriptname _00E_DonkeyNameAlias extends ReferenceAlias Hidden Event OnPlayerLoadGame() - If _00E_MuleOwned.GetValue() as Int != 0 + If SKSE.GetVersion() && _00E_MuleOwned.GetValue() as Int != 0 if NQ06_Freda.sMuleName != "" _00E_NQ06Bonni.SetName(NQ06_Freda.sMuleName) diff --git a/source/scripts/_00E_HorseNameAlias.psc b/source/scripts/_00E_HorseNameAlias.psc index d5a7ac0d..65bc495e 100644 --- a/source/scripts/_00E_HorseNameAlias.psc +++ b/source/scripts/_00E_HorseNameAlias.psc @@ -2,7 +2,7 @@ Scriptname _00E_HorseNameAlias extends ReferenceAlias Hidden Event OnPlayerLoadGame() - If _00E_HorseOwned.GetValue() as Int != 0 + If SKSE.GetVersion() && _00E_HorseOwned.GetValue() as Int != 0 if NQ06_Freda.sHorseName != "" (PlayerHorseAlias.GetReference() as Actor).GetActorBase().SetName(NQ06_Freda.sHorseName) diff --git a/source/scripts/_00E_NQ06_ShadowAlias.psc b/source/scripts/_00E_NQ06_ShadowAlias.psc index 57c5222d..9aca8590 100644 --- a/source/scripts/_00E_NQ06_ShadowAlias.psc +++ b/source/scripts/_00E_NQ06_ShadowAlias.psc @@ -2,14 +2,18 @@ Scriptname _00E_NQ06_ShadowAlias extends ReferenceAlias Hidden GlobalVariable Property _00E_FathersShadowOwned Auto +_00E_NQ06_Functions Property NQ06_Freda Auto + +Actor Property FS_NQR05_FatherShadowREF Auto + Event OnPlayerLoadGame() - If (_00E_FathersShadowOwned.GetValue() as Int) > 0 + If SKSE.GetVersion() && (_00E_FathersShadowOwned.GetValue() as Int) > 0 - String sShadowName = (GetOwningQuest() as _00E_NQ06_Functions).sFathersShadowName + String sShadowName = NQ06_Freda.sFathersShadowName - if sShadowName != "" - (GetReference() as Actor).GetActorBase().SetName(sShadowName) + if sShadowName != "" + FS_NQR05_FatherShadowREF.GetActorBase().SetName(sShadowName) endif EndIf diff --git a/source/scripts/_00e_game_playerhouse_boardsc.psc b/source/scripts/_00e_game_playerhouse_boardsc.psc index 5297a5c8..0c8bc8ab 100644 --- a/source/scripts/_00e_game_playerhouse_boardsc.psc +++ b/source/scripts/_00e_game_playerhouse_boardsc.psc @@ -93,15 +93,19 @@ function OnActivate(ObjectReference akActionRef) elseif iButton == 5 - Cell cCurrentCell = Self.GetParentCell() - String sHouseName = NQ24.ChooseHouseName() - cCurrentCell.SetName(sHouseName) - - If cCurrentCell == CapitalCityPlayerhouse - Player.sHouseMarketQuarterName = sHouseName - ElseIf cCurrentCell == CapitalCityPlayerHouseUpper - Player.sHouseNobleQuarterName = sHouseName - EndIf + if SKSE.GetVersion() + Cell cCurrentCell = Self.GetParentCell() + String sHouseName = NQ24.ChooseHouseName() + cCurrentCell.SetName(sHouseName) + + If cCurrentCell == CapitalCityPlayerhouse + Player.sHouseMarketQuarterName = sHouseName + ElseIf cCurrentCell == CapitalCityPlayerHouseUpper + Player.sHouseNobleQuarterName = sHouseName + EndIf + else + Debug.Notification("Renaming requires SKSE") + endif elseif iButton == 6 diff --git a/source/scripts/_00e_game_playerhouse_documentsc.psc b/source/scripts/_00e_game_playerhouse_documentsc.psc index 3511d9a3..9041e133 100644 --- a/source/scripts/_00e_game_playerhouse_documentsc.psc +++ b/source/scripts/_00e_game_playerhouse_documentsc.psc @@ -14,18 +14,21 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo PlayerREF.AddItem(kyHouseKey, 1) objNoteRef.Disable() cHouseCell.SetActorOwner(PlayerREF.GetActorBase()) - sHouseName = NQ24.ChooseHouseName() - If sHouseName == "" - sHouseName = DefaultHouseName.GetName() - EndIf - cHouseCell.SetName(sHouseName) HouseBoardREF.Enable() - If cHouseCell == CapitalCityPlayerhouse - Player.sHouseMarketQuarterName = sHouseName - ElseIf cHouseCell == CapitalCityPlayerHouseUpper - Player.sHouseNobleQuarterName = sHouseName - EndIf + if SKSE.GetVersion() + sHouseName = NQ24.ChooseHouseName() + If sHouseName == "" + sHouseName = DefaultHouseName.GetName() + EndIf + cHouseCell.SetName(sHouseName) + + If cHouseCell == CapitalCityPlayerhouse + Player.sHouseMarketQuarterName = sHouseName + ElseIf cHouseCell == CapitalCityPlayerHouseUpper + Player.sHouseNobleQuarterName = sHouseName + EndIf + endIf If !NQ24.IsCompleted() If !NQ24.IsRunning() diff --git a/source/scripts/_00e_nq06_functions.psc b/source/scripts/_00e_nq06_functions.psc index dfef617f..a8ff8475 100644 --- a/source/scripts/_00e_nq06_functions.psc +++ b/source/scripts/_00e_nq06_functions.psc @@ -7,6 +7,11 @@ Scriptname _00E_NQ06_Functions extends Quest Function SetHorseName() _00E_HorseOwned.SetValueInt(1) + + if ! SKSE.GetVersion() + return + endif + sHorseName = SetMountName() ActorBase PlayerHorseBase = PlayerHorse.GetActorReference().GetActorBase() If sHorseName != "" @@ -23,6 +28,11 @@ EndFunction Function SetMuleName() _00E_MuleOwned.SetValueInt(1) + + if ! SKSE.GetVersion() + return + endif + sMuleName = SetMountName() ActorBase PlayerMuleBase = Bonni.GetActorReference().GetActorBase() If sMuleName != "" @@ -39,6 +49,11 @@ EndFunction Function SetFatherShadowName() _00E_FathersShadowOwned.SetValueInt(1) + + if ! SKSE.GetVersion() + return + endif + sFathersShadowName = SetMountName() ActorBase PlayerFathersShadowBase = FS_NQR05_FatherShadow.GetActorReference().GetActorBase() If sFathersShadowName != "" @@ -60,22 +75,26 @@ EndFunction Function RenameMount(bool _bReturnToSelection) - int iRenameSelection = _00E_NQ06_RenameMountSelection.Show() - If iRenameSelection == 0 - SetMuleName() - ElseIf iRenameSelection == 1 - SetHorseName() - ElseIf iRenameSelection == 2 - SetFatherShadowName() - EndIf - - ReturnToSelection(_bReturnToSelection) + if SKSE.GetVersion() + int iRenameSelection = _00E_NQ06_RenameMountSelection.Show() + If iRenameSelection == 0 + SetMuleName() + ElseIf iRenameSelection == 1 + SetHorseName() + ElseIf iRenameSelection == 2 + SetFatherShadowName() + EndIf + + ReturnToSelection(_bReturnToSelection) + else + Debug.Notification("Renaming requires SKSE") + endif EndFunction Function ReturnToSelection(bool _bReturnToSelection) - If _bReturnToSelection == true + If _bReturnToSelection ((Self as Quest).GetAliasByName("HorseFlute") as _00E_HorseFlute_SC).PrepareTeleport() EndIf diff --git a/source/scripts/_00e_playerhousing_cellnamesc.psc b/source/scripts/_00e_playerhousing_cellnamesc.psc index c3ad6f5f..abce1b76 100644 --- a/source/scripts/_00e_playerhousing_cellnamesc.psc +++ b/source/scripts/_00e_playerhousing_cellnamesc.psc @@ -6,6 +6,10 @@ Scriptname _00E_PlayerHousing_CellNameSC extends ReferenceAlias ;===================================================================================== Event OnPlayerLoadGame() + if ! SKSE.GetVersion() + return + endif + If sHouseNobleQuarterName != "" CapitalCityPlayerHouseUpper.SetName(sHouseNobleQuarterName) Else