New loading method + fix for L4U in singleplayer

smilz0/Left4Bots#96

Author: smilz0

out/Left4Lib.vpk

@@ -0,0 +1,5 @@
+if ("HooksHub" in getroottable() && ::HooksHub.SecondRun)
+{
+	::HooksHub.Init();
+	::HooksHub.DbgPrintFuncs();
+}

root/scripts/vscripts/director_base_addon.nut

@@ -82,6 +82,7 @@ if (!("HooksHub" in getroottable()))
 {
 	::HooksHub <-
 	{
+		SecondRun = false
 		InterceptChatFuncs = {}
 		AllowTakeDamageFuncs = {}
 		AllowBashFuncs = {}
@@ -873,26 +874,24 @@ if (!("HooksHub" in getroottable()))
 	{
 		::Left4Lib.Logger.Debug("OnGameEvent_round_start_pre_entity");
 
-		HooksHub.Init();
-		
-		HooksHub.DbgPrintFuncs();
+		HooksHub.SecondRun = true;
 	}
 
 	// This is triggered right before round_start (but still after OnActivate after map transitions)
+	/*
 	::HooksHub.Events.OnGameEvent_round_start_post_nav <- function (params)
 	{
 		::Left4Lib.Logger.Debug("OnGameEvent_round_start_post_nav");
 	}
+	*/
 
 	// Like round_start_post_nav, it's triggered after OnActivate after map transition, before only on first map
+	/*
 	::HooksHub.Events.OnGameEvent_round_start <- function (params)
 	{
 		::Left4Lib.Logger.Debug("OnGameEvent_round_start");
-		
-		HooksHub.Init();
-		
-		HooksHub.DbgPrintFuncs();
 	}
+	*/
 
 	::Left4Lib.Logger.Info("HooksHub created");
 }

root/scripts/vscripts/left4lib_hooks.nut

@@ -236,14 +236,23 @@ if (!("Left4Users" in getroottable()))
 	::Left4Users.GetUserLevel <- function (player)
 	{
 		if (!player || !player.IsValid())
+		{
+			::Left4Lib.Logger.Debug("Left4Users.GetUserLevel - player: " + player);
 			return L4U_LEVEL.User;
+		}
 
 		local steamid = player.GetNetworkIDString();
 		if (!steamid || steamid == "BOT")
+		{
+			::Left4Lib.Logger.Debug("Left4Users.GetUserLevel - steamid: " + steamid);
 			return L4U_LEVEL.User; // player is a bot
+		}
 
 		if (Director.IsSinglePlayerGame())
+		{
+			::Left4Lib.Logger.Debug("Left4Users.GetUserLevel - IsSinglePlayerGame");
 			return L4U_LEVEL.Admin; // It's a single player game, player is supposed to be the only user here. Will give him admin privileges
+		}
 
 		local host = GetListenServerHost();
 		if (host && host == player)
@@ -261,6 +270,9 @@ if (!("Left4Users" in getroottable()))
 
 				::Left4Lib.Logger.Info("Local host " + player.GetPlayerName() + " has been added to the admins list");
 			}
+			else
+				::Left4Lib.Logger.Debug("Left4Users.GetUserLevel - steamid in Admins");
+
 			return L4U_LEVEL.Admin;
 		}
 
@@ -277,15 +289,15 @@ if (!("Left4Users" in getroottable()))
 
 	::Left4Users.PlayerJoined <- function (player)
 	{
-		//::Left4Lib.Logger.Debug("Left4Users.PlayerJoined - player: " + player.GetPlayerName());
-		
 		local userid = player.GetPlayerUserId();
 		local steamid = player.GetNetworkIDString();
 		local index = player.GetEntityIndex();
 		local level = GetUserLevel(player);
 		local tm = Director.GetTotalElapsedMissionTime();
 		local joined = false;
 
+		::Left4Lib.Logger.Debug("Left4Users.PlayerJoined - player: " + player.GetPlayerName() + " - level: " + level);
+		
 		if ((userid in OnlineUsers) && OnlineUsers[userid].conntime <= tm)
 		{
 			// It's an already connected player
@@ -299,6 +311,7 @@ if (!("Left4Users" in getroottable()))
 				OnlineUsers[userid].connfull = 1;
 				joined = true;
 			}
+			OnlineUsers[userid].level = level;
 		}
 		else
 		{

root/scripts/vscripts/left4lib_users.nut

@@ -71,33 +71,3 @@ function ScriptMode_Init( modename, mapname )
 
 	return true;
 }
-
-function ScriptMode_OnActivate( modename, mapname )
-{
-	printl("[L4L] ScriptMode_OnActivate");
-	
-	if ( g_ModeScript == null )
-	{
-		// Need to reload the mode script
-		// TODO: Should know exactly which script we want to load here
-		
-		g_ModeScript = getroottable().DirectorScript.MapScript.ChallengeScript
-
-		if ( IncludeScript( modename, g_ModeScript ) )
-		{
-			printl( "ScriptMode loaded " + modename + " and now Initializing" )
-		}
-	}
-		
-	if ( !SessionState.StartActive )
-	{
-		MergeSessionOptionTables()
-	}
-
-	if ( "SetupModeHUD" in g_ModeScript )
-	{
-		g_ModeScript.SetupModeHUD()
-	}
-
-	ScriptMode_SystemCall("OnActivate")
-}