Merge branch 'master' into Mario/status_effects_extended

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / freezetag / sv_freezetag.qh

diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
index 4c88b20de448ebafc0d8aa6195e4da21e0404c2a..6fdd693cc044a5c5b7a04d92be38758837f92660 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
+++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
@@ -30,6 +30,7 @@ REGISTER_MUTATOR(ft, false)
 .float freezetag_revive_time;
 .float freezetag_frozen_time;
 .float freezetag_frozen_timeout;
+.float freezetag_frozen_force;
 const float ICE_MAX_ALPHA = 1;
 const float ICE_MIN_ALPHA = 0.1;
 float freezetag_teams;
@@ -37,9 +38,12 @@ float freezetag_teams;
 bool autocvar_g_freezetag_revive_auto = 1;
 int autocvar_g_freezetag_revive_auto_progress = 1;
 int autocvar_g_freezetag_revive_auto_reducible;
-float autocvar_g_freezetag_revive_auto_reducible_forcefactor;
+float autocvar_g_freezetag_revive_auto_reducible_forcefactor = 0.01;
+float autocvar_g_freezetag_revive_auto_reducible_maxforce;
 float autocvar_g_freezetag_revive_extra_size;
 float autocvar_g_freezetag_revive_speed;
+float autocvar_g_freezetag_revive_speed_t2s = 0.25;
 float autocvar_g_freezetag_revive_time_to_score = 1.5;
 bool autocvar_g_freezetag_revive_nade;
 float autocvar_g_freezetag_revive_nade_health;
+float autocvar_g_freezetag_revive_spawnshield = 1;