Skip to content

Commit 1bf12d7

Browse files
smilz0smilz0
committed
Better loading method
smilz0/Left4Bots#96
1 parent f955c36 commit 1bf12d7

File tree

4 files changed

+82
-35
lines changed

4 files changed

+82
-35
lines changed

‎out/Left4Lib.vpk

1.59 KB
Binary file not shown.

‎root/addoninfo.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
addonSteamAppID 550
44
addontitle "Left 4 Lib"
5-
addonversion "1.3.4"
5+
addonversion "1.3.5"
66
addonauthor "smilzo"
77
addonDescription "Just a small library with some shared VScript functions/classes"
88
addonContent_Script 1

‎root/scripts/vscripts/director_base_addon.nut

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1-
if ("HooksHub" in getroottable() && ::HooksHub.SecondRun)
1+
if ("L4LSecondRun" in getroottable())
22
{
3-
::HooksHub.Init();
4-
::HooksHub.DbgPrintFuncs();
3+
printl("[L4L] Second Run");
4+
5+
if ("HooksHub" in getroottable())
6+
{
7+
::HooksHub.Init();
8+
::HooksHub.DbgPrintFuncs();
9+
10+
delete ::L4LSecondRun;
11+
}
512
}
13+
else
14+
{
15+
printl("[L4L] First Run");
16+
::L4LSecondRun <- 1;
17+
}
18+

‎root/scripts/vscripts/left4lib_hooks.nut

