From: Mario <mario@smbclan.net>
Date: Sat, 25 Nov 2017 01:29:58 +0000 (+1000)
Subject: Merge branch 'master' into DefaultUser/kick_teamkiller
X-Git-Tag: xonotic-v0.8.5~2425^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6bf8f685fd35f882e456bdbadc37617ac6bd53a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into DefaultUser/kick_teamkiller

# Conflicts:
#	mutators.cfg
---

d6bf8f685fd35f882e456bdbadc37617ac6bd53a
diff --cc mutators.cfg
index 1538c684f,c16fda72e..8bb2d953c
--- a/mutators.cfg
+++ b/mutators.cfg
@@@ -473,8 -478,10 +478,17 @@@ set g_dynamic_handicap_exponent 1 "The 
  set g_dynamic_handicap_min 0 "The minimum value of the handicap."
  set g_dynamic_handicap_max 0 "The maximum value of the handicap."
  
 +// ===============
 +// kick teamkiller
 +// ===============
 +set g_kick_teamkiller_rate 0 "Limit for teamkills per minute before the client gets dropped. 0 means that the teamkillers don't get kicked automatically"
 +set g_kick_teamkiller_lower_limit 5 "Minimum number of teamkills before the teamkill rate is considered"
++
+ // =====================
+ //  stale-move negation
+ // =====================
+ set g_smneg 0 "Stale-move negation: penalize repeated use of the same weapon"
+ set g_smneg_bonus 1 "Stale-move negation: allow weapons to become stronger than their baseline"
+ set g_smneg_bonus_asymptote 4 "Stale-move negation: damage = infinity at this bonus level"
+ set g_smneg_cooldown_factor 0.25 "Stale-move negation: penalty cooldown factor"
++