From 9321a692d711bcd727e50078c8558053b307a325 Mon Sep 17 00:00:00 2001 From: esteel Date: Tue, 25 Oct 2005 22:51:46 +0000 Subject: [PATCH] time/fraglimit overrides have now default of -1 so 0 can disable the limits and small runemenu fixes git-svn-id: svn://svn.icculus.org/nexuiz/trunk@540 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- scmenu/creategame/gamemodes/ctf.menu | 8 ++- scmenu/creategame/gamemodes/domination.menu | 4 +- scmenu/creategame/gamemodes/runematch.menu | 4 +- scmenu/creategame/gamemodes/teamplay.menu | 12 ++--- scmenu/data/gamemodes/ctf.menu | 20 ++++++- scmenu/data/gamemodes/domination.menu | 20 ++++++- scmenu/data/gamemodes/runematch.menu | 58 +++++++++++++++++++-- scmenu/data/server.menu | 26 +++++++-- 8 files changed, 129 insertions(+), 23 deletions(-) diff --git a/scmenu/creategame/gamemodes/ctf.menu b/scmenu/creategame/gamemodes/ctf.menu index bc87662f2..ba0d76a36 100644 --- a/scmenu/creategame/gamemodes/ctf.menu +++ b/scmenu/creategame/gamemodes/ctf.menu @@ -5,9 +5,15 @@ Item Layout CTF origin '450 0' alignment [AlignFirst] + Derive Nex_Option_EditBox TimeLimit + { + text "Time Limit Override (disable: -1)" + // use the same one from the basic menu + target "Data::Server::TimeLimit::Text" + } Derive Nex_Option_EditBox CaptureLimit { - text "CTF Point Limit Override" + text "CTF Point Limit Override (disable: -1)" target "Data::Game::CTF::CaptureLimit::Text" } Derive Nex_Option_EditBox FlagReturnTime diff --git a/scmenu/creategame/gamemodes/domination.menu b/scmenu/creategame/gamemodes/domination.menu index 8bfc322b9..f13427bf9 100644 --- a/scmenu/creategame/gamemodes/domination.menu +++ b/scmenu/creategame/gamemodes/domination.menu @@ -12,13 +12,13 @@ Item Layout Domination //} Derive Nex_Option_EditBox TimeLimit { - text "Time Limit Override" + text "Time Limit Override (disable: -1)" // use the same one from the basic menu target "Data::Server::TimeLimit::Text" } Derive Nex_Option_EditBox DomFragLimit { - text "Score Limit Override" + text "Score Limit Override (disable: -1)" target "Data::Game::Domination::DomFragLimit::Text" } diff --git a/scmenu/creategame/gamemodes/runematch.menu b/scmenu/creategame/gamemodes/runematch.menu index cda6bdb43..b6ef9618c 100644 --- a/scmenu/creategame/gamemodes/runematch.menu +++ b/scmenu/creategame/gamemodes/runematch.menu @@ -32,13 +32,13 @@ Item Layout Runematch Derive Nex_Option_EditBox TimeLimit { - text "Time Limit Override" + text "Time Limit Override (disable: -1)" // use the same one from the basic menu target "Data::Server::TimeLimit::Text" } Derive Nex_Option_EditBox RunematchFragLimit { - text "Score Limit Override" + text "Score Limit Override (disable: -1)" target "Data::Game::Runematch::RunematchFragLimit::Text" } diff --git a/scmenu/creategame/gamemodes/teamplay.menu b/scmenu/creategame/gamemodes/teamplay.menu index 186ee93e4..a06a63374 100644 --- a/scmenu/creategame/gamemodes/teamplay.menu +++ b/scmenu/creategame/gamemodes/teamplay.menu @@ -5,16 +5,16 @@ Item Layout Teamplay origin '450 0' alignment [AlignFirst] - Derive Nex_Option_EditBox FragLimit - { - text "Frag Limit Override" - target "Data::Server::FragLimit::Text" - } Derive Nex_Option_EditBox TimeLimit { - text "Time Limit Override" + text "Time Limit Override (disable: -1)" target "Data::Server::TimeLimit::Text" } + Derive Nex_Option_EditBox FragLimit + { + text "Frag Limit Override (disable: -1)" + target "Data::Server::FragLimit::Text" + } Derive Nex_Option_Switch DMForceTeamplay { text "Force Teamplay (TDM) in Deathmatch maps" diff --git a/scmenu/data/gamemodes/ctf.menu b/scmenu/data/gamemodes/ctf.menu index 77b1c41a8..47154088d 100644 --- a/scmenu/data/gamemodes/ctf.menu +++ b/scmenu/data/gamemodes/ctf.menu @@ -13,9 +13,25 @@ Item DataContainer CTF Item Data_Cvar CaptureLimit { cvarName "g_ctf_capture_limit" - defValue 0 + defValue -1 - [DataLink_Setting] + Item DataLink_Value Value + { + minValue -1 + maxValue 9999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar FlagReturnTime { diff --git a/scmenu/data/gamemodes/domination.menu b/scmenu/data/gamemodes/domination.menu index 53d175911..96b864310 100644 --- a/scmenu/data/gamemodes/domination.menu +++ b/scmenu/data/gamemodes/domination.menu @@ -13,9 +13,25 @@ Item DataContainer Domination Item Data_Cvar DomFragLimit { cvarName "g_domination_point_limit" - defValue 0 + defValue -1 - [DataLink_Setting] + Item DataLink_Value Value + { + minValue -1 + maxValue 9999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar DisableFrags { diff --git a/scmenu/data/gamemodes/runematch.menu b/scmenu/data/gamemodes/runematch.menu index 3eedd63ed..e39c54357 100644 --- a/scmenu/data/gamemodes/runematch.menu +++ b/scmenu/data/gamemodes/runematch.menu @@ -7,9 +7,25 @@ Item DataContainer Runematch Item Data_Cvar RunematchFragLimit { cvarName "g_runematch_point_limit" - defValue 0 + defValue -1 - [DataLink_Setting] + Item DataLink_Value Value + { + minValue -1 + maxValue 9999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar PointAmt { @@ -138,13 +154,47 @@ Item DataContainer Runematch { cvarName "g_balance_curse_empathy_takedamage" defValue -0.6 - [DataLink_Setting] + + Item DataLink_Value Value + { + minValue -1 + maxValue 0 + stepValue 0.01 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar VampireComboDamage { cvarName "g_balance_rune_vampire_combo_absorb" defValue -0.2 - [DataLink_Setting] + + Item DataLink_Value Value + { + minValue -1 + maxValue 0 + stepValue 0.01 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" + + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } diff --git a/scmenu/data/server.menu b/scmenu/data/server.menu index 77a76932a..ef33216e1 100644 --- a/scmenu/data/server.menu +++ b/scmenu/data/server.menu @@ -76,11 +76,13 @@ Item DataContainer Server Item Data_Cvar TimeLimit { cvarName "timelimit_override" - defValue 0 + defValue -1 Item DataLink_Value Value { + minValue -1 maxValue 86400 + stepValue 1 link "##up" } Item DataLink_Text Text @@ -88,7 +90,7 @@ Item DataContainer Server maxValue 8 link "##down" - Item DataLink_TextTime TextTime + Item DataLink_TextValue TextValue { link "##up prev" } @@ -97,9 +99,25 @@ Item DataContainer Server Item Data_Cvar FragLimit { cvarName "fraglimit_override" - defValue 20 + defValue -1 + + Item DataLink_Value Value + { + minValue -1 + maxValue 9999.0 + stepValue 1 + link "##up" + } + Item DataLink_Text Text + { + maxValue 8 + link "##down" - [DataLink_Setting] + Item DataLink_TextValue TextValue + { + link "##up prev" + } + } } Item Data_Cvar ServerProgs { -- 2.39.2