+65-31
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ if (!("HooksHub" in getroottable()))
8282
{
8383
::HooksHub <-
8484
{
85-
SecondRun = false
8685
InterceptChatFuncs = {}
8786
AllowTakeDamageFuncs = {}
8887
AllowBashFuncs = {}
@@ -554,15 +553,16 @@ if (!("HooksHub" in getroottable()))
554553
{
555554
::Left4Lib.Logger.Debug("HooksHub.Init");
556555

557-
local my_g_ModeScript = getroottable().DirectorScript.MapScript.ChallengeScript;
558-
local my_g_MapScript = getroottable().DirectorScript.MapScript;
556+
local my_roottable = getroottable();
557+
local my_g_ModeScript = my_roottable.DirectorScript.MapScript.ChallengeScript;
558+
local my_g_MapScript = my_roottable.DirectorScript.MapScript;
559559

560560
// Setting up InterceptChat hooks
561-
if ("InterceptChat" in getroottable() && getroottable().InterceptChat != null && getroottable().InterceptChat != HooksHub.InterceptChat)
561+
if ("InterceptChat" in my_roottable && my_roottable.InterceptChat != null && my_roottable.InterceptChat != HooksHub.InterceptChat)
562562
{
563-
HooksHub.SetInterceptChat("L4LROOT", getroottable().InterceptChat);
563+
HooksHub.SetInterceptChat("L4LROOT", my_roottable.InterceptChat);
564564

565-
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous getroottable() InterceptChat hook");
565+
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous my_roottable InterceptChat hook");
566566
}
567567
if ("InterceptChat" in my_g_ModeScript && my_g_ModeScript.InterceptChat != null && my_g_ModeScript.InterceptChat != HooksHub.InterceptChat && HooksHub.GetInterceptChatByFunc(my_g_ModeScript.InterceptChat) == null)
568568
{
@@ -578,14 +578,14 @@ if (!("HooksHub" in getroottable()))
578578
}
579579

580580
::Left4Lib.Logger.Debug("HooksHub.Init - Setting HooksHub.InterceptChat hook");
581-
getroottable().InterceptChat <- ::HooksHub.InterceptChat;
581+
my_roottable.InterceptChat <- ::HooksHub.InterceptChat;
582582
my_g_ModeScript.InterceptChat <- ::HooksHub.InterceptChat;
583583
my_g_MapScript.InterceptChat <- ::HooksHub.InterceptChat;
584584

585585
// Setting up AllowTakeDamage hooks
586-
if ("AllowTakeDamage" in getroottable() && getroottable().AllowTakeDamage != null && getroottable().AllowTakeDamage != HooksHub.AllowTakeDamage)
586+
if ("AllowTakeDamage" in my_roottable && my_roottable.AllowTakeDamage != null && my_roottable.AllowTakeDamage != HooksHub.AllowTakeDamage)
587587
{
588-
HooksHub.SetAllowTakeDamage("L4LROOT", getroottable().AllowTakeDamage);
588+
HooksHub.SetAllowTakeDamage("L4LROOT", my_roottable.AllowTakeDamage);
589589

590590
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous getroottable() AllowTakeDamage hook");
591591
}
@@ -603,16 +603,16 @@ if (!("HooksHub" in getroottable()))
603603
}
604604

605605
::Left4Lib.Logger.Debug("HooksHub.Init - Setting HooksHub.AllowTakeDamage hook");
606-
getroottable().AllowTakeDamage <- ::HooksHub.AllowTakeDamage;
606+
my_roottable.AllowTakeDamage <- ::HooksHub.AllowTakeDamage;
607607
my_g_ModeScript.AllowTakeDamage <- ::HooksHub.AllowTakeDamage;
608608
my_g_MapScript.AllowTakeDamage <- ::HooksHub.AllowTakeDamage;
609609

610610
// Setting up AllowBash hooks
611-
if ("AllowBash" in getroottable() && getroottable().AllowBash != null && getroottable().AllowBash != HooksHub.AllowBash)
611+
if ("AllowBash" in my_roottable && my_roottable.AllowBash != null && my_roottable.AllowBash != HooksHub.AllowBash)
612612
{
613-
HooksHub.SetAllowBash("L4LROOT", getroottable().AllowBash);
613+
HooksHub.SetAllowBash("L4LROOT", my_roottable.AllowBash);
614614

615-
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous getroottable() AllowBash hook");
615+
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous my_roottable AllowBash hook");
616616
}
617617
if ("AllowBash" in my_g_ModeScript && my_g_ModeScript.AllowBash != null && my_g_ModeScript.AllowBash != HooksHub.AllowBash && HooksHub.GetAllowBashByFunc(my_g_ModeScript.AllowBash) == null)
618618
{
@@ -628,16 +628,16 @@ if (!("HooksHub" in getroottable()))
628628
}
629629

630630
::Left4Lib.Logger.Debug("HooksHub.Init - Setting HooksHub.AllowBash hook");
631-
getroottable().AllowBash <- ::HooksHub.AllowBash;
631+
my_roottable.AllowBash <- ::HooksHub.AllowBash;
632632
my_g_ModeScript.AllowBash <- ::HooksHub.AllowBash;
633633
my_g_MapScript.AllowBash <- ::HooksHub.AllowBash;
634634

635635
// Setting up UserConsoleCommand hooks
636-
if ("UserConsoleCommand" in getroottable() && getroottable().UserConsoleCommand != null && getroottable().UserConsoleCommand != HooksHub.UserConsoleCommand)
636+
if ("UserConsoleCommand" in my_roottable && my_roottable.UserConsoleCommand != null && my_roottable.UserConsoleCommand != HooksHub.UserConsoleCommand)
637637
{
638-
HooksHub.SetUserConsoleCommand("L4LROOT", getroottable().UserConsoleCommand);
638+
HooksHub.SetUserConsoleCommand("L4LROOT", my_roottable.UserConsoleCommand);
639639

640-
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous getroottable() UserConsoleCommand hook");
640+
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous my_roottable UserConsoleCommand hook");
641641
}
642642
if ("UserConsoleCommand" in my_g_ModeScript && my_g_ModeScript.UserConsoleCommand != null && my_g_ModeScript.UserConsoleCommand != HooksHub.UserConsoleCommand && HooksHub.GetUserConsoleCommandByFunc(my_g_ModeScript.UserConsoleCommand) == null)
643643
{
@@ -653,16 +653,16 @@ if (!("HooksHub" in getroottable()))
653653
}
654654

655655
::Left4Lib.Logger.Debug("HooksHub.Init - Setting HooksHub.UserConsoleCommand hook");
656-
getroottable().UserConsoleCommand <- ::HooksHub.UserConsoleCommand;
656+
my_roottable.UserConsoleCommand <- ::HooksHub.UserConsoleCommand;
657657
my_g_ModeScript.UserConsoleCommand <- ::HooksHub.UserConsoleCommand;
658658
my_g_MapScript.UserConsoleCommand <- ::HooksHub.UserConsoleCommand;
659659

660660
// Setting up BotQuery hooks
661-
if ("BotQuery" in getroottable() && getroottable().BotQuery != null && getroottable().BotQuery != HooksHub.BotQuery)
661+
if ("BotQuery" in my_roottable && my_roottable.BotQuery != null && my_roottable.BotQuery != HooksHub.BotQuery)
662662
{
663-
HooksHub.SetBotQuery("L4LROOT", getroottable().BotQuery);
663+
HooksHub.SetBotQuery("L4LROOT", my_roottable.BotQuery);
664664

665-
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous getroottable() BotQuery hook");
665+
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous my_roottable BotQuery hook");
666666
}
667667
if ("BotQuery" in my_g_ModeScript && my_g_ModeScript.BotQuery != null && my_g_ModeScript.BotQuery != HooksHub.BotQuery && HooksHub.GetBotQueryByFunc(my_g_ModeScript.BotQuery) == null)
668668
{
@@ -678,16 +678,16 @@ if (!("HooksHub" in getroottable()))
678678
}
679679

680680
::Left4Lib.Logger.Debug("HooksHub.Init - Setting HooksHub.BotQuery hook");
681-
getroottable().BotQuery <- ::HooksHub.BotQuery;
681+
my_roottable.BotQuery <- ::HooksHub.BotQuery;
682682
my_g_ModeScript.BotQuery <- ::HooksHub.BotQuery;
683683
my_g_MapScript.BotQuery <- ::HooksHub.BotQuery;
684684

685685
// Setting up CanPickupObject hooks
686-
if ("CanPickupObject" in getroottable() && getroottable().CanPickupObject != null && getroottable().CanPickupObject != HooksHub.CanPickupObject)
686+
if ("CanPickupObject" in my_roottable && my_roottable.CanPickupObject != null && my_roottable.CanPickupObject != HooksHub.CanPickupObject)
687687
{
688-
HooksHub.SetCanPickupObject("L4LROOT", getroottable().CanPickupObject);
688+
HooksHub.SetCanPickupObject("L4LROOT", my_roottable.CanPickupObject);
689689

690-
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous getroottable() CanPickupObject hook");
690+
::Left4Lib.Logger.Debug("HooksHub.Init - Added previous my_roottable CanPickupObject hook");
691691
}
692692
if ("CanPickupObject" in my_g_ModeScript && my_g_ModeScript.CanPickupObject != null && my_g_ModeScript.CanPickupObject != HooksHub.CanPickupObject && HooksHub.GetCanPickupObjectByFunc(my_g_ModeScript.CanPickupObject) == null)
693693
{
@@ -703,7 +703,7 @@ if (!("HooksHub" in getroottable()))
703703
}
704704

705705
::Left4Lib.Logger.Debug("HooksHub.Init - Setting HooksHub.CanPickupObject hook");
706-
getroottable().CanPickupObject <- ::HooksHub.CanPickupObject;
706+
my_roottable.CanPickupObject <- ::HooksHub.CanPickupObject;
707707
my_g_ModeScript.CanPickupObject <- ::HooksHub.CanPickupObject;
708708
my_g_MapScript.CanPickupObject <- ::HooksHub.CanPickupObject;
709709

@@ -851,6 +851,40 @@ if (!("HooksHub" in getroottable()))
851851
}
852852
}
853853

