r1877 - in trunk/data: . menu/creategame/gamemodes menu/data/gamemodes
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Aug 30 15:22:59 EDT 2006
Author: esteel
Date: 2006-08-30 15:22:59 -0400 (Wed, 30 Aug 2006)
New Revision: 1877
Modified:
trunk/data/default.cfg
trunk/data/menu/creategame/gamemodes/teamplay.menu
trunk/data/menu/data/gamemodes/teamplay.menu
Log:
changed menu and default.cfg to use teamplay_default 4 so that g_mirrordamage and g_friendlyfire control things now
Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg 2006-08-30 19:22:35 UTC (rev 1876)
+++ trunk/data/default.cfg 2006-08-30 19:22:59 UTC (rev 1877)
@@ -251,13 +251,13 @@
// common team values
set g_tdm 0
-seta teamplay_default 3 // default teamplay setting in team games
+seta teamplay_default 4 // default teamplay setting in team games
// 1 = no friendly fire, self damage
// 2 = friendly fire and self damage enabled
// 3 = no friendly fire, but self damage enabled
// 4 = obey the following two cvars
-seta g_mirrordamage 0.0 // for teamplay 4: mirror damage factor
-seta g_friendlyfire 1.0 // for teamplay 4: fiendly fire factor
+seta g_mirrordamage 0.2 // for teamplay 4: mirror damage factor
+seta g_friendlyfire 0.0 // for teamplay 4: fiendly fire factor
set deathmatch_force_teamplay 0 // always play TDM on dm maps
seta g_balance_teams 0 // automatically balance out players entering instead of asking them for their preferred team
Modified: trunk/data/menu/creategame/gamemodes/teamplay.menu
===================================================================
--- trunk/data/menu/creategame/gamemodes/teamplay.menu 2006-08-30 19:22:35 UTC (rev 1876)
+++ trunk/data/menu/creategame/gamemodes/teamplay.menu 2006-08-30 19:22:59 UTC (rev 1877)
@@ -20,11 +20,16 @@
text "Force Teamplay (TDM) in Deathmatch maps"
target "::Data::Game::Teamplay::DMForceTeamplay::Switch"
}
- Derive Nex_Option_Switch TeamPlay
+ Derive Nex_Option_EditBox FriendlyFire
{
- text "Teamplay Friendly Fire"
- target "::Data::Game::Teamplay::TeamPlay::Switch"
+ text "Friendly Fire Amount"
+ target "Data::Game::Teamplay::FriendlyFire::Text"
}
+ Derive Nex_Option_EditBox MirrorDamage
+ {
+ text "Mirror Damage Amount"
+ target "::Data::Game::Teamplay::MirrorDamage::Text"
+ }
Derive Nex_Option_Switch BalanceTeams
{
text "Auto-Balance Teams on Join"
Modified: trunk/data/menu/data/gamemodes/teamplay.menu
===================================================================
--- trunk/data/menu/data/gamemodes/teamplay.menu 2006-08-30 19:22:35 UTC (rev 1876)
+++ trunk/data/menu/data/gamemodes/teamplay.menu 2006-08-30 19:22:59 UTC (rev 1877)
@@ -11,20 +11,19 @@
[DataLink_OnOffSwitch]
}
- Item Data_Cvar TeamPlay
+ Item Data_Cvar FriendlyFire
{
- cvarName "teamplay_default"
- defValue 1
+ cvarName "g_friendlyfire"
+ defValue 0.0
- Item DataLink_ValueSwitch Switch
- {
- minValue 1
- stepValue 1
- maxValue 3
- descList "'Self Fire, No Friendly' 'Friendly Fire' 'No Friendly Fire'"
+ [DataLink_Setting]
+ }
+ Item Data_Cvar MirrorDamage
+ {
+ cvarName "g_mirrordamage"
+ defValue 0.2
- link "##up"
- }
+ [DataLink_Setting]
}
Item Data_Cvar BalanceTeams
{
More information about the nexuiz-commits
mailing list