]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/RandomItems
authorMario <mario@smbclan.net>
Sat, 25 Nov 2017 03:24:47 +0000 (13:24 +1000)
committerMario <mario@smbclan.net>
Sat, 25 Nov 2017 03:24:47 +0000 (13:24 +1000)
# Conflicts:
# mutators.cfg

1  2 
mutators.cfg
qcsrc/common/mutators/mutator/_mod.inc
qcsrc/common/mutators/mutator/_mod.qh
qcsrc/common/stats.qh

diff --combined mutators.cfg
index ac5a4fda74114828d3d1abdedcdc0edf65900fbf,c16fda72e32b16f7d7f54df0d66afe772f065147..e37c190902d4901aa02ee2e5abbd86188c6f4489
@@@ -12,17 -12,21 +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"
  
  
  // ===========
@@@ -36,9 -40,7 +40,9 @@@ set g_instagib_ammo_convert_bullets 0 "
  set g_instagib_ammo_convert_cells 0 "convert normal cell ammo packs to insta cell ammo packs"
  set g_instagib_ammo_convert_rockets 0 "convert rocket ammo packs to insta cell ammo packs"
  set g_instagib_ammo_convert_shells 0 "convert shell ammo packs to insta cell ammo packs"
 +set g_instagib_invisibility_time 30 "Time of ivisibility powerup in seconds."
  set g_instagib_invis_alpha 0.15
 +set g_instagib_speed_time 30 "Time of speed powerup in seconds."
  set g_instagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
  set g_instagib_damagedbycontents 1 "allow damage from lava pits in instagib"
  set g_instagib_blaster_keepdamage 0 "allow secondary fire to hurt players"
@@@ -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
index 59b2c117d2cb63e705726ce6e997c4e46b359775,1ba168f0732f4ca2961dfe9738327876efa901e2..d1a6acfc91c0988929456b8eecbf7abc1354f70f
  #include <common/mutators/mutator/physical_items/_mod.inc>
  #include <common/mutators/mutator/pinata/_mod.inc>
  #include <common/mutators/mutator/random_gravity/_mod.inc>
 +#include <common/mutators/mutator/random_items/_mod.inc>
  #include <common/mutators/mutator/rocketflying/_mod.inc>
  #include <common/mutators/mutator/rocketminsta/_mod.inc>
  #include <common/mutators/mutator/running_guns/_mod.inc>
  #include <common/mutators/mutator/sandbox/_mod.inc>
  #include <common/mutators/mutator/spawn_near_teammate/_mod.inc>
+ #include <common/mutators/mutator/stale_move_negation/_mod.inc>
  #include <common/mutators/mutator/superspec/_mod.inc>
  #include <common/mutators/mutator/touchexplode/_mod.inc>
  #include <common/mutators/mutator/vampire/_mod.inc>
index b1c627fb6d76d3c48b75a31198a10fa7453c23cb,e7859d3cb1d12b3814f6af7bdcac2644dba1ce3f..a865d1922d9b0844ec65a711006f1cc3bf6ae679
  #include <common/mutators/mutator/physical_items/_mod.qh>
  #include <common/mutators/mutator/pinata/_mod.qh>
  #include <common/mutators/mutator/random_gravity/_mod.qh>
 +#include <common/mutators/mutator/random_items/_mod.qh>
  #include <common/mutators/mutator/rocketflying/_mod.qh>
  #include <common/mutators/mutator/rocketminsta/_mod.qh>
  #include <common/mutators/mutator/running_guns/_mod.qh>
  #include <common/mutators/mutator/sandbox/_mod.qh>
  #include <common/mutators/mutator/spawn_near_teammate/_mod.qh>
+ #include <common/mutators/mutator/stale_move_negation/_mod.qh>
  #include <common/mutators/mutator/superspec/_mod.qh>
  #include <common/mutators/mutator/touchexplode/_mod.qh>
  #include <common/mutators/mutator/vampire/_mod.qh>
