X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=gamemodes-server.cfg;h=d78b73e615430a7d3c3ca9b52c6f3141c8f56faa;hb=refs%2Fheads%2Fz411%2Fkaball_wait;hp=65fb610c84846a6f55ae99a94ccc34cdf12bd20f;hpb=a3832753051fb11cad5b2e64e85943c9950820bb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 65fb610c8..d78b73e61 100644
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -363,11 +363,12 @@ set g_domination_warmup 5 "time players have to wait before the round starts"
 //  freezetag
 // ===========
 set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them"
-set g_freezetag_warmup 5 "time players get to run around before the round starts"
+set g_freezetag_warmup 10 "time players get to run around before the round starts"
 set g_freezetag_point_limit -1	"Freeze Tag point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 set g_freezetag_point_leadlimit -1	"Freeze Tag point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
-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_speed 0.4 "Speed for reviving a frozen teammate if g_freezetag_revive_time_to_score is off"
+set g_freezetag_revive_speed_t2s 0.25 "Speed for reviving a frozen teammate if g_freezetag_revive_time_to_score is active"
+set g_freezetag_revive_clearspeed 1.6 "Speed at which reviving progress gets lost when out of range (if g_freezetag_revive_time_to_score is active reviving progress is not cleared)"
 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_nade 1 "Enable reviving from own nade explosion"
 set g_freezetag_revive_nade_health 40 "Amount of health player has if they revived from their own nade explosion"
@@ -376,7 +377,9 @@ set g_freezetag_round_timelimit 360 "round time limit in seconds"
 set g_freezetag_revive_auto 1 "automatically revive frozen players after some time (g_freezetag_frozen_maxtime)"
 set g_freezetag_revive_auto_progress 1 "start the automatic reviving progress as soon as the player gets frozen"
 set g_freezetag_revive_auto_reducible 1 "reduce auto-revival time when frozen players are hit by enemies; set to -1 to reduce it even when they are hit by teammates"
-set g_freezetag_revive_auto_reducible_forcefactor 0.025 "hit force to time reduction conversion factor"
+set g_freezetag_revive_auto_reducible_forcefactor 0.01 "hit force to time reduction conversion factor"
+set g_freezetag_revive_auto_reducible_maxforce 400 "max force considered at once"
+set g_freezetag_revive_spawnshield 1 "apply spawnshield for this time in seconds after the player has been revived"
 set g_freezetag_frozen_maxtime 60 "frozen players will be automatically unfrozen after this time in seconds"
 set g_freezetag_teams_override 0
 set g_freezetag_team_spawns 0 "when 1, players spawn from the team spawnpoints of the map, if any"
@@ -406,6 +409,7 @@ set g_keepaway_noncarrier_selfforce	1	"self force if you don't have the ball"
 set g_keepawayball_effects 0 "Add together the numbers you want: EF_ADDITIVE (32) / EF_NODEPTHTEST (8192) / EF_DIMLIGHT (8)"
 set g_keepawayball_trail_color	254	"particle trail color from player/ball"
 set g_keepawayball_damageforcescale	3 "Scale of force which is applied to the ball by weapons/explosions/etc"
+set g_keepawayball_pickup_delay 1   "time until the ball can be picked up again after getting dropped"
 set g_keepawayball_respawntime	10	"if no one picks up the ball, how long to wait until the ball respawns"
 
 
@@ -443,8 +447,8 @@ set g_lms 0 "Last Man Standing: everyone starts with a certain amount of lives,
 set g_lms_lives_override -1
 set g_lms_extra_lives 0
 set g_lms_regenerate 0
-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"
+set g_lms_last_join 3	"if g_lms_join_anytime is 0, new players can only join if the worst active player has (fraglimit - g_lms_last_join) or more lives; in other words, new players can no longer join once the worst player loses more than g_lms_last_join lives"
+set g_lms_join_anytime 1	"1: new players can join, but get same amount of lives as the worst player; 0: new players can only join if the worst active player has (fraglimit - g_lms_last_join) or more lives"
 set g_lms_weaponarena "most_available" "starting weapons - takes the same options as g_weaponarena"