X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=gamemodes.cfg;h=665fa558490b75fac0e554e8f8badc87cc00e218;hp=6913ac666c42bede94167a4d254d4b367888cee1;hb=e2e3108025e839a3295af9b72b92ee1ca3ea9656;hpb=6c111e4d7176d56d83f0f1fc10280493c0439b9e

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 6913ac666..665fa5584 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -89,7 +89,7 @@ seta g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo
 // =================================
 // when variables are set to anything other than 0, they take over the global setting...
 // to force disable delay or waves, set them to 0.125
-set g_ctf_respawn_delay 0
+set g_ctf_respawn_delay 5
 set g_ctf_respawn_waves 0
 set g_ctf_weapon_stay 0
 set g_dm_respawn_delay 0
@@ -278,6 +278,8 @@ seta g_freezetag_point_leadlimit -1	"Freeze Tag point lead limit overriding the
 set g_freezetag_revive_speed 0.4 "Speed for reviving a frozen teammate"
 set g_freezetag_revive_clearspeed 1.6 "Speed at which reviving progress gets lost when out of range"
 set g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
+set g_freezetag_revive_falldamage 0 "Enable reviving from this amount of fall damage"
+set g_freezetag_revive_falldamage_health 40 "Amount of health player has if they revived from falling"
 set g_freezetag_round_timelimit 180
 set g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with"
 set g_freezetag_frozen_maxtime 60 "frozen players will be automatically unfrozen after this time in seconds"
@@ -341,10 +343,8 @@ set g_keyhunt_teams 0
 // ===================
 set g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives, and the survivor wins"
 set g_lms_lives_override -1
+set g_lms_extra_lives 0
 set g_lms_regenerate 0
-set g_lms_campcheck_interval 10
-set g_lms_campcheck_damage 100
-set g_lms_campcheck_distance 1800
 set g_lms_last_join 3	"if g_lms_join_anytime is false, new players can only join if the worst active player has more than (fraglimit - g_lms_last_join) lives"
 set g_lms_join_anytime 1	"if true, new players can join, but get same amount of lives as the worst player"