Code cleanups + keepaway powerups, this one might be questionable and might require...

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index d2a47a09eca48dd42d346e3892ea60122bf1f2a6..7a61616de0f6b43f1b955b20ac7b0c86c5efb852 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -606,8 +606,8 @@ set g_cts_respawn_waves 0
 set g_cts_respawn_delay 0.25
 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts"
 set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible"
-set g_keepaway_respawn_delay 0
-set g_keepaway_respawn_waves 0
+set g_ka_respawn_delay 0
+set g_ka_respawn_waves 0
 
 // overtime
 seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit"
@@ -1247,21 +1247,21 @@ set g_keyhunt_teams 0
 
 // keepaway
 set g_keepaway 0 "game mode which focuses around a ball, look at g_keepaway_win_mode for further details"
+set g_keepaway_bckillscore 1 "enable scoring points (y/n) for ball carrier kills"
 set g_keepaway_pointlimit      -1      "total amount of points you can get, -1 for unlimited"
 set g_keepaway_pointleadlimit  -1      "mercy rule, -1 for unlimited"
-set g_keepaway_powerup 0       "powerup while holding the ball"
-set g_keepaway_powerup_damage  1.5     "damage multiplier while having powerup"
-set g_keepaway_powerup_force   1.5     "force multiplier while having powerup"
-set g_keepaway_powerup_selfdamage      1       "self damage multiplier while having powerup"
-set g_keepaway_powerup_selfforce       1.5     "self force multiplier while having powerup"
+set g_keepaway_ballcarrier_highspeed 1.5 "speed multiplier done to the person holding the ball"
+set g_keepaway_ballcarrier_damage      1.5     "damage multiplier while having powerup"
+set g_keepaway_ballcarrier_force       1.5     "force multiplier while having powerup"
+set g_keepaway_ballcarrier_selfdamage  1       "self damage multiplier while having powerup"
+set g_keepaway_ballcarrier_selfforce   1.5     "self force multiplier while having powerup"
 set g_keepaway_noncarrier_warn 0       "warn players when they kill without holding the ball"
 set g_keepaway_noncarrier_damage       0.5     "damage done to other players if both you and they don't have the ball"
 set g_keepaway_noncarrier_force        0.5     "force done to other players if both you and they don't have the ball"
 set g_keepaway_noncarrier_selfdamage   1       "self damage if you don't have the ball"
 set g_keepaway_noncarrier_selfforce    1       "self force if you don't have the ball"
-seta g_keepaway_win_mode       0       "win mode for keepaway: 0 = time, 1 = kills as carrier (KAC)"
 set g_keepawayball_trail_color 254     "particle trail color from player/ball"
-set g_keepawayball_damageforcescale    1       "I don't really know what this is for. :)"
+set g_keepawayball_damageforcescale    2 "Scale of force which is applied to the ball by weapons/explosions/etc"
 set g_keepawayball_respawntime 15      "if no one picks up the ball, how long to wait until the ball respawns"
 seta g_keepaway_teams_override 0
 set g_keepaway_teams 0
@@ -1784,6 +1784,7 @@ alias cl_hook_gamestart_as
 alias cl_hook_gamestart_rc
 alias cl_hook_gamestart_nexball
 alias cl_hook_gamestart_cts
+alias cl_hook_gamestart_ka
 alias cl_hook_gameend
 alias cl_hook_activeweapon
 
@@ -1804,6 +1805,7 @@ alias sv_hook_gamestart_as
 alias sv_hook_gamestart_rc
 alias sv_hook_gamestart_nexball
 alias sv_hook_gamestart_cts
+alias sv_hook_gamestart_ka
 alias sv_hook_gamerestart
 alias sv_hook_gameend
 
@@ -2024,7 +2026,7 @@ set g_forced_team_otherwise "default" "action if a non listed player joins (can
 exec balanceXonotic.cfg
 exec ctfscoring-ai.cfg
 exec effects-normal.cfg
-exec physicsNoQWBunny-xpmbased.cfg
+exec physicsX0.cfg
 exec turrets.cfg
 
 // hud cvar descriptions