854+
::HooksHub.CheckHooks <- function ()
855+
{
856+
local function checkHooksInTable(tbl, tblName, hookNames, err = false)
857+
{
858+
local n = 0;
859+
foreach (hookName in hookNames)
860+
{
861+
if ((hookName in tbl) && tbl[hookName] != ::HooksHub[hookName])
862+
{
863+
if (err)
864+
::Left4Lib.Logger.Error(hookName + " hook in " + tblName + " is not HooksHub." + hookName + "! Hook was set in " + tbl[hookName].getinfos().src);
865+
else
866+
::Left4Lib.Logger.Warning(hookName + " hook in " + tblName + " is not HooksHub." + hookName + "! Hook was set in " + tbl[hookName].getinfos().src);
867+
n++;
868+
}
869+
}
870+
return n;
871+
}
872+
873+
::Left4Lib.Logger.Debug("HooksHub.CheckHooks");
874+
875+
local hooks = ["InterceptChat", "AllowTakeDamage", "AllowBash", "UserConsoleCommand", "BotQuery", "CanPickupObject"];
876+
local errors = checkHooksInTable(getroottable(), "getroottable()", hooks);
877+
errors += checkHooksInTable(getroottable().DirectorScript.MapScript.ChallengeScript, "g_ModeScript", hooks, true);
878+
errors += checkHooksInTable(getroottable().DirectorScript.MapScript, "g_MapScript", hooks);
879+
/*
880+
NOTE:
881+
C++ seems to give g_ModeScript hooks the highest priority, so at this point if roottable and g_MapScript hooks are overwritten it doesn't matter, as long as g_ModeScript hooks are OK.
882+
*/
883+
884+
if (errors == 0)
885+
::Left4Lib.Logger.Info("HooksHub hooks OK");
886+
}
887+
854888
// https://github.com/smilz0/Left4Bots/issues/96
855889
/*
856890
Scripts/events order of each map (excluding map restart):
@@ -869,13 +903,13 @@ if (!("HooksHub" in getroottable()))
869903
However this will fail if other addons don't check if the hooks are already set and will replace HooksHub in the second scriptedmode_addon/director_base_addon cycle (previous logic likely had the same problem, so...).
870904
*/
871905

872-
// This is triggered even before the scriptedmode.nut (but only the second time, so only once per map)
906+
// This is triggered even before the scriptedmode.nut (but only the second time, so only once per map). NOTE: This is triggere before the director_base_addon(s) in map restart!
907+
/*
873908
::HooksHub.Events.OnGameEvent_round_start_pre_entity <- function (params)
874909
{
875910
::Left4Lib.Logger.Debug("OnGameEvent_round_start_pre_entity");
876-
877-
HooksHub.SecondRun = true;
878911
}
912+
*/
879913

880914
// This is triggered right before round_start (but still after OnActivate after map transitions)
881915
/*
@@ -886,12 +920,12 @@ if (!("HooksHub" in getroottable()))
886920
*/
887921

888922
// Like round_start_post_nav, it's triggered after OnActivate after map transition, before only on first map
889-
/*
890923
::HooksHub.Events.OnGameEvent_round_start <- function (params)
891924
{
892925
::Left4Lib.Logger.Debug("OnGameEvent_round_start");
926+
927+
DoEntFire("worldspawn", "RunScriptCode", "::HooksHub.CheckHooks()", 5.0, null, null);
893928
}
894-
*/
895929

896930
::Left4Lib.Logger.Info("HooksHub created");
897931
}

0 commit comments

Comments
 (0)