modernized for 2026 gmod functionality

This commit is contained in:
2026-01-04 18:26:23 -06:00
parent 1d676526fe
commit 1f89099250
7 changed files with 60 additions and 39 deletions

View File

@@ -32,7 +32,7 @@
net.Receive("JB.GetLogs",function()
local DamageLog = net.ReadTable();
local printLog=tobool(net.ReadBit());
local printLog = net.ReadBool();
if printLog then
MsgC(JB.Color.white,[[

View File

@@ -332,7 +332,7 @@ function JB:EndRound(winner)
net.Start("JB.GetLogs");
net.WriteTable(JB.ThisRound and JB.ThisRound.Logs or {});
net.WriteBit(true);
net.WriteBool(true);
net.Broadcast(p);
net.Start("JB.SendRoundUpdate"); net.WriteInt(STATE_ENDED,8); net.WriteInt(winner or 0, 8); net.Broadcast();

View File

@@ -35,37 +35,37 @@
resource.AddWorkshop("389805614");
--[[ If the workshop fails, the files below will be downloaded from the server :)
resource.AddFile("materials/jailbreak_excl/notify_bracket.png");
resource.AddFile("materials/jailbreak_excl/hud_restricted.png");
resource.AddFile("materials/jailbreak_excl/hud_health.png");
resource.AddFile("materials/jailbreak_excl/hud_health_bottom.png");
resource.AddFile("materials/jailbreak_excl/hud_warden_bar.png");
resource.AddFile("materials/jailbreak_excl/hud_time.png");
resource.AddFile("materials/jailbreak_excl/scoreboard_edge.png");
resource.AddFile("materials/jailbreak_excl/scoreboard_middle.png");
resource.AddFile("materials/jailbreak_excl/scoreboard_avatar.png");
resource.AddFile("materials/jailbreak_excl/weapon_selection_tile.png");
resource.AddFile("materials/jailbreak_excl/button_edge.png");
resource.AddFile("materials/jailbreak_excl/button_middle.png");
resource.AddFile("materials/jailbreak_excl/crosshair.png");
resource.AddFile("materials/jailbreak_excl/gradient.png");
resource.AddFile("materials/jailbreak_excl/lastrequest.png");
resource.AddFile("materials/jailbreak_excl/logo_guard.png")
resource.AddFile("materials/jailbreak_excl/logo_prisoner.png");
resource.AddFile("materials/jailbreak_excl/scope.png");
resource.AddFile("materials/jailbreak_excl/notify_quick_edge.png");
resource.AddFile("materials/jailbreak_excl/notify_quick_middle.png");
resource.AddFile("materials/jailbreak_excl/vgui_close.png");
resource.AddFile("materials/jailbreak_excl/vgui_close_hover.png");
resource.AddSingleFile("materials/jailbreak_excl/notify_bracket.png");
resource.AddSingleFile("materials/jailbreak_excl/hud_restricted.png");
resource.AddSingleFile("materials/jailbreak_excl/hud_health.png");
resource.AddSingleFile("materials/jailbreak_excl/hud_health_bottom.png");
resource.AddSingleFile("materials/jailbreak_excl/hud_warden_bar.png");
resource.AddSingleFile("materials/jailbreak_excl/hud_time.png");
resource.AddSingleFile("materials/jailbreak_excl/scoreboard_edge.png");
resource.AddSingleFile("materials/jailbreak_excl/scoreboard_middle.png");
resource.AddSingleFile("materials/jailbreak_excl/scoreboard_avatar.png");
resource.AddSingleFile("materials/jailbreak_excl/weapon_selection_tile.png");
resource.AddSingleFile("materials/jailbreak_excl/button_edge.png");
resource.AddSingleFile("materials/jailbreak_excl/button_middle.png");
resource.AddSingleFile("materials/jailbreak_excl/crosshair.png");
resource.AddSingleFile("materials/jailbreak_excl/gradient.png");
resource.AddSingleFile("materials/jailbreak_excl/lastrequest.png");
resource.AddSingleFile("materials/jailbreak_excl/logo_guard.png")
resource.AddSingleFile("materials/jailbreak_excl/logo_prisoner.png");
resource.AddSingleFile("materials/jailbreak_excl/scope.png");
resource.AddSingleFile("materials/jailbreak_excl/notify_quick_edge.png");
resource.AddSingleFile("materials/jailbreak_excl/notify_quick_middle.png");
resource.AddSingleFile("materials/jailbreak_excl/vgui_close.png");
resource.AddSingleFile("materials/jailbreak_excl/vgui_close_hover.png");
resource.AddFile("materials/jailbreak_excl/guide/slide_1.png");
resource.AddFile("materials/jailbreak_excl/guide/slide_2.png");
resource.AddFile("materials/jailbreak_excl/guide/slide_3.png");
resource.AddFile("materials/jailbreak_excl/guide/slide_4.png");
resource.AddSingleFile("materials/jailbreak_excl/guide/slide_1.png");
resource.AddSingleFile("materials/jailbreak_excl/guide/slide_2.png");
resource.AddSingleFile("materials/jailbreak_excl/guide/slide_3.png");
resource.AddSingleFile("materials/jailbreak_excl/guide/slide_4.png");
resource.AddFile("materials/jailbreak_excl/pointers/pointer_background.png");
resource.AddFile("materials/jailbreak_excl/pointers/generic.png")
resource.AddFile("materials/jailbreak_excl/pointers/exclamation.png")
resource.AddFile("materials/jailbreak_excl/pointers/question.png")
resource.AddFile("materials/jailbreak_excl/pointers/line.png")
resource.AddFile("materials/jailbreak_excl/pointers/cross.png")]]
resource.AddSingleFile("materials/jailbreak_excl/pointers/pointer_background.png");
resource.AddSingleFile("materials/jailbreak_excl/pointers/generic.png")
resource.AddSingleFile("materials/jailbreak_excl/pointers/exclamation.png")
resource.AddSingleFile("materials/jailbreak_excl/pointers/question.png")
resource.AddSingleFile("materials/jailbreak_excl/pointers/line.png")
resource.AddSingleFile("materials/jailbreak_excl/pointers/cross.png")]]

View File

@@ -238,7 +238,7 @@ local getLogs=function(p,cmd,a)
net.Start("JB.GetLogs");
net.WriteTable(logs or {});
net.WriteBit(true);
net.WriteBool(true);
net.Send(p);
end
concommand.Add("jb_logs_get",getLogs);

View File

@@ -146,8 +146,22 @@ JB.Gamemode.TeamBased = true;
JB.Gamemode.Name = "Jail Break";
-- utility functions
local function getGamemodeFolder()
local gm = GM or GAMEMODE
if gm and gm.FolderName and gm.FolderName ~= "" then
return gm.FolderName
end
if engine and engine.ActiveGamemode then
local active = engine.ActiveGamemode()
if active and active ~= "" then
return active
end
end
return "jailbreak"
end
local loadFolder = function(folder,shared)
local path = "jailbreak/gamemode/"..folder.."/";
local path = getGamemodeFolder().."/gamemode/"..folder.."/";
for _,name in pairs(file.Find(path.."*.lua","LUA")) do
local runtype = shared or "sh";
@@ -180,4 +194,4 @@ end
JB.Util = {};
assert(loadFolder("util") and loadFolder("core") and loadFolder("classes","sh") and loadFolder("lastrequests","sh") and loadFolder("vgui","cl"),"Failed to load Jail Break 7! Contact a developer!")
assert(loadFolder("util") and loadFolder("core") and loadFolder("classes","sh") and loadFolder("lastrequests","sh") and loadFolder("vgui","cl"),"Failed to load Jail Break 7! Contact a developer!")