diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index 2708703f..e90585fe 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/Skyrim.esm b/Skyrim.esm index 549a679e..4c27179a 100644 Binary files a/Skyrim.esm and b/Skyrim.esm differ diff --git a/scripts/_00E_SympathyControl.pex b/scripts/_00E_SympathyControl.pex index 7b0d6d4a..a5800c91 100644 Binary files a/scripts/_00E_SympathyControl.pex and b/scripts/_00E_SympathyControl.pex differ diff --git a/scripts/_00e_ark_travelcrossroadssc.pex b/scripts/_00e_ark_travelcrossroadssc.pex index d7ccd0bb..06a7349c 100644 Binary files a/scripts/_00e_ark_travelcrossroadssc.pex and b/scripts/_00e_ark_travelcrossroadssc.pex differ diff --git a/source/scripts/_00E_SympathyControl.psc b/source/scripts/_00E_SympathyControl.psc index b69b2788..40a69516 100644 --- a/source/scripts/_00E_SympathyControl.psc +++ b/source/scripts/_00E_SympathyControl.psc @@ -44,29 +44,23 @@ Function ModSympathyNG(Actor akSympathyActor, int iSympathyMod, bool bIsFlirt = EndIf EndIf - String sActorName = sympathyBase.GetName() - If !bStringOverride If (iSympathyMod > 0) && (iSympathyMod <= 5) _00E_Levelsystem_sApproves.Show() - ; Debug.Notification(sActorName + sLevelsystemAppreciate + ".") ElseIf (iSympathyMod > 5) && (iSympathyMod <= 10) _00E_Levelsystem_sAppreciates.Show() - ; Debug.Notification(sActorName + sLevelsystemAppreciateALot + ".") ElseIf (iSympathyMod > 10) && (iSympathyMod <= 20) _00E_Levelsystem_sAppreciatesALot.Show() - ; Debug.Notification(sActorName + sLevelsystemApproves + ".") ElseIf (iSympathyMod < 0) && (iSympathyMod >= -5) _00E_Levelsystem_sDislikes.Show() - ; Debug.Notification(sActorName + sLevelsystemDislikes + ".") ElseIf (iSympathyMod < -5) && (iSympathyMod >= -10) _00E_Levelsystem_sHurt.Show() - ; Debug.Notification(sActorName + sLevelsystemOffended + ".") ElseIf (iSympathyMod < -10) && (iSympathyMod >= -20) _00E_Levelsystem_sVeryHurt.Show() - ; Debug.Notification(sActorName + sLevelsystemVeryOffended + ".") EndIf Else + ; TODO: Use a vanilla message + String sActorName = sympathyBase.GetName() Debug.Notification(sActorName + sOverride) EndIf diff --git a/source/scripts/_00e_ark_travelcrossroadssc.psc b/source/scripts/_00e_ark_travelcrossroadssc.psc index 5c1b0d2f..50e380da 100644 --- a/source/scripts/_00e_ark_travelcrossroadssc.psc +++ b/source/scripts/_00e_ark_travelcrossroadssc.psc @@ -3,25 +3,29 @@ Scriptname _00e_Ark_TravelCrossroadsSC extends ObjectReference import UIExtensions ;===================================================================================== -; EVENTS +; EVENTS ;===================================================================================== Event OnActivate(ObjectReference akActionRef) - if akActionRef == PlayerREF - if MQ14.GetCurrentStageID() < 20 && MQ03.GetCurrentStageID() > 0 && !(MQ12b.GetCurrentStageID() >= 15 && MQ12c.GetCurrentStageID() < 5) && (_00E_TeleportGlobal.GetValueInt() == 0) - Game.RequestAutoSave() - ShowTravelMenu() - Elseif MQ12b.GetCurrentStageID() == 10 - ShowMQ12bTravelMenu() - Else - _00E_FastTravel_Ark_CantTravelRightNow.Show() - EndIf - EndIf - + + if akActionRef == PlayerREF + if MQ14.GetCurrentStageID() < 20 && MQ03.GetCurrentStageID() > 0 && !(MQ12b.GetCurrentStageID() >= 15 && MQ12c.GetCurrentStageID() < 5) && (_00E_TeleportGlobal.GetValueInt() == 0) + if SKSE.GetVersion() + ShowTravelMenu() + else + ShowTravelMenuVanilla() + endif + Elseif MQ12b.GetCurrentStageID() == 10 && SKSE.GetVersion() + ShowMQ12bTravelMenu() + Else + _00E_FastTravel_Ark_CantTravelRightNow.Show() + EndIf + EndIf + EndEvent ;===================================================================================== -; FUNCTIONS +; FUNCTIONS ;===================================================================================== Function ShowTravelMenu() @@ -124,8 +128,75 @@ Function ShowMQ12bTravelMenu() EndFunction +function ShowTravelMenuVanilla() + + int iListButton = _00E_FastTravel_Ark_SelectionMenu_01.Show() + + if iListButton == 0 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_Entrance) + ElseIf iListButton == 1 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_StrangerQuarter) + ElseIf iListButton == 2 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_Marketplace) + Elseif iListButton == 3 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_SouthQuarter) + Elseif iListButton == 4 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_NoblesQuarter) + elseif iListButton == 6 ; Exit + return + elseif iListButton == 5 ; More + + int iListButton2 = _00E_FastTravel_Ark_SelectionMenu_02.Show() + + if iListButton2 == 0 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_Harbour) + ElseIf iListButton2 == 1 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_Graveyard) + Elseif iListButton2 == 2 + If MQ03.IsCompleted() + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_Suntemple) + Else + _00E_FastTravel_Ark_NoTemple.Show() + EndIf + elseif iListButton2 == 3 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_UndercityEntrance) + elseif iListButton2 == 5 ; Exit + return + elseif iListButton2 == 4 ; More + + int iListButton3 = _00E_FastTravel_Ark_SelectionMenu_03.Show() + + if iListButton3 == 0 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_UndercityBarracks) + ElseIf iListButton3 == 1 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_UndercityMarketplace) + ElseIf iListButton3 == 2 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_UndercityTarpit) + Elseif iListButton3 == 3 + PlayerREF.MoveTo(_00E_FastTravel_Ark_Marker_CapitalCity_UndercityArena) + elseif iListButton3 == 5 ; Exit + return + elseif iListButton3 == 4 ; Return + ShowTravelMenuVanilla() + return + endif + + endif + + endif + + If iListButton == 0 || iListButton == 1 || iListButton == 3 + If MQ04.GetCurrentStageID() > 5 && !(MQ04.IsCompleted()) && !(MQ04.IsObjectiveCompleted(25)) + _00E_EPHandler.GiveEP(100) + MQ04.SetObjectiveCompleted(25) + EndIf + EndIf + +endfunction + + ;===================================================================================== -; PROPERTIES +; PROPERTIES ;===================================================================================== Actor Property PlayerREF Auto @@ -140,6 +211,7 @@ Message Property _00E_FastTravel_Ark_CantTravelRightNow Auto Message Property _00E_FastTravel_Ark_NoTemple Auto Message Property _00E_FastTravel_Ark_SelectionMenu_01 Auto Message Property _00E_FastTravel_Ark_SelectionMenu_02 Auto +Message Property _00E_FastTravel_Ark_SelectionMenu_03 Auto Message Property _00E_FastTravel_Ark_SelectionMenu_Restricted1 Auto GlobalVariable Property _00E_TeleportGlobal Auto diff --git a/strings/skyrim_english.dlstrings b/strings/skyrim_english.dlstrings index af5b7bac..a25ab545 100644 Binary files a/strings/skyrim_english.dlstrings and b/strings/skyrim_english.dlstrings differ diff --git a/strings/skyrim_english.strings b/strings/skyrim_english.strings index ffd0fb44..ea9e6d0c 100644 Binary files a/strings/skyrim_english.strings and b/strings/skyrim_english.strings differ