From a61f8128e5ee6fb5a3683f8c21acf855e92f17ef Mon Sep 17 00:00:00 2001 From: SticklyMan Date: Thu, 22 Feb 2024 11:40:30 -0700 Subject: [PATCH] Replace ai_keepragdolls with ai_serverragdolls - Seems like the original setting no longer works, even in single player - Named "Keep Corpses" to be consistent with Gmod labeling --- lua/ulx/xgui/server/sv_settings.lua | 2 +- lua/ulx/xgui/settings/server.lua | 6 ++---- ulx.build | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/ulx/xgui/server/sv_settings.lua b/lua/ulx/xgui/server/sv_settings.lua index cadfae3..005afad 100644 --- a/lua/ulx/xgui/server/sv_settings.lua +++ b/lua/ulx/xgui/server/sv_settings.lua @@ -16,8 +16,8 @@ function settings.init() ULib.replicatedWritableCvar( "sv_voiceenable", "rep_sv_voiceenable", GetConVarNumber( "sv_voiceenable" ), false, false, "xgui_svsettings" ) ULib.replicatedWritableCvar( "sv_alltalk", "rep_sv_alltalk", GetConVarNumber( "sv_alltalk" ), false, false, "xgui_svsettings" ) ULib.replicatedWritableCvar( "ai_disabled", "rep_ai_disabled", GetConVarNumber( "ai_disabled" ), false, false, "xgui_svsettings" ) - ULib.replicatedWritableCvar( "ai_keepragdolls", "rep_ai_keepragdolls", GetConVarNumber( "ai_keepragdolls" ), false, false, "xgui_svsettings" ) ULib.replicatedWritableCvar( "ai_ignoreplayers", "rep_ai_ignoreplayers", GetConVarNumber( "ai_ignoreplayers" ), false, false, "xgui_svsettings" ) + ULib.replicatedWritableCvar( "ai_serverragdolls", "rep_ai_serverragdolls", GetConVarNumber( "ai_serverragdolls" ), false, false, "xgui_svsettings" ) ULib.replicatedWritableCvar( "sv_gravity", "rep_sv_gravity", GetConVarNumber( "sv_gravity" ), false, false, "xgui_svsettings" ) ULib.replicatedWritableCvar( "phys_timescale", "rep_phys_timescale", GetConVarNumber( "phys_timescale" ), false, false, "xgui_svsettings" ) diff --git a/lua/ulx/xgui/settings/server.lua b/lua/ulx/xgui/settings/server.lua index 98168a8..cc272de 100644 --- a/lua/ulx/xgui/settings/server.lua +++ b/lua/ulx/xgui/settings/server.lua @@ -8,11 +8,9 @@ local sidepanel = xlib.makescrollpanel{ x=5, y=5, w=140, h=322, spacing=4, paren xlib.makelabel{ dock=TOP, dockmargin={0,0,0,0}, label="Alltalk setting:", parent=sidepanel } xlib.makecombobox{ dock=TOP, dockmargin={0,2,0,0}, w=140, repconvar="rep_sv_alltalk", isNumberConvar=true, choices={ "Team near you", "Team only", "Everyone near you", "Everyone" }, parent=sidepanel } xlib.makecheckbox{ dock=TOP, dockmargin={0,5,0,0}, label="Enable Voice Chat", convar=xlib.ifListenHost("sv_voiceenable"), repconvar=xlib.ifNotListenHost("rep_sv_voiceenable"), parent=sidepanel } -xlib.makecheckbox{ dock=TOP, dockmargin={0,5,0,0}, label="Disable AI", convar=xlib.ifListenHost("ai_disabled"), repconvar=xlib.ifNotListenHost("rep_ai_disabled"), parent=sidepanel } +xlib.makecheckbox{ dock=TOP, dockmargin={0,20,0,0}, label="Disable AI", convar=xlib.ifListenHost("ai_disabled"), repconvar=xlib.ifNotListenHost("rep_ai_disabled"), parent=sidepanel } xlib.makecheckbox{ dock=TOP, dockmargin={0,5,0,0}, label="AI Ignore Players", convar=xlib.ifListenHost("ai_ignoreplayers"), repconvar=xlib.ifNotListenHost("rep_ai_ignoreplayers"), parent=sidepanel } -if game.SinglePlayer() then - xlib.makecheckbox{ dock=TOP, dockmargin={0,5,0,0}, label="Keep AI Ragdolls", convar=xlib.ifListenHost("ai_keepragdolls"), repconvar=xlib.ifNotListenHost("rep_ai_keepragdolls"), parent=sidepanel } -end +xlib.makecheckbox{ dock=TOP, dockmargin={0,5,0,0}, label="Keep Corpses", convar=xlib.ifListenHost("ai_serverragdolls"), repconvar=xlib.ifNotListenHost("rep_ai_serverragdolls"), parent=sidepanel } xlib.makelabel{ dock=TOP, dockmargin={0,5,0,0}, label="Gravity", parent=sidepanel } xlib.makeslider{ dock=TOP, dockmargin={0,2,5,0}, label="<--->", w=125, min=-1000, max=1000, convar=xlib.ifListenHost("sv_gravity"), repconvar=xlib.ifNotListenHost("rep_sv_gravity"), parent=sidepanel, fixclip=true } xlib.makelabel{ dock=TOP, dockmargin={0,5,0,0}, label="Physics Timescale", parent=sidepanel } diff --git a/ulx.build b/ulx.build index cd17fe3..0726b3e 100644 --- a/ulx.build +++ b/ulx.build @@ -1 +1 @@ -1708627107 +1708627249