From: Mario <zacjardine@y7mail.com>
Date: Sat, 25 Nov 2017 01:27:25 +0000 (+0000)
Subject: Merge branch 'TimePath/stale_move_negation' into 'master'
X-Git-Tag: xonotic-v0.8.5~2428
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=a8b4ee97c89d9c2604d9dafd6bde514089c84450;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/stale_move_negation' into 'master'

Mutator: Stale-move negation

See merge request xonotic/xonotic-data.pk3dir!489
---

a8b4ee97c89d9c2604d9dafd6bde514089c84450
diff --combined mutators.cfg
index de8faa4ff,9682293db..c16fda72e
--- a/mutators.cfg
+++ b/mutators.cfg
@@@ -12,21 -12,17 +12,21 @@@ seta cl_dodging_timeout 0.2 "determine
  
  set sv_dodging_air_dodging 0
  set sv_dodging_wall_dodging 0 "allow dodging off walls"
 -set sv_dodging_delay 0.5 "determines how long a player has to wait to be able to dodge again after dodging"
 +set sv_dodging_delay 0.6 "determines how long a player has to wait to be able to dodge again after dodging"
  set sv_dodging_up_speed 200 "the jump velocity of the dodge"
 -set sv_dodging_horiz_speed 400 "the horizontal velocity of the dodge"
 -set sv_dodging_horiz_speed_frozen 200 "the horizontal velocity of the dodge while frozen"
 +set sv_dodging_horiz_speed_min 200 "the lower bound of current velocity for force scaling"
 +set sv_dodging_horiz_speed_max 1000 "the upper bound of current velocity for force scaling"
 +set sv_dodging_horiz_force_slowest 400 "the horizontal velocity of the dodge when current velocity is <= sv_dodging_horiz_speed_min, values between min and max are linearly scaled"
 +set sv_dodging_horiz_force_fastest 400 "the horizontal velocity of the dodge when current velocity is >= sv_dodging_horiz_speed_max, values between min and max are linearly scaled"
 +set sv_dodging_horiz_force_frozen 200 "the horizontal velocity of the dodge while frozen"
  set sv_dodging_ramp_time 0.1 "a ramp so that the horizontal part of the dodge is added smoothly (seconds)"
  set sv_dodging_height_threshold 10 "the maximum height above ground where to allow dodging"
  set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that still allows dodging"
  set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent"
  set sv_dodging_frozen 0 "allow dodging while frozen"
  set sv_dodging_frozen_doubletap 0
 -set sv_dodging_maxspeed 450 "maximum speed a player can be moving at before they dodge again"
 +set sv_dodging_maxspeed 350 "maximum speed a player can be moving at to use the standard dodging from an (almost) standstill"
 +set sv_dodging_air_maxspeed 450 "maximum speed a player can be moving at before they dodge again when air dodging is enabled"
  
  
  // ===========
@@@ -473,7 -469,14 +473,15 @@@ set g_running_guns 0 "... or wonder, ti
  //  dynamic handicap
  // ==================
  set g_dynamic_handicap 0 "Whether to enable dynamic handicap."
 -set g_dynamic_handicap_scale 1 "The scale of the handicap. Larger values mean more penalties for strong players and more buffs for weak players."
 +set g_dynamic_handicap_scale 0.2 "The scale of the handicap. Larger values mean more penalties for strong players and more buffs for weak players."
 +set g_dynamic_handicap_exponent 1 "The exponent used to calculate handicap. 1 means linear scale. Values more than 1 mean stronger non-linear handicap. Values less than 1 mean weaker non-linear handicap"
  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"