feat: LocationToString to print LevelName as well

feat: Check if player is already in the right Level before trying to load
fix: Presaved locations

Author: igromanru

scripts/LocationsManager.lua

@@ -9,7 +9,11 @@ local LocationsManager = {}
 function LocationToString(Location)
     if not Location or not Location.Name then return "" end
 
-    return Location.Name .. ": Coordinates " .. VectorToString(Location.Location) .. ", Rotation: " .. RotatorToString(Location.Rotation)
+    local result = Location.Name .. ": Coordinates " .. VectorToString(Location.Location) .. ", Rotation: " .. RotatorToString(Location.Rotation)
+    if Location.LevelName then
+        result = result .. ", LevelName: " .. Location.LevelName
+    end
+    return result
 end
 
 ---@param Name string
@@ -77,14 +81,20 @@ function LocationsManager.LoadLocation(Name)
         local myPlayer = AFUtils.GetMyPlayer()
         if myPlayer then
             if location.LevelName then
-                local outSuccess = { bSuccess = false }
-                local outNotLoaded = { bNotLoaded = false }
-                AFUtils.GetLevelStreamingCustom():LoadStreamLevel(myPlayer, location.LevelName, true, false, outSuccess, outNotLoaded)
-                LogDebug("LoadLocation: LoadStreamLevel Success: ", outSuccess.bSuccess)
-                LogDebug("LoadLocation: LoadStreamLevel NotLoaded: " .. outNotLoaded.bNotLoaded)
-                if not outSuccess or not outSuccess.bSuccess then
-                    LogError("LoadLocation: Failed to LoadStreamLevel, LevelName: " .. location.LevelName)
-                    return false
+                local myPlayerController = AFUtils.GetMyPlayerController()
+                if myPlayerController and myPlayerController.ActiveLevelName:ToString() ~= location.LevelName then
+                    LogDebug("LoadLocation: ActiveLevelName: " .. myPlayerController.ActiveLevelName:ToString())
+                    local outSuccess = { bSuccess = false }
+                    local outNotLoaded = { bNotLoaded = false }
+                    LogDebug("LoadLocation: LoadStreamLevel with name: " .. location.LevelName)
+                    local steamLevel = AFUtils.GetLevelStreamingCustom():LoadStreamLevel(myPlayerController:GetWorld(), location.LevelName, false, false, outSuccess, outNotLoaded)
+                    LogDebug("LoadLocation: LoadStreamLevel Success: ", outSuccess.bSuccess)
+                    LogDebug("LoadLocation: LoadStreamLevel NotLoaded: ", outNotLoaded.bNotLoaded)
+                    if not outSuccess or not outSuccess.bSuccess then
+                        LogError("LoadLocation: Failed to LoadStreamLevel, LevelName: " .. location.LevelName)
+                    end
+                else
+                    LogDebug("LoadLocation: Skip LoadStreamLevel, ActiveLevelName and location LevelName are the same")
                 end
             else
                 LogInfo("LoadLocation: Warning! Loading a Location wtihout a LevelName!")

scripts/Settings.lua

@@ -8,7 +8,7 @@ local BaseUtils = require("AFUtils.BaseUtils.BaseUtils")
 ---@field Rotation FRotator
 
 ---@param Name string
----@field LevelName string
+---@param LevelName string
 ---@param Location FVector
 ---@param Rotation FRotator?
 ---@return LocationStruct
@@ -50,9 +50,9 @@ Settings = {
     InventorySlotCount = -1,
     DistantShore = false,
     Locations = {
-        LocationStruct("Cafeteria", "Facility_Office1", FVector(12529, 128, -15377)),
-        LocationStruct("Flathill", "V_FOG", FVector(335956, 1294, 6203)),
-        LocationStruct("Distant Shore", "V_DistantShore", FVector(331136, -334205, 906)),
+        LocationStruct("Cafeteria", "Facility_Office1", FVector(-15314, 12532, 128), FRotator(0, 359, 0)),
+        LocationStruct("Flathill", "V_FOG", FVector(6275, 337158, 1294), FRotator(358, 268, 0)),
+        LocationStruct("Distant Shore", "V_DistantShore", FVector(331428, -334214, 908), FRotator(1, 3, 0)),
     }, ---@type LocationStruct[]
 }
 

scripts/main.lua

@@ -10,7 +10,7 @@
 local AFUtils = require("AFUtils.AFUtils")
 
 ModName = "CheatConsoleCommands"
-ModVersion = "1.8.0"
+ModVersion = "1.8.1"
 DebugMode = true
 IsModEnabled = true