Restore old secondary force for overkill balance

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

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 630eb7a85d7bfee6e2eee10725c8299d0297f925..80d99022669f30b3819d93f0ba2da519c9bb30cc 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -2,8 +2,8 @@
 //  Master config for core game modes
 // ===================================
 
-// global gametype setting (1 = deathmatch)
-set gamecfg 1
+// global gametype setting (0 = deathmatch)
+set gamecfg 0
 
 // say aliases
 alias asay_ctf_flagcarrier "say_team flag carrier at %y"
@@ -39,6 +39,7 @@ alias cl_hook_gamestart_ka
 alias cl_hook_gamestart_ft
 alias cl_hook_gamestart_inv
 alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
+alias cl_hook_shutdown
 alias cl_hook_activeweapon
 
 alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2"
@@ -256,6 +257,7 @@ set g_ca_teams 0
 set g_ctf 0 "Capture The Flag: take the enemy flag and bring it to yours at your base to score"
 set g_ctf_oneflag 0 "Allow oneflag CTF mode on maps that support it"
 set g_ctf_oneflag_reverse 0 "apply reverse mode to oneflag CTF (take flag to enemy bases to cap), overrides g_ctf_reverse only in oneflag, g_ctf_reverse still affects oneflag"
+set g_ctf_leaderboard 0 "show top capture times in the scoreboard"
 set g_ctf_flag_return 1 "auto return the flag to base when touched by a teammate"
 set g_ctf_flag_return_carrying 0 "(manual return mode) auto return the flag to base if touched by a flag carrier"
 set g_ctf_flag_return_carried_radius 100 "allow flags to be returned by carrier if base is within this radius"
@@ -308,6 +310,7 @@ set g_ctf_pass_velocity 750 "how fast or far a player can pass the flag"
 set g_ctf_allow_vehicle_touch 0 "allow flags to be picked up/captured/returned without even leaving the vehicle"
 set g_ctf_allow_vehicle_carry 1 "allow players to hold flags inside a vehicle"
 set g_ctf_allow_monster_touch 0 "allow flags to be returned by monsters"
+set g_ctf_score_ignore_fields 0 "force regular score settings to override per entity specified scores"
 
 set g_ctf_shield_max_ratio 0   "shield at most this percentage of a team from the enemy flag (try: 0.4 for 40%)"
 set g_ctf_shield_min_negscore 20       "shield the player from the flag if he's got this negative amount of points or less"
@@ -326,7 +329,6 @@ set g_ctf_flag_neutral_skin 4
 set g_ctf_flag_glowtrails 1
 set g_ctf_fullbrightflags 0
 set g_ctf_dynamiclights 0
-set g_ctf_captimerecord_always 0 "always show capture time information when someone captures the flag"
 
 seta g_ctf_ignore_frags 0      "1: regular frags give no points"
 exec ctfscoring-samual.cfg
@@ -418,7 +420,9 @@ set g_keepawayball_respawntime      10      "if no one picks up the ball, how long to wait
 //  key hunt
 // ==========
 set g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score"
-set g_balance_keyhunt_delay_return 60
+set g_balance_keyhunt_return_when_unreachable 1 "automatically destroy a key if it falls into lava/slime/trigger hurt"
+set g_balance_keyhunt_delay_damage_return 5 "time a key takes to automatically destroy itself if it falls into lava/slime/trigger hurt"
+set g_balance_keyhunt_delay_return 60 "time a key takes to destroy itself if dropped"
 set g_balance_keyhunt_delay_round 5
 set g_balance_keyhunt_delay_tracking 10
 set g_balance_keyhunt_delay_fadeout 2