diff --combined qcsrc/common/stats.qh
index 77f01e267203423caf07c25abfe47d2f9a8b9a14,8da6bf5a738548a4e6b6e2e093c73baa7e61b954..daa1d3c8b7bd205640288198c94a0eb7f010dede
@@@ -217,28 -217,36 +217,36 @@@ float autocvar_sv_dodging_wall_distance
  bool autocvar_sv_dodging_frozen;
  bool autocvar_sv_dodging_frozen_doubletap;
  float autocvar_sv_dodging_height_threshold;
- float autocvar_sv_dodging_horiz_speed;
- float autocvar_sv_dodging_horiz_speed_frozen;
+ float autocvar_sv_dodging_horiz_speed_min;
+ float autocvar_sv_dodging_horiz_speed_max;
+ float autocvar_sv_dodging_horiz_force_slowest;
+ float autocvar_sv_dodging_horiz_force_fastest;
+ float autocvar_sv_dodging_horiz_force_frozen;
  float autocvar_sv_dodging_ramp_time;
  float autocvar_sv_dodging_up_speed;
  bool autocvar_sv_dodging_wall_dodging;
  bool autocvar_sv_dodging_air_dodging;
- float autocvar_sv_dodging_maxspeed = 450;
+ float autocvar_sv_dodging_maxspeed;
+ float autocvar_sv_dodging_air_maxspeed;
  #endif
  
  #if 0
  REGISTER_STAT(DODGING, int, g_dodging)
  REGISTER_STAT(DODGING_DELAY, float, autocvar_sv_dodging_delay)
  REGISTER_STAT(DODGING_DISTANCE_THRESHOLD, float, autocvar_sv_dodging_wall_distance_threshold)
- REGISTER_STAT(DODGING_FROZEN_NO_DOUBLETAP, int, autocvar_sv_dodging_frozen_doubletap)
+ REGISTER_STAT(DODGING_FROZEN_DOUBLETAP, int, autocvar_sv_dodging_frozen_doubletap)
  REGISTER_STAT(DODGING_HEIGHT_THRESHOLD, float, autocvar_sv_dodging_height_threshold)
- REGISTER_STAT(DODGING_HORIZ_SPEED, float, autocvar_sv_dodging_horiz_speed)
- REGISTER_STAT(DODGING_HORIZ_SPEED_FROZEN, float, autocvar_sv_dodging_horiz_speed_frozen)
+ REGISTER_STAT(DODGING_HORIZ_SPEED_MIN, float, autocvar_sv_dodging_horiz_speed_min)
+ REGISTER_STAT(DODGING_HORIZ_SPEED_MAX, float, autocvar_sv_dodging_horiz_speed_max)
+ REGISTER_STAT(DODGING_HORIZ_FORCE_SLOWEST, float, autocvar_sv_dodging_horiz_force_slowest)
+ REGISTER_STAT(DODGING_HORIZ_FORCE_FASTEST, float, autocvar_sv_dodging_horiz_force_fastest)
+ REGISTER_STAT(DODGING_HORIZ_FORCE_FROZEN, float, autocvar_sv_dodging_horiz_force_frozen)
  REGISTER_STAT(DODGING_RAMP_TIME, float, autocvar_sv_dodging_ramp_time)
  REGISTER_STAT(DODGING_UP_SPEED, float, autocvar_sv_dodging_up_speed)
  REGISTER_STAT(DODGING_WALL, bool, autocvar_sv_dodging_wall_dodging)
  REGISTER_STAT(DODGING_AIR, bool, autocvar_sv_dodging_air_dodging)
  REGISTER_STAT(DODGING_MAXSPEED, float, autocvar_sv_dodging_maxspeed)
+ REGISTER_STAT(DODGING_AIR_MAXSPEED, float, autocvar_sv_dodging_air_maxspeed)
  #endif
  /** cvar loopback */
  REGISTER_STAT(DODGING_FROZEN, int, autocvar_sv_dodging_frozen)
@@@ -295,7 -303,6 +303,7 @@@ REGISTER_STAT(SLICK_APPLYGRAVITY, bool
  
  #ifdef SVQC
  #include "physics/movetypes/movetypes.qh"
 +float warmup_limit;
  #endif
  
  REGISTER_STAT(MOVEVARS_AIRACCEL_QW_STRETCHFACTOR, float)