From: Mario <mario@smbclan.net>
Date: Sat, 25 Nov 2017 03:24:47 +0000 (+1000)
Subject: Merge branch 'master' into Lyberta/RandomItems
X-Git-Tag: xonotic-v0.8.5~2426^2
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=6860495bd0cb15353c11be01ad03f052c34b9536;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/RandomItems

# Conflicts:
#	mutators.cfg
---

6860495bd0cb15353c11be01ad03f052c34b9536
diff --cc mutators.cfg
index ac5a4fda7,c16fda72e..e37c19090
--- a/mutators.cfg
+++ b/mutators.cfg
@@@ -476,9 -478,10 +480,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."
  
+ // =====================
+ //  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"
++
 +// ==============
 +//  random items
 +// ==============
 +set g_random_items 0 "Whether to enable random items."
 +set g_random_loot 0 "Whether to enable random loot."
 +exec randomitems-xonotic.cfg